Author: joncham
Date: 2007-04-27 09:29:42 -0400 (Fri, 27 Apr 2007)
New Revision: 76386
Modified:
branches/mono-1-2-4/mono/mono/metadata/ChangeLog
branches/mono-1-2-4/mono/mono/metadata/marshal.c
Log:
2007-04-23 Jonathan Chambers <[EMAIL PROTECTED]>
* marshal.c: Fix calling convention for CCW on non-windows
platforms. STDCALL on windows, CDECL everywhere else to work
with XPCOM and MainWin COM.
Code is contributed under MIT/X11 license.
Modified: branches/mono-1-2-4/mono/mono/metadata/ChangeLog
===================================================================
--- branches/mono-1-2-4/mono/mono/metadata/ChangeLog 2007-04-27 13:16:11 UTC
(rev 76385)
+++ branches/mono-1-2-4/mono/mono/metadata/ChangeLog 2007-04-27 13:29:42 UTC
(rev 76386)
@@ -1,3 +1,11 @@
+2007-04-23 Jonathan Chambers <[EMAIL PROTECTED]>
+
+ * marshal.c: Fix calling convention for CCW on non-windows
+ platforms. STDCALL on windows, CDECL everywhere else to work
+ with XPCOM and MainWin COM.
+
+ Code is contributed under MIT/X11 license.
+
2007-04-23 Martin Baulig <[EMAIL PROTECTED]>
Fix #80969.
Modified: branches/mono-1-2-4/mono/mono/metadata/marshal.c
===================================================================
--- branches/mono-1-2-4/mono/mono/metadata/marshal.c 2007-04-27 13:16:11 UTC
(rev 76385)
+++ branches/mono-1-2-4/mono/mono/metadata/marshal.c 2007-04-27 13:29:42 UTC
(rev 76386)
@@ -11252,7 +11252,13 @@
/* FIXME: which to use? */
csig = signature_dup (method->klass->image, sig);
/* csig = mono_metadata_signature_dup (sig); */
+
+ /* STDCALL on windows, CDECL everywhere else to work with XPCOM and
MainWin COM */
+#ifdef PLATFORM_WIN32
csig->call_convention = MONO_CALL_STDCALL;
+#else
+ csig->call_convention = MONO_CALL_C;
+#endif
csig->hasthis = 0;
csig->pinvoke = 1;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
