From 4a8f23098702d7d8693c5673ed8d31a1af8e8d72 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sun, 10 Apr 2022 09:29:43 -0600 Subject: [PATCH] Remove dead strings from .rc files (#67817) --- src/coreclr/dlls/mscorrc/mscorrc.common.rc | 1 - src/coreclr/dlls/mscorrc/mscorrc.rc | 26 -------------- src/coreclr/dlls/mscorrc/resource.h | 21 ----------- src/coreclr/ildasm/dasm.rc | 32 ----------------- src/coreclr/ildasm/resource.h | 35 +------------------ src/coreclr/inc/corerror.xml | 8 +---- src/coreclr/pal/prebuilt/corerror/mscorurt.rc | 3 +- src/coreclr/pal/prebuilt/inc/corerror.h | 1 - 8 files changed, 3 insertions(+), 124 deletions(-) diff --git a/src/coreclr/dlls/mscorrc/mscorrc.common.rc b/src/coreclr/dlls/mscorrc/mscorrc.common.rc index f2de015d116f4..e4bd82e9d3b35 100644 --- a/src/coreclr/dlls/mscorrc/mscorrc.common.rc +++ b/src/coreclr/dlls/mscorrc/mscorrc.common.rc @@ -3,7 +3,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_EE_NAME_UNKNOWN_UNQ "" IDS_EE_NAME_UNKNOWN "" 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" diff --git a/src/coreclr/dlls/mscorrc/mscorrc.rc b/src/coreclr/dlls/mscorrc/mscorrc.rc index f7f21ebdb8836..24c9505471b98 100644 --- a/src/coreclr/dlls/mscorrc/mscorrc.rc +++ b/src/coreclr/dlls/mscorrc/mscorrc.rc @@ -42,15 +42,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #include "mscorrc.common.rc" - -#define MDARC_DEBUGGER_FIBER_MODE_NOT_SUPPORTED_MSG \ - L"A thread has entered fiber mode and therefore debugging must be stopped." - -STRINGTABLE DISCARDABLE -BEGIN - MDARC_DEBUGGER_FIBER_MODE_NOT_SUPPORTED MDARC_DEBUGGER_FIBER_MODE_NOT_SUPPORTED_MSG -END - STRINGTABLE DISCARDABLE BEGIN CLDB_E_FILE_OLDVER "Version %d.%d is not a compatible version." @@ -150,9 +141,6 @@ BEGIN COR_E_SERIALIZATION "An error relating to serialization occurred during the load of file or assembly '%1'." COR_E_SECURITY "A security violation has occurred." IDS_EE_PROC_NOT_FOUND "A procedure imported by '%1' could not be loaded." - IDS_IBC_MISSING_EXTERNAL_TYPE "The generic type specified by the IBC data is not available to this assembly" - IDS_IBC_MISSING_EXTERNAL_METHOD "The generic method specified by the IBC data is not available to this assembly" - IDS_EE_HWINTRINSIC_NGEN_DISALLOWED "Hardware intrinsics may not be used with ngen." IDS_INET_E_CANNOT_CONNECT "Cannot connect to URL for '%1'." IDS_INET_E_RESOURCE_NOT_FOUND "The server or proxy was not found for '%1'." @@ -211,7 +199,6 @@ BEGIN COR_E_NEWER_RUNTIME "The assembly is built by a runtime newer than the currently loaded runtime, and cannot be loaded." IDS_EE_BAD_USER_PROFILE "The specified user does not have a valid profile. Unable to load '%1'." IDS_EE_ALREADY_EXISTS "Cannot create/shadow copy '%1' when that file already exists." - IDS_EE_NOTNDIRECT "Not a PInvoke method." IDS_EE_ERRORTITLE "Error" IDS_EE_ERRORMESSAGETEMPLATE "Error 0x%08x.\n\n%s." IDS_EE_RETHROW_NOT_ALLOWED "No exception available to rethrow." @@ -349,7 +336,6 @@ BEGIN IDS_CLASSLOAD_BADFORMAT "Could not load type '%1' from assembly '%2' because the format is invalid." IDS_CLASSLOAD_BYREFARRAY "Could not create array type '%1' from assembly '%2' because the element type is ByRef." IDS_CLASSLOAD_BYREFLIKEARRAY "Could not create array type '%1' from assembly '%2' because the element type is ByRef-like." - IDS_CLASSLOAD_MISSINGMETHOD "Could not load type '%1' from assembly '%2' because the method '%3' could not be loaded." IDS_CLASSLOAD_FIELDTOOLARGE "Size of field of type '%1' from assembly '%2' is too large." IDS_CLASSLOAD_CANTEXTEND "Type '%1' from assembly '%2' cannot extend from any other type." IDS_CLASSLOAD_STATICVIRTUAL "Method '%3' in type '%1' from assembly '%2' cannot be a static and a virtual." @@ -433,8 +419,6 @@ BEGIN IDS_EE_INVOKE_NEW_ENUM_INVALID_RETURN "Variant returned from an Invoke call with a DISPID of -4 does not contain a valid IUnknown pointer." IDS_EE_COM_OBJECT_RELEASE_RACE "COM object that has been separated from its underlying RCW cannot be used. The COM object was released while it was still in use on another thread." IDS_EE_COM_OBJECT_NO_LONGER_HAS_WRAPPER "COM object that has been separated from its underlying RCW cannot be used." - IDS_EE_CALLBACK_NOT_CALLED_FROM_CCTOR "Function can only be called from inside the class constructor of a class derived from a COM imported class." - IDS_EE_CALLBACK_ALREADY_REGISTERED "Base type has already registered a type creation callback." IDS_EE_CANNOTCAST "Unable to cast object of type '%1' to type '%2'." IDS_EE_CANNOTCASTSAME "[A]%1 cannot be cast to [B]%2. %3. %4." @@ -455,7 +439,6 @@ BEGIN IDS_EE_SAFEARRAYSZARRAYMISMATCH "SafeArray cannot be marshaled to this array type because it has either nonzero lower bounds or more than one dimension." IDS_EE_ASSEMBLY_GETTYPE_CANNONT_HAVE_ASSEMBLY_SPEC "Type names passed to Assembly.GetType() must not specify an assembly." - IDS_EE_CANNOT_HAVE_ASSEMBLY_SPEC "Unexpected assembly-qualifier in a typename." IDS_EE_NEEDS_ASSEMBLY_SPEC "Typename needs an assembly qualifier." IDS_EE_FILELOAD_ERROR_GENERIC "Could not load file or assembly '%1'. %2" @@ -465,7 +448,6 @@ BEGIN IDS_EE_CREATEINSTANCE_FAILED "Creating an instance of the COM component with CLSID %2 from the IClassFactory failed due to the following error: %1 %3." IDS_EE_CREATEINSTANCE_LIC_FAILED "Creating an instance of the licensed COM component with CLSID %2 from the IClassFactory failed due to the following error: %1 %3." - IDS_EE_CREATEINSTANCEFROMAPP_FAILED "Creating an instance of the COM component with CLSID %2 using CoCreateInstanceFromApp failed due to the following error: %1 %3. Please make sure your COM object is in the allowed list of CoCreateInstanceFromApp." IDS_EE_RCW_INVALIDCAST_ITF "Unable to cast COM object of type '%2' to interface type '%3'. This operation failed because the QueryInterface call on the COM component for the interface with IID '%4' failed due to the following error: %1." IDS_EE_RCW_INVALIDCAST_EVENTITF "Unable to cast COM object of type '%2' to event interface type '%3'. This operation failed because the QueryInterface call on the COM component for the interface with IID '%4' failed due to the following error: '%1' and the COM component does not support the source interface with IID '%5'." @@ -480,7 +462,6 @@ BEGIN IDS_EE_MISSING_FIELD "Field not found: '%1'." IDS_EE_MISSING_METHOD "Method not found: '%1'." - IDS_EE_NO_IDISPATCH "This object cannot be marshaled as an IDispatch." IDS_EE_NO_IINSPECTABLE "Marshalling as IInspectable is not supported in the .NET runtime." IDS_EE_NO_BACKING_CLASS_FACTORY "An instance of the __ComObject type cannot be created unless the type has been obtained using GetTypeFromProgID or GetTypeFromCLSID." @@ -600,9 +581,6 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - - IDS_DEBUG_UNHANDLEDEXCEPTION_IPC "INTERNAL ERROR:\n\nUnhandled exception in Debugger::HandleIPCEvent.\n\nEvent ID=0x%x.\n\nException code=0x%08x, Eip=0x%08x.\n\nProcess ID=0x%x (%d), Thread ID=0x%x (%d).\n\n" IDS_DEBUG_UNHANDLED_EXCEPTION_MSG "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_USER_BREAKPOINT_MSG "Application has encountered a user-defined breakpoint.\n\nProcess ID=0x%x (%d), Thread ID=0x%x (%d).\n\nClick ABORT to terminate the application.\nClick RETRY to debug the application.\nClick IGNORE to ignore the breakpoint." @@ -692,12 +670,10 @@ BEGIN BFA_BAD_SIGNATURE "The signature is incorrect." BFA_TYPEREG_NAME_TOO_LONG "Full Name of Typeref is too long." BFA_BAD_TYPEREF_TOKEN "Invalid Typeref token." - BFA_BAD_CLASS_INT_CA "The ClassInterface custom attribute is invalid." BFA_BAD_CLASS_INT_CA_FORMAT "ClassInterface custom attribute does not have the right format." BFA_BAD_COMPLUS_SIG "Illegal or unimplemented ELEM_TYPE in signature." BFA_BAD_ELEM_IN_SIZEOF "Bad element type in SizeOf." BFA_BAD_CA_HEADER "Malformed custom attribute header." - BFA_BAD_STRING_TOKEN "Bad string token." BFA_BAD_STRING_TOKEN_RANGE "No string associated with token." BFA_FIXUP_WRONG_PLATFORM "Image has a platform-specific fixup type that is not compatible with this platform." BFA_UNEXPECTED_GENERIC_TOKENTYPE "Token specifying generic type must be either a typeref or typedef." @@ -707,7 +683,6 @@ BEGIN BFA_UNEXPECTED_ARRAY_TYPE "Array type not expected here." BFA_BAD_VISIBILITY "Bad type visibility flag value." BFA_FAMILY_ON_GLOBAL "Family flag is not allowed on global functions." - BFA_NOFIND_EXPORTED_TYPE "Could not find exported type in metadata." BFA_NOT_AN_ARRAY "Expected array type." BFA_EXPECTED_METHODDEF_OR_MEMBERREF "Generic member ref must be of type MethodDef or MemberRef." BFA_UNEXPECTED_FIELD_SIGNATURE "An unexpected field signature was found." @@ -761,7 +736,6 @@ STRINGTABLE DISCARDABLE BEGIN IDS_HOST_ASSEMBLY_RESOLVER_ASSEMBLY_ALREADY_LOADED_IN_CONTEXT "Assembly with same name is already loaded" IDS_HOST_ASSEMBLY_RESOLVER_DYNAMICALLY_EMITTED_ASSEMBLIES_UNSUPPORTED "Dynamically emitted assemblies are unsupported during host-based resolution." - IDS_HOST_ASSEMBLY_RESOLVER_INCOMPATIBLE_BINDING_CONTEXT "Assembly is already bound to an incompatible binding context." END STRINGTABLE DISCARDABLE diff --git a/src/coreclr/dlls/mscorrc/resource.h b/src/coreclr/dlls/mscorrc/resource.h index 7a8f148456a83..9def5aee52967 100644 --- a/src/coreclr/dlls/mscorrc/resource.h +++ b/src/coreclr/dlls/mscorrc/resource.h @@ -24,8 +24,6 @@ // Resource strings for MDA descriptions. //----------------------------------------------------------------------------- -#define MDARC_DEBUGGER_FIBER_MODE_NOT_SUPPORTED 0x1934 - #define IDS_RTL 0x01F5 #define IDS_DS_ACTIVESESSIONS 0x1701 @@ -48,7 +46,6 @@ #define IDS_EE_LOAD_BAD_MAIN_SIG 0x1712 #define IDS_EE_COM_UNSUPPORTED_TYPE 0x1713 -#define IDS_EE_NOTNDIRECT 0x1719 #define IDS_EE_RETHROW_NOT_ALLOWED 0x171d #define IDS_EE_INVALID_OLE_VARIANT 0x171e @@ -126,7 +123,6 @@ #define IDS_CLASSLOAD_BADFORMAT 0x1774 #define IDS_CLASSLOAD_BYREFARRAY 0x1775 #define IDS_CLASSLOAD_BYREFLIKEARRAY 0x1776 -#define IDS_CLASSLOAD_MISSINGMETHOD 0x1777 #define IDS_CLASSLOAD_STATICVIRTUAL 0x1778 #define IDS_CLASSLOAD_REDUCEACCESS 0x1779 #define IDS_CLASSLOAD_BADPINVOKE 0x177a @@ -171,11 +167,9 @@ #define IDS_CLASSLOAD_STATICVIRTUAL_NOTIMPL 0x17a9 #define IDS_CLASSLOAD_TOOMANYGENERICARGS 0x17ab -#define IDS_ERROR 0x17b0 #define IDS_DEBUG_SERVICE_CAPTION 0x17b4 #define IDS_DEBUG_USERBREAKPOINT 0x17b6 #define IDS_DEBUG_UNHANDLEDEXCEPTION 0x17b7 -#define IDS_DEBUG_UNHANDLEDEXCEPTION_IPC 0x17b8 #define IDS_PERFORMANCEMON_FUNCNOTFOUND 0x17bb #define IDS_PERFORMANCEMON_FUNCNOTFOUND_TITLE 0x17bc #define IDS_PERFORMANCEMON_PSAPINOTFOUND 0x17bd @@ -201,8 +195,6 @@ #define IDS_EE_INVOKE_NEW_ENUM_INVALID_RETURN 0x17d7 #define IDS_EE_COM_OBJECT_RELEASE_RACE 0x17d8 #define IDS_EE_COM_OBJECT_NO_LONGER_HAS_WRAPPER 0x17d9 -#define IDS_EE_CALLBACK_NOT_CALLED_FROM_CCTOR 0x17da -#define IDS_EE_CALLBACK_ALREADY_REGISTERED 0x17de #define IDS_EE_NDIRECT_BADNATL_CALLCONV 0x17df #define IDS_EE_CANNOTCAST 0x17e0 #define IDS_EE_NOTISOMORPHIC 0x17e1 @@ -230,16 +222,12 @@ #define IDS_CLASSLOAD_EQUIVALENTSTRUCTMETHODS 0x17fe #define IDS_CLASSLOAD_EQUIVALENTSTRUCTFIELDS 0x17ff -#define IDS_EE_NO_IDISPATCH 0x1a02 - - #define IDS_EE_SIGTOOCOMPLEX 0x1a03 #define IDS_EE_STRUCTTOOCOMPLEX 0x1a04 #define IDS_EE_STRUCTARRAYTOOLARGE 0x1a05 #define IDS_EE_BADMARSHALFIELD_NOSTRINGBUILDER 0x1a06 #define IDS_EE_NAME_UNKNOWN 0x1a07 #define IDS_EE_NO_BACKING_CLASS_FACTORY 0x1a0b -#define IDS_EE_NAME_UNKNOWN_UNQ 0x1a0c #define IDS_EE_STRING_TOOLONG 0x1a0d #define IDS_EE_VARARG_NOT_SUPPORTED 0x1a0f @@ -322,7 +310,6 @@ #define IDS_CLASSLOAD_32BITCLRLOADING64BITASSEMBLY 0x1a81 #define IDS_EE_ASSEMBLY_GETTYPE_CANNONT_HAVE_ASSEMBLY_SPEC 0x1a84 -#define IDS_EE_CANNOT_HAVE_ASSEMBLY_SPEC 0x1a86 #define IDS_EE_NEEDS_ASSEMBLY_SPEC 0x1a87 #define IDS_EE_FILELOAD_ERROR_GENERIC 0x1a88 @@ -369,11 +356,7 @@ #define IDS_CLASSLOAD_EQUIVALENTBADTYPE 0x1ab7 #define IDS_EE_CODEEXECUTION_CONTAINSGENERICVAR 0x1abb #define IDS_CLASSLOAD_WRONGCPU 0x1abc -#define IDS_EE_CREATEINSTANCEFROMAPP_FAILED 0x1abd -#define IDS_IBC_MISSING_EXTERNAL_TYPE 0x1ac5 -#define IDS_IBC_MISSING_EXTERNAL_METHOD 0x1ac6 -#define IDS_EE_HWINTRINSIC_NGEN_DISALLOWED 0x1ac7 #define IDS_CLASSLOAD_MI_FINAL_IMPL 0x1ac8 #define IDS_CLASSLOAD_AMBIGUOUS_OVERRIDE 0x1ac9 #define IDS_CLASSLOAD_UNSUPPORTED_DISPATCH 0x1aca @@ -442,7 +425,6 @@ #define BFA_BAD_SIGNATURE 0x2044 #define BFA_TYPEREG_NAME_TOO_LONG 0x2045 #define BFA_BAD_TYPEREF_TOKEN 0x2046 -#define BFA_BAD_CLASS_INT_CA 0x2047 #define BFA_BAD_CLASS_INT_CA_FORMAT 0x2048 #define BFA_BAD_COMPLUS_SIG 0x2049 #define BFA_BAD_ELEM_IN_SIZEOF 0x204b @@ -451,7 +433,6 @@ #define IDS_CLASSLOAD_INTERFACE_NO_ACCESS 0x204f #define BFA_BAD_CA_HEADER 0x2050 -#define BFA_BAD_STRING_TOKEN 0x2052 #define BFA_BAD_STRING_TOKEN_RANGE 0x2053 #define BFA_FIXUP_WRONG_PLATFORM 0x2054 #define BFA_UNEXPECTED_GENERIC_TOKENTYPE 0x2055 @@ -461,7 +442,6 @@ #define BFA_UNEXPECTED_ARRAY_TYPE 0x2059 #define BFA_BAD_VISIBILITY 0x205a #define BFA_FAMILY_ON_GLOBAL 0x205b -#define BFA_NOFIND_EXPORTED_TYPE 0x205c #define BFA_NOT_AN_ARRAY 0x205d #define BFA_EXPECTED_METHODDEF_OR_MEMBERREF 0x205e @@ -568,7 +548,6 @@ #define IDS_HOST_ASSEMBLY_RESOLVER_ASSEMBLY_ALREADY_LOADED_IN_CONTEXT 0x2636 #define IDS_HOST_ASSEMBLY_RESOLVER_DYNAMICALLY_EMITTED_ASSEMBLIES_UNSUPPORTED 0x2637 -#define IDS_HOST_ASSEMBLY_RESOLVER_INCOMPATIBLE_BINDING_CONTEXT 0x2638 #define IDS_NATIVE_IMAGE_CANNOT_BE_LOADED_MULTIPLE_TIMES 0x263a diff --git a/src/coreclr/ildasm/dasm.rc b/src/coreclr/ildasm/dasm.rc index 9e8467f19b0c7..f497253455626 100644 --- a/src/coreclr/ildasm/dasm.rc +++ b/src/coreclr/ildasm/dasm.rc @@ -55,16 +55,12 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_USAGE_TITLE L"ILDASM command line syntax" IDS_USAGE_01 L"Usage: ildasm [options] [options]\n\n" IDS_USAGE_02 L"Options for output redirection:\n" IDS_USAGE_03 L" /OUT= Direct output to file rather than to console.\n" IDS_USAGE_04A L" /HTML Output in HTML format (valid with /OUT option only).\n" IDS_USAGE_04B L" /RTF Output in rich text format (valid with /OUT option only).\n" IDS_USAGE_05 L"Options for file/console output:\n" -#ifdef OWNER_OPTION_ENABLED - IDS_USAGE_06 L" /OWNER= Set owner name to disassemble a protected PE file.\n" -#endif IDS_USAGE_07 L" /BYTES Show actual bytes (in hex) as instruction comments.\n" END @@ -143,11 +139,8 @@ BEGIN IDS_E_NOCORHDR L"error : '%s' has no valid CLR header and cannot be disassembled" IDS_E_BADCORHDR L"error : Bad CLR header, or the version of the file format is not supported" IDS_E_OPENMD L"error : Failed to open meta data" - IDS_E_COPYRIGHT L"error : Copyrighted material - can not disassemble!" IDS_E_DASMOK L"*********** DISASSEMBLY COMPLETE ***********************" IDS_E_PARTDASM L"warning : THIS IS A PARTIAL DISASSEMBLY, NOT SUITABLE FOR RE-ASSEMBLING" - IDS_E_INSTRDT L"error : Failed to create instruction decoding table" - IDS_E_NOCOMPR L"error : Compression not supported" IDS_E_CLSENUM L"error : Unable to enumerate classes" IDS_E_SELFNSTD L"error : class %08X is nested in itself" IDS_E_NOENCLOS L"error : class %08X is nested in missing class %08x" @@ -211,42 +204,17 @@ STRINGTABLE DISCARDABLE BEGIN IDS_E_MULTIPLEINPUT L"MULTIPLE INPUT FILES SPECIFIED\n\n" IDS_E_INVALIDOPTION L"INVALID COMMAND LINE OPTION: %s\n\n" - IDS_PROGRESSBOX L"ProgressBox" - IDS_DISASSEMBLING L"Disassembling" - IDS_PB_FILE L"File %s" - IDS_PB_FILE1 L"File ...%s" - IDS_PB_TOFILE L"To file %s" - IDS_PB_TOFILE1 L"To file ...%s" - IDS_PB_CLASSESDONE L"%d classes, %d done" - IDS_PB_GLOBALSDONE L"%d global methods, %d done" - IDS_PB_CANCEL L"Cancel" - IDS_PB_WRITINGDATA L"Writing global data" IDS_W_CREATEDW32RES L"WARNING: Created Win32 resource file %s" IDS_E_CORRUPTW32RES L"ERROR: Corrupt Win32 resources" IDS_E_CANTOPENW32RES L"ERROR: Unable to open file %s" IDS_E_CANTACCESSW32RES L"ERROR: Unable to access Win32 resources" - IDS_CANTVIEW_TX L"Can't view %s::%s(%s)" - IDS_CANTVIEW_HD L"Can't View IL" - IDS_ONLYPEINGUI L"ILDASM supports only PE files in graphic mode" - IDS_BADFILETYPE L"Invalid File Type" IDS_E_CANTOPENOUT L"Unable to open '%s' for output." - IDS_E_CANTCREATEPROC L"Failed to CreateProcess\n\n" - IDS_TEXTTOOLARGEFORGUI L"Text too large for GUI. Use File/Dump menu entry to disassemble to file." - IDS_FILTER_IN L"PE file (*.exe,*.dll,*.mod,*.mdl,*.winmd)\t*.exe;*.dll;*.mod;*.mdl;*.winmd\tAny type (*.*)\t*.*\t\0" - IDS_FILTER_OUT L"IL file (*.il)\t*.il\tText file (*.txt) \t*.txt\tAny type (*.*)\t*.*\t\0" - IDS_FILTER_OUT2 L"Text file (*.txt) \t*.txt\tAny type (*.*)\t*.*\t\0" - IDS_CANNOTOPENFILE L"Cannot open file" - IDS_UNABLETOREGLIBS L"Unable to register libraries!" IDS_ERRORREOPENINGFILE L"Error reopening the file with FileToken 0x%08X" IDS_ASSEMNAMETOOLONG L"error *** Assembly name too long, truncated to 1023 characters" IDS_ASMREFNAMETOOLONG L"error *** AssemblyRef name too long, truncated to 1023 characters" - IDS_ERRORCAPTION L"ERROR" - IDS_ILDASM_TITLE L"Microsoft (R) .NET Framework IL Disassembler" - IDS_VERSION L"Version %s" IDS_W_CREATEDMRES L"WARNING: managed resource file %s created" IDS_E_READINGMRES L"ERROR: reading managed resource %s at offset 0x%X" IDS_RTL L"RTL_False" // change this to RTL_True on Arabic/Hebrew system - IDS_LEGALCOPYRIGHT L"\251 Microsoft Corporation. All rights reserved." END #endif // English (U.S.) resources diff --git a/src/coreclr/ildasm/resource.h b/src/coreclr/ildasm/resource.h index f9ee00f9989e2..4995b4d28b85d 100644 --- a/src/coreclr/ildasm/resource.h +++ b/src/coreclr/ildasm/resource.h @@ -8,19 +8,14 @@ #define IDS_RTL 48 -#define IDS_USAGE_TITLE 200 -#define IDS_USAGE_01 IDS_USAGE_TITLE + 1 +#define IDS_USAGE_01 201 #define IDS_USAGE_02 IDS_USAGE_01 + 1 #define IDS_USAGE_03 IDS_USAGE_02 + 1 #define IDS_USAGE_04 IDS_USAGE_03 + 1 #define IDS_USAGE_04A IDS_USAGE_04 + 1 #define IDS_USAGE_04B IDS_USAGE_04A + 1 #define IDS_USAGE_05 IDS_USAGE_04B + 1 -#ifdef OWNER_OPTION_ENABLED -#define IDS_USAGE_06 IDS_USAGE_05 + 1 -#else #define IDS_USAGE_06 IDS_USAGE_05 -#endif #define IDS_USAGE_07 IDS_USAGE_06 + 1 #define IDS_USAGE_08 IDS_USAGE_07 + 1 #define IDS_USAGE_09 IDS_USAGE_08 + 1 @@ -94,11 +89,8 @@ #define IDS_E_NOCORHDR 403 #define IDS_E_BADCORHDR 404 #define IDS_E_OPENMD 405 -#define IDS_E_COPYRIGHT 406 #define IDS_E_DASMOK 408 #define IDS_E_PARTDASM 409 -#define IDS_E_INSTRDT 410 -#define IDS_E_NOCOMPR 411 #define IDS_E_CLSENUM 412 #define IDS_E_SELFNSTD 413 #define IDS_E_NOENCLOS 414 @@ -146,41 +138,16 @@ #define IDS_E_MULTIPLEINPUT 458 #define IDS_E_INVALIDOPTION 459 -#define IDS_PROGRESSBOX 460 -#define IDS_DISASSEMBLING 461 -#define IDS_PB_FILE 462 -#define IDS_PB_FILE1 463 -#define IDS_PB_TOFILE 464 -#define IDS_PB_TOFILE1 465 -#define IDS_PB_CLASSESDONE 466 -#define IDS_PB_GLOBALSDONE 467 -#define IDS_PB_CANCEL 468 -#define IDS_PB_WRITINGDATA 469 #define IDS_W_CREATEDW32RES 470 #define IDS_E_CORRUPTW32RES 471 #define IDS_E_CANTOPENW32RES 472 #define IDS_E_CANTACCESSW32RES 473 -#define IDS_CANTVIEW_TX 474 -#define IDS_CANTVIEW_HD 475 -#define IDS_ONLYPEINGUI 476 -#define IDS_BADFILETYPE 477 #define IDS_E_CANTOPENOUT 478 -#define IDS_E_CANTCREATEPROC 479 -#define IDS_TEXTTOOLARGEFORGUI 480 -#define IDS_FILTER_IN 481 -#define IDS_FILTER_OUT 482 -#define IDS_FILTER_OUT2 483 -#define IDS_CANNOTOPENFILE 484 -#define IDS_UNABLETOREGLIBS 485 #define IDS_ERRORREOPENINGFILE 486 #define IDS_ASSEMNAMETOOLONG 487 #define IDS_ASMREFNAMETOOLONG 488 -#define IDS_ERRORCAPTION 489 -#define IDS_ILDASM_TITLE 490 -#define IDS_VERSION 491 #define IDS_W_CREATEDMRES 492 #define IDS_E_READINGMRES 493 -#define IDS_LEGALCOPYRIGHT 494 #define IDS_E_INVALIDRECORD 495 #define IDC_CHECK1 1000 diff --git a/src/coreclr/inc/corerror.xml b/src/coreclr/inc/corerror.xml index fbc74db6bbda2..d8cb9b5275067 100644 --- a/src/coreclr/inc/corerror.xml +++ b/src/coreclr/inc/corerror.xml @@ -28,7 +28,7 @@ - + @@ -2283,12 +2283,6 @@ During a GC initialization, the GCHeapAffinitizeRanges config couldn't be parsed due to its invalid format. - - CLR_E_CROSSGEN_NO_IBC_DATA_FOUND - "Cannot compile using the PartialNgen flag because no IBC data was found." - During crossgen compilation, the PartialNgen flag was set, but no IBC data was found in the resources section of the input image, and no IBC file was externally provided. - - CLR_E_GC_BAD_HARD_LIMIT "GC heap hard limit configuration is invalid." diff --git a/src/coreclr/pal/prebuilt/corerror/mscorurt.rc b/src/coreclr/pal/prebuilt/corerror/mscorurt.rc index 17a30c222d8d5..7014b585938a5 100644 --- a/src/coreclr/pal/prebuilt/corerror/mscorurt.rc +++ b/src/coreclr/pal/prebuilt/corerror/mscorurt.rc @@ -268,7 +268,7 @@ BEGIN MSG_FOR_URT_HR(CORDBG_E_CANNOT_RESOLVE_ASSEMBLY) "We failed to resolve assembly given an AssemblyRef token. Assembly may be not loaded yet or not a valid token." MSG_FOR_URT_HR(CORDBG_E_MUST_BE_IN_LOAD_MODULE) "Must be in context of LoadModule callback to perform requested operation." MSG_FOR_URT_HR(CORDBG_E_CANNOT_BE_ON_ATTACH) "Requested operation cannot be performed during an attach operation." - MSG_FOR_URT_HR(CORDBG_E_NGEN_NOT_SUPPORTED) "NGEN must be supported to perform the requested operation." + MSG_FOR_URT_HR(CORDBG_E_NGEN_NOT_SUPPORTED) "NGEN is not supported." MSG_FOR_URT_HR(CORDBG_E_ILLEGAL_SHUTDOWN_ORDER) "Trying to shutdown out of order." MSG_FOR_URT_HR(CORDBG_E_CANNOT_DEBUG_FIBER_PROCESS) "Debugging fiber mode managed process is not supported." MSG_FOR_URT_HR(CORDBG_E_MUST_BE_IN_CREATE_PROCESS) "Must be in context of CreateProcess callback to perform requested operation." @@ -328,6 +328,5 @@ BEGIN MSG_FOR_URT_HR(CLR_E_GC_BAD_AFFINITY_CONFIG_FORMAT) "GCHeapAffinitizeRanges configuration string has invalid format." MSG_FOR_URT_HR(CLR_E_GC_BAD_HARD_LIMIT) "GC heap hard limit configuration is invalid." MSG_FOR_URT_HR(CLR_E_GC_LARGE_PAGE_MISSING_HARD_LIMIT) "GC large page support requires hard limit settings." - MSG_FOR_URT_HR(CLR_E_CROSSGEN_NO_IBC_DATA_FOUND) "Cannot compile using the PartialNgen flag because no IBC data was found." MSG_FOR_URT_HR(COR_E_BADIMAGEFORMAT) "The format of a DLL or executable being loaded is invalid." END diff --git a/src/coreclr/pal/prebuilt/inc/corerror.h b/src/coreclr/pal/prebuilt/inc/corerror.h index d1ba2e7f52e5f..b69dedb6b75d1 100644 --- a/src/coreclr/pal/prebuilt/inc/corerror.h +++ b/src/coreclr/pal/prebuilt/inc/corerror.h @@ -399,7 +399,6 @@ #define CLR_E_GC_OOM EMAKEHR(0x2009) #define CLR_E_GC_BAD_AFFINITY_CONFIG EMAKEHR(0x200a) #define CLR_E_GC_BAD_AFFINITY_CONFIG_FORMAT EMAKEHR(0x200b) -#define CLR_E_CROSSGEN_NO_IBC_DATA_FOUND EMAKEHR(0x200c) #define CLR_E_GC_BAD_HARD_LIMIT EMAKEHR(0x200d) #define CLR_E_GC_LARGE_PAGE_MISSING_HARD_LIMIT EMAKEHR(0x200e) #define COR_E_UNAUTHORIZEDACCESS E_ACCESSDENIED