Removed dead strings from corerror.xml

Commit migrated from https://github.com/dotnet/coreclr/commit/cc5dcbe6d1f5a799deab8064081b4e760e0df38e

diff --git a/src/coreclr/src/inc/corerror.xml b/src/coreclr/src/inc/corerror.xml
index a859cfa..0d83e3b 100644 (file)
--- a/src/coreclr/src/inc/corerror.xml
+++ b/src/coreclr/src/inc/corerror.xml
@@ -86,16 +86,6 @@
        <Comment> Typelib import: progress report. </Comment>
 </HRESULT>
 
-<HRESULT NumericValue="0x13116d">
-       <SymbolicName>TLBX_I_PIA_REGISTERED_FOR_TLB</SymbolicName>
-       <Comment> Primary interop assembly '{0}' is already registered for type library '{1}'. </Comment>
-</HRESULT>
-
-<HRESULT NumericValue="0x13116e">
-       <SymbolicName>TLBX_I_AGNOSTIC_ASSEMBLY</SymbolicName>
-       <Comment> Importing a type library into a platform agnostic assembly.  This can cause errors if the type library is not truly platform agnostic. </Comment>
-</HRESULT>
-
 <HRESULT NumericValue="0x13116f">
        <SymbolicName>TLBX_I_USEIUNKNOWN</SymbolicName>
        <Comment> Typelib export: substituted IUnknown for type. </Comment>
@@ -116,21 +106,6 @@
        <Comment> Typelib export: Warning message wrapper. </Comment>
 </HRESULT>
 
-<HRESULT NumericValue="0x131174">
-       <SymbolicName>TLBX_W_ASSEMBLY_HAS_EMBEDDED_TLB</SymbolicName>
-       <Comment> Type library is being exported for assembly '{0}' which already contains an embedded type library </Comment>
-</HRESULT>
-
-<HRESULT NumericValue="0x131175">
-       <SymbolicName>TLBX_W_CROSS_COMPILE_NO_REFS</SymbolicName>
-       <Comment> When cross-compiling, all type library references should be included on the command line to ensure the correct bit-specific type libraries are loaded. </Comment>
-</HRESULT>
-
-<HRESULT NumericValue="0x131176">
-       <SymbolicName>TLBX_W_PURE_CROSS_COMPILE</SymbolicName>
-       <Comment> Performing cross-compile of 32-bit non-agnostic assembly to 64-bit type library or 64-bit non-agnostic assembly to 32-bit type library.  This is dangerous as pointer sizes and processor dependence will likely cause incompatibility between the assembly and resultant type library. </Comment>
-</HRESULT>
-
 <HRESULT NumericValue="0x131179">
        <SymbolicName>TLBX_I_TYPE_EXPORTED</SymbolicName>
        <Comment> Typelib export: type exported </Comment>
@@ -3592,11 +3567,6 @@
   <Comment> Concurrent GC mode is enabled, which prevents use of COR_PRF_MONITOR_GC </Comment>
 </HRESULT>
 
-<HRESULT NumericValue="0x80131377">
-    <SymbolicName>CORPROF_E_INCONSISTENT_FLAGS_WITH_HOST_PROTECTION_SETTING</SymbolicName>
-    <Comment> Host enforces host protection attributes, which prevents use of COR_PRF_USE_PROFILE_IMAGES, COR_PRF_MONITOR_CODE_TRANSITIONS, and COR_PRF_MONITOR_ENTERLEAVE </Comment>
-</HRESULT>
-    
 <HRESULT NumericValue="0x80131378">
     <SymbolicName>CORPROF_E_DEBUGGING_DISABLED</SymbolicName>
     <Comment> This functionality requires CoreCLR debugging to be enabled. </Comment>
@@ -3622,21 +3592,11 @@
   <Comment> This call is not supported unless ReJIT is first enabled during initialization by setting COR_PRF_ENABLE_REJIT via SetEventMask. </Comment>
 </HRESULT>
 
