[PATCH v4 5/8] msvcrt: Skip exhaustive locale search with valid snames.

[Victor Chiletto]

From: Victor Chiletto

---
 dlls/msvcr110/tests/msvcr110.c |  4 ++--
 dlls/msvcrt/locale.c           | 31 ++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c
index 5d4b32b544c..2ad17195796 100644
--- a/dlls/msvcr110/tests/msvcr110.c
+++ b/dlls/msvcr110/tests/msvcr110.c
@@ -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)
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index fa81ffbc397..55c818ce2cb 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -337,6 +337,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));
@@ -358,21 +359,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
+        }
+
+        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);

-        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;
     }