Remove 'from HRESULT' (#22782)

diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc
index 6717d68..20612bb 100644 (file)
--- a/src/dlls/mscorrc/mscorrc.rc
+++ b/src/dlls/mscorrc/mscorrc.rc
@@ -496,7 +496,6 @@ BEGIN
 STRINGTABLE DISCARDABLE 
 BEGIN
     CEE_E_CVTRES_NOT_FOUND                  "Could not execute CVTRES.EXE."
-    IDS_EE_EXCEPTION_FROM_HRESULT           "Exception from HRESULT: "
     IDS_EE_NDIRECT_UNSUPPORTED_SIG          "Method's type signature is not PInvoke compatible."
     IDS_EE_COM_UNSUPPORTED_SIG              "Method's type signature is not Interop compatible."
     IDS_EE_COM_UNSUPPORTED_TYPE             "The method returned a COM Variant type that is not Interop compatible."

diff --git a/src/dlls/mscorrc/resource.h b/src/dlls/mscorrc/resource.h
index cbd03b6..cec39bb 100644 (file)
--- a/src/dlls/mscorrc/resource.h
+++ b/src/dlls/mscorrc/resource.h
@@ -88,7 +88,6 @@
 #define IDS_DS_DSOTHREADMODEL                   0x1707
 
 #define IDS_EE_NDIRECT_UNSUPPORTED_SIG          0x1708
-#define IDS_EE_EXCEPTION_FROM_HRESULT           0x1709
 #define IDS_EE_NDIRECT_BADNATL                  0x170a
 #define IDS_EE_NDIRECT_LOADLIB_WIN              0x170b
 #define IDS_EE_NDIRECT_GETPROCADDRESS_WIN       0x170c

diff --git a/src/utilcode/ex.cpp b/src/utilcode/ex.cpp
index 5c182d5..a5a7cb9 100644 (file)
--- a/src/utilcode/ex.cpp
+++ b/src/utilcode/ex.cpp
@@ -1200,7 +1200,6 @@ void GetHRMsg(HRESULT hr, SString &result, BOOL bNoGeekStuff/* = FALSE*/)
         result.Append(strDescr);
     }
 
-    
     if (!bNoGeekStuff)
     {
         if (fHaveDescr)
@@ -1208,21 +1207,16 @@ void GetHRMsg(HRESULT hr, SString &result, BOOL bNoGeekStuff/* = FALSE*/)
             result.Append(W(" ("));
         }
 
-        SString strExcepFromHR;
-        strExcepFromHR.LoadResource(CCompRC::Error, IDS_EE_EXCEPTION_FROM_HRESULT);
-        result.Append(strExcepFromHR);
         result.AppendPrintf(W("0x%.8X"), hr);
         if (name != NULL)
         {
             result.AppendPrintf(W(" (%S)"), name);
         }
 
-
         if (fHaveDescr)
         {
             result.Append(W(")"));
         }
-        
     }
 }