Fix CultureInfo creation with special Windows LCID values (dotnet#37834)

* Fix CultureInfo creation with special Windows LCID values * Restrict the test to Windows 10.
solovis-mherndon · Jun 15, 2020 · 02df47b · 02df47b
1 parent 7b13fb8
commit 02df47b
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 26 deletions.
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs b/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
@@ -47,5 +47,28 @@ public void Ctor_String_Invalid()
                 Assert.Throws<CultureNotFoundException>(() => new CultureInfo("xx-XX"));
             }
         }
+
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsWindows10Version1903OrGreater))]
+        [InlineData(0x2000)]
+        [InlineData(0x2400)]
+        [InlineData(0x2800)]
+        [InlineData(0x2C00)]
+        [InlineData(0x3000)]
+        [InlineData(0x3400)]
+        [InlineData(0x3800)]
+        [InlineData(0x3C00)]
+        [InlineData(0x4000)]
+        [InlineData(0x4400)]
+        [InlineData(0x4800)]
+        [InlineData(0x4C00)]
+        public void TestCreationWithTemporaryLCID(int lcid)
+        {
+            // https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/926e694f-1797-4418-a922-343d1c5e91a6
+            // If a temporary LCID is assigned it will be dynamically assigned at runtime to be
+            // 0x2000, 0x2400, 0x2800, 0x2C00, 0x3000, 0x3400, 0x3800, 0x3C00, 0x4000, 0x4400, 0x4800, or 0x4C00,
+            // for the valid language-script-region tags.
+
+            Assert.NotEqual(lcid, new CultureInfo(lcid).LCID);
+        }
     }
 }
diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs
@@ -234,14 +234,6 @@ private static string ConvertIcuTimeFormatString(ReadOnlySpan<char> icuFormatStr
             return result.Slice(0, resultPos).ToString();
         }
 
-        private static string? IcuLCIDToLocaleName(int culture)
-        {
-            Debug.Assert(!GlobalizationMode.Invariant);
-            Debug.Assert(!GlobalizationMode.UseNls);
-
-            return IcuLocaleData.LCIDToLocaleName(culture);
-        }
-
         private static int IcuLocaleNameToLCID(string cultureName)
         {
             Debug.Assert(!GlobalizationMode.Invariant);

diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Nls.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Nls.cs
@@ -466,22 +466,6 @@ private static int NlsLocaleNameToLCID(string cultureName)
             return Interop.Kernel32.LocaleNameToLCID(cultureName, Interop.Kernel32.LOCALE_ALLOW_NEUTRAL_NAMES);
         }
 
-        private static unsafe string? NlsLCIDToLocaleName(int culture)
-        {
-            Debug.Assert(!GlobalizationMode.Invariant);
-            Debug.Assert(GlobalizationMode.UseNls);
-
-            char* pBuffer = stackalloc char[Interop.Kernel32.LOCALE_NAME_MAX_LENGTH + 1]; // +1 for the null termination
-            int length = Interop.Kernel32.LCIDToLocaleName(culture, pBuffer, Interop.Kernel32.LOCALE_NAME_MAX_LENGTH + 1, Interop.Kernel32.LOCALE_ALLOW_NEUTRAL_NAMES);
-
-            if (length > 0)
-            {
-                return new string(pBuffer);
-            }
-
-            return null;
-        }
-
         private int NlsGetAnsiCodePage(string cultureName)
         {
             Debug.Assert(GlobalizationMode.UseNls);

diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Unix.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Unix.cs
@@ -78,6 +78,12 @@ private bool InitCultureDataCore()
             return true;
         }
 
+        private static string? LCIDToLocaleName(int culture)
+        {
+            Debug.Assert(!GlobalizationMode.Invariant);
+            return IcuLocaleData.LCIDToLocaleName(culture);
+        }
+
         internal bool IsWin32Installed => false;
 
         internal static unsafe CultureData GetCurrentRegionData() => CultureInfo.CurrentCulture._cultureData;

diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Windows.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Windows.cs
@@ -172,5 +172,20 @@ internal static unsafe CultureData GetCurrentRegionData()
             // Fallback to current locale data.
             return CultureInfo.CurrentCulture._cultureData;
         }
+
+        private static unsafe string? LCIDToLocaleName(int culture)
+        {
+            Debug.Assert(!GlobalizationMode.Invariant);
+
+            char* pBuffer = stackalloc char[Interop.Kernel32.LOCALE_NAME_MAX_LENGTH + 1]; // +1 for the null termination
+            int length = Interop.Kernel32.LCIDToLocaleName(culture, pBuffer, Interop.Kernel32.LOCALE_NAME_MAX_LENGTH + 1, Interop.Kernel32.LOCALE_ALLOW_NEUTRAL_NAMES);
+
+            if (length > 0)
+            {
+                return new string(pBuffer);
+            }
+
+            return null;
+        }
     }
 }
diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs
@@ -867,8 +867,7 @@ internal static CultureData GetCultureData(int culture, bool bUseUserOverride)
             }
 
             // Convert the lcid to a name, then use that
-            // Note that this will return neutral names (unlike Vista native API)
-            localeName = GlobalizationMode.UseNls ? NlsLCIDToLocaleName(culture) : IcuLCIDToLocaleName(culture);
+            localeName = LCIDToLocaleName(culture);
 
             if (!string.IsNullOrEmpty(localeName))
             {