Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 09:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] kernel32: Use different default sublangs for Spanish and Chinese.

Browse source 
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 7737693693ca46a88c41cfeab95d2b65423d8e51 by Andrew Eikum <aeikum@codeweavers.com>
This commit is contained in:
winesync 2024-04-25 19:53:32 +03:00 committed by Timo Kreuzer
parent a3102dc0dd
commit 544f114459
1 changed files with 5 additions and 3 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

@ -354,6 +354,7 @@ static UINT find_charset( const WCHAR *name )
if (entry) return entry->codepage; if (entry) return entry->codepage;
return 0; return 0;
} }
#endif // (WINVER >= 0x0600)
static LANGID get_default_sublang( LANGID lang ) static LANGID get_default_sublang( LANGID lang )
{ {
@ -373,6 +374,7 @@ static LANGID get_default_sublang( LANGID lang )
return lang; return lang;
} }
#if (WINVER >= 0x0600)
/*********************************************************************** /***********************************************************************
* find_locale_id_callback * find_locale_id_callback
*/ */
@ -1720,7 +1722,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len )
/* 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 = MAKELANGID(PRIMARYLANGID(lang_id), SUBLANG_DEFAULT); lang_id = MAKELANGID(PRIMARYLANGID(lang_id), get_default_sublang( lang_id ));
if (lctype != LOCALE_FONTSIGNATURE) if (lctype != LOCALE_FONTSIGNATURE)
{ {
@ -2868,7 +2870,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), SUBLANG_DEFAULT); langid = MAKELANGID(PRIMARYLANGID(langid), get_default_sublang( langid ));
lcid = MAKELCID(langid, SORTIDFROMLCID(lcid)); lcid = MAKELCID(langid, SORTIDFROMLCID(lcid));
} }
} }
@ -4407,7 +4409,7 @@ static BOOL NLS_GetLanguageGroupName(LGRPID lgrpid, LPWSTR szName, ULONG nameSiz
langId = GetSystemDefaultLangID(); langId = GetSystemDefaultLangID();
if (SUBLANGID(langId) == SUBLANG_NEUTRAL) if (SUBLANGID(langId) == SUBLANG_NEUTRAL)
langId = MAKELANGID( PRIMARYLANGID(langId), SUBLANG_DEFAULT ); 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 );