-<HRESULT NumericValue="0x8013137D">
-  <SymbolicName>CORPROF_E_ACTIVE_REJIT_REQUEST_NOT_FOUND</SymbolicName>
-  <Comment> Could not revert the specified method, because a corresponding active ReJIT request was not found. Either the method was never requested to be reJITted OR the method was already reverted. </Comment>
-</HRESULT>
-  
 <HRESULT NumericValue="0x8013137E">
     <SymbolicName>CORPROF_E_FUNCTION_IS_COLLECTIBLE</SymbolicName>
     <Comment> The specified function is instantiated into a collectible assembly, and is thus not supported by this API method. </Comment>
 </HRESULT>
 
-<HRESULT NumericValue="0x8013137F">
-    <SymbolicName>CORPROF_E_REJIT_REQUIRES_DISABLE_NGEN</SymbolicName>
-    <Comment> If the profiler specifies COR_PRF_ENABLE_REJIT to SetEventMask, it must also specify COR_PRF_DISABLE_ALL_NGEN_IMAGES. </Comment>
-</HRESULT>
-
 <HRESULT NumericValue="0x80131380">
     <SymbolicName>CORPROF_E_CALLBACK6_REQUIRED</SymbolicName>
     <Comment> Profiler must implement ICorProfilerCallback6 interface for this call to be supported. </Comment>
@@ -3949,10 +3909,6 @@
 </HRESULT>
 
 <HRESULT NumericValue="0x80131450">
-       <SymbolicName>ISS_E_ISOSTORE_START</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131450">
        <SymbolicName>ISS_E_ISOSTORE</SymbolicName>
        <Message>"IsolatedStorage operation failed."</Message>
 </HRESULT>
@@ -5636,121 +5592,10 @@
        <Message>"Ldtoken instruction required before call to System.Runtime.CompilerServices.InitializeArray."</Message>
 </HRESULT>
 
-<HRESULT NumericValue="0x80131904">
-       <SymbolicName>COR_E_SqlException</SymbolicName>
-       <Comment> System.Data.SqlClient.SqlClientException </Comment>
-</HRESULT>
-
 <HRESULT NumericValue="0x80131920">
        <SymbolicName>COR_E_Data</SymbolicName>
 </HRESULT>
 
-<HRESULT NumericValue="0x80131921">
-       <SymbolicName>COR_E_DataDeletedRowInaccessible</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131922">
-       <SymbolicName>COR_E_DataDuplicateName</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131923">
-       <SymbolicName>COR_E_DataInRowChangingEvent</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131924">
-       <SymbolicName>COR_E_DataInvalidConstraint</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131925">
-       <SymbolicName>COR_E_DataMissingPrimaryKey</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131926">
-       <SymbolicName>COR_E_DataNoNullAllowed</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131927">
-       <SymbolicName>COR_E_DataReadOnly</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131928">
-       <SymbolicName>COR_E_DataRowNotInTable</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131929">
-       <SymbolicName>COR_E_DataVersionNotFound</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x8013192a">
-       <SymbolicName>COR_E_DataConstraint</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x8013192b">
-       <SymbolicName>COR_E_StrongTyping</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131930">
-       <SymbolicName>COR_E_SqlType</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131931">
-       <SymbolicName>COR_E_SqlNullValue</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131932">
-       <SymbolicName>COR_E_SqlTruncate</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131933">
-       <SymbolicName>COR_E_AdapterMapping</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131934">
-       <SymbolicName>COR_E_DataAdapter</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131935">
-       <SymbolicName>COR_E_DBConcurrency</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131936">
-       <SymbolicName>COR_E_OperationAborted</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131937">
-       <SymbolicName>COR_E_InvalidUdt</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131937">
-       <SymbolicName>COR_E_OdbcException</SymbolicName>
-       <Comment> System.Data.Odbc.OdbcException </Comment>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131938">
-       <SymbolicName>COR_E_OracleException</SymbolicName>
-       <Comment> System.Data.OracleClient.OracleException </Comment>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131940">
-       <SymbolicName>COR_E_Xml</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131941">
-       <SymbolicName>COR_E_XmlSchema</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131942">
-       <SymbolicName>COR_E_XmlXslt</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131943">
-       <SymbolicName>COR_E_XmlXPath</SymbolicName>
-</HRESULT>
-
-<HRESULT NumericValue="0x80131944">
-       <SymbolicName>COR_E_XmlQuery</SymbolicName>
-</HRESULT>
-
 <HRESULT NumericValue="0x80131b00">
        <SymbolicName>VLDTR_E_IFACE_NOTIFACE</SymbolicName>
        <Message>"Interface in InterfaceImpl is not marked tdInterface."</Message>

