[PATCH 0/2] MR4357: ntdll/unix: Try harder to initialize locale from Mac setting.

[Jactry Zeng (＠jactry)]

This allows initializing locale from Mac locale identifiers like
'zh-Hans-US'. The current implementation recognizes it as 'zh-US'
which isn't a valid locale identifier for Windows.
This patch will try again with the 'lang-script' identifier after
get_win_locale() fails with the 'lang-region' identifier.

[PATCH 1/2] ntdll/unix: Use different variable names for Mac locales.

[Jactry Zeng]

From: Jactry Zeng

---
 dlls/ntdll/unix/env.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c
index 5a58911c759..6b249917cfe 100644
--- a/dlls/ntdll/unix/env.c
+++ b/dlls/ntdll/unix/env.c
@@ -807,9 +807,9 @@ static void init_locale(void)
 #ifdef __APPLE__
     if (!system_locale[0])
     {
-        CFLocaleRef locale = CFLocaleCopyCurrent();
-        CFStringRef lang = CFLocaleGetValue( locale, kCFLocaleLanguageCode );
-        CFStringRef country = CFLocaleGetValue( locale, kCFLocaleCountryCode );
+        CFLocaleRef mac_sys_locale = CFLocaleCopyCurrent();
+        CFStringRef lang = CFLocaleGetValue( mac_sys_locale, kCFLocaleLanguageCode );
+        CFStringRef country = CFLocaleGetValue( mac_sys_locale, kCFLocaleCountryCode );
         CFStringRef locale_string;

if (country)
@@ -818,7 +818,7 @@ static void init_locale(void)
             locale_string = CFStringCreateCopy(NULL, lang);

CFStringGetCString(locale_string, system_locale, sizeof(system_locale), kCFStringEncodingUTF8);
-        CFRelease(locale);
+        CFRelease(mac_sys_locale);
         CFRelease(locale_string);
     }
     if (!user_locale[0])
@@ -833,13 +833,13 @@ static void init_locale(void)
             {
                 CFStringRef lang = CFDictionaryGetValue( components, kCFLocaleLanguageCode );
                 CFStringRef country = CFDictionaryGetValue( components, kCFLocaleCountryCode );
-                CFLocaleRef locale = NULL;
+                CFLocaleRef mac_user_locale = NULL;
                 CFStringRef locale_string;

if (!country)
                 {
-                    locale = CFLocaleCopyCurrent();
-                    country = CFLocaleGetValue( locale, kCFLocaleCountryCode );
+                    mac_user_locale = CFLocaleCopyCurrent();
+                    country = CFLocaleGetValue( mac_user_locale, kCFLocaleCountryCode );
                 }
                 if (country)
                     locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, country );
@@ -847,7 +847,7 @@ static void init_locale(void)
                     locale_string = CFStringCreateCopy( NULL, lang );
                 CFStringGetCString( locale_string, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 );
                 CFRelease( locale_string );
-                if (locale) CFRelease( locale );
+                if (mac_user_locale) CFRelease( mac_user_locale );
                 CFRelease( components );
             }
         }

[PATCH 2/2] ntdll/unix: Try harder to initialize locale from Mac setting.

[Jactry Zeng]

From: Jactry Zeng

This allows initializing locale from Mac locale identifiers like
'zh-Hans-US'. The current implementation recognizes it as 'zh-US'
which isn't a valid locale identifier for Windows.
This patch will try again with the 'lang-script' identifier after
get_win_locale() fails with the 'lang-region' identifier.
---
 dlls/ntdll/unix/env.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c
index 6b249917cfe..f691fa3eac2 100644
--- a/dlls/ntdll/unix/env.c
+++ b/dlls/ntdll/unix/env.c
@@ -796,6 +796,7 @@ static const NLS_LOCALE_DATA *get_win_locale( const NLS_LOCALE_HEADER *header, c
  */
 static void init_locale(void)
 {
+    static char lang_script[LOCALE_NAME_MAX_LENGTH];
     struct locale_nls_header *header;
     const NLS_LOCALE_HEADER *locale_table;
     const NLS_LOCALE_DATA *locale;
@@ -833,6 +834,7 @@ static void init_locale(void)
             {
                 CFStringRef lang = CFDictionaryGetValue( components, kCFLocaleLanguageCode );
                 CFStringRef country = CFDictionaryGetValue( components, kCFLocaleCountryCode );
+                CFStringRef script = CFDictionaryGetValue( components, kCFLocaleScriptCode );
                 CFLocaleRef mac_user_locale = NULL;
                 CFStringRef locale_string;

@@ -847,6 +849,14 @@ static void init_locale(void)
                     locale_string = CFStringCreateCopy( NULL, lang );
                 CFStringGetCString( locale_string, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 );
                 CFRelease( locale_string );
+
+                if (script)
+                {
+                    locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, script );
+                    CFStringGetCString( locale_string, lang_script, sizeof(lang_script), kCFStringEncodingUTF8 );
+                    CFRelease( locale_string );
+                }
+
                 if (mac_user_locale) CFRelease( mac_user_locale );
                 CFRelease( components );
             }
@@ -862,6 +872,8 @@ static void init_locale(void)
             system_lcid = locale->idefaultlanguage;
         if ((locale =  get_win_locale( locale_table, user_locale )))
             user_lcid = locale->idefaultlanguage;
+        if (!user_lcid && (locale = get_win_locale( locale_table, lang_script )))
+            user_lcid = locale->idefaultlanguage;
         free( header );
     }
     if (!system_lcid) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT );