2006-12-15 Jonathan Chambers <joncham@gmail.com>

	* marshal.c (mono_string_from_bstr): Revert previous Windows change
	and fix on Linux.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index d769e25b165828d94b38ec7c79646c8b61efc650..0f61b4029fe73c12b249a6497d4dc6b19438dfb6 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-15  Jonathan Chambers  <joncham@gmail.com>
+
+       * marshal.c (mono_string_from_bstr): Revert previous Windows change
+       and fix on Linux.
+       
 2006-12-15  Miguel de Icaza  <miguel@novell.com>
 
        * marshal.c (mono_string_from_bstr): Jon Chambers pointed out that

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 6aa2d7649007f455d6c6555b5560efe51d5ae0ac..627d9ee86f43224a7c2c66441d7e451029a4ef5c 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -931,9 +931,9 @@ mono_string_from_bstr (gpointer bstr)
 #ifdef PLATFORM_WIN32
        if (!bstr)
                return NULL;
-       return mono_string_new_utf16 (mono_domain_get (), SysStringLen (bstr), bstr);
+       return mono_string_new_utf16 (mono_domain_get (), bstr, SysStringLen (bstr));
 #else
-       return mono_string_new_utf16 (mono_domain_get (), *(guint32 *) bstr, ((char *)bstr) - 4);
+       return mono_string_new_utf16 (mono_domain_get (), bstr, *(guint32 *)((char *)bstr - 4));
 #endif
 }