From dda0b6c296cf4276b3e7a0d35955cd7174e38e41 Mon Sep 17 00:00:00 2001 From: lightningterror <18107717+lightningterror@users.noreply.github.com> Date: Sun, 20 Nov 2022 00:07:09 +0100 Subject: [PATCH] common: Drop windows 8.1 and server 2012 r2 support. We already require windows 10 (build 1809) with the recent recompiler changes. --- common/HTTPDownloaderWinHTTP.cpp | 4 +--- common/Windows/WinMisc.cpp | 15 +++++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/common/HTTPDownloaderWinHTTP.cpp b/common/HTTPDownloaderWinHTTP.cpp index 36b6346115..340a34e5fc 100644 --- a/common/HTTPDownloaderWinHTTP.cpp +++ b/common/HTTPDownloaderWinHTTP.cpp @@ -52,9 +52,7 @@ std::unique_ptr HTTPDownloader::Create(const char* user_agent) bool HTTPDownloaderWinHttp::Initialize(const char* user_agent) { - // WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY is not supported before Win8.1. - const DWORD dwAccessType = - IsWindows8Point1OrGreater() ? WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY : WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; + const DWORD dwAccessType = WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY; m_hSession = WinHttpOpen(StringUtil::UTF8StringToWideString(user_agent).c_str(), dwAccessType, nullptr, nullptr, WINHTTP_FLAG_ASYNC); diff --git a/common/Windows/WinMisc.cpp b/common/Windows/WinMisc.cpp index 4becb71535..951fdfd517 100644 --- a/common/Windows/WinMisc.cpp +++ b/common/Windows/WinMisc.cpp @@ -64,19 +64,14 @@ std::string GetOSVersionString() SYSTEM_INFO si; GetNativeSystemInfo(&si); - if (!IsWindows8Point1OrGreater()) - { - retval = "Unsupported Operating System!"; - } - else + if (IsWindows10OrGreater()) { retval = "Microsoft "; - - if (IsWindows10OrGreater()) - retval += IsWindowsServer() ? "Windows Server 2016" : "Windows 10"; - else // IsWindows8Point1OrGreater() - retval += IsWindowsServer() ? "Windows Server 2012 R2" : "Windows 8.1"; + retval += IsWindowsServer() ? "Windows Server 2016" : "Windows 10"; + } + else + retval = "Unsupported Operating System!"; return retval; }