From adaba6d06ceb14e75e1fc933dec60fe62993584b Mon Sep 17 00:00:00 2001
From: Andy Gocke <andy@commentout.net>
Date: Mon, 25 Jan 2021 15:19:04 -0800
Subject: [PATCH 1/2] Stop localizing '<Unknown>' and '<In Memory Module>'
 strings

GetFullyQualifiedName returns special strings for modules without
paths. Those names are currently localized. To improve predictability,
this change removes localization for these strings.
---
 src/coreclr/dlls/mscorrc/mscorrc.common.rc | 1 -
 src/coreclr/dlls/mscorrc/resource.h        | 1 -
 src/coreclr/vm/commodule.cpp               | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/coreclr/dlls/mscorrc/mscorrc.common.rc b/src/coreclr/dlls/mscorrc/mscorrc.common.rc
index ee8c730d444fdb..f2de015d116f4f 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 b78c5d84c304a0..4763f7d075c8f9 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 7ca511e7db6f9f..b9d1ee1a0cab62 100644
--- a/src/coreclr/vm/commodule.cpp
+++ b/src/coreclr/vm/commodule.cpp
@@ -862,7 +862,7 @@ void QCALLTYPE COMModule::GetFullyQualifiedName(QCall::ModuleHandle pModule, QCa
         if (*fileName != 0) {
                 retString.Set(fileName);
         } else {
-            hr = UtilLoadStringRC(IDS_EE_NAME_UNKNOWN, wszBuffer, sizeof( wszBuffer ) / sizeof( WCHAR ), true );
+            hr = UtilLoadStringRC(W("<Unknown>"), wszBuffer, sizeof( wszBuffer ) / sizeof( WCHAR ), true );
             if (FAILED(hr))
                 COMPlusThrowHR(hr);
             retString.Set(wszBuffer);
@@ -870,7 +870,7 @@ void QCALLTYPE COMModule::GetFullyQualifiedName(QCall::ModuleHandle pModule, QCa
     }
     else
     {
-        hr = UtilLoadStringRC(IDS_EE_NAME_INMEMORYMODULE, wszBuffer, sizeof( wszBuffer ) / sizeof( WCHAR ), true );
+        hr = UtilLoadStringRC(W("<In Memory Module>"), wszBuffer, sizeof( wszBuffer ) / sizeof( WCHAR ), true );
         if (FAILED(hr))
             COMPlusThrowHR(hr);
         retString.Set(wszBuffer);

From 4a90f2437dd52e29e48f3b1c24d046231dcc2475 Mon Sep 17 00:00:00 2001
From: Andy Gocke <andy@commentout.net>
Date: Mon, 25 Jan 2021 15:24:29 -0800
Subject: [PATCH 2/2] Not paying attention

---
 src/coreclr/vm/commodule.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/coreclr/vm/commodule.cpp b/src/coreclr/vm/commodule.cpp
index b9d1ee1a0cab62..e789270777fb8f 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(W("<Unknown>"), wszBuffer, sizeof( wszBuffer ) / sizeof( WCHAR ), true );
-            if (FAILED(hr))
-                COMPlusThrowHR(hr);
-            retString.Set(wszBuffer);
+            retString.Set(W("<Unknown>"));
         }
     }
     else
     {
-        hr = UtilLoadStringRC(W("<In Memory Module>"), wszBuffer, sizeof( wszBuffer ) / sizeof( WCHAR ), true );
-        if (FAILED(hr))
-            COMPlusThrowHR(hr);
-        retString.Set(wszBuffer);
+        retString.Set(W("<In Memory Module>"));
     }
 
     END_QCALL;