[ros-diffs] [spetreolle] 47978: Sync __crtGetStringTypeW from Wine. Fixes msvcrt:locale crash.

[spetreolle at svn.reactos.org]

Author: spetreolle
Date: Fri Jul  9 14:33:03 2010
New Revision: 47978

URL: http://svn.reactos.org/svn/reactos?rev=47978&view=rev
Log:
Sync __crtGetStringTypeW from Wine.
Fixes msvcrt:locale crash.


Modified:
    trunk/reactos/dll/win32/msvcrt/msvcrt.spec
    trunk/reactos/lib/sdk/crt/locale/locale.c

Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.spec?rev=47978&r1=47977&r2=47978&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Fri Jul  9 14:33:03 2010
@@ -138,7 +138,7 @@
 @ cdecl __crtCompareStringA(long long str long str long) kernel32.CompareStringA
 @ cdecl __crtCompareStringW(long long wstr long wstr long) kernel32.CompareStringW
 @ cdecl __crtGetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfo
-@ cdecl __crtGetStringTypeW(long long wstr long ptr) kernel32.GetStringTypeW
+@ cdecl __crtGetStringTypeW(long long wstr long ptr)
 @ cdecl __crtLCMapStringA(long long str long ptr long long long)
 # stub __crtLCMapStringW
 @ cdecl __dllonexit(ptr ptr ptr)

Modified: trunk/reactos/lib/sdk/crt/locale/locale.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.c?rev=47978&r1=47977&r2=47978&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Fri Jul  9 14:33:03 2010
@@ -901,3 +901,18 @@
 {
   return __setlc_active;
 }
+
+/*********************************************************************
+ *              __crtGetStringTypeW(MSVCRT.@)
+ *
+ * This function was accepting different number of arguments in older
+ * versions of msvcrt.
+ */
+BOOL CDECL __crtGetStringTypeW(DWORD unk, DWORD type,
+        wchar_t *buffer, int len, WORD *out)
+{
+    FIXME("(unk %x, type %x, wstr %p(%d), %p) partial stub\n",
+            unk, type, buffer, len, out);
+
+    return GetStringTypeW(type, buffer, len, out);
+}