[PATCH v3 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.

--
  v3: ntdll/unix: Support to initialize locale from 'lang-script' format language identifier.
      ntdll/unix: Use different variable names for Mac locales.

https://gitlab.winehq.org/wine/wine/-/merge_requests/4357

[PATCH v3 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 v3 2/2] ntdll/unix: Support to initialize locale from 'lang-script' format language identifier.

[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.
---
 dlls/ntdll/unix/env.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c
index 6b249917cfe..ebdb27262f5 100644
--- a/dlls/ntdll/unix/env.c
+++ b/dlls/ntdll/unix/env.c
@@ -833,18 +833,25 @@ 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;

-                if (!country)
+                if (script)
+                    locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, script );
+                else
                 {
-                    mac_user_locale = CFLocaleCopyCurrent();
-                    country = CFLocaleGetValue( mac_user_locale, kCFLocaleCountryCode );
+                    if (!country)
+                    {
+                        mac_user_locale = CFLocaleCopyCurrent();
+                        country = CFLocaleGetValue( mac_user_locale, kCFLocaleCountryCode );
+                    }
+                    if (country)
+                        locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, country );
+                    else
+                        locale_string = CFStringCreateCopy( NULL, lang );
                 }
-                if (country)
-                    locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, country );
-                else
-                    locale_string = CFStringCreateCopy( NULL, lang );
+
                 CFStringGetCString( locale_string, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 );
                 CFRelease( locale_string );
                 if (mac_user_locale) CFRelease( mac_user_locale );

[Alexandre Julliard (＠julliard)]

You should use both script and country, like `user_to_win_locale` does. The fallback to neutral should be done separately, after the full locale name has been checked, and on all platforms.