diff options
| author | Tarek Mahmoud Sayed <tarekms@microsoft.com> | 2016-08-30 15:46:50 -0700 |
|---|---|---|
| committer | Tarek Mahmoud Sayed <tarekms@microsoft.com> | 2016-08-30 15:46:50 -0700 |
| commit | a4c2d83f439caa7d9a79f4cbc692dc8c8a89f41e (patch) | |
| tree | 75501a85cedc14f665f255ef1f09ce61263448ae /src/classlibnative/nls | |
| parent | 62f28d6d7801ce4c691194950798130502a4b13b (diff) | |
| download | coreclr-a4c2d83f439caa7d9a79f4cbc692dc8c8a89f41e.tar.gz coreclr-a4c2d83f439caa7d9a79f4cbc692dc8c8a89f41e.tar.bz2 coreclr-a4c2d83f439caa7d9a79f4cbc692dc8c8a89f41e.zip | |
Expose missing Global/Encoding APIs in coreclr and remove empty stubs
This change is to expose all missing globalization and Encoding APIs in corelib
to have the complete exposed list for such namespaces.
Also we are removing the empty methods stubs for Windows implementation
And have the actual implementation in-place
Diffstat (limited to 'src/classlibnative/nls')
| -rw-r--r-- | src/classlibnative/nls/nlsinfo.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/classlibnative/nls/nlsinfo.cpp b/src/classlibnative/nls/nlsinfo.cpp index da54a5b17b..864f998d1f 100644 --- a/src/classlibnative/nls/nlsinfo.cpp +++ b/src/classlibnative/nls/nlsinfo.cpp @@ -127,7 +127,7 @@ inline BOOL IsCustomCultureId(LCID lcid) return (lcid == LOCALE_CUSTOM_DEFAULT || lcid == LOCALE_CUSTOM_UNSPECIFIED); } -#ifndef FEATURE_CORECLR +#ifndef FEATURE_COREFX_GLOBALIZATION // // Normalization Implementation // @@ -136,7 +136,7 @@ HMODULE COMNlsInfo::m_hNormalization = NULL; PFN_NORMALIZATION_IS_NORMALIZED_STRING COMNlsInfo::m_pfnNormalizationIsNormalizedStringFunc = NULL; PFN_NORMALIZATION_NORMALIZE_STRING COMNlsInfo::m_pfnNormalizationNormalizeStringFunc = NULL; PFN_NORMALIZATION_INIT_NORMALIZATION COMNlsInfo::m_pfnNormalizationInitNormalizationFunc = NULL; -#endif +#endif // FEATURE_COREFX_GLOBALIZATION #if FEATURE_CODEPAGES_FILE /*============================nativeCreateOpenFileMapping============================ @@ -2623,7 +2623,7 @@ FCIMPL0(CodePageDataItem *, COMNlsInfo::nativeGetCodePageTableDataPointer) FCIMPLEND -#ifndef FEATURE_CORECLR +#ifndef FEATURE_COREFX_GLOBALIZATION // // Normalization // @@ -2722,12 +2722,15 @@ void QCALLTYPE COMNlsInfo::nativeNormalizationInitNormalization(int NormForm, BY if (!hNormalization) ThrowLastError(); } +#ifndef FEATURE_CORECLR + // in coreclr we should always find the normalization in kernel32 as it supports Win7 and up else { HRESULT hr = g_pCLRRuntime->LoadLibrary(NORMALIZATION_DLL, &hNormalization); if (FAILED(hr)) ThrowHR(hr); } +#endif // FEATURE_CORECLR _ASSERTE(hNormalization != NULL); m_hNormalization = hNormalization; @@ -2767,7 +2770,7 @@ void QCALLTYPE COMNlsInfo::nativeNormalizationInitNormalization(int NormForm, BY END_QCALL; } -#endif // FEATURE_CORECLR +#endif // FEATURE_COREFX_GLOBALIZATION // |