Cleanup redundant stale COR header definition (#16261)

diff --git a/src/inc/corhdr.h b/src/inc/corhdr.h
index e878c21..df54ab4 100644 (file)
--- a/src/inc/corhdr.h
+++ b/src/inc/corhdr.h
@@ -165,6 +165,9 @@ typedef enum ReplacesCorHdrNumericDefines
     COR_VTABLE_FROM_UNMANAGED_RETAIN_APPDOMAIN=0x08,    // NEW
     COR_VTABLE_CALL_MOST_DERIVED        =0x10,          // Call most derived method described by
 
+// EATJ constants
+    IMAGE_COR_EATJ_THUNK_SIZE           = 32,           // Size of a jump thunk reserved range.
+
 // Max name lengths    
     //@todo: Change to unlimited name lengths.
     MAX_CLASS_NAME                      =1024,

diff --git a/src/pal/inc/rt/ntimage.h b/src/pal/inc/rt/ntimage.h
index 7d98b56..8e03cb4 100644 (file)
--- a/src/pal/inc/rt/ntimage.h
+++ b/src/pal/inc/rt/ntimage.h
@@ -1781,90 +1781,6 @@ typedef enum IMPORT_OBJECT_NAME_TYPE
 
 // end_winnt
 
-// The structure is used by the NT loader for clr URT support.  It
-// is a duplicate of the definition in corhdr.h.
-
-// begin_winnt
-
-#ifndef __IMAGE_COR20_HEADER_DEFINED__
-#define __IMAGE_COR20_HEADER_DEFINED__
-
-typedef enum ReplacesCorHdrNumericDefines
-{
-// COM+ Header entry point flags.
-    COMIMAGE_FLAGS_ILONLY               =0x00000001,
-    COMIMAGE_FLAGS_32BITREQUIRED        =0x00000002,
-    COMIMAGE_FLAGS_IL_LIBRARY           =0x00000004,
-    COMIMAGE_FLAGS_STRONGNAMESIGNED     =0x00000008,
-    COMIMAGE_FLAGS_NATIVE_ENTRYPOINT    =0x00000010,
-    COMIMAGE_FLAGS_TRACKDEBUGDATA       =0x00010000,
-
-// Version flags for image.
-    COR_VERSION_MAJOR_V2                =2,
-    COR_VERSION_MAJOR                   =COR_VERSION_MAJOR_V2,
-    COR_VERSION_MINOR                   =0,
-    COR_DELETED_NAME_LENGTH             =8,
-    COR_VTABLEGAP_NAME_LENGTH           =8,
-
-// Maximum size of a NativeType descriptor.
-    NATIVE_TYPE_MAX_CB                  =1,   
-    COR_ILMETHOD_SECT_SMALL_MAX_DATASIZE=0xFF,
-
-// #defines for the MIH FLAGS
-    IMAGE_COR_MIH_METHODRVA             =0x01,
-    IMAGE_COR_MIH_EHRVA                 =0x02,    
-    IMAGE_COR_MIH_BASICBLOCK            =0x08,
-
-// V-table constants
-    COR_VTABLE_32BIT                    =0x01,          // V-table slots are 32-bits in size.   
-    COR_VTABLE_64BIT                    =0x02,          // V-table slots are 64-bits in size.   
-    COR_VTABLE_FROM_UNMANAGED           =0x04,          // If set, transition from unmanaged.
-    COR_VTABLE_CALL_MOST_DERIVED        =0x10,          // Call most derived method described by
-
-// EATJ constants
-    IMAGE_COR_EATJ_THUNK_SIZE           =32,            // Size of a jump thunk reserved range.
-
-// Max name lengths    
-    //<TODO> Change to unlimited name lengths. </TODO>
-    MAX_CLASS_NAME                      =1024,
-    MAX_PACKAGE_NAME                    =1024,
-} ReplacesCorHdrNumericDefines;
-
-// COM+ 2.0 header structure.
-typedef struct IMAGE_COR20_HEADER
-{
-    // Header versioning
-    ULONG                   cb;              
-    USHORT                  MajorRuntimeVersion;
-    USHORT                  MinorRuntimeVersion;
-    
-    // Symbol table and startup information
-    IMAGE_DATA_DIRECTORY    MetaData;        
-    ULONG                   Flags;           
-
-    // If COMIMAGE_FLAGS_NATIVE_ENTRYPOINT is not set, EntryPointToken represents a managed entrypoint.
-    // If COMIMAGE_FLAGS_NATIVE_ENTRYPOINT is set, EntryPointRVA represents an RVA to a native entrypoint.
-    union {
-        ULONG               EntryPointToken;
-        ULONG               EntryPointRVA;
-    };
-    
-    // Binding information
-    IMAGE_DATA_DIRECTORY    Resources;
-    IMAGE_DATA_DIRECTORY    StrongNameSignature;
-
-    // Regular fixup and binding information
-    IMAGE_DATA_DIRECTORY    CodeManagerTable;
-    IMAGE_DATA_DIRECTORY    VTableFixups;
-    IMAGE_DATA_DIRECTORY    ExportAddressTableJumps;
-
-    // Precompiled image info (internal use only - set to zero)
-    IMAGE_DATA_DIRECTORY    ManagedNativeHeader;
-    
-} IMAGE_COR20_HEADER, *PIMAGE_COR20_HEADER;
-
-#endif // __IMAGE_COR20_HEADER_DEFINED__
-
 //
 // End Image Format
 //

diff --git a/src/pal/inc/rt/palrt.h b/src/pal/inc/rt/palrt.h
index 4c23280..af76e04 100644 (file)
--- a/src/pal/inc/rt/palrt.h
+++ b/src/pal/inc/rt/palrt.h
@@ -1616,7 +1616,6 @@ typedef struct tagVS_FIXEDFILEINFO
 #include "cpp/ccombstr.h"
 #include "cpp/cstring.h"
 #endif // !PAL_STDCPP_COMPAT
-#include "sscli_version.h"
 
 #endif // RC_INVOKED
 

diff --git a/src/pal/inc/rt/sscli_version.h b/src/pal/inc/rt/sscli_version.h
deleted file mode 100644 (file)
index 3b31f4e..0000000
--- a/src/pal/inc/rt/sscli_version.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-//
-
-//
-// ===========================================================================
-// File: sscli_version.h
-// 
-// =========================================================================== 
-
-
-#ifndef __SSCLI_VERSION_H__
-#define __SSCLI_VERSION_H__
-
-#ifndef __RC_STRINGIZE__
-#define __RC_STRINGIZE__AUX(x)      #x
-#define __RC_STRINGIZE__(x)         __RC_STRINGIZE__AUX(x)
-#endif
-
-#ifndef __RC_STRINGIZE_WSZ__
-#define __RC_STRINGIZE_WSZ__AUX(x)  L###x
-#define __RC_STRINGIZE_WSZ__(x)     __RC_STRINGIZE_WSZ__AUX(x)
-#endif
-
-#define SSCLI_VERSION_MAJOR 2
-#define SSCLI_VERSION_MINOR 0
-#define SSCLI_VERSION_RELEASE 0001
-
-#define SSCLI_VERSION_STR __RC_STRINGIZE__(SSCLI_VERSION_MAJOR) "." __RC_STRINGIZE__(SSCLI_VERSION_MINOR) "." __RC_STRINGIZE__(SSCLI_VERSION_RELEASE)
-
-#define SSCLI_VERSION_STRW __RC_STRINGIZE_WSZ__(SSCLI_VERSION_MAJOR) L"." __RC_STRINGIZE_WSZ__(SSCLI_VERSION_MINOR) L"." __RC_STRINGIZE_WSZ__(SSCLI_VERSION_RELEASE)
-#endif // __SSCLI_VERSION_H__