kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales.

Signed-off-by: Matej Špindler <spindler.matej@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales.
da5112c7 · Matej Špindler · Alexandre Julliard · cd5570d9 · da5112c7 · da5112c7
Commit da5112c7 authored May 22, 2018 by Matej Špindler Committed by Alexandre Julliard May 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

locale.c dlls/kernel32/locale.c +1 -1

locale.c dlls/kernel32/tests/locale.c +4 -0

No files found.
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -1812,7 +1812,7 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len)
    /* special handling for neutral locale names */
    if (locale && strlenW(locale) == 2)
    {
-        switch (info)
+        switch (info & ~LOCALE_LOCALEINFOFLAGSMASK)
        {
        case LOCALE_SNAME:
            if (len && len < 3)

--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -4499,6 +4499,10 @@ static void test_GetLocaleInfoEx(void)
        ok(ret == 1, "got %d\n", ret);
        ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW));

+        ret = pGetLocaleInfoEx(enW, LOCALE_SPARENT | LOCALE_NOUSEROVERRIDE, bufferW, sizeof(bufferW)/sizeof(WCHAR));
+        ok(ret == 1, "got %d\n", ret);
+        ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW));
+
        ret = pGetLocaleInfoEx(enW, LOCALE_SCOUNTRY, bufferW, sizeof(bufferW)/sizeof(WCHAR));
        ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret);
        if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) ||