Skip to content

Commit a3225a9

Browse files
danmoseleyjkotas
andauthored
remove dead resources from mscorrc.rc (#116121)
* remove dead resources * 'breaks' * Update src/coreclr/dlls/mscorrc/resource.h * Update src/coreclr/dlls/mscorrc/resource.h * Apply suggestions from code review * Update src/coreclr/dlls/mscorrc/mscorrc.rc * Update src/coreclr/dlls/mscorrc/resource.h * Update src/coreclr/dlls/mscorrc/resource.h * Update src/coreclr/dlls/mscorrc/resource.h --------- Co-authored-by: Jan Kotas <[email protected]>
1 parent 1aa4568 commit a3225a9

File tree

2 files changed

+0
-47
lines changed

2 files changed

+0
-47
lines changed

src/coreclr/dlls/mscorrc/mscorrc.rc

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,6 @@ BEGIN
293293
IDS_EE_INTEROP_STUB_CA_NO_ACCESS_TO_STUB_METHOD "The interop method '%1' cannot access the stub method '%2' specified in ManagedToNativeComInteropStubAttribute. Please make sure they have compatible access modifiers and security accessibility."
294294
#endif // FEATURE_COMINTEROP
295295

296-
#if defined(FEATURE_COMINTEROP) || defined(FEATURE_COMWRAPPERS)
297-
IDS_EE_NATIVE_COM_WEAKREF_BAD_TYPE "The object resolved by a native IWeakReference has an incompatible type for its managed WeakReference instance.\r\nExpected WeakReference target type: '%1'\r\nNative IWeakReference returned type: '%2'"
298-
#endif // FEATURE_COMINTEROP || FEATURE_COMWRAPPERS
299-
300296
IDS_CLASSLOAD_TYPEWRONGNUMGENERICARGS "The generic type '%1' was used with the wrong number of generic arguments in assembly '%2'."
301297
IDS_CLASSLOAD_INVALIDINSTANTIATION "The generic type '%1' was used with an invalid instantiation in assembly '%2'."
302298
IDS_CLASSLOAD_VARIANCE_IN_METHOD_ARG "Could not load type '%1' from assembly '%2' because a covariant or contravariant type parameter was used illegally in the signature for an argument in method '%3'."
@@ -368,7 +364,6 @@ BEGIN
368364
IDS_CLASSLOAD_UNSUPPORTED_DISPATCH "Could not make constrained call to method '%1' on interface '%2' with type '%3' from assembly '%4'. Dispatch to default interface methods is not supported in this situation."
369365
IDS_CLASSLOAD_METHOD_NOT_IMPLEMENTED "Could not call method '%1' on type '%2' with an instance of '%3' from assembly '%4' because there is no implementation for the method."
370366

371-
IDS_CLASSLOAD_MISSINGMETHODRVA "Could not load type '%1' from assembly '%2' because the method '%3' has no implementation (no RVA)."
372367
IDS_CLASSLOAD_BAD_FIELD "Type '%1' from assembly '%2' has a field of an illegal type."
373368
IDS_CLASSLOAD_MI_ILLEGAL_BODY "Body referenced in a method implementation must be defined in the same type. Type: '%1'. Assembly: '%2'."
374369
IDS_CLASSLOAD_MI_ILLEGAL_TOKEN_BODY "Body token used in a method implementation is out of range. Type: '%1'. Assembly: '%2'."
@@ -419,8 +414,6 @@ BEGIN
419414
IDS_EE_SIZECONTROLBADTYPE "Array size control parameter type not supported."
420415
IDS_EE_SAFEARRAYSZARRAYMISMATCH "SafeArray cannot be marshaled to this array type because it has either nonzero lower bounds or more than one dimension."
421416

422-
IDS_EE_NEEDS_ASSEMBLY_SPEC "Typename needs an assembly qualifier."
423-
424417
IDS_EE_FILELOAD_ERROR_GENERIC "Could not load file or assembly '%1'. %2"
425418

426419
IDS_EE_LOCAL_COGETCLASSOBJECT_FAILED "Retrieving the COM class factory for component with CLSID %2 failed due to the following error: %1 %3."
@@ -557,12 +550,6 @@ BEGIN
557550

558551
END
559552

560-
// General prompt strings.
561-
STRINGTABLE DISCARDABLE
562-
BEGIN
563-
IDS_RTL "RTL_False" // change this to RTL_True on Arabic/Hebrew system
564-
END
565-
566553
// BAD_FORMAT_ASSERT error messages
567554
STRINGTABLE DISCARDABLE
568555
BEGIN

src/coreclr/dlls/mscorrc/resource.h

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,6 @@
2020
#endif // HRESULT_CODE
2121

2222

23-
//-----------------------------------------------------------------------------
24-
// Resource strings for MDA descriptions.
25-
//-----------------------------------------------------------------------------
26-
27-
#define IDS_RTL 0x01F5
28-
29-
#define IDS_DS_ACTIVESESSIONS 0x1701
30-
#define IDS_DS_DATASOURCENAME 0x1702
31-
#define IDS_DS_DATASOURCEREADONLY 0x1703
32-
#define IDS_DS_DBMSNAME 0x1704
33-
#define IDS_DS_DBMSVER 0x1705
34-
#define IDS_DS_IDENTIFIERCASE 0x1706
35-
#define IDS_DS_DSOTHREADMODEL 0x1707
36-
3723
#define IDS_EE_NDIRECT_UNSUPPORTED_SIG 0x1708
3824
#define IDS_EE_NDIRECT_UNSUPPORTED_UNMANAGEDCALLERSONLY 0x1709
3925
#define IDS_EE_NDIRECT_BADNATL 0x170a
@@ -65,7 +51,6 @@
6551
#define IDS_EE_ILLEGAL_TOKEN_FOR_MAIN 0x1723
6652
#define IDS_EE_MAIN_METHOD_MUST_BE_STATIC 0x1724
6753
#define IDS_EE_MAIN_METHOD_HAS_INVALID_RTN 0x1725
68-
#define IDS_EE_VTABLECALLSNOTSUPPORTED 0x1726
6954

7055
#define IDS_EE_BADMARSHALFIELD_STRING 0x1727
7156
#define IDS_EE_BADMARSHALFIELD_NOCUSTOMMARSH 0x1728
@@ -113,8 +98,6 @@
11398
#define IDS_EE_BADMARSHAL_ARGITERATORRESTRICTION 0x1765
11499
#define IDS_EE_BADMARSHAL_HANDLEREFRESTRICTION 0x1766
115100

116-
#define IDS_EE_ADUNLOAD_NOT_ALLOWED 0x1767
117-
118101
#define IDS_CANNOT_MARSHAL 0x1770
119102
#define IDS_CANNOT_MARSHAL_RECURSIVE_DEF 0x1771
120103
#define IDS_EE_HASH_VAL_FAILED 0x1772
@@ -150,7 +133,6 @@
150133
#define IDS_CLASSLOAD_MI_BADSIGNATURE 0x1793
151134
#define IDS_CLASSLOAD_MI_NOTIMPLEMENTED 0x1794
152135
#define IDS_CLASSLOAD_MI_MUSTBEVIRTUAL 0x1796
153-
#define IDS_CLASSLOAD_MISSINGMETHODRVA 0x1797
154136
#define IDS_CLASSLOAD_FIELDTOOLARGE 0x1798
155137
#define IDS_CLASSLOAD_CANTEXTEND 0x179a
156138
#define IDS_CLASSLOAD_ZEROSIZE 0x179b
@@ -178,17 +160,9 @@
178160
#define IDS_CLASSLOAD_BYREF_OF_BYREF 0x17af
179161
#define IDS_CLASSLOAD_POINTER_OF_BYREF 0x17b0
180162

181-
#define IDS_DEBUG_USERBREAKPOINT 0x17b6
182-
183-
#define IDS_PERFORMANCEMON_FUNCNOTFOUND 0x17bb
184-
#define IDS_PERFORMANCEMON_FUNCNOTFOUND_TITLE 0x17bc
185-
#define IDS_PERFORMANCEMON_PSAPINOTFOUND 0x17bd
186-
#define IDS_PERFORMANCEMON_PSAPINOTFOUND_TITLE 0x17be
187-
188163
#define IDS_INVALID_REDIM 0x17c3
189164
#define IDS_INVALID_PINVOKE_CALLCONV 0x17c4
190165
#define IDS_CLASSLOAD_NSTRUCT_EXPLICIT_OFFSET 0x17c7
191-
#define IDS_EE_BADPINVOKEFIELD_NOTMARSHALABLE 0x17c9
192166

193167
#define IDS_EE_INVALIDLCIDPARAM 0x17cd
194168
#define IDS_EE_BADMARSHAL_NESTEDARRAY 0x17ce
@@ -269,12 +243,10 @@
269243

270244
#define IDS_CLASSLOAD_INVALIDINSTANTIATION 0x1a59
271245

272-
#define IDS_EE_CLASSLOAD_INVALIDINSTANTIATION 0x1a59
273246
#define IDS_EE_BADMARSHALFIELD_ZEROLENGTHFIXEDSTRING 0x1a5a
274247

275248
#define IDS_EE_BADMARSHAL_CRITICALHANDLENATIVETOCOM 0x1a62
276249
#define IDS_EE_BADMARSHAL_ABSTRACTOUTCRITICALHANDLE 0x1a63
277-
#define IDS_EE_BADMARSHAL_RETURNCHCOMTONATIVE 0x1a64
278250
#define IDS_EE_BADMARSHAL_CRITICALHANDLE 0x1a65
279251
#define IDS_EE_BADMARSHAL_INT128_RESTRICTION 0x1a66
280252

@@ -290,7 +262,6 @@
290262

291263
#define IDS_CLASSLOAD_VARIANCE_IN_METHOD_ARG 0x1a79
292264
#define IDS_CLASSLOAD_VARIANCE_IN_METHOD_RESULT 0x1a7a
293-
#define IDS_CLASSLOAD_VARIANCE_IN_BASE 0x1a7b
294265
#define IDS_CLASSLOAD_VARIANCE_IN_INTERFACE 0x1a7c
295266
#define IDS_CLASSLOAD_VARIANCE_IN_CONSTRAINT 0x1a7d
296267
#define IDS_CLASSLOAD_VARIANCE_CLASS 0x1a7e
@@ -299,8 +270,6 @@
299270
#define IDS_CLASSLOAD_OVERLAPPING_INTERFACES 0x1a80
300271
#define IDS_CLASSLOAD_32BITCLRLOADING64BITASSEMBLY 0x1a81
301272

302-
#define IDS_EE_NEEDS_ASSEMBLY_SPEC 0x1a87
303-
304273
#define IDS_EE_FILELOAD_ERROR_GENERIC 0x1a88
305274

306275
#define IDS_EE_BADMARSHAL_UNSUPPORTED_SIG 0x1a89
@@ -528,9 +497,6 @@
528497
#define IDS_E_PROF_TIMEOUT_WAITING_FOR_CONCURRENT_GC 0x251D
529498

530499
#define IDS_EE_CANNOTCAST_NOMARSHAL 0x2629
531-
#if defined(FEATURE_COMINTEROP) || defined(FEATURE_COMWRAPPERS)
532-
#define IDS_EE_NATIVE_COM_WEAKREF_BAD_TYPE 0x262e
533-
#endif // FEATURE_COMINTEROP || FEATURE_COMWRAPPERS
534500

535501
#define IDS_HOST_ASSEMBLY_RESOLVER_ASSEMBLY_ALREADY_LOADED_IN_CONTEXT 0x2636
536502
#define IDS_HOST_ASSEMBLY_RESOLVER_DYNAMICALLY_EMITTED_ASSEMBLIES_UNSUPPORTED 0x2637

0 commit comments

Comments
 (0)