Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SYSSETUP][INTL.CPL] Use GetGeoInfoW with current thread locale

Browse source 
Fixes inconsistency when thread locale differs from system or user locale.
This commit is contained in:
Stanislav Motylkov 2021-10-24 20:10:28 +03:00
parent 4278f46620
commit 9635f45bd4
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/cpl/intl/generalp.c
View file

@ -1162,7 +1162,7 @@ LocationsEnumProc(GEOID gId)
WCHAR loc[MAX_STR_SIZE]; WCHAR loc[MAX_STR_SIZE];
INT index; INT index;
if (GetGeoInfoW(gId, GEO_FRIENDLYNAME, loc, MAX_STR_SIZE, LANG_SYSTEM_DEFAULT) == 0) if (GetGeoInfoW(gId, GEO_FRIENDLYNAME, loc, MAX_STR_SIZE, GetThreadLocale()) == 0)
return TRUE; return TRUE;
index = (INT)SendMessageW(hGeoList, index = (INT)SendMessageW(hGeoList,
@ -1196,7 +1196,7 @@ CreateLocationsList(HWND hWnd)
GEO_FRIENDLYNAME, GEO_FRIENDLYNAME,
loc, loc,
MAX_STR_SIZE, MAX_STR_SIZE,
LANG_SYSTEM_DEFAULT); GetThreadLocale());
SendMessageW(hGeoList, SendMessageW(hGeoList,
CB_SELECTSTRING, CB_SELECTSTRING,

2
dll/win32/syssetup/wizard.c
View file

@ -1095,7 +1095,7 @@ SetUserLocaleName(HWND hwnd)
WCHAR LocaleText[256 * 2]; WCHAR LocaleText[256 * 2];
GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SLANGUAGE, CurLocale, ARRAYSIZE(CurLocale)); GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SLANGUAGE, CurLocale, ARRAYSIZE(CurLocale));
GetGeoInfoW(GetUserGeoID(GEOCLASS_NATION), GEO_FRIENDLYNAME, CurGeo, ARRAYSIZE(CurGeo), LANG_SYSTEM_DEFAULT); GetGeoInfoW(GetUserGeoID(GEOCLASS_NATION), GEO_FRIENDLYNAME, CurGeo, ARRAYSIZE(CurGeo), GetThreadLocale());
LoadStringW(hDllInstance, IDS_LOCALETEXT, ResText, ARRAYSIZE(ResText)); LoadStringW(hDllInstance, IDS_LOCALETEXT, ResText, ARRAYSIZE(ResText));
StringCchPrintfW(LocaleText, ARRAYSIZE(LocaleText), ResText, CurLocale, CurGeo); StringCchPrintfW(LocaleText, ARRAYSIZE(LocaleText), ResText, CurLocale, CurGeo);