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

kernelbase: Reimplement LCIDToLocaleName() using the locale.nls data. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2022-03-28 12:21:15 +02:00
parent 0f7cd3d685
commit 412e79181f
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2790,6 +2790,14 @@ static void test_LocaleNameToLCID(void)
ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(L"zh-hans"), ret); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(L"zh-hans"), ret);
ok(!lstrcmpW(L"zh-CN", buffer), "%s: got wrong locale name %s\n", ok(!lstrcmpW(L"zh-CN", buffer), "%s: got wrong locale name %s\n",
wine_dbgstr_w(L"zh-hans"), wine_dbgstr_w(buffer)); wine_dbgstr_w(L"zh-hans"), wine_dbgstr_w(buffer));
/* de-DE_phoneb */
lcid = pLocaleNameToLCID(L"de-DE_phoneb", 0);
ok(lcid == MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), SORT_GERMAN_PHONE_BOOK),
"%s: got wrong lcid 0x%04lx\n", wine_dbgstr_w(L"zh-hans"), lcid);
ret = pLCIDToLocaleName(lcid, buffer, ARRAY_SIZE(buffer), 0);
ok(!lstrcmpW(L"de-DE_phoneb", buffer), "got wrong locale name %s\n",
wine_dbgstr_w(buffer));
} }
if (pRtlLocaleNameToLcid) if (pRtlLocaleNameToLcid)

16
dlls/kernelbase/locale.c
View File

@ -5180,9 +5180,9 @@ LANGID WINAPI DECLSPEC_HOTPATCH GetSystemDefaultLangID(void)
/*********************************************************************** /***********************************************************************
* GetSystemDefaultLocaleName (kernelbase.@) * GetSystemDefaultLocaleName (kernelbase.@)
*/ */
INT WINAPI DECLSPEC_HOTPATCH GetSystemDefaultLocaleName( LPWSTR name, INT len ) INT WINAPI DECLSPEC_HOTPATCH GetSystemDefaultLocaleName( LPWSTR name, INT count )
{ {
return LCIDToLocaleName( GetSystemDefaultLCID(), name, len, 0 ); return get_locale_info( system_locale, system_lcid, LOCALE_SNAME, name, count );
} }
@ -5329,7 +5329,7 @@ LANGID WINAPI DECLSPEC_HOTPATCH GetUserDefaultLangID(void)
*/ */
INT WINAPI DECLSPEC_HOTPATCH GetUserDefaultLocaleName( LPWSTR name, INT len ) INT WINAPI DECLSPEC_HOTPATCH GetUserDefaultLocaleName( LPWSTR name, INT len )
{ {
return LCIDToLocaleName( GetUserDefaultLCID(), name, len, 0 ); return get_locale_info( user_locale, user_lcid, LOCALE_SNAME, name, len );
} }
@ -5692,10 +5692,14 @@ DWORD WINAPI DECLSPEC_HOTPATCH IsValidNLSVersion( NLS_FUNCTION func, const WCHAR
*/ */
INT WINAPI DECLSPEC_HOTPATCH LCIDToLocaleName( LCID lcid, WCHAR *name, INT count, DWORD flags ) INT WINAPI DECLSPEC_HOTPATCH LCIDToLocaleName( LCID lcid, WCHAR *name, INT count, DWORD flags )
{ {
static int once; const NLS_LOCALE_DATA *locale = get_locale_by_id( &lcid, flags );
if (flags && !once++) FIXME( "unsupported flags %lx\n", flags );
return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count ); if (!locale)
{
SetLastError( ERROR_INVALID_PARAMETER );
return 0;
}
return get_locale_info( locale, lcid, LOCALE_SNAME, name, count );
} }