ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Use EnumSystemLocalesEx instead of directly accessing kernel32 resources. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2022-03-31 10:56:18 +02:00
parent 689e63485c
commit f14adf5928
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/msvcrt/locale.c
View File

@ -255,22 +255,19 @@ static int compare_info(LCID lcid, DWORD flags, char* buff, const char* cmp, BOO
} }
static BOOL CALLBACK static BOOL CALLBACK
find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LONG_PTR lParam) find_best_locale_proc( WCHAR *name, DWORD locale_flags, LPARAM lParam )
{ {
locale_search_t *res = (locale_search_t *)lParam; locale_search_t *res = (locale_search_t *)lParam;
const LCID lcid = MAKELCID(LangID, SORT_DEFAULT); const LCID lcid = LocaleNameToLCID( name, 0 );
char buff[MAX_ELEM_LEN]; char buff[MAX_ELEM_LEN];
unsigned int flags = 0; unsigned int flags = 0;
if(PRIMARYLANGID(LangID) == LANG_NEUTRAL)
return CONTINUE_LOOKING;
#if _MSVCR_VER >= 110 #if _MSVCR_VER >= 110
if (res->allow_sname && compare_info(lcid,LOCALE_SNAME,buff,res->search_language, TRUE)) if (res->allow_sname && compare_info(lcid,LOCALE_SNAME,buff,res->search_language, TRUE))
{ {
TRACE(":Found locale: %s->%s\n", res->search_language, buff); TRACE(":Found locale: %s->%s\n", res->search_language, buff);
res->match_flags = FOUND_SNAME; res->match_flags = FOUND_SNAME;
res->found_lang_id = LangID; res->found_lang_id = LANGIDFROMLCID(lcid);
return STOP_LOOKING; return STOP_LOOKING;
} }
#endif #endif
@ -305,7 +302,7 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO
{ {
/* Found a better match than previously */ /* Found a better match than previously */
res->match_flags = flags; res->match_flags = flags;
res->found_lang_id = LangID; res->found_lang_id = LANGIDFROMLCID(lcid);
} }
if ((flags & (FOUND_LANGUAGE | FOUND_COUNTRY)) == if ((flags & (FOUND_LANGUAGE | FOUND_COUNTRY)) ==
(FOUND_LANGUAGE | FOUND_COUNTRY)) (FOUND_LANGUAGE | FOUND_COUNTRY))
@ -363,9 +360,7 @@ LCID locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *sname)
search.allow_sname = TRUE; search.allow_sname = TRUE;
} }
EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, EnumSystemLocalesEx( find_best_locale_proc, 0, (LPARAM)&search, NULL);
(LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc,
(LONG_PTR)&search);
if (!search.match_flags) if (!search.match_flags)
return -1; return -1;