2010-03-24 Rodrigo Kumpera <rkumpera@novell.com>

	* reflection.c: Add support for new v4 type
	System.Reflection.MonoAssembly that is the concrete version
	of Assembly which is abstract unver v4.

svn path=/trunk/mono/; revision=154175

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 682cea0e92d9656a31a5e6f273d1081587538b99..2cc7d0bcc47e617c2f9b180af2d65235ab8b6647 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-24 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * reflection.c: Add support for new v4 type
+       System.Reflection.MonoAssembly that is the concrete version
+       of Assembly which is abstract unver v4.
+
 2010-03-24  U-anarquia\miguel  <miguel@anarquia>
 
        * reflection.c (mono_reflection_get_custom_attrs_info): Protect

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index b58a4295fb80b9a542e1cb38ffa9ba850ab1a52f..d3e026678cd7b632c24431f17a0c55a7c6d54c3e 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -6119,14 +6119,18 @@ mono_image_set_wrappers_type (MonoReflectionModuleBuilder *moduleb, MonoReflecti
 MonoReflectionAssembly*
 mono_assembly_get_object (MonoDomain *domain, MonoAssembly *assembly)
 {
-       static MonoClass *System_Reflection_Assembly;
+       static MonoClass *assembly_type;
        MonoReflectionAssembly *res;
        
        CHECK_OBJECT (MonoReflectionAssembly *, assembly, NULL);
-       if (!System_Reflection_Assembly)
-               System_Reflection_Assembly = mono_class_from_name (
-                       mono_defaults.corlib, "System.Reflection", "Assembly");
-       res = (MonoReflectionAssembly *)mono_object_new (domain, System_Reflection_Assembly);
+       if (!assembly_type) {
+               MonoClass *class = mono_class_from_name (mono_defaults.corlib, "System.Reflection", "MonoAssembly");
+               if (class == NULL)
+                       class = mono_class_from_name (mono_defaults.corlib, "System.Reflection", "Assembly");
+               g_assert (class);
+               assembly_type = class;
+       }
+       res = (MonoReflectionAssembly *)mono_object_new (domain, assembly_type);
        res->assembly = assembly;
 
        CACHE_OBJECT (MonoReflectionAssembly *, assembly, res, NULL);
@@ -7698,7 +7702,7 @@ mono_reflection_get_token (MonoObject *obj)
                MonoReflectionModule *m = (MonoReflectionModule*)obj;
 
                token = m->token;
-       } else if (strcmp (klass->name, "Assembly") == 0) {
+       } else if (strcmp (klass->name, "Assembly") == 0 || strcmp (klass->name, "MonoAssembly") == 0) {
                token = mono_metadata_make_token (MONO_TABLE_ASSEMBLY, 1);
        } else {
                gchar *msg = g_strdup_printf ("MetadataToken is not supported for type '%s.%s'", klass->name_space, klass->name);
@@ -8682,7 +8686,7 @@ mono_reflection_get_custom_attrs_info (MonoObject *obj)
                MonoType *type = mono_reflection_type_get_handle ((MonoReflectionType *)obj);
                klass = mono_class_from_mono_type (type);
                cinfo = mono_custom_attrs_from_class (klass);
-       } else if (strcmp ("Assembly", klass->name) == 0) {
+       } else if (strcmp ("Assembly", klass->name) == 0 || strcmp ("MonoAssembly", klass->name) == 0) {
                MonoReflectionAssembly *rassembly = (MonoReflectionAssembly*)obj;
                cinfo = mono_custom_attrs_from_assembly (rassembly->assembly);
        } else if (strcmp ("Module", klass->name) == 0) {