From 697fc48c13555eb9c533d806da3bc36a2db0bd33 Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Fri, 9 Jul 2010 14:33:03 +0000 Subject: [PATCH] Sync __crtGetStringTypeW from Wine. Fixes msvcrt:locale crash. svn path=/trunk/; revision=47978 --- reactos/dll/win32/msvcrt/msvcrt.spec | 2 +- reactos/lib/sdk/crt/locale/locale.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/msvcrt/msvcrt.spec b/reactos/dll/win32/msvcrt/msvcrt.spec index 3a9c7cf5a8b..3ccd0390796 100644 --- a/reactos/dll/win32/msvcrt/msvcrt.spec +++ b/reactos/dll/win32/msvcrt/msvcrt.spec @@ -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) diff --git a/reactos/lib/sdk/crt/locale/locale.c b/reactos/lib/sdk/crt/locale/locale.c index 627234ed67d..7e7b1afd4af 100644 --- a/reactos/lib/sdk/crt/locale/locale.c +++ b/reactos/lib/sdk/crt/locale/locale.c @@ -901,3 +901,18 @@ unsigned int CDECL ___setlc_active_func(void) { 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); +} -- 2.17.1