2005-01-06 Zoltan Varga <vargaz@freemail.hu>

	* reflection.c (reflection_methodbuilder_from_method_builder): Copy
	fields from mb, not rmb. Fixes #71017.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 3f9b78fa8b752c5c9e5c1aff3181bd3fdc9164c4..7da2ec877b8ff40e18d9f0a125851b82671b45af 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,5 +1,8 @@
 2005-01-06  Zoltan Varga  <vargaz@freemail.hu>
 
+       * reflection.c (reflection_methodbuilder_from_method_builder): Copy
+       fields from mb, not rmb. Fixes #71017.
+
        * marshal.c (emit_ptr_to_str_conv): Add support for 
        ByValTStr -> string conversion. Fixes #71015.
 

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 1fe52a4c5d0d3da24d0504532877309281c3c88f..6a789876f54b92333aa5d3b8d0ac15b19d5b5d05 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -1313,9 +1313,9 @@ reflection_methodbuilder_from_method_builder (ReflectionMethodBuilder *rmb, Mono
        rmb->refs = NULL;
 
        if (mb->dll) {
-               rmb->charset = rmb->charset & 0xf;
-               rmb->lasterr = rmb->charset & 0x40;
-               rmb->native_cc = rmb->native_cc;
+               rmb->charset = mb->charset & 0xf;
+               rmb->lasterr = mb->charset & 0x40;
+               rmb->native_cc = mb->native_cc;
                rmb->dllentry = mb->dllentry;
                rmb->dll = mb->dll;
        }
@@ -5351,7 +5351,6 @@ mono_method_get_object (MonoDomain *domain, MonoMethod *method, MonoClass *refcl
         */
        const char *cname;
        MonoClass *klass;
-       MonoMethod *original = method;
        MonoReflectionMethod *ret;
 
        if (method->is_inflated) {
@@ -7616,6 +7615,7 @@ reflection_methodbuilder_to_mono_method (MonoClass *klass,
                method_aux->dll = g_strdup (mono_string_to_utf8 (rmb->dll));
                
                ((MonoMethodPInvoke*)m)->piflags = (rmb->native_cc << 8) | (rmb->charset ? (rmb->charset - 1) * 2 : 1) | rmb->lasterr;
+               printf ("B: %d %d\n", ((MonoMethodPInvoke*)m)->piflags, rmb->charset);
 
                if (klass->image->dynamic)
                        g_hash_table_insert (((MonoDynamicImage*)klass->image)->method_aux_hash, m, method_aux);