Merge pull request #680 from lioncash/fakepoll-removal

Remove fakepoll.h
dolphin-emu · Jul 28, 2014 · 3554a15 · 3554a15
2 parents 86db004 + 4fa71dd
commit 3554a15
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 238 deletions.
diff --git a/Source/Core/AudioCommon/stdafx.h b/Source/Core/AudioCommon/stdafx.h
@@ -3,14 +3,13 @@
 // Refer to the license.txt file included.
 
 #pragma once
-/*
-#ifdef HAVE_DXSDK_JUNE_2010
-#define _WIN32_WINNT 0x501
-#else
-#pragma message("Resulting binary will be compatible with DirectX >= Windows 8. Install the June 2010 DirectX SDK if you want to build for older environments.")
-#define _WIN32_WINNT 0x602
-#endif
-*/
+
+// Windows Vista is the lowest version we support
+// BUT We need to use the headers for Win8+ XAudio2, so Win8 version is used here.
+// The XAudio2 code will gracefully fallback to older versions if the new one
+// isn't available at runtime.
+#define _WIN32_WINNT 0x0602
+
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 #define NOMINMAX            // Don't include windows min/max definitions
 

diff --git a/Source/Core/Common/stdafx.h b/Source/Core/Common/stdafx.h
@@ -4,23 +4,12 @@
 
 #pragma once
 
-/*
-#ifndef _WIN32_WINNT
-	#define _WIN32_WINNT 0x501
-#endif
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500    // Default value is 0x0400
-#endif
-*/
+// Windows Vista is the lowest version we support
+#define _WIN32_WINNT 0x0600
 
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 #define NOMINMAX            // Don't include windows min/max definitions
 
-/*
-#define _CRT_SECURE_NO_DEPRECATE 1
-#define _CRT_NONSTDC_NO_DEPRECATE 1
-*/
 #include <tchar.h>
 #include <vector>
-#include <windows.h>
-
+#include <Windows.h>
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -362,7 +362,6 @@
     <ClInclude Include="HW\WiimoteReal\WiimoteReal.h" />
     <ClInclude Include="HW\WiimoteReal\WiimoteRealBase.h" />
     <ClInclude Include="HW\WII_IPC.h" />
-    <ClInclude Include="IPC_HLE\fakepoll.h" />
     <ClInclude Include="IPC_HLE\hci.h" />
     <ClInclude Include="IPC_HLE\ICMP.h" />
     <ClInclude Include="IPC_HLE\l2cap.h" />
@@ -463,4 +462,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="ActionReplay">
@@ -1107,9 +1107,6 @@
     <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h">
       <Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
     </ClInclude>
-    <ClInclude Include="IPC_HLE\fakepoll.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
     <ClInclude Include="IPC_HLE\ICMP.h">
       <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
     </ClInclude>
@@ -1214,4 +1211,4 @@
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
@@ -2,10 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-// Used for pair up
-#undef NTDDI_VERSION
-#define NTDDI_VERSION  NTDDI_WINXPSP2
-
 #include <algorithm>
 #include <cstdio>
 #include <cstdlib>

diff --git a/Source/Core/Core/IPC_HLE/ICMP.h b/Source/Core/Core/IPC_HLE/ICMP.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef _WIN32
-#include <winsock2.h>
+#include <WinSock2.h>
 #else
 #include <netinet/in.h>
 #endif

diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
@@ -24,9 +24,7 @@
 #ifdef _WIN32
 #include <ws2tcpip.h>
 #include <iphlpapi.h>
-#include <iphlpapi.h>
 
-#include "Core/IPC_HLE/fakepoll.h"
 #define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
 #define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
 

diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.h b/Source/Core/Core/IPC_HLE/WII_Socket.h
@@ -7,9 +7,11 @@
 #ifdef _WIN32
 #include <ws2tcpip.h>
 #include <iphlpapi.h>
-#include <iphlpapi.h>
+#include <WinSock2.h>
+
+typedef pollfd pollfd_t;
 
-#include "fakepoll.h"
+#define poll WSAPoll
 #define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
 #define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
 

diff --git a/Source/Core/Core/IPC_HLE/fakepoll.h b/Source/Core/Core/IPC_HLE/fakepoll.h
diff --git a/Source/Core/Core/stdafx.h b/Source/Core/Core/stdafx.h
@@ -4,10 +4,8 @@
 
 #pragma once
 
-#define _WIN32_WINNT 0x501
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500    // Default value is 0x0400
-#endif
+// Windows Vista is the lowest version we support
+#define _WIN32_WINNT 0x0600
 
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 #define NOMINMAX            // Don't include windows min/max definitions

diff --git a/Source/Core/DiscIO/stdafx.h b/Source/Core/DiscIO/stdafx.h
@@ -4,17 +4,12 @@
 
 #pragma once
 
-#ifndef _WIN32_WINNT        // Allow use of features specific to Windows XP or later.
-#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
+// Windows Vista is the lowest version we support
+#define _WIN32_WINNT 0x0600
 
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 #define NOMINMAX            // Don't include windows min/max definitions
 
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-
 // TODO: reference additional headers your program requires here
 
 #include <algorithm>
diff --git a/Source/Core/DolphinWX/stdafx.h b/Source/Core/DolphinWX/stdafx.h
@@ -6,11 +6,8 @@
 
 #ifdef _WIN32
 
-// Change these values to use different versions
-#define WINVER          0x0400
-#define _WIN32_WINNT    0x0501
-#define _WIN32_IE       0x0500
-#define _RICHEDIT_VER   0x0100
+// Windows Vista is the lowest version we support
+#define _WIN32_WINNT 0x0600
 
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 #define NOMINMAX            // Don't include windows min/max definitions

diff --git a/Source/Core/InputCommon/stdafx.h b/Source/Core/InputCommon/stdafx.h
@@ -3,12 +3,13 @@
 // Refer to the license.txt file included.
 
 #pragma once
-/*
-#define _WIN32_WINNT 0x501
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500       // Default value is 0x0400
-#endif
-*/
+
+// Windows Vista is the lowest version we support
+// BUT We need to use the headers for Win8+ XInput, so Win8 version is used here.
+// The XInput code will gracefully fallback to older versions if the new one
+// isn't available at runtime.
+#define _WIN32_WINNT 0x0602
+
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 #define NOMINMAX            // Don't include windows min/max definitions
 

diff --git a/Source/Core/VideoBackends/D3D/stdafx.h b/Source/Core/VideoBackends/D3D/stdafx.h
@@ -3,10 +3,9 @@
 // Refer to the license.txt file included.
 
 #pragma once
-#define _WIN32_WINNT 0x501
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500    // Default value is 0x0400
-#endif
+
+// Windows Vista is the lowest version we support
+#define _WIN32_WINNT 0x0600
 
 #define NOMINMAX            // Don't include windows min/max definitions
 

diff --git a/Source/Core/VideoBackends/OGL/stdafx.h b/Source/Core/VideoBackends/OGL/stdafx.h
@@ -3,10 +3,9 @@
 // Refer to the license.txt file included.
 
 #pragma once
-#define _WIN32_WINNT 0x501
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500    // Default value is 0x0400
-#endif
+
+// Windows Vista is the lowest version we support
+#define _WIN32_WINNT 0x0600
 
 #define NOMINMAX            // Don't include windows min/max definitions