From 5ea80b86dbe0c8e05886ab9c8835e4766239c907 Mon Sep 17 00:00:00 2001
From: Jonathan Li <jonathan.li@hotmail.co.uk>
Date: Fri, 26 Feb 2016 03:57:53 +0000
Subject: [PATCH] spu2-x:windows: Remove VersionHelpers workaround

We've moved to the non-XP toolkit - it can be removed.
---
 plugins/spu2-x/src/Windows/Config.cpp  | 22 ++--------------------
 plugins/spu2-x/src/Windows/WinConfig.h |  1 +
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/plugins/spu2-x/src/Windows/Config.cpp b/plugins/spu2-x/src/Windows/Config.cpp
index 8434e11900..02f2b3e84b 100644
--- a/plugins/spu2-x/src/Windows/Config.cpp
+++ b/plugins/spu2-x/src/Windows/Config.cpp
@@ -82,20 +82,6 @@ int numSpeakers = 0;
 int dplLevel = 0;
 
 /*****************************************************************************/
-BOOL IsVistaOrGreater2() // workaround for XP toolset missing VersionHelpers.h 
-{
-	OSVERSIONINFOEX osvi;
-	DWORDLONG dwlConditionMask = 0;
-	int op = VER_GREATER_EQUAL;
-
-	ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
-	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-	osvi.dwMajorVersion = 6;
-
-	VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, op);
-
-	return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask);
-}
 
 void ReadSettings()
 {
@@ -140,12 +126,8 @@ void ReadSettings()
 	// portaudio occasionally has issues selecting the proper default audio device.
 	// let's use xaudio2 until this is sorted (rama)
 
-//	if ( IsVistaOrGreater2() ) {		// XA2 for WinXP, morder modern gets Portaudio
-//		CfgReadStr(L"OUTPUT", L"Output_Module", omodid, 127, PortaudioOut->GetIdent());
-//	}
-//	else {
-		CfgReadStr(L"OUTPUT", L"Output_Module", omodid, 127, XAudio2Out->GetIdent());
-//	}
+//	CfgReadStr(L"OUTPUT", L"Output_Module", omodid, 127, PortaudioOut->GetIdent());
+	CfgReadStr(L"OUTPUT", L"Output_Module", omodid, 127, XAudio2Out->GetIdent());
 
 	// find the driver index of this module:
 	OutputModule = FindOutputModuleById( omodid );
diff --git a/plugins/spu2-x/src/Windows/WinConfig.h b/plugins/spu2-x/src/Windows/WinConfig.h
index 269ff0c465..3169a9d4e2 100644
--- a/plugins/spu2-x/src/Windows/WinConfig.h
+++ b/plugins/spu2-x/src/Windows/WinConfig.h
@@ -25,6 +25,7 @@
 #include <commctrl.h>
 #include <initguid.h>
 #include <tchar.h>
+#include <VersionHelpers.h>
 
 #include "resource.h"