Commit 5bf1423c authored by Daniel Lehman's avatar Daniel Lehman Committed by Alexandre Julliard

kernel32: Return LOCALE_INVARIANT from ConvertDefaultLocale.

parent ece3af78
......@@ -2513,6 +2513,9 @@ LCID WINAPI ConvertDefaultLocale( LCID lcid )
switch (lcid)
{
case LOCALE_INVARIANT:
/* keep as-is */
break;
case LOCALE_SYSTEM_DEFAULT:
lcid = GetSystemDefaultLCID();
break;
......
......@@ -3132,6 +3132,9 @@ static void test_ConvertDefaultLocale(void)
LCID_RES(LOCALE_SYSTEM_DEFAULT, GetSystemDefaultLCID());
LCID_RES(LOCALE_USER_DEFAULT, GetUserDefaultLCID());
LCID_RES(LOCALE_NEUTRAL, GetUserDefaultLCID());
lcid = ConvertDefaultLocale(LOCALE_INVARIANT);
ok(lcid == LOCALE_INVARIANT || broken(lcid == 0x47f) /* win2k[3]/winxp */,
"Expected lcid = %08x, got %08x\n", LOCALE_INVARIANT, lcid);
}
static BOOL CALLBACK langgrp_procA(LGRPID lgrpid, LPSTR lpszNum, LPSTR lpszName,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment