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

Serge Gautherie winehq-git_serge_180711 at gautherie.fr
Fri Mar 20 13:04:23 CDT 2020


Signed-off-by: Serge Gautherie <winehq-git_serge_180711 at gautherie.fr>
---
Please, check whether the 3 .h parts are wanted.
---
 dlls/comctl32/tests/rebar.c  | 4 ----
 dlls/riched20/editstr.h      | 4 ----
 dlls/shell32/tests/systray.c | 2 +-
 dlls/urlmon/tests/sec_mgr.c  | 3 ---
 dlls/user32/tests/input.c    | 3 ---
 include/commctrl.h           | 4 ----
 include/winresrc.h           | 4 ----
 programs/explorer/systray.c  | 1 -
 programs/wordpad/wordpad.c   | 1 -
 9 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c
index 6c82295..21b655b 100644
--- a/dlls/comctl32/tests/rebar.c
+++ b/dlls/comctl32/tests/rebar.c
@@ -17,10 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* make sure the structures work with a comctl32 v5.x */
-#define _WIN32_WINNT 0x500
-#define _WIN32_IE 0x500
-
 #include <assert.h>
 #include <stdarg.h>
 
diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h
index a2e6f85..608901a 100644
--- a/dlls/riched20/editstr.h
+++ b/dlls/riched20/editstr.h
@@ -21,10 +21,6 @@
 #ifndef __EDITSTR_H
 #define __EDITSTR_H
 
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0400
-#endif
-
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c
index 0d815a6..ba5832e 100644
--- a/dlls/shell32/tests/systray.c
+++ b/dlls/shell32/tests/systray.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#define _WIN32_IE 0x600
+
 #include <stdarg.h>
 
 #include <windows.h>
diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c
index 0577af4..4d61079 100644
--- a/dlls/urlmon/tests/sec_mgr.c
+++ b/dlls/urlmon/tests/sec_mgr.c
@@ -21,9 +21,6 @@
 #define COBJMACROS
 #define CONST_VTABLE
 
-/* needed for IInternetZoneManagerEx2 */
-#define _WIN32_IE 0x0700
-
 #include <wine/test.h>
 #include <stdarg.h>
 #include <stddef.h>
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index ddaf754..3fc84f6 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -45,9 +45,6 @@
  *
  */
 
-#define _WIN32_WINNT 0x401
-#define _WIN32_IE 0x0500
-
 #include <stdarg.h>
 #include <assert.h>
 
diff --git a/include/commctrl.h b/include/commctrl.h
index b503f9e..dfd2f4a 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -53,10 +53,6 @@ HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
 
 #define COMCTL32_VERSION                5  /* dll version */
 
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0400
-#endif
-
 #define ICC_LISTVIEW_CLASSES   0x00000001  /* listview, header */
 #define ICC_TREEVIEW_CLASSES   0x00000002  /* treeview, tooltips */
 #define ICC_BAR_CLASSES        0x00000004  /* toolbar, statusbar, trackbar, tooltips */
diff --git a/include/winresrc.h b/include/winresrc.h
index 2f99661..5cc0db4 100644
--- a/include/winresrc.h
+++ b/include/winresrc.h
@@ -23,10 +23,6 @@
 #define WINVER 0x0500
 #endif
 
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0501
-#endif
-
 #ifndef _WIN32_WINDOWS
 #define _WIN32_WINDOWS 0x0410
 #endif
diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index f9e6661..dcd75f4 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -21,7 +21,6 @@
 #include <assert.h>
 
 #define NONAMELESSUNION
-#define _WIN32_IE 0x500
 #include <windows.h>
 #include <commctrl.h>
 #include <shellapi.h>
diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 579291b..c8e3132 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -20,7 +20,6 @@
  */
 
 #define WIN32_LEAN_AND_MEAN
-#define _WIN32_IE 0x0400
 
 #include <stdarg.h>
 #include <stdlib.h>
-- 
2.10.0.windows.1




More information about the wine-devel mailing list