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

	* loader.c (mono_lookup_pinvoke_call): Revert the previous patch as it breaks
	System.Drawing.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 66dbf15fb249993dff6bb98c428168d19801f41b..c98caa5d53db879ef1af515e014d62507c7da403 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,5 +1,8 @@
 2005-01-18  Zoltan Varga  <vargaz@freemail.hu>
 
+       * loader.c (mono_lookup_pinvoke_call): Revert the previous patch as it breaks 
+       System.Drawing.
+
        * reflection.c (mono_method_body_get_object): Handle abstract and
        runtime methods.
 

diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index 3fa356d80263dbc251f6b27e22195fe586486130..7c437df8267ed1ef4a91920beae6f3aed66052b5 100644 (file)
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -766,12 +766,6 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char
                }
 
 #ifdef PLATFORM_WIN32
-               if (piinfo->addr) {
-                       /* Set call conv to cdecl, since stdcall would need a mangled name */
-                       if (method->signature->call_convention == MONO_CALL_DEFAULT)
-                               method->signature->call_convention = MONO_CALL_C;
-               }
-
                /* Try the stdcall mangled name */
                if (!piinfo->addr) {
                        /* FIX: Compute this correctly */