Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] kernel32: Keep the sublanguage specified by the script name when looking for the default.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id c5a39bd98f5388d48b728d19ce466665fa37bfbd by Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
winesync 2024-04-25 19:58:44 +03:00 committed by Timo Kreuzer
parent b46bf67c2e
commit 90c0562935
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/kernel32/winnls/string/locale.c
View file

@ -1733,8 +1733,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len )
lang_id = LANGIDFROMLCID( lcid ); lang_id = LANGIDFROMLCID( lcid );
/* replace SUBLANG_NEUTRAL by SUBLANG_DEFAULT */ /* replace SUBLANG_NEUTRAL by SUBLANG_DEFAULT */
if (SUBLANGID(lang_id) == SUBLANG_NEUTRAL) if (SUBLANGID(lang_id) == SUBLANG_NEUTRAL) lang_id = get_default_sublang( lang_id );
lang_id = MAKELANGID(PRIMARYLANGID(lang_id), get_default_sublang( lang_id ));
if (lctype != LOCALE_FONTSIGNATURE) if (lctype != LOCALE_FONTSIGNATURE)
{ {
@ -2902,7 +2901,7 @@ LCID WINAPI ConvertDefaultLocale( LCID lcid )
langid = LANGIDFROMLCID(lcid); langid = LANGIDFROMLCID(lcid);
if (SUBLANGID(langid) == SUBLANG_NEUTRAL) if (SUBLANGID(langid) == SUBLANG_NEUTRAL)
{ {
langid = MAKELANGID(PRIMARYLANGID(langid), get_default_sublang( langid )); langid = get_default_sublang( langid );
lcid = MAKELCID(langid, SORTIDFROMLCID(lcid)); lcid = MAKELCID(langid, SORTIDFROMLCID(lcid));
} }
} }
@ -4440,8 +4439,7 @@ static BOOL NLS_GetLanguageGroupName(LGRPID lgrpid, LPWSTR szName, ULONG nameSiz
/* FIXME: Is it correct to use the system default langid? */ /* FIXME: Is it correct to use the system default langid? */
langId = GetSystemDefaultLangID(); langId = GetSystemDefaultLangID();
if (SUBLANGID(langId) == SUBLANG_NEUTRAL) if (SUBLANGID(langId) == SUBLANG_NEUTRAL) langId = get_default_sublang( langId );
langId = MAKELANGID(PRIMARYLANGID(langId), get_default_sublang( langId ));
hResource = FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, szResourceName, langId ); hResource = FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, szResourceName, langId );