From 9b57a265c7efd3732b035bade005561a04767128 Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Sat, 6 Apr 2024 08:45:34 -0700 Subject: [PATCH] Fix contract and remove unused method overload (#100722) --- src/coreclr/inc/sstring.h | 1 - src/coreclr/utilcode/sstring_com.cpp | 14 ++------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/coreclr/inc/sstring.h b/src/coreclr/inc/sstring.h index 14244d779d82be..1b58f299bef77f 100644 --- a/src/coreclr/inc/sstring.h +++ b/src/coreclr/inc/sstring.h @@ -574,7 +574,6 @@ class EMPTY_BASES_DECL SString : private SBuffer public: BOOL LoadResource(CCompRC::ResourceCategory eCategory, int resourceID); HRESULT LoadResourceAndReturnHR(CCompRC::ResourceCategory eCategory, int resourceID); - HRESULT LoadResourceAndReturnHR(CCompRC* pResourceDLL, CCompRC::ResourceCategory eCategory, int resourceID); BOOL FormatMessage(DWORD dwFlags, LPCVOID lpSource, DWORD dwMessageId, DWORD dwLanguageId, const SString &arg1 = Empty(), const SString &arg2 = Empty(), const SString &arg3 = Empty(), const SString &arg4 = Empty(), diff --git a/src/coreclr/utilcode/sstring_com.cpp b/src/coreclr/utilcode/sstring_com.cpp index f788b22041256b..b674556741fcb5 100644 --- a/src/coreclr/utilcode/sstring_com.cpp +++ b/src/coreclr/utilcode/sstring_com.cpp @@ -22,13 +22,7 @@ BOOL SString::LoadResource(CCompRC::ResourceCategory eCategory, int resourceID) HRESULT SString::LoadResourceAndReturnHR(CCompRC::ResourceCategory eCategory, int resourceID) { - WRAPPER_NO_CONTRACT; - return LoadResourceAndReturnHR(NULL, eCategory,resourceID); -} - -HRESULT SString::LoadResourceAndReturnHR(CCompRC* pResourceDLL, CCompRC::ResourceCategory eCategory, int resourceID) -{ - CONTRACT(BOOL) + CONTRACT(HRESULT) { INSTANCE_CHECK; NOTHROW; @@ -38,11 +32,7 @@ HRESULT SString::LoadResourceAndReturnHR(CCompRC* pResourceDLL, CCompRC::Resourc HRESULT hr = E_FAIL; #ifndef FEATURE_UTILCODE_NO_DEPENDENCIES - if (pResourceDLL == NULL) - { - pResourceDLL = CCompRC::GetDefaultResourceDll(); - } - + CCompRC* pResourceDLL = CCompRC::GetDefaultResourceDll(); if (pResourceDLL != NULL) {