system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 03:45:57 +00:00
Code Issues Projects Releases Wiki Activity

msvcrt: Skip exhaustive locale search with valid snames.

Browse Source
This commit is contained in:
Victor Chiletto 2023-06-12 16:51:02 -03:00 committed by Alexandre Julliard
parent 45dd09d0cf
commit 72c3b8f3a0
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msvcr110/tests/msvcr110.c
View File

@ -153,14 +153,14 @@ static void test_setlocale(void)
ok(!ret, "setlocale(en-us.1250) succeeded (%s)\n", ret);
ret = p_setlocale(LC_ALL, "zh-Hans");
todo_wine ok((ret != NULL
ok((ret != NULL
|| broken(ret == NULL)), /* Vista */
"expected success, but got NULL\n");
if (ret)
ok(!strcmp(ret, "zh-Hans"), "setlocale zh-Hans failed\n");
ret = p_setlocale(LC_ALL, "zh-Hant");
todo_wine ok((ret != NULL
ok((ret != NULL
|| broken(ret == NULL)), /* Vista */
"expected success, but got NULL\n");
if (ret)

4
dlls/msvcr120/tests/msvcr120.c
View File

@ -598,11 +598,11 @@ static void test____lc_locale_name_func(void)
p_setlocale(LC_ALL, "zh-Hans");
lc_names = p____lc_locale_name_func();
todo_wine ok(!lstrcmpW(lc_names[1], L"zh-Hans"), "lc_names[1] expected zh-Hans got %s\n", wine_dbgstr_w(lc_names[1]));
ok(!lstrcmpW(lc_names[1], L"zh-Hans"), "lc_names[1] expected zh-Hans got %s\n", wine_dbgstr_w(lc_names[1]));
p_setlocale(LC_ALL, "zh-Hant");
lc_names = p____lc_locale_name_func();
todo_wine ok(!lstrcmpW(lc_names[1], L"zh-Hant"), "lc_names[1] expected zh-Hant got %s\n", wine_dbgstr_w(lc_names[1]));
ok(!lstrcmpW(lc_names[1], L"zh-Hant"), "lc_names[1] expected zh-Hant got %s\n", wine_dbgstr_w(lc_names[1]));
p_setlocale(LC_ALL, "C");
lc_names = p____lc_locale_name_func();

31
dlls/msvcrt/locale.c
View File

@ -343,6 +343,7 @@ BOOL locale_to_sname(const char *locale, unsigned short *codepage, BOOL *sname_m
if(!locale[0] || (cp == locale && !region)) {
GetUserDefaultLocaleName(sname, sname_size);
} else {
WCHAR wbuf[LOCALE_NAME_MAX_LENGTH];
locale_search_t search;
memset(&search, 0, sizeof(locale_search_t));
@ -364,21 +365,33 @@ BOOL locale_to_sname(const char *locale, unsigned short *codepage, BOOL *sname_m
if(!cp && !region)
{
remap_synonym(search.search_language);
#if _MSVCR_VER >= 110
search.allow_sname = TRUE;
#endif
}
EnumSystemLocalesEx( find_best_locale_proc, 0, (LPARAM)&search, NULL);
MultiByteToWideChar(CP_ACP, 0, search.search_language, -1, wbuf, LOCALE_NAME_MAX_LENGTH);
if (search.allow_sname && IsValidLocaleName(wbuf))
{
search.match_flags = FOUND_SNAME;
wcsncpy(sname, wbuf, sname_size);
}
else
{
EnumSystemLocalesEx( find_best_locale_proc, 0, (LPARAM)&search, NULL);
if (!search.match_flags)
return FALSE;
if (!search.match_flags)
return FALSE;
/* If we were given something that didn't match, fail */
if (search.search_language[0] && !(search.match_flags & (FOUND_SNAME | FOUND_LANGUAGE)))
return FALSE;
if (search.search_country[0] && !(search.match_flags & FOUND_COUNTRY))
return FALSE;
/* If we were given something that didn't match, fail */
if (search.search_language[0] && !(search.match_flags & (FOUND_SNAME | FOUND_LANGUAGE)))
return FALSE;
if (search.search_country[0] && !(search.match_flags & FOUND_COUNTRY))
return FALSE;
LCIDToLocaleName(search.found_lang_id, sname, sname_size, LOCALE_ALLOW_NEUTRAL_NAMES);
}
LCIDToLocaleName(search.found_lang_id, sname, sname_size, LOCALE_ALLOW_NEUTRAL_NAMES);
is_sname = (search.match_flags & FOUND_SNAME) != 0;
}