ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Fixed handling LOCALE_NAME_USER_DEFAULT in GetLocaleInfoEx.

Browse Source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2016-08-26 22:13:17 +02:00 committed by Alexandre Julliard
parent d26c0ca214
commit 505406fc83
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/kernel32/locale.c
View File

@ -1726,7 +1726,7 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len)
if (!lcid) return 0; if (!lcid) return 0;
/* special handling for neutral locale names */ /* special handling for neutral locale names */
if (info == LOCALE_SNAME && strlenW(locale) == 2) if (info == LOCALE_SNAME && locale && strlenW(locale) == 2)
{ {
if (len && len < 3) if (len && len < 3)
{ {

8
dlls/kernel32/tests/locale.c
View File

@ -4283,7 +4283,7 @@ static void test_IdnToUnicode(void)
static void test_GetLocaleInfoEx(void) static void test_GetLocaleInfoEx(void)
{ {
static const WCHAR enW[] = {'e','n',0}; static const WCHAR enW[] = {'e','n',0};
WCHAR bufferW[80]; WCHAR bufferW[80], buffer2[80];
INT ret; INT ret;
if (!pGetLocaleInfoEx) if (!pGetLocaleInfoEx)
@ -4354,6 +4354,12 @@ static void test_GetLocaleInfoEx(void)
ok(!lstrcmpW(bufferW, ptr->name), "%s: got wrong LOCALE_SNAME %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(bufferW)); ok(!lstrcmpW(bufferW, ptr->name), "%s: got wrong LOCALE_SNAME %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(bufferW));
ptr++; ptr++;
} }
ret = pGetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SNAME, bufferW, sizeof(bufferW)/sizeof(WCHAR));
ok(ret && ret == lstrlenW(bufferW)+1, "got ret value %d\n", ret);
ret = GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SNAME, buffer2, sizeof(buffer2)/sizeof(WCHAR));
ok(ret && ret == lstrlenW(buffer2)+1, "got ret value %d\n", ret);
ok(!lstrcmpW(bufferW, buffer2), "LOCALE_SNAMEs don't match %s %s\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(buffer2));
} }
} }