* Move thread CurrentCulture and CurrentUICulture variables to CultureInfo.
* Move CultureInfo to shared CoreLib
* Code style fixes for consistency.
* Fold down APPX code into CultureInfo.CurrentCulture/CurrentUICulture.
* Remove unnecessary parentheses around return statements.
* Remove GetCurrentUICultureNoAppX.
<Compile Include="$(BclSourcesRoot)\System\Environment.cs" />
<Compile Include="$(BclSourcesRoot)\System\Exception.cs" />
<Compile Include="$(BclSourcesRoot)\System\GC.cs" />
- <Compile Include="$(BclSourcesRoot)\System\Globalization\CultureInfo.cs" />
<Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.cs" />
<Compile Include="$(BclSourcesRoot)\System\Internal.cs" />
<Compile Include="$(BclSourcesRoot)\System\IO\FileLoadException.CoreCLR.cs" />
<ItemGroup Condition="'$(TargetsUnix)' == 'true'">
<Compile Include="$(BclSourcesRoot)\System\DateTime.Unix.cs" />
<Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" />
- <Compile Include="$(BclSourcesRoot)\System\Globalization\CultureInfo.Unix.cs" />
<Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.Unix.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Unix.cs" />
</ItemGroup>
<Compile Include="$(BclSourcesRoot)\System\DateTime.Windows.cs" />
<Compile Include="$(BclSourcesRoot)\Interop\Windows\Kernel32\Interop.GetSystemDirectoryW.cs" />
<Compile Include="$(BclSourcesRoot)\System\ApplicationModel.Windows.cs" />
- <Compile Include="$(BclSourcesRoot)\System\Globalization\CultureInfo.Windows.cs" />
<Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.Windows.cs" />
<Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Windows.cs" />
<Compile Include="$(BclSourcesRoot)\System\Environment.Windows.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendricalCalculationsHelper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CharUnicodeInfoData.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CharUnicodeInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ChineseLunisolarCalendar.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Microsoft\Win32\SafeHandles\SafeFindHandle.Windows.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Diagnostics\DebugProvider.Windows.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarData.Windows.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
+ <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.Windows.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Windows.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Windows.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HijriCalendar.Win32.cs" Condition="'$(EnableWinRT)' != 'true' and '$(EnableDummyGlobalizationImplementation)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarData.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
+ <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HijriCalendar.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\IdnMapping.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\JapaneseCalendar.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
--- /dev/null
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace System.Globalization
+{
+ public partial class CultureInfo : IFormatProvider
+ {
+ internal static CultureInfo GetUserDefaultCulture()
+ {
+ if (GlobalizationMode.Invariant)
+ return CultureInfo.InvariantCulture;
+
+ CultureInfo cultureInfo = null;
+ string localeName;
+ if (CultureData.GetDefaultLocaleName(out localeName))
+ {
+ cultureInfo = GetCultureByName(localeName, true);
+ cultureInfo._isReadOnly = true;
+ }
+ else
+ {
+ cultureInfo = CultureInfo.InvariantCulture;
+ }
+
+ return cultureInfo;
+ }
+
+ private static CultureInfo GetUserDefaultUICulture()
+ {
+ return InitializeUserDefaultCulture();
+ }
+ }
+}
--- /dev/null
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if FEATURE_APPX
+using System.Resources;
+using Internal.Resources;
+#endif
+
+namespace System.Globalization
+{
+ public partial class CultureInfo : IFormatProvider
+ {
+#if FEATURE_APPX
+ // When running under AppX, we use this to get some information about the language list
+ private static volatile WindowsRuntimeResourceManagerBase s_WindowsRuntimeResourceManager;
+
+ [ThreadStatic]
+ private static bool ts_IsDoingAppXCultureInfoLookup;
+#endif
+
+ internal static CultureInfo GetUserDefaultCulture()
+ {
+ if (GlobalizationMode.Invariant)
+ return CultureInfo.InvariantCulture;
+
+ const uint LOCALE_SNAME = 0x0000005c;
+ const string LOCALE_NAME_USER_DEFAULT = null;
+ const string LOCALE_NAME_SYSTEM_DEFAULT = "!x-sys-default-locale";
+
+ string strDefault = CultureData.GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SNAME);
+ if (strDefault == null)
+ {
+ strDefault = CultureData.GetLocaleInfoEx(LOCALE_NAME_SYSTEM_DEFAULT, LOCALE_SNAME);
+
+ if (strDefault == null)
+ {
+ // If system default doesn't work, use invariant
+ return CultureInfo.InvariantCulture;
+ }
+ }
+
+ CultureInfo temp = GetCultureByName(strDefault, true);
+
+ temp._isReadOnly = true;
+
+ return temp;
+ }
+
+ private static CultureInfo GetUserDefaultUICulture()
+ {
+#if !ENABLE_WINRT
+ if (GlobalizationMode.Invariant)
+ return CultureInfo.InvariantCulture;
+
+ const uint MUI_LANGUAGE_NAME = 0x8; // Use ISO language (culture) name convention
+ uint langCount = 0;
+ uint bufLen = 0;
+
+ if (Interop.Kernel32.GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, out langCount, null, ref bufLen))
+ {
+ char[] languages = new char[bufLen];
+ if (Interop.Kernel32.GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, out langCount, languages, ref bufLen))
+ {
+ int index = 0;
+ while (languages[index] != (char)0 && index < languages.Length)
+ {
+ index++;
+ }
+
+ CultureInfo temp = GetCultureByName(new string(languages, 0, index), true);
+ temp._isReadOnly = true;
+ return temp;
+ }
+ }
+#endif
+
+ return InitializeUserDefaultCulture();
+ }
+
+#if FEATURE_APPX
+ internal static CultureInfo GetCultureInfoForUserPreferredLanguageInAppX()
+ {
+ // If a call to GetCultureInfoForUserPreferredLanguageInAppX() generated a recursive
+ // call to itself, return null, since we don't want to stack overflow. For example,
+ // this can happen if some code in this method ends up calling CultureInfo.CurrentCulture.
+ // In this case, returning null will mean CultureInfo.CurrentCulture gets the default Win32
+ // value, which should be fine.
+ if (ts_IsDoingAppXCultureInfoLookup)
+ {
+ return null;
+ }
+
+ CultureInfo toReturn = null;
+
+ try
+ {
+ ts_IsDoingAppXCultureInfoLookup = true;
+
+ if (s_WindowsRuntimeResourceManager == null)
+ {
+ s_WindowsRuntimeResourceManager = ResourceManager.GetWinRTResourceManager();
+ }
+
+ toReturn = s_WindowsRuntimeResourceManager.GlobalResourceContextBestFitCultureInfo;
+ }
+ finally
+ {
+ ts_IsDoingAppXCultureInfoLookup = false;
+ }
+
+ return toReturn;
+ }
+
+ internal static bool SetCultureInfoForUserPreferredLanguageInAppX(CultureInfo ci)
+ {
+ if (s_WindowsRuntimeResourceManager == null)
+ {
+ s_WindowsRuntimeResourceManager = ResourceManager.GetWinRTResourceManager();
+ }
+
+ return s_WindowsRuntimeResourceManager.SetGlobalResourceContextDefaultCulture(ci);
+ }
+#endif
+ }
+}
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
+#if ENABLE_WINRT
+using Internal.Runtime.Augments;
+#endif
namespace System.Globalization
{
-#if CORECLR
- using StringCultureInfoDictionary = Dictionary<string, CultureInfo>;
- using StringLcidDictionary = Dictionary<int, CultureInfo>;
-
- using Lock = Object;
-#else
- using StringCultureInfoDictionary = LowLevelDictionary<string, CultureInfo>;
- using StringLcidDictionary = LowLevelDictionary<int, CultureInfo>;
-#endif
-
public partial class CultureInfo : IFormatProvider, ICloneable
{
//--------------------------------------------------------------------//
// We use the _cultureData to get the data for our object
private bool _isReadOnly;
- private CompareInfo compareInfo;
- private TextInfo textInfo;
- internal NumberFormatInfo numInfo;
- internal DateTimeFormatInfo dateTimeInfo;
- private Calendar calendar;
+ private CompareInfo _compareInfo;
+ private TextInfo _textInfo;
+ internal NumberFormatInfo _numInfo;
+ internal DateTimeFormatInfo _dateTimeInfo;
+ private Calendar _calendar;
//
// The CultureData instance that we are going to read data from.
// For supported culture, this will be the CultureData instance that read data from mscorlib assembly.
private static volatile CultureInfo s_DefaultThreadCurrentUICulture;
private static volatile CultureInfo s_DefaultThreadCurrentCulture;
+ [ThreadStatic]
+ internal static CultureInfo s_currentThreadCulture;
+ [ThreadStatic]
+ internal static CultureInfo s_currentThreadUICulture;
+
internal static AsyncLocal<CultureInfo> s_asyncLocalCurrentCulture;
internal static AsyncLocal<CultureInfo> s_asyncLocalCurrentUICulture;
internal static void AsyncLocalSetCurrentCulture(AsyncLocalValueChangedArgs<CultureInfo> args)
{
- Thread.m_CurrentCulture = args.CurrentValue;
+ s_currentThreadCulture = args.CurrentValue;
}
internal static void AsyncLocalSetCurrentUICulture(AsyncLocalValueChangedArgs<CultureInfo> args)
{
- Thread.m_CurrentUICulture = args.CurrentValue;
+ s_currentThreadUICulture = args.CurrentValue;
}
- private static readonly Lock _lock = new Lock();
- private static volatile StringCultureInfoDictionary s_NameCachedCultures;
- private static volatile StringLcidDictionary s_LcidCachedCultures;
+ private static readonly object _lock = new object();
+ private static volatile Dictionary<string, CultureInfo> s_NameCachedCultures;
+ private static volatile Dictionary<int, CultureInfo> s_LcidCachedCultures;
//The parent culture.
private CultureInfo _parent;
{
}
-
public CultureInfo(string name, bool useUserOverride)
{
if (name == null)
SR.ArgumentNull_String);
}
- InitializeFromName(name, useUserOverride);
+ // Get our data providing record
+ _cultureData = CultureData.GetCultureData(name, useUserOverride);
+
+ if (_cultureData == null)
+ {
+ throw new CultureNotFoundException(nameof(name), name, SR.Argument_CultureNotSupported);
+ }
+
+ _name = _cultureData.CultureName;
+ _isInherited = (this.GetType() != typeof(System.Globalization.CultureInfo));
}
private CultureInfo(CultureData cultureData, bool isReadOnly = false)
}
return new CultureInfo(cultureData);
- }
- public CultureInfo(int culture) : this(culture, true)
+ }
+
+ public CultureInfo(int culture) : this(culture, true)
{
}
throw new ArgumentOutOfRangeException(nameof(culture), SR.ArgumentOutOfRange_NeedPosNum);
}
- InitializeFromCultureId(culture, useUserOverride);
- }
-
- private void InitializeFromCultureId(int culture, bool useUserOverride)
- {
switch (culture)
{
case LOCALE_CUSTOM_DEFAULT:
_name = _cultureData.CultureName;
}
- private void InitializeFromName(string name, bool useUserOverride)
- {
- // Get our data providing record
- _cultureData = CultureData.GetCultureData(name, useUserOverride);
-
- if (_cultureData == null)
- {
- throw new CultureNotFoundException(nameof(name), name, SR.Argument_CultureNotSupported);
- }
-
- _name = _cultureData.CultureName;
- _isInherited = (this.GetType() != typeof(System.Globalization.CultureInfo));
- }
-
// Constructor called by SQL Server's special munged culture - creates a culture with
// a TextInfo and CompareInfo that come from a supplied alternate source. This object
// is ALWAYS read-only.
{
if (cultureName == null)
{
- throw new ArgumentNullException(nameof(cultureName),SR.ArgumentNull_String);
+ throw new ArgumentNullException(nameof(cultureName), SR.ArgumentNull_String);
}
_cultureData = CultureData.GetCultureData(cultureName, false);
if (_cultureData == null)
throw new CultureNotFoundException(nameof(cultureName), cultureName, SR.Argument_CultureNotSupported);
-
+
_name = _cultureData.CultureName;
CultureInfo altCulture = GetCultureInfo(textAndCompareCultureName);
- compareInfo = altCulture.CompareInfo;
- textInfo = altCulture.TextInfo;
+ _compareInfo = altCulture.CompareInfo;
+ _textInfo = altCulture.TextInfo;
}
// We do this to try to return the system UI language and the default user languages
return culture;
}
- return (new CultureInfo(culture._cultureData.SSPECIFICCULTURE));
+ return new CultureInfo(culture._cultureData.SSPECIFICCULTURE);
}
internal static bool VerifyCultureName(string cultureName, bool throwException)
return VerifyCultureName(culture.Name, throwException);
}
- // We need to store the override from the culture data record.
- private bool _useUserOverride;
-
- internal static CultureInfo GetCurrentUICultureNoAppX()
+ ////////////////////////////////////////////////////////////////////////
+ //
+ // CurrentCulture
+ //
+ // This instance provides methods based on the current user settings.
+ // These settings are volatile and may change over the lifetime of the
+ // thread.
+ //
+ ////////////////////////////////////////////////////////////////////////
+
+ //
+ // We use the following order to return CurrentCulture and CurrentUICulture
+ // o Use WinRT to return the current user profile language
+ // o use current thread culture if the user already set one using CurrentCulture/CurrentUICulture
+ // o use thread culture if the user already set one using DefaultThreadCurrentCulture
+ // or DefaultThreadCurrentUICulture
+ // o Use NLS default user culture
+ // o Use NLS default system culture
+ // o Use Invariant culture
+ //
+ public static CultureInfo CurrentCulture
{
- CultureInfo ci = GetUserDefaultCultureCacheOverride();
- if (ci != null)
+ get
{
- return ci;
+#if ENABLE_WINRT
+ WinRTInteropCallbacks callbacks = WinRTInterop.UnsafeCallbacks;
+ if (callbacks != null && callbacks.IsAppxModel())
+ {
+ return (CultureInfo)callbacks.GetUserDefaultCulture();
+ }
+#endif
+#if FEATURE_APPX
+ if (ApplicationModel.IsUap)
+ {
+ CultureInfo culture = GetCultureInfoForUserPreferredLanguageInAppX();
+ if (culture != null)
+ return culture;
+ }
+#endif
+
+ if (s_currentThreadCulture != null)
+ {
+ return s_currentThreadCulture;
+ }
+
+ CultureInfo ci = s_DefaultThreadCurrentCulture;
+ if (ci != null)
+ {
+ return ci;
+ }
+
+ return s_userDefaultCulture ?? InitializeUserDefaultCulture();
+ }
+
+ set
+ {
+ if (value == null)
+ {
+ throw new ArgumentNullException(nameof(value));
+ }
+
+#if ENABLE_WINRT
+ WinRTInteropCallbacks callbacks = WinRTInterop.UnsafeCallbacks;
+ if (callbacks != null && callbacks.IsAppxModel())
+ {
+ callbacks.SetGlobalDefaultCulture(value);
+ return;
+ }
+#endif
+#if FEATURE_APPX
+ if (ApplicationModel.IsUap)
+ {
+ if (SetCultureInfoForUserPreferredLanguageInAppX(value))
+ {
+ // successfully set the culture, otherwise fallback to legacy path
+ return;
+ }
+ }
+#endif
+
+ if (s_asyncLocalCurrentCulture == null)
+ {
+ Interlocked.CompareExchange(ref s_asyncLocalCurrentCulture, new AsyncLocal<CultureInfo>(AsyncLocalSetCurrentCulture), null);
+ }
+ s_asyncLocalCurrentCulture.Value = value;
}
+ }
- if (Thread.m_CurrentUICulture != null)
+ public static CultureInfo CurrentUICulture
+ {
+ get
{
- return Thread.m_CurrentUICulture;
+#if ENABLE_WINRT
+ WinRTInteropCallbacks callbacks = WinRTInterop.UnsafeCallbacks;
+ if (callbacks != null && callbacks.IsAppxModel())
+ {
+ return (CultureInfo)callbacks.GetUserDefaultCulture();
+ }
+#endif
+#if FEATURE_APPX
+ if (ApplicationModel.IsUap)
+ {
+ CultureInfo culture = GetCultureInfoForUserPreferredLanguageInAppX();
+ if (culture != null)
+ return culture;
+ }
+#endif
+
+ if (s_currentThreadUICulture != null)
+ {
+ return s_currentThreadUICulture;
+ }
+
+ CultureInfo ci = s_DefaultThreadCurrentUICulture;
+ if (ci != null)
+ {
+ return ci;
+ }
+
+ return UserDefaultUICulture;
}
- ci = s_DefaultThreadCurrentUICulture;
- if (ci != null)
+ set
{
- return ci;
+ if (value == null)
+ {
+ throw new ArgumentNullException(nameof(value));
+ }
+
+ CultureInfo.VerifyCultureName(value, true);
+
+#if ENABLE_WINRT
+ WinRTInteropCallbacks callbacks = WinRTInterop.UnsafeCallbacks;
+ if (callbacks != null && callbacks.IsAppxModel())
+ {
+ callbacks.SetGlobalDefaultCulture(value);
+ return;
+ }
+#endif
+#if FEATURE_APPX
+ if (ApplicationModel.IsUap)
+ {
+ if (SetCultureInfoForUserPreferredLanguageInAppX(value))
+ {
+ // successfully set the culture, otherwise fallback to legacy path
+ return;
+ }
+ }
+#endif
+
+ if (s_asyncLocalCurrentUICulture == null)
+ {
+ Interlocked.CompareExchange(ref s_asyncLocalCurrentUICulture, new AsyncLocal<CultureInfo>(AsyncLocalSetCurrentUICulture), null);
+ }
+
+ // this one will set s_currentThreadUICulture too
+ s_asyncLocalCurrentUICulture.Value = value;
}
+ }
- return UserDefaultUICulture;
+ internal static void ResetThreadCulture()
+ {
+ s_currentThreadCulture = null;
+ s_currentThreadUICulture = null;
}
internal static CultureInfo UserDefaultUICulture => s_userDefaultUICulture ?? InitializeUserDefaultUICulture();
get
{
Debug.Assert(s_InvariantCultureInfo != null);
- return (s_InvariantCultureInfo);
+ return s_InvariantCultureInfo;
}
}
{
get
{
- return (this._cultureData.ILANGUAGE);
+ return _cultureData.ILANGUAGE;
}
}
{
types |= CultureTypes.ReplacementCultures;
}
- return (CultureData.GetCultures(types));
+ return CultureData.GetCultures(types);
}
////////////////////////////////////////////////////////////////////////
{
get
{
- return (_cultureData.SNATIVEDISPLAYNAME);
+ return _cultureData.SNATIVEDISPLAYNAME;
}
}
{
get
{
- return (_cultureData.SENGDISPLAYNAME);
+ return _cultureData.SENGDISPLAYNAME;
}
}
{
get
{
- return (_cultureData.SISO639LANGNAME);
+ return _cultureData.SISO639LANGNAME;
}
}
{
get
{
- if (this.compareInfo == null)
+ if (_compareInfo == null)
{
// Since CompareInfo's don't have any overrideable properties, get the CompareInfo from
// the Non-Overridden CultureInfo so that we only create one CompareInfo per culture
- this.compareInfo = UseUserOverride
- ? GetCultureInfo(this._name).CompareInfo
- : new CompareInfo(this);
+ _compareInfo = UseUserOverride
+ ? GetCultureInfo(_name).CompareInfo
+ : new CompareInfo(this);
}
- return (compareInfo);
+ return _compareInfo;
}
}
{
get
{
- if (textInfo == null)
+ if (_textInfo == null)
{
// Make a new textInfo
TextInfo tempTextInfo = new TextInfo(_cultureData);
tempTextInfo.SetReadOnlyState(_isReadOnly);
- textInfo = tempTextInfo;
+ _textInfo = tempTextInfo;
}
- return (textInfo);
+ return _textInfo;
}
}
// using CompareInfo to verify the data passed through the constructor
// CultureInfo(String cultureName, String textAndCompareCultureName)
- return (this.Name.Equals(that.Name) && this.CompareInfo.Equals(that.CompareInfo));
+ return this.Name.Equals(that.Name) && this.CompareInfo.Equals(that.CompareInfo);
}
- return (false);
+ return false;
}
public override int GetHashCode()
{
- return (this.Name.GetHashCode() + this.CompareInfo.GetHashCode());
+ return this.Name.GetHashCode() + this.CompareInfo.GetHashCode();
}
}
- public virtual Object GetFormat(Type formatType)
+ public virtual object GetFormat(Type formatType)
{
if (formatType == typeof(NumberFormatInfo))
- return (NumberFormat);
+ return NumberFormat;
if (formatType == typeof(DateTimeFormatInfo))
- return (DateTimeFormat);
- return (null);
+ return DateTimeFormat;
+ return null;
}
public virtual bool IsNeutralCulture
// Disable warning 618: System.Globalization.CultureTypes.FrameworkCultures' is obsolete
#pragma warning disable 618
types |= _cultureData.IsFramework ? CultureTypes.FrameworkCultures : 0;
-
#pragma warning restore 618
+
types |= _cultureData.IsSupplementalCustomCulture ? CultureTypes.UserCustomCulture : 0;
types |= _cultureData.IsReplacementCulture ? CultureTypes.ReplacementCultures | CultureTypes.UserCustomCulture : 0;
{
get
{
- if (numInfo == null)
+ if (_numInfo == null)
{
NumberFormatInfo temp = new NumberFormatInfo(_cultureData);
temp.isReadOnly = _isReadOnly;
- Interlocked.CompareExchange(ref numInfo, temp, null);
+ Interlocked.CompareExchange(ref _numInfo, temp, null);
}
- return (numInfo);
+ return _numInfo;
}
set
{
throw new ArgumentNullException(nameof(value), SR.ArgumentNull_Obj);
}
VerifyWritable();
- numInfo = value;
+ _numInfo = value;
}
}
{
get
{
- if (dateTimeInfo == null)
+ if (_dateTimeInfo == null)
{
// Change the calendar of DTFI to the specified calendar of this CultureInfo.
DateTimeFormatInfo temp = new DateTimeFormatInfo(_cultureData, this.Calendar);
temp._isReadOnly = _isReadOnly;
- Interlocked.CompareExchange(ref dateTimeInfo, temp, null);
+ Interlocked.CompareExchange(ref _dateTimeInfo, temp, null);
}
- return (dateTimeInfo);
+ return _dateTimeInfo;
}
set
throw new ArgumentNullException(nameof(value), SR.ArgumentNull_Obj);
}
VerifyWritable();
- dateTimeInfo = value;
+ _dateTimeInfo = value;
}
}
s_userDefaultUICulture = GetUserDefaultUICulture();
RegionInfo.s_currentRegionInfo = null;
- #pragma warning disable 0618 // disable the obsolete warning
+#pragma warning disable 0618 // disable the obsolete warning
TimeZone.ResetTimeZone();
- #pragma warning restore 0618
+#pragma warning restore 0618
TimeZoneInfo.ClearCachedData();
s_LcidCachedCultures = null;
s_NameCachedCultures = null;
{
if (calType == CalendarId.GREGORIAN)
{
- return (new GregorianCalendar());
+ return new GregorianCalendar();
}
return GetCalendarInstanceRare(calType);
}
case CalendarId.GREGORIAN_ARABIC: // Gregorian Arabic calendar
case CalendarId.GREGORIAN_XLIT_ENGLISH: // Gregorian Transliterated English calendar
case CalendarId.GREGORIAN_XLIT_FRENCH: // Gregorian Transliterated French calendar
- return (new GregorianCalendar((GregorianCalendarTypes)calType));
+ return new GregorianCalendar((GregorianCalendarTypes)calType);
case CalendarId.TAIWAN: // Taiwan Era calendar
- return (new TaiwanCalendar());
+ return new TaiwanCalendar();
case CalendarId.JAPAN: // Japanese Emperor Era calendar
- return (new JapaneseCalendar());
+ return new JapaneseCalendar();
case CalendarId.KOREA: // Korean Tangun Era calendar
- return (new KoreanCalendar());
+ return new KoreanCalendar();
case CalendarId.THAI: // Thai calendar
- return (new ThaiBuddhistCalendar());
+ return new ThaiBuddhistCalendar();
case CalendarId.HIJRI: // Hijri (Arabic Lunar) calendar
- return (new HijriCalendar());
+ return new HijriCalendar();
case CalendarId.HEBREW: // Hebrew (Lunar) calendar
- return (new HebrewCalendar());
+ return new HebrewCalendar();
case CalendarId.UMALQURA:
- return (new UmAlQuraCalendar());
+ return new UmAlQuraCalendar();
case CalendarId.PERSIAN:
- return (new PersianCalendar());
+ return new PersianCalendar();
}
- return (new GregorianCalendar());
+ return new GregorianCalendar();
}
/*=================================Calendar==========================
{
get
{
- if (calendar == null)
+ if (_calendar == null)
{
Debug.Assert(_cultureData.CalendarIds.Length > 0, "_cultureData.CalendarIds.Length > 0");
// Get the default calendar for this culture. Note that the value can be
System.Threading.Interlocked.MemoryBarrier();
newObj.SetReadOnlyState(_isReadOnly);
- calendar = newObj;
+ _calendar = newObj;
}
- return (calendar);
+ return _calendar;
}
}
{
cals[i] = GetCalendarInstance(calID[i]);
}
- return (cals);
+ return cals;
}
}
temp._isReadOnly = true;
_consoleFallbackCulture = temp;
}
- return (temp);
+ return temp;
}
- public virtual Object Clone()
+ public virtual object Clone()
{
CultureInfo ci = (CultureInfo)MemberwiseClone();
ci._isReadOnly = false;
//they've already been allocated. If this is a derived type, we'll take a more generic codepath.
if (!_isInherited)
{
- if (this.dateTimeInfo != null)
+ if (_dateTimeInfo != null)
{
- ci.dateTimeInfo = (DateTimeFormatInfo)this.dateTimeInfo.Clone();
+ ci._dateTimeInfo = (DateTimeFormatInfo)_dateTimeInfo.Clone();
}
- if (this.numInfo != null)
+ if (_numInfo != null)
{
- ci.numInfo = (NumberFormatInfo)this.numInfo.Clone();
+ ci._numInfo = (NumberFormatInfo)_numInfo.Clone();
}
}
else
ci.NumberFormat = (NumberFormatInfo)this.NumberFormat.Clone();
}
- if (textInfo != null)
+ if (_textInfo != null)
{
- ci.textInfo = (TextInfo)textInfo.Clone();
+ ci._textInfo = (TextInfo)_textInfo.Clone();
}
- if (calendar != null)
+ if (_calendar != null)
{
- ci.calendar = (Calendar)calendar.Clone();
+ ci._calendar = (Calendar)_calendar.Clone();
}
- return (ci);
+ return ci;
}
public static CultureInfo ReadOnly(CultureInfo ci)
if (ci.IsReadOnly)
{
- return (ci);
+ return ci;
}
CultureInfo newInfo = (CultureInfo)(ci.MemberwiseClone());
//they've already been allocated. If this is a derived type, we'll take a more generic codepath.
if (!ci._isInherited)
{
- if (ci.dateTimeInfo != null)
+ if (ci._dateTimeInfo != null)
{
- newInfo.dateTimeInfo = DateTimeFormatInfo.ReadOnly(ci.dateTimeInfo);
+ newInfo._dateTimeInfo = DateTimeFormatInfo.ReadOnly(ci._dateTimeInfo);
}
- if (ci.numInfo != null)
+ if (ci._numInfo != null)
{
- newInfo.numInfo = NumberFormatInfo.ReadOnly(ci.numInfo);
+ newInfo._numInfo = NumberFormatInfo.ReadOnly(ci._numInfo);
}
}
else
}
}
- if (ci.textInfo != null)
+ if (ci._textInfo != null)
{
- newInfo.textInfo = TextInfo.ReadOnly(ci.textInfo);
+ newInfo._textInfo = TextInfo.ReadOnly(ci._textInfo);
}
- if (ci.calendar != null)
+ if (ci._calendar != null)
{
- newInfo.calendar = Calendar.ReadOnly(ci.calendar);
+ newInfo._calendar = Calendar.ReadOnly(ci._calendar);
}
// Don't set the read-only flag too early.
// We should set the read-only flag here. Otherwise, info.DateTimeFormat will not be able to set.
newInfo._isReadOnly = true;
- return (newInfo);
+ return newInfo;
}
{
get
{
- return (_isReadOnly);
+ return _isReadOnly;
}
}
CultureInfo retval;
// Temporary hashtable for the names.
- StringCultureInfoDictionary tempNameHT = s_NameCachedCultures;
+ Dictionary<string, CultureInfo> tempNameHT = s_NameCachedCultures;
if (name != null)
{
// We expect the same result for both hashtables, but will test individually for added safety.
if (tempNameHT == null)
{
- tempNameHT = new StringCultureInfoDictionary();
+ tempNameHT = new Dictionary<string, CultureInfo>();
}
else
{
}
// Next, the Lcid table.
- StringLcidDictionary tempLcidHT = s_LcidCachedCultures;
+ Dictionary<int, CultureInfo> tempLcidHT = s_LcidCachedCultures;
if (tempLcidHT == null)
{
// Case insensitive is not an issue here, save the constructor call.
- tempLcidHT = new StringLcidDictionary();
+ tempLcidHT = new Dictionary<int, CultureInfo>();
}
else
{
// Must check for -1 now since the helper function uses the value to signal
// the altCulture code path for SQL Server.
// Also check for zero as this would fail trying to add as a key to the hash.
- if (culture <= 0)
+ if (culture <= 0)
{
throw new ArgumentOutOfRangeException(nameof(culture), SR.ArgumentOutOfRange_NeedPosNum);
}
{
throw new ArgumentNullException(nameof(altName));
}
-
CultureInfo retval = GetCultureInfoHelper(-1, name, altName);
if (retval == null)
}
}
}
-
System.Globalization.CultureInfo culture = System.Globalization.CultureInfo.CurrentCulture;
if (!culture._isInherited)
{
- DateTimeFormatInfo info = culture.dateTimeInfo;
+ DateTimeFormatInfo info = culture._dateTimeInfo;
if (info != null)
{
return info;
// Fast path for a regular CultureInfo
if (provider is CultureInfo cultureProvider && !cultureProvider._isInherited)
{
- return cultureProvider.numInfo ?? cultureProvider.NumberFormat;
+ return cultureProvider._numInfo ?? cultureProvider.NumberFormat;
}
return
System.Globalization.CultureInfo culture = CultureInfo.CurrentCulture;
if (!culture._isInherited)
{
- NumberFormatInfo info = culture.numInfo;
+ NumberFormatInfo info = culture._numInfo;
if (info != null)
{
return info;
+++ /dev/null
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics;
-using System.Threading;
-
-namespace System.Globalization
-{
- public partial class CultureInfo : IFormatProvider
- {
- private static CultureInfo GetUserDefaultCultureCacheOverride()
- {
- return null; // ICU doesn't provide a user override
- }
-
- internal static CultureInfo GetUserDefaultCulture()
- {
- if (GlobalizationMode.Invariant)
- return CultureInfo.InvariantCulture;
-
- CultureInfo cultureInfo = null;
- string localeName;
- if (CultureData.GetDefaultLocaleName(out localeName))
- {
- cultureInfo = GetCultureByName(localeName, true);
- cultureInfo._isReadOnly = true;
- }
- else
- {
- cultureInfo = CultureInfo.InvariantCulture;
- }
-
- return cultureInfo;
- }
-
- private static CultureInfo GetUserDefaultUICulture()
- {
- return GetUserDefaultCulture();
- }
-
- ////////////////////////////////////////////////////////////////////////
- //
- // CurrentCulture
- //
- // This instance provides methods based on the current user settings.
- // These settings are volatile and may change over the lifetime of the
- // thread.
- //
- ////////////////////////////////////////////////////////////////////////
-
- //
- // We use the following order to return CurrentCulture and CurrentUICulture
- // o use current thread culture if the user already set one using CurrentCulture/CurrentUICulture
- // o use thread culture if the user already set one using DefaultThreadCurrentCulture
- // or DefaultThreadCurrentUICulture
- // o Use NLS default user culture
- // o Use NLS default system culture
- // o Use Invariant culture
- //
- public static CultureInfo CurrentCulture
- {
- get
- {
- if (Thread.m_CurrentCulture != null)
- {
- return Thread.m_CurrentCulture;
- }
-
- CultureInfo ci = s_DefaultThreadCurrentCulture;
- if (ci != null)
- {
- return ci;
- }
-
- return s_userDefaultCulture ?? InitializeUserDefaultCulture();
- }
-
- set
- {
- if (value == null)
- {
- throw new ArgumentNullException(nameof(value));
- }
-
- if (s_asyncLocalCurrentCulture == null)
- {
- Interlocked.CompareExchange(ref s_asyncLocalCurrentCulture, new AsyncLocal<CultureInfo>(AsyncLocalSetCurrentCulture), null);
- }
- s_asyncLocalCurrentCulture.Value = value;
- }
- }
-
- public static CultureInfo CurrentUICulture
- {
- get
- {
- return GetCurrentUICultureNoAppX();
- }
-
- set
- {
- if (value == null)
- {
- throw new ArgumentNullException(nameof(value));
- }
-
- CultureInfo.VerifyCultureName(value, true);
- if (s_asyncLocalCurrentUICulture == null)
- {
- Interlocked.CompareExchange(ref s_asyncLocalCurrentUICulture, new AsyncLocal<CultureInfo>(AsyncLocalSetCurrentUICulture), null);
- }
-
- // this one will set s_currentThreadUICulture too
- s_asyncLocalCurrentUICulture.Value = value;
- }
- }
-
- }
-}
+++ /dev/null
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics;
-
-#if ENABLE_WINRT
-using Internal.Runtime.Augments;
-#endif
-
-using System.Threading;
-#if FEATURE_APPX
-using System.Resources;
-using Internal.Resources;
-#endif
-
-namespace System.Globalization
-{
- public partial class CultureInfo : IFormatProvider
- {
-#if FEATURE_APPX
- // When running under AppX, we use this to get some information about the language list
- private static volatile WindowsRuntimeResourceManagerBase s_WindowsRuntimeResourceManager;
-
- [ThreadStatic]
- private static bool ts_IsDoingAppXCultureInfoLookup;
-#endif
-
- /// <summary>
- /// Gets the default user culture from WinRT, if available.
- /// </summary>
- /// <remarks>
- /// This method may return null, if there is no default user culture or if WinRT isn't available.
- /// </remarks>
- private static CultureInfo GetUserDefaultCultureCacheOverride()
- {
-#if ENABLE_WINRT
- WinRTInteropCallbacks callbacks = WinRTInterop.UnsafeCallbacks;
- if (callbacks != null && callbacks.IsAppxModel())
- {
- return (CultureInfo)callbacks.GetUserDefaultCulture();
- }
-#endif
-
- return null;
- }
-
- internal static CultureInfo GetUserDefaultCulture()
- {
- if (GlobalizationMode.Invariant)
- return CultureInfo.InvariantCulture;
-
- const uint LOCALE_SNAME = 0x0000005c;
- const string LOCALE_NAME_USER_DEFAULT = null;
- const string LOCALE_NAME_SYSTEM_DEFAULT = "!x-sys-default-locale";
-
- string strDefault = CultureData.GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SNAME);
- if (strDefault == null)
- {
- strDefault = CultureData.GetLocaleInfoEx(LOCALE_NAME_SYSTEM_DEFAULT, LOCALE_SNAME);
-
- if (strDefault == null)
- {
- // If system default doesn't work, use invariant
- return CultureInfo.InvariantCulture;
- }
- }
-
- CultureInfo temp = GetCultureByName(strDefault, true);
-
- temp._isReadOnly = true;
-
- return temp;
- }
-
- private static CultureInfo GetUserDefaultUICulture()
- {
- if (GlobalizationMode.Invariant)
- return CultureInfo.InvariantCulture;
-
- const uint MUI_LANGUAGE_NAME = 0x8; // Use ISO language (culture) name convention
- uint langCount = 0;
- uint bufLen = 0;
-
- if (Interop.Kernel32.GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, out langCount, null, ref bufLen))
- {
- char [] languages = new char[bufLen];
- if (Interop.Kernel32.GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, out langCount, languages, ref bufLen))
- {
- int index = 0;
- while (languages[index] != (char) 0 && index<languages.Length)
- {
- index++;
- }
-
- CultureInfo temp = GetCultureByName(new string(languages, 0, index), true);
- temp._isReadOnly = true;
- return temp;
- }
- }
-
- return GetUserDefaultCulture();
- }
-
- ////////////////////////////////////////////////////////////////////////
- //
- // CurrentCulture
- //
- // This instance provides methods based on the current user settings.
- // These settings are volatile and may change over the lifetime of the
- // thread.
- //
- ////////////////////////////////////////////////////////////////////////
-
- //
- // We use the following order to return CurrentCulture and CurrentUICulture
- // o Use WinRT to return the current user profile language
- // o use current thread culture if the user already set one using CurrentCulture/CurrentUICulture
- // o use thread culture if the user already set one using DefaultThreadCurrentCulture
- // or DefaultThreadCurrentUICulture
- // o Use NLS default user culture
- // o Use NLS default system culture
- // o Use Invariant culture
- //
- public static CultureInfo CurrentCulture
- {
- get
- {
-#if FEATURE_APPX
- if (ApplicationModel.IsUap)
- {
- CultureInfo culture = GetCultureInfoForUserPreferredLanguageInAppX();
- if (culture != null)
- return culture;
- }
-#endif
- CultureInfo ci = GetUserDefaultCultureCacheOverride();
- if (ci != null)
- {
- return ci;
- }
-
- if (Thread.m_CurrentCulture != null)
- {
- return Thread.m_CurrentCulture;
- }
-
- ci = s_DefaultThreadCurrentCulture;
- if (ci != null)
- {
- return ci;
- }
-
- return s_userDefaultCulture ?? InitializeUserDefaultCulture();
- }
-
- set
- {
- if (value == null)
- {
- throw new ArgumentNullException(nameof(value));
- }
-
-#if FEATURE_APPX
- if (ApplicationModel.IsUap)
- {
- if (SetCultureInfoForUserPreferredLanguageInAppX(value))
- {
- // successfully set the culture, otherwise fallback to legacy path
- return;
- }
- }
-#endif
- if (s_asyncLocalCurrentCulture == null)
- {
- Interlocked.CompareExchange(ref s_asyncLocalCurrentCulture, new AsyncLocal<CultureInfo>(AsyncLocalSetCurrentCulture), null);
- }
- s_asyncLocalCurrentCulture.Value = value;
- }
- }
-
- public static CultureInfo CurrentUICulture
- {
- get
- {
-#if FEATURE_APPX
- if (ApplicationModel.IsUap)
- {
- CultureInfo culture = GetCultureInfoForUserPreferredLanguageInAppX();
- if (culture != null)
- return culture;
- }
-#endif
- return GetCurrentUICultureNoAppX();
- }
-
- set
- {
- if (value == null)
- {
- throw new ArgumentNullException(nameof(value));
- }
-
- CultureInfo.VerifyCultureName(value, true);
-#if FEATURE_APPX
- if (ApplicationModel.IsUap)
- {
- if (SetCultureInfoForUserPreferredLanguageInAppX(value))
- {
- // successfully set the culture, otherwise fallback to legacy path
- return;
- }
- }
-#endif
- if (s_asyncLocalCurrentUICulture == null)
- {
- Interlocked.CompareExchange(ref s_asyncLocalCurrentUICulture, new AsyncLocal<CultureInfo>(AsyncLocalSetCurrentUICulture), null);
- }
-
- // this one will set s_currentThreadUICulture too
- s_asyncLocalCurrentUICulture.Value = value;
- }
- }
-
-#if FEATURE_APPX
- internal static CultureInfo GetCultureInfoForUserPreferredLanguageInAppX()
- {
- // If a call to GetCultureInfoForUserPreferredLanguageInAppX() generated a recursive
- // call to itself, return null, since we don't want to stack overflow. For example,
- // this can happen if some code in this method ends up calling CultureInfo.CurrentCulture.
- // In this case, returning null will mean CultureInfo.CurrentCulture gets the default Win32
- // value, which should be fine.
- if (ts_IsDoingAppXCultureInfoLookup)
- {
- return null;
- }
-
- CultureInfo toReturn = null;
-
- try
- {
- ts_IsDoingAppXCultureInfoLookup = true;
-
- if (s_WindowsRuntimeResourceManager == null)
- {
- s_WindowsRuntimeResourceManager = ResourceManager.GetWinRTResourceManager();
- }
-
- toReturn = s_WindowsRuntimeResourceManager.GlobalResourceContextBestFitCultureInfo;
- }
- finally
- {
- ts_IsDoingAppXCultureInfoLookup = false;
- }
-
- return toReturn;
- }
-
- internal static bool SetCultureInfoForUserPreferredLanguageInAppX(CultureInfo ci)
- {
- if (s_WindowsRuntimeResourceManager == null)
- {
- s_WindowsRuntimeResourceManager = ResourceManager.GetWinRTResourceManager();
- }
-
- return s_WindowsRuntimeResourceManager.SetGlobalResourceContextDefaultCulture(ci);
- }
-#endif
- }
-}
#pragma warning restore 414
#pragma warning restore 169
-
- // Do not move! Order of above fields needs to be preserved for alignment
- // with native code
- // See code:#threadCultureInfo
- [ThreadStatic]
- internal static CultureInfo m_CurrentCulture;
- [ThreadStatic]
- internal static CultureInfo m_CurrentUICulture;
[ThreadStatic]
private static Thread t_currentThread;
// If you add more pre-conditions to this method, check to see if you also need to
// add them to CultureInfo.DefaultThreadCurrentUICulture.set.
- if (m_CurrentUICulture == null && m_CurrentCulture == null)
+ if (CultureInfo.s_currentThreadUICulture == null && CultureInfo.s_currentThreadCulture == null)
nativeInitCultureAccessors();
CultureInfo.CurrentUICulture = value;
// If you add more pre-conditions to this method, check to see if you also need to
// add them to CultureInfo.DefaultThreadCurrentCulture.set.
- if (m_CurrentCulture == null && m_CurrentUICulture == null)
+ if (CultureInfo.s_currentThreadUICulture == null && CultureInfo.s_currentThreadCulture == null)
nativeInitCultureAccessors();
CultureInfo.CurrentCulture = value;
DEFINE_FIELD_U(m_padding, CustomAttributeType, m_padding)
DEFINE_CLASS_U(Globalization, CultureInfo, CultureInfoBaseObject)
-DEFINE_FIELD_U(compareInfo, CultureInfoBaseObject, compareInfo)
-DEFINE_FIELD_U(textInfo, CultureInfoBaseObject, textInfo)
-DEFINE_FIELD_U(numInfo, CultureInfoBaseObject, numInfo)
-DEFINE_FIELD_U(dateTimeInfo, CultureInfoBaseObject, dateTimeInfo)
-DEFINE_FIELD_U(calendar, CultureInfoBaseObject, calendar)
+DEFINE_FIELD_U(_compareInfo, CultureInfoBaseObject, _compareInfo)
+DEFINE_FIELD_U(_textInfo, CultureInfoBaseObject, _textInfo)
+DEFINE_FIELD_U(_numInfo, CultureInfoBaseObject, _numInfo)
+DEFINE_FIELD_U(_dateTimeInfo, CultureInfoBaseObject, _dateTimeInfo)
+DEFINE_FIELD_U(_calendar, CultureInfoBaseObject, _calendar)
DEFINE_FIELD_U(_consoleFallbackCulture, CultureInfoBaseObject, _consoleFallbackCulture)
DEFINE_FIELD_U(_name, CultureInfoBaseObject, _name)
DEFINE_FIELD_U(_nonSortName, CultureInfoBaseObject, _nonSortName)
DEFINE_FIELD_U(_parent, CultureInfoBaseObject, _parent)
DEFINE_FIELD_U(_isReadOnly, CultureInfoBaseObject, _isReadOnly)
DEFINE_FIELD_U(_isInherited, CultureInfoBaseObject, _isInherited)
-DEFINE_FIELD_U(_useUserOverride, CultureInfoBaseObject, _useUserOverride)
DEFINE_CLASS(CULTURE_INFO, Globalization, CultureInfo)
DEFINE_METHOD(CULTURE_INFO, STR_CTOR, .ctor, IM_Str_RetVoid)
DEFINE_FIELD(CULTURE_INFO, CURRENT_CULTURE, s_userDefaultCulture)
DEFINE_PROPERTY(CULTURE_INFO, ID, LCID, Int)
#endif
DEFINE_PROPERTY(CULTURE_INFO, PARENT, Parent, CultureInfo)
+DEFINE_FIELD(CULTURE_INFO, CULTURE, s_currentThreadCulture)
+DEFINE_FIELD(CULTURE_INFO, UI_CULTURE, s_currentThreadUICulture)
DEFINE_CLASS(CURRENCY, System, Currency)
DEFINE_METHOD(CURRENCY, DECIMAL_CTOR, .ctor, IM_Dec_RetVoid)
DEFINE_FIELD_U(DONT_USE_InternalThread, ThreadBaseObject, m_InternalThread)
DEFINE_FIELD_U(m_Priority, ThreadBaseObject, m_Priority)
DEFINE_CLASS(THREAD, Threading, Thread)
-DEFINE_FIELD(THREAD, CULTURE, m_CurrentCulture)
-DEFINE_FIELD(THREAD, UI_CULTURE, m_CurrentUICulture)
DEFINE_SET_PROPERTY(THREAD, CULTURE, CurrentCulture, CultureInfo)
DEFINE_SET_PROPERTY(THREAD, UI_CULTURE, CurrentUICulture, CultureInfo)
DEFINE_STATIC_PROPERTY(THREAD, CURRENT_THREAD, CurrentThread, Thread)
friend class MscorlibBinder;
private:
- OBJECTREF compareInfo;
- OBJECTREF textInfo;
- OBJECTREF numInfo;
- OBJECTREF dateTimeInfo;
- OBJECTREF calendar;
+ OBJECTREF _compareInfo;
+ OBJECTREF _textInfo;
+ OBJECTREF _numInfo;
+ OBJECTREF _dateTimeInfo;
+ OBJECTREF _calendar;
OBJECTREF _cultureData;
OBJECTREF _consoleFallbackCulture;
STRINGREF _name; // "real" name - en-US, de-DE_phoneb or fj-FJ
CULTUREINFOBASEREF _parent;
CLR_BOOL _isReadOnly;
CLR_BOOL _isInherited;
- CLR_BOOL _useUserOverride;
public:
CULTUREINFOBASEREF GetParent()
GCX_COOP();
if (managedThreadCurrentCulture == NULL) {
- managedThreadCurrentCulture = MscorlibBinder::GetField(FIELD__THREAD__CULTURE);
+ managedThreadCurrentCulture = MscorlibBinder::GetField(FIELD__CULTURE_INFO__CULTURE);
pCurrentCulture = (OBJECTREF*)pThread->GetStaticFieldAddress(managedThreadCurrentCulture);
}
if (managedThreadCurrentUICulture == NULL) {
- managedThreadCurrentUICulture = MscorlibBinder::GetField(FIELD__THREAD__UI_CULTURE);
+ managedThreadCurrentUICulture = MscorlibBinder::GetField(FIELD__CULTURE_INFO__UI_CULTURE);
pCurrentCulture = (OBJECTREF*)pThread->GetStaticFieldAddress(managedThreadCurrentUICulture);
}
}
projects / platform / upstream / coreclr.git / commitdiff