Daniel Lehman : kernel32: Return LOCALE_INVARIANT from ConvertDefaultLocale.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Aug 25 09:38:01 CDT 2015
Module: wine
Branch: master
Commit: 5bf1423c2c5c081109848d8ac629796b4fbc432c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf1423c2c5c081109848d8ac629796b4fbc432c
Author: Daniel Lehman <dlehman at esri.com>
Date: Mon Aug 17 14:36:19 2015 -0700
kernel32: Return LOCALE_INVARIANT from ConvertDefaultLocale.
---
dlls/kernel32/locale.c | 3 +++
dlls/kernel32/tests/locale.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index eaf1183..c0a66ef 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -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;
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 86adcdb..51e2b07 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -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,
More information about the wine-cvs
mailing list