msvcr110: Try SNAME when matching locale.

dlls/msvcr110/tests/msvcr110.c

@@ -63,11 +63,13 @@ static void test_setlocale(void)
 
     for(i=0; i<sizeof(names)/sizeof(*names); i++) {
         ret = p_setlocale(LC_ALL, names[i]);
-        todo_wine ok(!!ret, "expected success, but got NULL\n");
-        if(ret) ok(!strcmp(ret, names[i]),
-                    "expected %s, got %s\n", names[i], ret);
+        ok(ret != NULL, "expected success, but got NULL\n");
+        ok(!strcmp(ret, names[i]), "expected %s, got %s\n", names[i], ret);
     }
 
+    ret = p_setlocale(LC_ALL, "en-us.1250");
+    ok(!ret, "setlocale(en-us.1250) succeeded (%s)\n", ret);
+
     p_setlocale(LC_ALL, "C");
 }
 

dlls/msvcrt/mbcs.c

@@ -245,7 +245,7 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo)
 
   if(lcid == -1) {
     sprintf(bufA, format, newcp);
-    mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA, NULL);
+    mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA, NULL, NULL);
   } else {
     mbcinfo->mblcid = lcid;
   }

dlls/msvcrt/msvcrt.h

@@ -264,7 +264,8 @@ struct __thread_data {
     frame_info                     *frame_info_head;
     void                           *unk8[6];
     LCID                            cached_lcid;
-    int                             unk9[3];
+    BOOL                            cached_sname;
+    int                             unk9[2];
     DWORD                           cached_cp;
     char                            cached_locale[131];
     void                           *unk10[100];
@@ -277,7 +278,7 @@ typedef struct __thread_data thread_data_t;
 
 extern thread_data_t *msvcrt_get_thread_data(void) DECLSPEC_HIDDEN;
 
-LCID MSVCRT_locale_to_LCID(const char*, unsigned short*) DECLSPEC_HIDDEN;
+LCID MSVCRT_locale_to_LCID(const char*, unsigned short*, BOOL*) DECLSPEC_HIDDEN;
 extern MSVCRT__locale_t MSVCRT_locale DECLSPEC_HIDDEN;
 extern unsigned int MSVCRT___lc_codepage;
 extern int MSVCRT___lc_collate_cp;