Author: zoltan
Date: 2007-07-31 15:12:27 -0400 (Tue, 31 Jul 2007)
New Revision: 83139

Modified:
   trunk/mono/mono/utils/ChangeLog
   trunk/mono/mono/utils/mono-dl.c
Log:
2007-07-31  Zoltan Varga  <[EMAIL PROTECTED]>

        * mono-dl.c (w32_dlerror): Fix call to FormatMessage (). Fixes #82260.


Modified: trunk/mono/mono/utils/ChangeLog
===================================================================
--- trunk/mono/mono/utils/ChangeLog     2007-07-31 18:59:40 UTC (rev 83138)
+++ trunk/mono/mono/utils/ChangeLog     2007-07-31 19:12:27 UTC (rev 83139)
@@ -1,3 +1,7 @@
+2007-07-31  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * mono-dl.c (w32_dlerror): Fix call to FormatMessage (). Fixes #82260.
+
 2007-07-27  Mark Probst  <[EMAIL PROTECTED]>
 
        * mono-membar.h: Memory barriers.

Modified: trunk/mono/mono/utils/mono-dl.c
===================================================================
--- trunk/mono/mono/utils/mono-dl.c     2007-07-31 18:59:40 UTC (rev 83138)
+++ trunk/mono/mono/utils/mono-dl.c     2007-07-31 19:12:27 UTC (rev 83139)
@@ -91,10 +91,12 @@
        DWORD code = GetLastError ();
 
        if (FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | 
FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL,
-               code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, 0, NULL))
+               code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), &buf, 0, NULL))
        {
                ret = g_utf16_to_utf8 (buf, wcslen(buf), NULL, NULL, NULL);
                LocalFree (buf);
+       } else {
+               g_assert_not_reached ();
        }
        return ret;
 }

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to