kernel32: Return LOCALE_INVARIANT from ConvertDefaultLocale.

This commit is contained in:
Daniel Lehman 2015-08-17 14:36:19 -07:00 committed by Alexandre Julliard
parent ece3af7855
commit 5bf1423c2c
2 changed files with 6 additions and 0 deletions

View file

@ -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;

View file

@ -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,