diff options
| author | Tarek Mahmoud Sayed <tarekms@microsoft.com> | 2016-11-01 16:17:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 16:17:50 -0700 |
| commit | 98b795e2a7d76c0d854084add431d362394e9800 (patch) | |
| tree | 51b2ad66037106b3dc84ca2706ecf6eb04ed5c79 /src/classlibnative | |
| parent | 0112e877e29426464844dd6575ad1808caf37267 (diff) | |
| download | coreclr-98b795e2a7d76c0d854084add431d362394e9800.tar.gz coreclr-98b795e2a7d76c0d854084add431d362394e9800.tar.bz2 coreclr-98b795e2a7d76c0d854084add431d362394e9800.zip | |
Enable the rest of netstandard1.7 globalization APIs (#7935)
* Enable more netstandard 1.7 Globalization APIs
* Enable Windows support for the new APIs
* Fix spaces and line alignments
Diffstat (limited to 'src/classlibnative')
| -rw-r--r-- | src/classlibnative/inc/nlsinfo.h | 2 | ||||
| -rw-r--r-- | src/classlibnative/nls/nlsinfo.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/classlibnative/inc/nlsinfo.h b/src/classlibnative/inc/nlsinfo.h index 1c1ff01f8a..4b7a036e2e 100644 --- a/src/classlibnative/inc/nlsinfo.h +++ b/src/classlibnative/inc/nlsinfo.h @@ -115,8 +115,8 @@ public: static INT_PTR InternalInitVersionedSortHandle(LPCWSTR localeName, INT_PTR* handleOrigin); static INT_PTR InternalInitVersionedSortHandle(LPCWSTR localeName, INT_PTR* handleOrigin, DWORD sortVersion); static DWORD QCALLTYPE InternalGetSortVersion(); - static BOOL QCALLTYPE InternalGetNlsVersionEx(INT_PTR handle, INT_PTR handleOrigin, LPCWSTR lpLocaleName, NLSVERSIONINFOEX * lpVersionInformation); #endif + static BOOL QCALLTYPE InternalGetNlsVersionEx(INT_PTR handle, INT_PTR handleOrigin, LPCWSTR lpLocaleName, NLSVERSIONINFOEX * lpVersionInformation); #ifndef FEATURE_CORECLR diff --git a/src/classlibnative/nls/nlsinfo.cpp b/src/classlibnative/nls/nlsinfo.cpp index cd5483387d..b930673ea9 100644 --- a/src/classlibnative/nls/nlsinfo.cpp +++ b/src/classlibnative/nls/nlsinfo.cpp @@ -3411,7 +3411,6 @@ INT_PTR COMNlsInfo::InternalInitOsSortHandle(LPCWSTR localeName, __out INT_PTR* return pSort; } -#ifndef FEATURE_CORECLR BOOL QCALLTYPE COMNlsInfo::InternalGetNlsVersionEx(INT_PTR handle, INT_PTR handleOrigin, LPCWSTR lpLocaleName, NLSVERSIONINFOEX * lpVersionInformation) { CONTRACTL { @@ -3421,7 +3420,7 @@ BOOL QCALLTYPE COMNlsInfo::InternalGetNlsVersionEx(INT_PTR handle, INT_PTR handl BOOL ret = FALSE; BEGIN_QCALL; - +#ifndef FEATURE_CORECLR AppDomain* curDomain = GetAppDomain(); if(curDomain->m_bUseOsSorting) @@ -3449,12 +3448,15 @@ BOOL QCALLTYPE COMNlsInfo::InternalGetNlsVersionEx(INT_PTR handle, INT_PTR handl lpVersionInformation->dwEffectiveId = 0; ZeroMemory(&(lpVersionInformation->guidCustomVersion), sizeof(GUID)); } - +#else + ret = GetNLSVersionEx(COMPARE_STRING, lpLocaleName, lpVersionInformation); +#endif // FEATURE_CORECLR END_QCALL; return ret; } +#ifndef FEATURE_CORECLR DWORD QCALLTYPE COMNlsInfo::InternalGetSortVersion() { CONTRACTL { |