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

kernelbase: Map LANG_SERBIAN_NEUTRAL in ConvertDefaultLocale(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-02-03 17:48:34 -06:00 committed by Alexandre Julliard
parent db2666e9d2
commit f51e44c180
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/kernel32/tests/locale.c
View File

@ -3652,6 +3652,10 @@ static void test_ConvertDefaultLocale(void)
broken( lcid == 0x7c04 ) || /* winxp */ broken( lcid == 0x7c04 ) || /* winxp */
broken( lcid == 0x0404 ), /* vista */ broken( lcid == 0x0404 ), /* vista */
"Expected lcid = %08x got %08x\n", MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ), lcid ); "Expected lcid = %08x got %08x\n", MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ), lcid );
lcid = ConvertDefaultLocale( LANG_SERBIAN_NEUTRAL );
ok( lcid == MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN ) ||
broken( lcid == MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_LATIN ) ), /* <= vista */
"Expected lcid = %08x got %08x\n", MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN ), lcid );
/* Invariant language is not treated specially */ /* Invariant language is not treated specially */
TEST_LCID(LANG_INVARIANT, SUBLANG_DEFAULT, SORT_DEFAULT); TEST_LCID(LANG_INVARIANT, SUBLANG_DEFAULT, SORT_DEFAULT);

2
dlls/kernelbase/locale.c
View File

@ -3189,6 +3189,8 @@ LCID WINAPI DECLSPEC_HOTPATCH ConvertDefaultLocale( LCID lcid )
return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ); return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED );
case MAKELANGID( LANG_CHINESE, 0x1f ): case MAKELANGID( LANG_CHINESE, 0x1f ):
return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ); return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG );
case LANG_SERBIAN_NEUTRAL:
return MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN );
case MAKELANGID( LANG_SPANISH, SUBLANG_NEUTRAL ): case MAKELANGID( LANG_SPANISH, SUBLANG_NEUTRAL ):
return MAKELANGID( LANG_SPANISH, SUBLANG_SPANISH_MODERN ); return MAKELANGID( LANG_SPANISH, SUBLANG_SPANISH_MODERN );
case MAKELANGID( LANG_IRISH, SUBLANG_NEUTRAL ): case MAKELANGID( LANG_IRISH, SUBLANG_NEUTRAL ):