diff options
| author | Marek Safar <marek.safar@gmail.com> | 2019-01-04 02:34:03 +0100 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-01-03 15:34:03 -1000 |
| commit | 8d2f4ed72a9d48164a4c8147fe7911e62a5d9594 (patch) | |
| tree | 69aac796ea6d8d0a0013dbe92788ded6970893d5 /src/vm | |
| parent | 10c3e60c863d01f638daa240af957c3c5791cda5 (diff) | |
| download | coreclr-8d2f4ed72a9d48164a4c8147fe7911e62a5d9594.tar.gz coreclr-8d2f4ed72a9d48164a4c8147fe7911e62a5d9594.tar.bz2 coreclr-8d2f4ed72a9d48164a4c8147fe7911e62a5d9594.zip | |
Adds portable version of EncodingTable (#21735)
* Adds portable version of EncodingTable
Most of the implementation is extracted from CoreRT
* Use string comparer directly
* Remove no longer used COMNlsInfo
* Adds localization support
* Removes FeatureCoreFxGlobalization configuration
* Remove redudant encodings look up from GetEncoding
* Keep Hashtable for nameToCodePage as it does not lock on read
* Replace locked dictionary lookup with short switch
* Include comment with msbuild task link used to generate the data file
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/ceemain.cpp | 3 | ||||
| -rw-r--r-- | src/vm/ecalllist.h | 12 | ||||
| -rw-r--r-- | src/vm/mscorlib.cpp | 1 |
3 files changed, 0 insertions, 16 deletions
diff --git a/src/vm/ceemain.cpp b/src/vm/ceemain.cpp index 159c91b601..c7b330c72b 100644 --- a/src/vm/ceemain.cpp +++ b/src/vm/ceemain.cpp @@ -153,9 +153,6 @@ #include "apithreadstress.h" #include "perflog.h" #include "../dlls/mscorrc/resource.h" -#ifdef FEATURE_USE_LCID -#include "nlsinfo.h" -#endif #include "util.hpp" #include "shimload.h" #include "comthreadpool.h" diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h index 0217052319..05ced0fc68 100644 --- a/src/vm/ecalllist.h +++ b/src/vm/ecalllist.h @@ -743,15 +743,6 @@ FCFuncStart(gClrConfig) QCFuncElement("GetConfigBoolValue", ClrConfigNative::GetConfigBoolValue) FCFuncEnd() -#if !defined(FEATURE_COREFX_GLOBALIZATION) -FCFuncStart(gEncodingTableFuncs) - FCFuncElement("GetNumEncodingItems", COMNlsInfo::nativeGetNumEncodingItems) - FCFuncElement("GetEncodingData", COMNlsInfo::nativeGetEncodingTableDataPointer) - FCFuncElement("GetCodePageData", COMNlsInfo::nativeGetCodePageTableDataPointer) - FCFuncElement("nativeCompareOrdinalIgnoreCaseWC", COMString::FCCompareOrdinalIgnoreCaseWC) -FCFuncEnd() -#endif // !defined(FEATURE_COREFX_GLOBALIZATION) - FCFuncStart(gArrayFuncs) FCFuncElement("get_Rank", ArrayNative::GetRank) FCFuncElement("GetLowerBound", ArrayNative::GetLowerBound) @@ -1245,9 +1236,6 @@ FCClassElement("Debugger", "System.Diagnostics", gDiagnosticsDebugger) FCClassElement("DefaultBinder", "System", gCOMDefaultBinderFuncs) FCClassElement("Delegate", "System", gDelegateFuncs) FCClassElement("DependentHandle", "System.Runtime.CompilerServices", gDependentHandleFuncs) -#if !defined(FEATURE_COREFX_GLOBALIZATION) -FCClassElement("EncodingTable", "System.Text", gEncodingTableFuncs) -#endif // !defined(FEATURE_COREFX_GLOBALIZATION) FCClassElement("Enum", "System", gEnumFuncs) FCClassElement("Environment", "System", gEnvironmentFuncs) #if defined(FEATURE_PERFTRACING) diff --git a/src/vm/mscorlib.cpp b/src/vm/mscorlib.cpp index ca7f6b6bb5..4fa94499db 100644 --- a/src/vm/mscorlib.cpp +++ b/src/vm/mscorlib.cpp @@ -32,7 +32,6 @@ #include "comdynamic.h" #include "excep.h" #include "fcall.h" -#include "nlsinfo.h" #include "clrconfignative.h" #include "commodule.h" #include "marshalnative.h" |