windows: Set _WIN32_WINNT to 0x0600 (Windows Vista)

common/include/PS2Eext.h

@@ -21,6 +21,9 @@
 #include <cstdarg>
 
 #if defined(_MSC_VER)
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#endif
 #include <windows.h>
 #include <windowsx.h>
 #include <commctrl.h>

common/include/Utilities/RedtapeWindows.h

@@ -31,14 +31,13 @@
 
 #ifdef _WIN32
 
-// Force availability of to WinNT APIs (change to 0x600 to disable XP-specific APIs)
+#ifndef _WIN32_WINNT
-#ifndef WINVER
+#define _WIN32_WINNT 0x0600
-#define WINVER 0x0501
-#define _WIN32_WINNT 0x0501
 #endif
 
 #include <windows.h>
 
+// TODO: I think NOMINMAX above takes care of this already. So these can probably be removed.
 // disable Windows versions of min/max -- we'll use the typesafe STL versions instead.
 #undef min
 #undef max

plugins/CDVDnull/CDVD.h

@@ -17,19 +17,10 @@
  #ifndef __CDVD_H__
 #define __CDVD_H__
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
 #define CDVDdefs
 #include "PS2Edefs.h"
 #include "PS2Eext.h"
 
-#ifdef _MSC_VER
-#include <windows.h>
-#include <windowsx.h>
-#endif
-
 /*#ifdef _MSC_VER
 #define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
 #else

plugins/GSdx/targetver.h

@@ -20,37 +20,5 @@
  */
 
 #pragma once
-/*
-// Including SDKDDKVer.h defines the highest available Windows platform.
 
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+#define _WIN32_WINNT 0x0600
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>
-*/
-
-// The following macros define the minimum required platform.  The minimum required platform
-// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run
-// your application.  The macros work by enabling all features available on platform versions up to and
-// including the version specified.
-
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-
-#ifndef WINVER                          // Specifies that the minimum required platform is Windows Vista.
-#define WINVER 0x0600           // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT            // Specifies that the minimum required platform is Windows Vista.
-#define _WIN32_WINNT 0x0600     // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINDOWS          // Specifies that the minimum required platform is Windows 98.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE                       // Specifies that the minimum required platform is Internet Explorer 7.0.
-#define _WIN32_IE 0x0700        // Change this to the appropriate value to target other versions of IE.
-#endif
-
-#include <WinSDKVer.h>

plugins/GSdx/vsprops/common.props

@@ -8,7 +8,6 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_WINDOWS;_WIN32_WINNT=0x501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FloatingPointModel>Fast</FloatingPointModel>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <WarningLevel>Level4</WarningLevel>

plugins/LilyPad/Global.h

@@ -97,13 +97,7 @@ extern Window  GSwin;
 #endif
 
 #ifdef _MSC_VER
-// Actually works with 0x0400, but need 0x500 to get XBUTTON defines,
+#define _WIN32_WINNT 0x0600
-// 0x501 to get raw input structures, and 0x0600 to get WM_MOUSEHWHEEL.
-#define WINVER 0x0600
-#define _WIN32_WINNT WINVER
-#define __MSCW32__
-
-
 #include <windows.h>
 
 #ifdef PCSX2_DEBUG

plugins/cdvdGigaherz/src/CDVD.h

@@ -16,6 +16,7 @@
 #ifndef __CDVD_H__
 #define __CDVD_H__
 
+#define _WIN32_WINNT 0x0600
 #include <windows.h>
 #include <stdio.h>
 

plugins/cdvdGigaherz/src/PlainIso.cpp

@@ -13,8 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
 #include "CDVD.h"
 #pragma warning(disable:4200)
 #pragma pack(1)

plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp

@@ -13,8 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
 #include "../CDVD.h"
 #pragma warning(disable:4200)
 #pragma pack(1)

plugins/cdvdGigaherz/src/Windows/PlainIso.cpp

@@ -13,8 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
 #include "../CDVD.h"
 #pragma warning(disable:4200)
 #pragma pack(1)

plugins/cdvdGigaherz/src/Windows/config.cpp

@@ -15,13 +15,12 @@
 //License along with this library; if not, write to the Free Software
 //Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 //
-//#include "spu2.h"
+
-#include <windows.h>
+#include "../CDVD.h"
+#include <Windows.h>
 #include <commctrl.h>
 #include "resource.h"
 
-#include "../cdvd.h"
-
 // Config Vars
 
 // DEBUG

plugins/spu2-x/src/Windows/WinConfig.h

@@ -17,11 +17,9 @@
 
 #pragma once
 
-#ifndef WINVER
+#ifndef _WIN32_WINNT
-#	define WINVER 0x0501
+#define _WIN32_WINNT 0x0600
-#	define _WIN32_WINNT 0x0501
 #endif
-
 #include <windows.h>
 #include <mmsystem.h>
 #include <commctrl.h>

plugins/spu2-x/src/Windows/dsp.cpp

@@ -18,9 +18,7 @@
 
 #include "Global.h"
 
-#	define WINVER 0x0501
+#define _WIN32_WINNT 0x0600
-#	define _WIN32_WINNT 0x0501
-
 #include <windows.h>
 #include <mmsystem.h>
 

plugins/xpad/stdafx.h

@@ -4,33 +4,9 @@
 
 #pragma once
 
-#pragma warning(disable: 4996 4995 4324 4100 4101 4201)
+#define WIN32_LEAN_AND_MEAN
 
-// The following macros define the minimum required platform.  The minimum required platform
+#define _WIN32_WINNT 0x0600
-// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run
-// your application.  The macros work by enabling all features available on platform versions up to and
-// including the version specified.
-
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-
-#ifndef WINVER                          // Specifies that the minimum required platform is Windows Vista.
-#define WINVER 0x0600           // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT            // Specifies that the minimum required platform is Windows Vista.
-#define _WIN32_WINNT 0x0600     // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINDOWS          // Specifies that the minimum required platform is Windows 98.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE                       // Specifies that the minimum required platform is Internet Explorer 7.0.
-#define _WIN32_IE 0x0700        // Change this to the appropriate value to target other versions of IE.
-#endif
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
 
 #include <windows.h>
 #include <commctrl.h>

plugins/xpad/vsprops/common.props

@@ -8,8 +8,6 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_WINNT=0x500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FloatingPointModel>Fast</FloatingPointModel>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>