diff options
author | Andy Gocke <angocke@microsoft.com> | 2021-01-28 09:42:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-28 09:42:05 +0300 |
commit | 82bf84c67949ab91f248e940428cfbd5c09a9e2f (patch) | |
tree | 6f8ea5eccdd73d64f87a164d4e9d5c6e1732c112 /src | |
parent | b03410d6603ecc45412c6298ae15a1cca96966d2 (diff) |
Stop localizing '<Unknown>' and '<In Memory Module>' strings (#47437)
GetFullyQualifiedName returns special strings for modules without
paths. Those names are currently localized. To improve predictability,
this change removes localization for these strings.
Diffstat (limited to 'src')
-rw-r--r-- | src/coreclr/dlls/mscorrc/mscorrc.common.rc | 1 | ||||
-rw-r--r-- | src/coreclr/dlls/mscorrc/resource.h | 1 | ||||
-rw-r--r-- | src/coreclr/vm/commodule.cpp | 12 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/coreclr/dlls/mscorrc/mscorrc.common.rc b/src/coreclr/dlls/mscorrc/mscorrc.common.rc index ee8c730d444..f2de015d116 100644 --- a/src/coreclr/dlls/mscorrc/mscorrc.common.rc +++ b/src/coreclr/dlls/mscorrc/mscorrc.common.rc @@ -5,7 +5,6 @@ STRINGTABLE DISCARDABLE BEGIN IDS_EE_NAME_UNKNOWN_UNQ "<Unknown %1>" IDS_EE_NAME_UNKNOWN "<Unknown>" - IDS_EE_NAME_INMEMORYMODULE "<In Memory Module>" IDS_DEBUG_UNHANDLEDEXCEPTION "Application has generated an exception that could not be handled.\n\nProcess ID=0x%x (%d), Thread ID=0x%x (%d).\n\nClick OK to terminate the application.\nClick CANCEL to debug the application." IDS_DEBUG_SERVICE_CAPTION "Application Error" END diff --git a/src/coreclr/dlls/mscorrc/resource.h b/src/coreclr/dlls/mscorrc/resource.h index b78c5d84c30..4763f7d075c 100644 --- a/src/coreclr/dlls/mscorrc/resource.h +++ b/src/coreclr/dlls/mscorrc/resource.h @@ -237,7 +237,6 @@ #define IDS_EE_STRUCTARRAYTOOLARGE 0x1a05 #define IDS_EE_BADMARSHALFIELD_NOSTRINGBUILDER 0x1a06 #define IDS_EE_NAME_UNKNOWN 0x1a07 -#define IDS_EE_NAME_INMEMORYMODULE 0x1a08 #define IDS_EE_THREAD_NOTSTARTED 0x1a0a #define IDS_EE_NO_BACKING_CLASS_FACTORY 0x1a0b #define IDS_EE_NAME_UNKNOWN_UNQ 0x1a0c diff --git a/src/coreclr/vm/commodule.cpp b/src/coreclr/vm/commodule.cpp index 7ca511e7db6..e789270777f 100644 --- a/src/coreclr/vm/commodule.cpp +++ b/src/coreclr/vm/commodule.cpp @@ -854,26 +854,18 @@ void QCALLTYPE COMModule::GetFullyQualifiedName(QCall::ModuleHandle pModule, QCa HRESULT hr = S_OK; - WCHAR wszBuffer[64]; - if (pModule->IsPEFile()) { LPCWSTR fileName = pModule->GetPath(); if (*fileName != 0) { retString.Set(fileName); } else { - hr = UtilLoadStringRC(IDS_EE_NAME_UNKNOWN, wszBuffer, sizeof( wszBuffer ) / sizeof( WCHAR ), true ); - if (FAILED(hr)) - COMPlusThrowHR(hr); - retString.Set(wszBuffer); + retString.Set(W("<Unknown>")); } } else { - hr = UtilLoadStringRC(IDS_EE_NAME_INMEMORYMODULE, wszBuffer, sizeof( wszBuffer ) / sizeof( WCHAR ), true ); - if (FAILED(hr)) - COMPlusThrowHR(hr); - retString.Set(wszBuffer); + retString.Set(W("<In Memory Module>")); } END_QCALL; |