[Scummvm-cvs-logs] scummvm master -> 992585167041e77be219338629e49c11132a3d92

[Kirben]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9925851670 WIN32: Fix taskbar detection under Windows 10 onwards.


Commit: 992585167041e77be219338629e49c11132a3d92
    https://github.com/scummvm/scummvm/commit/992585167041e77be219338629e49c11132a3d92
Author: Kirben (kirben at optusnet.com.au)
Date: 2016-06-08T09:56:18+10:00

Commit Message:
WIN32: Fix taskbar detection under Windows 10 onwards.

Changed paths:
    backends/taskbar/win32/win32-taskbar.cpp



diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp
index f3339fb..b2810e5 100644
--- a/backends/taskbar/win32/win32-taskbar.cpp
+++ b/backends/taskbar/win32/win32-taskbar.cpp
@@ -85,7 +85,7 @@ const PROPERTYKEY PKEY_Title = { /* fmtid = */ { 0xF29F85E0, 0x4FF9, 0x1068, { 0
 
 Win32TaskbarManager::Win32TaskbarManager(SdlWindow *window) : _window(window), _taskbar(NULL), _count(0), _icon(NULL) {
 	// Do nothing if not running on Windows 7 or later
-	if (!isWin7OrLater())
+	if (!confirmWindowsVersion(10, 0) && !confirmWindowsVersion(6, 1))
 		return;
 
 	CoInitialize(NULL);
@@ -400,14 +400,14 @@ BOOL VerifyVersionInfoFunc(LPOSVERSIONINFOEXA lpVersionInformation, DWORD dwType
    return verifyVersionInfo(lpVersionInformation, dwTypeMask, dwlConditionMask);
 }
 
-bool Win32TaskbarManager::isWin7OrLater() {
+bool Win32TaskbarManager::confirmWindowsVersion(uint majorVersion, uint minorVersion) {
 	OSVERSIONINFOEX versionInfo;
 	DWORDLONG conditionMask = 0;
 
 	ZeroMemory(&versionInfo, sizeof(OSVERSIONINFOEX));
 	versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-	versionInfo.dwMajorVersion = 6;
-	versionInfo.dwMinorVersion = 1;
+	versionInfo.dwMajorVersion = majorVersion;
+	versionInfo.dwMinorVersion = minorVersion;
 
 	conditionMask = VerSetConditionMaskFunc(conditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
 	conditionMask = VerSetConditionMaskFunc(conditionMask, VER_MINORVERSION, VER_GREATER_EQUAL);