mlang [1/2]: Take advantage of a recently added LOCALE_SNAME support

[Dmitry Timoshkov]

Hello,

Changelog:
    mlang [1/2]: Take advantage of a recently added LOCALE_SNAME support.

---
 dlls/mlang/mlang.c       |   11 ++++-------
 dlls/mlang/tests/mlang.c |   15 +++++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 8bdcc27..295aa85 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -1730,13 +1730,10 @@ static BOOL CALLBACK enum_locales_proc(L
         return FALSE;
 
     info->wszRfc1766[0] = 0;
-    n = GetLocaleInfoW(info->lcid, LOCALE_SISO639LANGNAME, info->wszRfc1766, MAX_RFC1766_NAME);
-    if (n && n < MAX_RFC1766_NAME)
-    {
-        info->wszRfc1766[n - 1] = '-';
-        GetLocaleInfoW(info->lcid, LOCALE_SISO3166CTRYNAME, info->wszRfc1766 + n, MAX_RFC1766_NAME - n);
-        LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, info->wszRfc1766 + n, -1, info->wszRfc1766 + n, MAX_RFC1766_NAME - n);
-    }
+    n = GetLocaleInfoW(info->lcid, LOCALE_SNAME, info->wszRfc1766, MAX_RFC1766_NAME);
+    if (n)
+        LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, info->wszRfc1766, -1, info->wszRfc1766, MAX_RFC1766_NAME);
+
     info->wszLocaleName[0] = 0;
     GetLocaleInfoW(info->lcid, LOCALE_SLANGUAGE, info->wszLocaleName, MAX_LOCALE_NAME);
     TRACE("ISO639: %s SLANGUAGE: %s\n", wine_dbgstr_w(info->wszRfc1766), wine_dbgstr_w(info->wszLocaleName));
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index 2665f3c..cb0a01f 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -33,12 +33,15 @@ #ifndef CP_UNICODE
 #define CP_UNICODE 1200
 #endif
 
-/*#define DUMP_CP_INFO*/
-/*#define DUMP_SCRIPT_INFO*/
+#if 0
+#define DUMP_CP_INFO
+#define DUMP_SCRIPT_INFO
 
 #if defined DUMP_CP_INFO || defined DUMP_SCRIPT_INFO
+#undef __WINE_WINE_TEST_H
 #include "wine/debug.h"
 #endif
+#endif /* 0 */
 
 #define TRACE_2 OutputDebugStringA
 
@@ -314,8 +317,8 @@ static void test_EnumCodePages(IMultiLan
 	static const WCHAR autoW[] = {'_','a','u','t','o',0};
 
 #ifdef DUMP_CP_INFO
-	trace("MIMECPINFO #%lu:\n"
-	      "dwFlags %08lx %s\n"
+	trace("MIMECPINFO #%u:\n"
+	      "dwFlags %08x %s\n"
 	      "uiCodePage %u\n"
 	      "uiFamilyCodePage %u\n"
 	      "wszDescription %s\n"
@@ -554,7 +557,7 @@ static void test_EnumScripts(IMultiLangu
     {
 	CPINFOEXA cpinfoex;
 #ifdef DUMP_SCRIPT_INFO
-	trace("SCRIPTINFO #%lu:\n"
+	trace("SCRIPTINFO #%u:\n"
 	      "ScriptId %08x\n"
 	      "uiCodePage %u\n"
 	      "wszDescription %s\n"
@@ -657,7 +660,7 @@ static void test_rfc1766(IMultiLanguage2
         if (ret != S_OK) break;
 
 #ifdef DUMP_CP_INFO
-        trace("lcid %04lx rfc_name %s locale_name %s\n",
+        trace("lcid %04x rfc_name %s locale_name %s\n",
               info.lcid, wine_dbgstr_w(info.wszRfc1766), wine_dbgstr_w(info.wszLocaleName));
 #endif
 
-- 
1.4.2