diff options
| author | SupSuper | 2018-11-22 12:26:32 +0000 |
|---|---|---|
| committer | Thierry Crozat | 2018-12-16 10:48:13 +0000 |
| commit | 7bff9176d582c9c59a341d1a6fbe8ddb4f04e575 (patch) | |
| tree | dd175b173633500d2e28c0899e190c6386a046c3 /backends | |
| parent | 61070f6ce0c15d3636f984c9aa00aa9c68cb25e1 (diff) | |
| download | scummvm-rg350-7bff9176d582c9c59a341d1a6fbe8ddb4f04e575.tar.gz scummvm-rg350-7bff9176d582c9c59a341d1a6fbe8ddb4f04e575.tar.bz2 scummvm-rg350-7bff9176d582c9c59a341d1a6fbe8ddb4f04e575.zip | |
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".
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/sdl/win32/win32_wrapper.cpp | 10 | ||||
| -rw-r--r-- | backends/taskbar/win32/win32-taskbar.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
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; diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp index 1537859243..f6706de72d 100644 --- a/backends/taskbar/win32/win32-taskbar.cpp +++ b/backends/taskbar/win32/win32-taskbar.cpp @@ -77,7 +77,7 @@ const PROPERTYKEY PKEY_Title = { /* fmtid = */ { 0xF29F85E0, 0x4FF9, 0x1068, { 0 Win32TaskbarManager::Win32TaskbarManager(SdlWindow_Win32 *window) : _window(window), _taskbar(NULL), _count(0), _icon(NULL) { // Do nothing if not running on Windows 7 or later - if (!Win32::confirmWindowsVersion(10, 0) && !Win32::confirmWindowsVersion(6, 1)) + if (!Win32::confirmWindowsVersion(6, 1)) return; CoInitialize(NULL); |