From 7bff9176d582c9c59a341d1a6fbe8ddb4f04e575 Mon Sep 17 00:00:00 2001
From: SupSuper
Date: Thu, 22 Nov 2018 12:26:32 +0000
Subject: WIN32: Fix incorrect Windows version check

There's no point in testing for Windows 10 since the comparison is already "greater than or equals", and it identifies itself as 6.2 for backwards compatibility. Likely it was failing before because the return type was wrong.

Version checks are unreliable anyways, should use feature checks, but "if it ain't broke don't fix it".
---
 backends/platform/sdl/win32/win32_wrapper.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'backends/platform/sdl/win32')

diff --git a/backends/platform/sdl/win32/win32_wrapper.cpp b/backends/platform/sdl/win32/win32_wrapper.cpp
index d199ce8994..b61098ab9a 100644
--- a/backends/platform/sdl/win32/win32_wrapper.cpp
+++ b/backends/platform/sdl/win32/win32_wrapper.cpp
@@ -29,8 +29,8 @@
 
 // VerSetConditionMask and VerifyVersionInfo didn't appear until Windows 2000,
 // so we need to check for them at runtime
-LONGLONG VerSetConditionMaskFunc(ULONGLONG dwlConditionMask, DWORD dwTypeMask, BYTE dwConditionMask) {
-	typedef BOOL(WINAPI *VerSetConditionMaskFunction)(ULONGLONG conditionMask, DWORD typeMask, BYTE conditionOperator);
+ULONGLONG VerSetConditionMaskFunc(ULONGLONG dwlConditionMask, DWORD dwTypeMask, BYTE dwConditionMask) {
+	typedef ULONGLONG(WINAPI *VerSetConditionMaskFunction)(ULONGLONG conditionMask, DWORD typeMask, BYTE conditionOperator);
 
 	VerSetConditionMaskFunction verSetConditionMask = (VerSetConditionMaskFunction)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "VerSetConditionMask");
 	if (verSetConditionMask == NULL)
@@ -52,11 +52,11 @@ BOOL VerifyVersionInfoFunc(LPOSVERSIONINFOEXA lpVersionInformation, DWORD dwType
 namespace Win32 {
 
 bool confirmWindowsVersion(int majorVersion, int minorVersion) {
-	OSVERSIONINFOEX versionInfo;
+	OSVERSIONINFOEXA versionInfo;
 	DWORDLONG conditionMask = 0;
 
-	ZeroMemory(&versionInfo, sizeof(OSVERSIONINFOEX));
-	versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+	ZeroMemory(&versionInfo, sizeof(OSVERSIONINFOEXA));
+	versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA);
 	versionInfo.dwMajorVersion = majorVersion;
 	versionInfo.dwMinorVersion = minorVersion;
 
-- 
cgit v1.2.3