Cleanup Win7 and earlier compatibility from CoreCLR (#122884)

When running on Windows, we are now always running on Win8.

We also don't need to delay-load the WinRT APIs used by CoreCLR anymore
as they're always available.

We can also remove the delay loading for version.dll now that we pass
`/DEPENDENTLOADFLAG:0x800` to force dependencies to be loaded from
System32 (the original reason for the delay load hook was to force
System32 instead of the default lookup rules for the commonly named
`version.dll`).

---------

Co-authored-by: Copilot <[email protected]>

Author: jkoritzinsky

src/coreclr/dlls/mscoree/CMakeLists.txt

@@ -11,10 +11,8 @@ set(CLR_SOURCES
 
 if(CLR_CMAKE_TARGET_WIN32)
 list(APPEND CLR_SOURCES
-    ${CLR_SRC_NATIVE_DIR}/libs/Common/delayloadhook_windows.cpp
-    Native.rc
+  Native.rc
 )
-
 set (DEF_SOURCES
   mscorwks_ntdef.src
 )

src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt

@@ -21,12 +21,6 @@ if (CLR_CMAKE_HOST_WIN32)
     # invariants (e.g. size of region between Jit_PatchedCodeLast-Jit_PatchCodeStart needs to fit in a page).
     add_linker_flag("/INCREMENTAL:NO")
 
-    # Delay load libraries required for WinRT as that is not supported on all platforms
-    add_linker_flag("/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll")
-
-    # Delay load version.dll so that we can specify how to search when loading it as it is not part of Windows' known DLLs
-    add_linker_flag("/DELAYLOAD:version.dll")
-
     # No library groups for Win32
     set(START_LIBRARY_GROUP)
     set(END_LIBRARY_GROUP)
@@ -131,7 +125,6 @@ if(CLR_CMAKE_TARGET_WIN32)
         shlwapi.lib
         bcrypt.lib
         RuntimeObject.lib
-        delayimp.lib
     )
 else()
     list(APPEND CORECLR_LIBRARIES

src/coreclr/inc/ostype.h

@@ -12,49 +12,6 @@
 #define LIMITED_METHOD_CONTRACT
 #endif
 
-//*****************************************************************************
-// Enum to track which version of the OS we are running
-// Note that Win7 is the minimum supported platform. Any code using
-// utilcode (which includes the CLR's execution engine) will fail to start
-// on a pre-Win7 platform. This is enforced by InitRunningOnVersionStatus.
-//*****************************************************************************
-typedef enum {
-    RUNNING_ON_STATUS_UNINITED = 0,
-    RUNNING_ON_WIN7            = 1,
-    RUNNING_ON_WIN8            = 2
-} RunningOnStatusEnum;
-
-extern RunningOnStatusEnum gRunningOnStatus;
-
-void InitRunningOnVersionStatus();
-
-//*****************************************************************************
-// Returns true if you are running on Windows 8 or newer.
-//*****************************************************************************
-inline BOOL RunningOnWin8()
-{
-    WRAPPER_NO_CONTRACT;
-#if (!defined(HOST_X86) && !defined(HOST_AMD64))
-    return TRUE;
-#else
-    if (gRunningOnStatus == RUNNING_ON_STATUS_UNINITED)
-    {
-        InitRunningOnVersionStatus();
-    }
-
-    return (gRunningOnStatus >= RUNNING_ON_WIN8) ? TRUE : FALSE;
-#endif
-}
-
-#ifdef FEATURE_COMINTEROP
-
-inline BOOL WinRTSupported()
-{
-    return RunningOnWin8();
-}
-
-#endif // FEATURE_COMINTEROP
-
 #ifdef HOST_64BIT
 inline BOOL RunningInWow64()
 {

src/coreclr/utilcode/util_nodependencies.cpp

@@ -14,43 +14,8 @@
 #include "utilcode.h"
 #include "ex.h"
 
-#ifdef HOST_WINDOWS
-#include <versionhelpers.h>
-#endif
-
 #if !defined(FEATURE_UTILCODE_NO_DEPENDENCIES) || defined(_DEBUG)
 
-RunningOnStatusEnum gRunningOnStatus = RUNNING_ON_STATUS_UNINITED;
-
-#define NON_SUPPORTED_PLATFORM_TERMINATE_ERROR_CODE     0xBAD1BAD1
-
-//*****************************************************************************
-// One time initialization of the OS version
-//*****************************************************************************
-void InitRunningOnVersionStatus ()
-{
-#ifdef HOST_WINDOWS
-    STATIC_CONTRACT_NOTHROW;
-    STATIC_CONTRACT_GC_NOTRIGGER;
-    STATIC_CONTRACT_CANNOT_TAKE_LOCK;
-
-    if(IsWindows8OrGreater())
-    {
-        gRunningOnStatus = RUNNING_ON_WIN8;
-    }
-    else if(IsWindows7OrGreater())
-    {
-        gRunningOnStatus = RUNNING_ON_WIN7;
-    }
-    else
-    {
-        // The current platform isn't supported. Display a message to this effect and exit.
-        minipal_log_print_error("Platform not supported: Windows 7 is the minimum supported version\n");
-        TerminateProcess(GetCurrentProcess(), NON_SUPPORTED_PLATFORM_TERMINATE_ERROR_CODE);
-    }
-#endif // HOST_WINDOWS
-} // InitRunningOnVersionStatus
-
 #ifndef HOST_64BIT
 //------------------------------------------------------------------------------
 // Returns TRUE if we are running on a 64-bit OS in WoW, FALSE otherwise.

src/coreclr/vm/threads.cpp

@@ -2363,7 +2363,6 @@ void Thread::BaseWinRTUninitialize()
     STATIC_CONTRACT_GC_TRIGGERS;
     STATIC_CONTRACT_MODE_PREEMPTIVE;
 
-    _ASSERTE(WinRTSupported());
     _ASSERTE(GetThread() == this);
     _ASSERTE(IsWinRTInitialized());
 
@@ -2401,7 +2400,6 @@ void Thread::CoUninitialize()
 #ifdef FEATURE_COMINTEROP
         if (IsWinRTInitialized())
         {
-            _ASSERTE(WinRTSupported());
             BaseWinRTUninitialize();
             ResetWinRTInitialized();
         }
@@ -2612,7 +2610,6 @@ void Thread::CleanupCOMState()
 #ifdef FEATURE_COMINTEROP
         if (IsWinRTInitialized())
         {
-            _ASSERTE(WinRTSupported());
             BaseWinRTUninitialize();
             ResetWinRTInitialized();
         }
@@ -3783,7 +3780,6 @@ Thread::ApartmentState Thread::SetApartment(ApartmentState state)
 #ifdef FEATURE_COMINTEROP
             if (IsWinRTInitialized())
             {
-                _ASSERTE(WinRTSupported());
                 BaseWinRTUninitialize();
                 ResetWinRTInitialized();
             }
@@ -3875,10 +3871,10 @@ Thread::ApartmentState Thread::SetApartment(ApartmentState state)
         _ASSERTE(!"Unexpected HRESULT returned from CoInitializeEx!");
     }
 
-    // If WinRT is supported on this OS, also initialize it at the same time.  Since WinRT sits on top of COM
-    // we need to make sure that it is initialized in the same threading mode as we just started COM itself
+    // Since WinRT sits on top of COM we need to make sure that it is initialized
+    // in the same threading mode as we just started COM itself
     // with (or that we detected COM had already been started with).
-    if (WinRTSupported() && !IsWinRTInitialized())
+    if (!IsWinRTInitialized())
     {
         GCX_PREEMP();
 

src/native/corehost/apphost/static/CMakeLists.txt

@@ -61,7 +61,6 @@ if(CLR_CMAKE_TARGET_WIN32)
     add_compile_definitions(UNICODE)
     list(APPEND SOURCES
         ../apphost.windows.cpp
-        ${CLR_SRC_NATIVE_DIR}/libs/Common/delayloadhook_windows.cpp
     )
 
     list(APPEND HEADERS
@@ -119,12 +118,6 @@ if(CLR_CMAKE_TARGET_WIN32)
     # Incremental linking results in the linker inserting extra padding and routing function calls via thunks that can break the
     # invariants (e.g. size of region between Jit_PatchedCodeLast-Jit_PatchCodeStart needs to fit in a page).
     add_linker_flag("/INCREMENTAL:NO")
-
-    # Delay load libraries required for WinRT as that is not supported on all platforms
-    add_linker_flag("/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll")
-
-    # Delay load version.dll so that we can specify how to search when loading it as it is not part of Windows' known DLLs
-    add_linker_flag("/DELAYLOAD:version.dll")
 endif()
 
 if(CLR_CMAKE_TARGET_WIN32)
@@ -145,7 +138,6 @@ if(CLR_CMAKE_TARGET_WIN32)
         shell32.lib
         bcrypt.lib
         RuntimeObject.lib
-        delayimp.lib
     )
 
     # additional requirements for System.IO.Compression.Native
@@ -309,4 +301,4 @@ add_sanitizer_runtime_support(singlefilehost)
 
 if (CLR_CMAKE_HOST_APPLE)
     adhoc_sign_with_entitlements(singlefilehost "${CLR_ENG_NATIVE_DIR}/entitlements.plist")
-endif()
+endif()