diff --git a/src/coreclr/src/pal/prebuilt/inc/corerror.h b/src/coreclr/src/pal/prebuilt/inc/corerror.h
index d4d4495..cad9661 100644 (file)
--- a/src/coreclr/src/pal/prebuilt/inc/corerror.h
+++ b/src/coreclr/src/pal/prebuilt/inc/corerror.h
@@ -27,15 +27,10 @@
 #define CLDB_S_NULL SMAKEHR(0x1109)
 #define CLDB_S_INDEX_TABLESCANREQUIRED SMAKEHR(0x1125)
 #define TLBX_I_TYPEINFO_IMPORTED SMAKEHR(0x116c)
-#define TLBX_I_PIA_REGISTERED_FOR_TLB SMAKEHR(0x116d)
-#define TLBX_I_AGNOSTIC_ASSEMBLY SMAKEHR(0x116e)
 #define TLBX_I_USEIUNKNOWN SMAKEHR(0x116f)
 #define TLBX_I_UNCONVERTABLE_ARGS SMAKEHR(0x1170)
 #define TLBX_I_UNCONVERTABLE_FIELD SMAKEHR(0x1171)
 #define TLBX_W_WARNING_MESSAGE SMAKEHR(0x1173)
-#define TLBX_W_ASSEMBLY_HAS_EMBEDDED_TLB SMAKEHR(0x1174)
-#define TLBX_W_CROSS_COMPILE_NO_REFS SMAKEHR(0x1175)
-#define TLBX_W_PURE_CROSS_COMPILE SMAKEHR(0x1176)
 #define TLBX_I_TYPE_EXPORTED SMAKEHR(0x1179)
 #define TLBX_I_DUPLICATE_DISPID SMAKEHR(0x117a)
 #define TLBX_I_REF_TYPE_AS_STRUCT SMAKEHR(0x117c)
@@ -622,15 +617,12 @@
 #define CORPROF_E_INCONSISTENT_WITH_FLAGS EMAKEHR(0x1374)
 #define CORPROF_E_PROFILER_CANCEL_ACTIVATION EMAKEHR(0x1375)
 #define CORPROF_E_CONCURRENT_GC_NOT_PROFILABLE EMAKEHR(0x1376)
-#define CORPROF_E_INCONSISTENT_FLAGS_WITH_HOST_PROTECTION_SETTING EMAKEHR(0x1377)
 #define CORPROF_E_DEBUGGING_DISABLED EMAKEHR(0x1378)
 #define CORPROF_E_TIMEOUT_WAITING_FOR_CONCURRENT_GC EMAKEHR(0x1379)
 #define CORPROF_E_MODULE_IS_DYNAMIC EMAKEHR(0x137a)
 #define CORPROF_E_CALLBACK4_REQUIRED EMAKEHR(0x137b)
 #define CORPROF_E_REJIT_NOT_ENABLED EMAKEHR(0x137c)
