[PATCH] include: Remove now useless forced WINVER defines.

Serge Gautherie winehq-git_serge_180711 at gautherie.fr
Wed Mar 18 17:41:24 CDT 2020


Signed-off-by: Serge Gautherie <winehq-git_serge_180711 at gautherie.fr>
---
Please, check whether the 2 .h parts are wanted.
---
 dlls/d3d8/tests/device.c      | 1 -
 dlls/d3d9/tests/device.c      | 1 -
 dlls/gdi32/tests/dc.c         | 2 --
 dlls/user32/tests/dialog.c    | 2 --
 dlls/user32/tests/msg.c       | 3 ---
 dlls/user32/tests/sysparams.c | 4 ----
 include/windef.h              | 4 ----
 include/winresrc.h            | 4 ----
 8 files changed, 21 deletions(-)

diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 42eee28..2e182e6 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINVER 0x0602 /* for CURSOR_SUPPRESSED */
 #include <stdlib.h>
 #define COBJMACROS
 #include <initguid.h>
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 16f4221..afbd13a 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -22,7 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINVER 0x0602 /* for CURSOR_SUPPRESSED */
 #define COBJMACROS
 #include <d3d9.h>
 #include "utils.h"
diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c
index c8a903e..6640134 100644
--- a/dlls/gdi32/tests/dc.c
+++ b/dlls/gdi32/tests/dc.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
-#define WINVER 0x0501 /* request latest DEVMODE */
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
 
diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
index 2a7d71f..5a6a0bf 100644
--- a/dlls/user32/tests/dialog.c
+++ b/dlls/user32/tests/dialog.c
@@ -29,8 +29,6 @@
  * normally be met.
  */
 
-#define WINVER 0x0600 /* For NONCLIENTMETRICS with padding */
-
 #include <assert.h>
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 303a026..07f2160 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define _WIN32_WINNT 0x0600 /* For WM_CHANGEUISTATE,QS_RAWINPUT,WM_DWMxxxx */
-#define WINVER 0x0600 /* for WM_GETTITLEBARINFOEX */
-
 #include <assert.h>
 #include <limits.h>
 #include <stdarg.h>
diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index cf12725..b37af4d 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -17,10 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define _WIN32_WINNT 0x0600 /* For SPI_GETMOUSEHOVERWIDTH and more */
-#define _WIN32_IE 0x0700
-#define WINVER 0x0600 /* For COLOR_MENUBAR, NONCLIENTMETRICS with padding */
-
 #include <assert.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/include/windef.h b/include/windef.h
index 0074d5c..326cdba 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -21,10 +21,6 @@
 #ifndef _WINDEF_
 #define _WINDEF_
 
-#ifndef WINVER
-#define WINVER 0x0500
-#endif
-
 #ifndef NO_STRICT
 # ifndef STRICT
 #  define STRICT
diff --git a/include/winresrc.h b/include/winresrc.h
index 2f99661..275fc1d 100644
--- a/include/winresrc.h
+++ b/include/winresrc.h
@@ -19,10 +19,6 @@
 #ifndef _WINRESRC_
 #define _WINRESRC_
 
-#ifndef WINVER
-#define WINVER 0x0500
-#endif
-
 #ifndef _WIN32_IE
 #define _WIN32_IE 0x0501
 #endif
-- 
2.10.0.windows.1




More information about the wine-devel mailing list