From 803b5e1371f6066a6cc708775c359fb07a02068d Mon Sep 17 00:00:00 2001
From: Serge Gautherie <32623169+SergeGautherie@users.noreply.github.com>
Date: Fri, 3 Apr 2020 14:01:22 +0200
Subject: [PATCH] [WINETESTS] Remove forced _WIN32_WINNT defines (#2463)

Only comctl32 is affected.

Import
https://source.winehq.org/git/wine.git/commit/be3cda6ec0856d143d4737ee9306844569b76e15
---
 modules/rostests/winetests/comctl32/subclass.c | 2 --
 modules/rostests/winetests/kernel32/sync.c     | 3 ---
 modules/rostests/winetests/kernel32/thread.c   | 5 -----
 modules/rostests/winetests/kernel32/timer.c    | 4 ----
 modules/rostests/winetests/kernel32/version.c  | 5 -----
 modules/rostests/winetests/psapi/psapi_main.c  | 5 -----
 modules/rostests/winetests/user32/broadcast.c  | 4 ----
 modules/rostests/winetests/user32/class.c      | 5 -----
 modules/rostests/winetests/user32/menu.c       | 4 ----
 9 files changed, 37 deletions(-)

diff --git a/modules/rostests/winetests/comctl32/subclass.c b/modules/rostests/winetests/comctl32/subclass.c
index fc778d67115..b2b47319b16 100644
--- a/modules/rostests/winetests/comctl32/subclass.c
+++ b/modules/rostests/winetests/comctl32/subclass.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define _WIN32_WINNT 0x0501 /* For SetWindowSubclass/etc */
-
 #include <assert.h>
 #include <stdarg.h>
 
diff --git a/modules/rostests/winetests/kernel32/sync.c b/modules/rostests/winetests/kernel32/sync.c
index fced98bf217..9056c3d1bbe 100644
--- a/modules/rostests/winetests/kernel32/sync.c
+++ b/modules/rostests/winetests/kernel32/sync.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __REACTOS__
-#define _WIN32_WINNT 0x500
-#endif
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/modules/rostests/winetests/kernel32/thread.c b/modules/rostests/winetests/kernel32/thread.c
index b0bee53b1c5..85a86581de5 100644
--- a/modules/rostests/winetests/kernel32/thread.c
+++ b/modules/rostests/winetests/kernel32/thread.c
@@ -18,11 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */
-#ifndef __REACTOS__
-#define _WIN32_WINNT 0x0600
-#endif
-
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/modules/rostests/winetests/kernel32/timer.c b/modules/rostests/winetests/kernel32/timer.c
index be4c9e9f2df..d2a6138c97a 100644
--- a/modules/rostests/winetests/kernel32/timer.c
+++ b/modules/rostests/winetests/kernel32/timer.c
@@ -18,10 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __REACTOS__
-#define _WIN32_WINNT 0x0501
-#endif
-
 #include "wine/test.h"
 #include "winbase.h"
 
diff --git a/modules/rostests/winetests/kernel32/version.c b/modules/rostests/winetests/kernel32/version.c
index 39f869b993d..5f7a9bb03f5 100644
--- a/modules/rostests/winetests/kernel32/version.c
+++ b/modules/rostests/winetests/kernel32/version.c
@@ -18,11 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* Needed for PRODUCT_* defines and GetProductInfo() */
-#ifndef __REACTOS__
-#define _WIN32_WINNT 0x0600
-#endif
-
 #include "wine/test.h"
 #include "winbase.h"
 #include "winternl.h"
diff --git a/modules/rostests/winetests/psapi/psapi_main.c b/modules/rostests/winetests/psapi/psapi_main.c
index 92853348594..68f0045199f 100644
--- a/modules/rostests/winetests/psapi/psapi_main.c
+++ b/modules/rostests/winetests/psapi/psapi_main.c
@@ -19,11 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* 0x0600 makes PROCESS_ALL_ACCESS not compatible with pre-Vista versions */
-#ifndef __REACTOS__
-#define _WIN32_WINNT 0x0500
-#endif
-
 #include <stdarg.h>
 
 #include "ntstatus.h"
diff --git a/modules/rostests/winetests/user32/broadcast.c b/modules/rostests/winetests/user32/broadcast.c
index 91afcc28fdf..f80d455cba3 100644
--- a/modules/rostests/winetests/user32/broadcast.c
+++ b/modules/rostests/winetests/user32/broadcast.c
@@ -18,10 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __REACTOS__
-#define _WIN32_WINNT 0x0501
-#endif
-
 #include <stdarg.h>
 #include <stdio.h>
 
diff --git a/modules/rostests/winetests/user32/class.c b/modules/rostests/winetests/user32/class.c
index d8cf14a3cda..43c32162e08 100644
--- a/modules/rostests/winetests/user32/class.c
+++ b/modules/rostests/winetests/user32/class.c
@@ -18,11 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* To get CS_DROPSHADOW with the MSVC headers */
-#ifndef __REACTOS__
-#define _WIN32_WINNT 0x0501
-#endif
-
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/modules/rostests/winetests/user32/menu.c b/modules/rostests/winetests/user32/menu.c
index a7a8b8a4f24..95a5e21d2c4 100644
--- a/modules/rostests/winetests/user32/menu.c
+++ b/modules/rostests/winetests/user32/menu.c
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __REACTOS__
-#define _WIN32_WINNT 0x0501
-#endif
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>