Delete dead code to support OSes prior to Windows 7 (#17367)

1 files changed, 1 insertions, 111 deletions

diff --git a/src/utilcode/util_nodependencies.cpp b/src/utilcode/util_nodependencies.cpp
index 7ce3c83036..387ccbe071 100644
--- a/src/utilcode/util_nodependencies.cpp
+++ b/src/utilcode/util_nodependencies.cpp
@@ -18,11 +18,9 @@
 #if !defined(FEATURE_UTILCODE_NO_DEPENDENCIES) || defined(_DEBUG)
 
 RunningOnStatusEnum gRunningOnStatus = RUNNING_ON_STATUS_UNINITED;
-BOOL gExInfoAvailable = FALSE;
-BOOL gExInfoIsServer = TRUE;
 
 #define NON_SUPPORTED_PLATFORM_MSGBOX_TITLE             W("Platform not supported")
-#define NON_SUPPORTED_PLATFORM_MSGBOX_TEXT              W("The minimum supported platform is Windows 2000")
+#define NON_SUPPORTED_PLATFORM_MSGBOX_TEXT              W("The minimum supported platform is Windows 7")
 #define NON_SUPPORTED_PLATFORM_TERMINATE_ERROR_CODE     0xBAD1BAD1
 
 //*****************************************************************************
@@ -81,84 +79,6 @@ void InitRunningOnVersionStatus ()
         goto CHECK_SUPPORTED;
     }
 
-
-    ZeroMemory(&sVer, sizeof(OSVERSIONINFOEX));
-    sVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-
-    sVer.dwMajorVersion = 6;
-    sVer.dwPlatformId = VER_PLATFORM_WIN32_NT;
-
-
-    dwlConditionMask = 0;
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_PLATFORMID, VER_EQUAL);
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_MAJORVERSION, VER_GREATER_EQUAL);
-
-    if(VerifyVersionInfo(&sVer, CLR_VER_MAJORVERSION | CLR_VER_PLATFORMID, dwlConditionMask))
-    {
-        gRunningOnStatus = RUNNING_ON_VISTA;
-        fSupportedPlatform = TRUE;
-        goto CHECK_SUPPORTED;
-    }
-
-
-    ZeroMemory(&sVer, sizeof(OSVERSIONINFOEX));
-    sVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-
-    sVer.dwMajorVersion = 5;
-    sVer.dwMinorVersion = 2;
-    sVer.dwPlatformId = VER_PLATFORM_WIN32_NT;
-
-
-    dwlConditionMask = 0;
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_PLATFORMID, VER_EQUAL);
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_MAJORVERSION, VER_GREATER_EQUAL);
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_MINORVERSION, VER_GREATER_EQUAL);
-
-    if(VerifyVersionInfo(&sVer, CLR_VER_MAJORVERSION | CLR_VER_PLATFORMID | CLR_VER_MINORVERSION, dwlConditionMask))
-    {
-        gRunningOnStatus = RUNNING_ON_WIN2003;
-        fSupportedPlatform = TRUE;
-        goto CHECK_SUPPORTED;
-    }
-
-    sVer.dwMajorVersion = 5;
-    sVer.dwMinorVersion = 1;
-    sVer.dwPlatformId = VER_PLATFORM_WIN32_NT;
-
-    dwlConditionMask = 0;
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_PLATFORMID, VER_EQUAL);
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_MAJORVERSION, VER_GREATER_EQUAL);
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_MINORVERSION, VER_GREATER_EQUAL);
-
-    if(VerifyVersionInfo(&sVer, CLR_VER_MAJORVERSION | CLR_VER_PLATFORMID | CLR_VER_MINORVERSION, dwlConditionMask))
-    {
-        gRunningOnStatus = RUNNING_ON_WINXP;
-        fSupportedPlatform = TRUE;
-        goto CHECK_SUPPORTED;
-    }
-
-
-
-    ZeroMemory(&sVer, sizeof(OSVERSIONINFOEX));
-    sVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-
-    sVer.dwMajorVersion = 5;
-    sVer.dwMinorVersion = 0;
-    sVer.dwPlatformId = VER_PLATFORM_WIN32_NT;
-
-
-    dwlConditionMask = 0;
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_PLATFORMID, VER_EQUAL);
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_MAJORVERSION, VER_GREATER_EQUAL);
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_MINORVERSION, VER_GREATER_EQUAL);
-
-    if(VerifyVersionInfo(&sVer, CLR_VER_MAJORVERSION | CLR_VER_PLATFORMID | CLR_VER_MINORVERSION, dwlConditionMask))
-    {
-        gRunningOnStatus = RUNNING_ON_WINNT5;
-        fSupportedPlatform = TRUE;
-        goto CHECK_SUPPORTED;
-    }
-    
 CHECK_SUPPORTED:
 
     if (!fSupportedPlatform)
@@ -170,36 +90,6 @@ CHECK_SUPPORTED:
         TerminateProcess(GetCurrentProcess(), NON_SUPPORTED_PLATFORM_TERMINATE_ERROR_CODE);
     }
 
-    gExInfoAvailable = 0;
-    gExInfoIsServer = 0;
-
-    OSVERSIONINFOEX   sVerX;
-    ZeroMemory(&sVerX, sizeof(OSVERSIONINFOEX));
-    sVerX.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-    sVerX.wProductType = VER_NT_DOMAIN_CONTROLLER;
-
-    dwlConditionMask = 0;
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_PRODUCT_TYPE, VER_EQUAL);
-
-    if(VerifyVersionInfo(&sVerX, CLR_VER_PRODUCT_TYPE, dwlConditionMask))
-    {
-        gExInfoIsServer = 1;
-    }
-    
-
-    ZeroMemory(&sVerX, sizeof(OSVERSIONINFOEX));
-    sVerX.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-    sVerX.wProductType = VER_NT_SERVER;
-
-    dwlConditionMask = 0;
-    VER_SET_CONDITION(dwlConditionMask, CLR_VER_PRODUCT_TYPE, VER_EQUAL);
-
-    if(VerifyVersionInfo(&sVerX, CLR_VER_PRODUCT_TYPE, dwlConditionMask))
-    {
-        gExInfoIsServer = 1;
-    }
-
-    gExInfoAvailable = 1;
 #else // FEATURE_PAL
     // UNIXTODO: Do we need version checks for Linux?
 #endif // FEATURE_PAL