Merge pull request #1483 from Unity-Technologies/uwp-culture-info-fix

Fix CultureInfo implementation when running as UWP application.

Author: TautvydasZilys

mcs/class/corlib/Mono.Interop/MonoPInvokeCallbackAttribute.cs

@@ -0,0 +1,33 @@
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace Mono.Interop
+{
+	// Internal in order to not conflict with other definitions
+	[AttributeUsage (AttributeTargets.Method)]
+	internal sealed class MonoPInvokeCallbackAttribute : Attribute
+	{
+		public MonoPInvokeCallbackAttribute (Type t)
+		{
+		}
+	}
+}

mcs/class/corlib/System.Globalization/CultureInfo.cs

@@ -30,6 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using Mono.Interop;
 using System.Collections.Generic;
 using System.Threading;
 using System.Runtime.CompilerServices;
@@ -1123,6 +1124,39 @@ internal static CultureInfo UserDefaultCulture {
 			}
 		}
 
+		static CultureInfo s_UserPreferredCultureInfoInAppX;
+
+		delegate void OnCultureInfoChangedDelegate ([MarshalAs(UnmanagedType.LPWStr)] string language);
+
+		[DllImport("__Internal")]
+		static extern void InitializeUserPreferredCultureInfoInAppX (OnCultureInfoChangedDelegate onCultureInfoChangedInAppX);
+
+		[DllImport("__Internal")]
+		static extern void SetUserPreferredCultureInfoInAppX ([MarshalAs(UnmanagedType.LPWStr)] string name);
+
+		[MonoPInvokeCallback (typeof(OnCultureInfoChangedDelegate))]
+		static void OnCultureInfoChangedInAppX ([MarshalAs(UnmanagedType.LPWStr)] string language)
+		{
+			if (language != null) {
+				s_UserPreferredCultureInfoInAppX = new CultureInfo(language);
+			} else {
+				s_UserPreferredCultureInfoInAppX = null;
+			}
+		}
+
+		internal static CultureInfo GetCultureInfoForUserPreferredLanguageInAppX ()
+		{
+			if (s_UserPreferredCultureInfoInAppX == null)
+				InitializeUserPreferredCultureInfoInAppX (OnCultureInfoChangedInAppX);
+
+			return s_UserPreferredCultureInfoInAppX;
+		}
+
+		internal static void SetCultureInfoForUserPreferredLanguageInAppX (CultureInfo cultureInfo)
+		{
+			SetUserPreferredCultureInfoInAppX (cultureInfo.Name);
+			s_UserPreferredCultureInfoInAppX = cultureInfo;
+		}
 
 #region reference sources
 		// TODO:

mcs/class/corlib/corlib.dll.sources

@@ -41,6 +41,7 @@ Mono/DataConverter.cs
 Mono.Interop/ComInteropProxy.cs
 Mono.Interop/IDispatch.cs
 Mono.Interop/IUnknown.cs
+Mono.Interop/MonoPInvokeCallbackAttribute.cs
 ../Mono.Security/Mono.Math/BigInteger.cs
 ../Mono.Security/Mono.Math.Prime/ConfidenceFactor.cs
 ../Mono.Security/Mono.Math.Prime/PrimalityTests.cs

mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs

@@ -18,6 +18,8 @@ namespace System.Threading
 {    
 #if !MONO
     using Microsoft.Win32.SafeHandles;
+#else
+    using Mono.Interop;
 #endif
     using System.Security.Permissions;
     using System.Runtime.InteropServices;
@@ -437,14 +439,6 @@ private static void InvocationEntry(IntPtr arg)
 			}
         }
 
-		[AttributeUsage (AttributeTargets.Method)]
-		sealed class MonoPInvokeCallbackAttribute : Attribute
-		{
-			public MonoPInvokeCallbackAttribute(Type t)
-            {
-			}
-		}
-
         class InvocationContext
         {
             private SendOrPostCallback m_Delegate;

mcs/class/referencesource/mscorlib/system/threading/thread.cs

@@ -1209,12 +1209,11 @@ public static void SetData(LocalDataStoreSlot slot, Object data)
         public CultureInfo CurrentUICulture {
             get {
                 Contract.Ensures(Contract.Result<CultureInfo>() != null);
-#if FEATURE_APPX
+
                 if(AppDomain.IsAppXModel()) {
                     return CultureInfo.GetCultureInfoForUserPreferredLanguageInAppX() ?? GetCurrentUICultureNoAppX();
                 } 
                 else 
-#endif
                 {
                     return GetCurrentUICultureNoAppX();
                 }
@@ -1237,6 +1236,12 @@ public CultureInfo CurrentUICulture {
                 // If you add more pre-conditions to this method, check to see if you also need to 
                 // add them to CultureInfo.DefaultThreadCurrentUICulture.set.
 
+                if (AppDomain.IsAppXModel ())
+                {
+                    CultureInfo.SetCultureInfoForUserPreferredLanguageInAppX (value);
+                    return;
+                }
+
 #if FEATURE_LEAK_CULTURE_INFO
                 if (nativeSetThreadUILocale(value.SortName) == false)
                 {
@@ -1335,12 +1340,10 @@ public CultureInfo CurrentCulture {
             get {
                 Contract.Ensures(Contract.Result<CultureInfo>() != null);
 
-#if FEATURE_APPX
                 if(AppDomain.IsAppXModel()) {
                     return CultureInfo.GetCultureInfoForUserPreferredLanguageInAppX() ?? GetCurrentCultureNoAppX();
                 } 
                 else 
-#endif
                 {
                     return GetCurrentCultureNoAppX();
                 }
@@ -1359,6 +1362,12 @@ public CultureInfo CurrentCulture {
                 // If you add more pre-conditions to this method, check to see if you also need to 
                 // add them to CultureInfo.DefaultThreadCurrentCulture.set.
 
+                if (AppDomain.IsAppXModel ())
+                {
+                    CultureInfo.SetCultureInfoForUserPreferredLanguageInAppX (value);
+                    return;
+                }
+
 #if FEATURE_LEAK_CULTURE_INFO
                 //If we can't set the nativeThreadLocale, we'll just let it stay
                 //at whatever value it had before.  This allows people who use