From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 22 Dec 2014 14:38:00 +0000 (+0200)
Subject: Fix the Windows version check in Touchscreen::is_available
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=2310eed6d8a73af7dd380eefb3ee7a30d277909a;p=libs%2Fgui.git

Fix the Windows version check in Touchscreen::is_available
---

diff --git a/source/input/windows/touchscreen.cpp b/source/input/windows/touchscreen.cpp
index 7e314ca..d6e76e0 100644
--- a/source/input/windows/touchscreen.cpp
+++ b/source/input/windows/touchscreen.cpp
@@ -15,11 +15,11 @@ bool Touchscreen::is_available()
 	version.dwOSVersionInfoSize = sizeof(version);
 	version.dwMajorVersion = 6;
 	version.dwMinorVersion = 1;
-	version.dwServicePackMajor = 0;
-	version.dwServicePackMinor = 0;
+	version.wServicePackMajor = 0;
+	version.wServicePackMinor = 0;
 	DWORD mask = VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR;
 	DWORDLONG cond = VerSetConditionMask(0, mask, VER_GREATER_EQUAL);
-	if(!VerifyVersionInfo(&version, type, cond))
+	if(VerifyVersionInfo(&version, mask, cond))
 		return false;
 
 	if(!GetSystemMetrics(SM_TABLETPC))