-#define CORPROF_E_ACTIVE_REJIT_REQUEST_NOT_FOUND EMAKEHR(0x137d)
 #define CORPROF_E_FUNCTION_IS_COLLECTIBLE EMAKEHR(0x137e)
-#define CORPROF_E_REJIT_REQUIRES_DISABLE_NGEN EMAKEHR(0x137f)
 #define CORPROF_E_CALLBACK6_REQUIRED EMAKEHR(0x1380)
 #define CORPROF_E_CALLBACK7_REQUIRED EMAKEHR(0x1382)
 #define SECURITY_E_XML_TO_ASN_ENCODING EMAKEHR(0x1400)
@@ -682,7 +674,6 @@
 #define CORSECATTR_E_NO_PROPERTY EMAKEHR(0x144d)
 #define CORSECATTR_E_EXCEPTION EMAKEHR(0x144e)
 #define CORSECATTR_E_EXCEPTION_HR EMAKEHR(0x144f)
-#define ISS_E_ISOSTORE_START EMAKEHR(0x1450)
 #define ISS_E_ISOSTORE EMAKEHR(0x1450)
 #define ISS_E_OPEN_STORE_FILE EMAKEHR(0x1460)
 #define ISS_E_OPEN_FILE_MAPPING EMAKEHR(0x1461)
@@ -1008,34 +999,7 @@
 #define VER_E_PE_LOAD EMAKEHR(0x18f4)
 #define VER_E_WRITE_RVA_STATIC EMAKEHR(0x18f5)
 #define VER_E_INITIALIZE_ARRAY_MISSING_TOKEN EMAKEHR(0x18f6)
-#define COR_E_SqlException EMAKEHR(0x1904)
 #define COR_E_Data EMAKEHR(0x1920)
-#define COR_E_DataDeletedRowInaccessible EMAKEHR(0x1921)
-#define COR_E_DataDuplicateName EMAKEHR(0x1922)
-#define COR_E_DataInRowChangingEvent EMAKEHR(0x1923)
-#define COR_E_DataInvalidConstraint EMAKEHR(0x1924)
-#define COR_E_DataMissingPrimaryKey EMAKEHR(0x1925)
-#define COR_E_DataNoNullAllowed EMAKEHR(0x1926)
-#define COR_E_DataReadOnly EMAKEHR(0x1927)
-#define COR_E_DataRowNotInTable EMAKEHR(0x1928)
-#define COR_E_DataVersionNotFound EMAKEHR(0x1929)
-#define COR_E_DataConstraint EMAKEHR(0x192a)
-#define COR_E_StrongTyping EMAKEHR(0x192b)
-#define COR_E_SqlType EMAKEHR(0x1930)
-#define COR_E_SqlNullValue EMAKEHR(0x1931)
-#define COR_E_SqlTruncate EMAKEHR(0x1932)
-#define COR_E_AdapterMapping EMAKEHR(0x1933)
-#define COR_E_DataAdapter EMAKEHR(0x1934)
-#define COR_E_DBConcurrency EMAKEHR(0x1935)
-#define COR_E_OperationAborted EMAKEHR(0x1936)
-#define COR_E_InvalidUdt EMAKEHR(0x1937)
-#define COR_E_OdbcException EMAKEHR(0x1937)
-#define COR_E_OracleException EMAKEHR(0x1938)
-#define COR_E_Xml EMAKEHR(0x1940)
-#define COR_E_XmlSchema EMAKEHR(0x1941)
-#define COR_E_XmlXslt EMAKEHR(0x1942)
-#define COR_E_XmlXPath EMAKEHR(0x1943)
-#define COR_E_XmlQuery EMAKEHR(0x1944)
 #define VLDTR_E_IFACE_NOTIFACE EMAKEHR(0x1b00)
 #define VLDTR_E_FD_RVAHASNORVA EMAKEHR(0x1b01)
 #define VLDTR_E_FD_RVAHASZERORVA EMAKEHR(0x1b02)