[ros-diffs] [reactos] 01/01: [REACTOS] Remove forced _WIN32_IE defines

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=724466597f33bbb926d97…

commit 724466597f33bbb926d97d609670302d1cc9eb0d
Author:     Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr>
AuthorDate: Sat Mar 21 02:09:33 2020 +0100
Commit:     Victor Perevertkin <victor(a)perevertkin.ru>
CommitDate: Mon Mar 30 13:47:09 2020 +0300

    [REACTOS] Remove forced _WIN32_IE defines
    
    No impact, as already deactivated or superseded or superfluous.
    
    Import
   
https://source.winehq.org/git/wine.git/commit/7770e26f2d773dcade6f073585b6f…
---
 base/applications/wordpad/wordpad.c          | 1 -
 dll/win32/riched20/editstr.h                 | 4 ----
 modules/rostests/winetests/comctl32/rebar.c  | 6 ------
 modules/rostests/winetests/shell32/systray.c | 3 ---
 modules/rostests/winetests/urlmon/sec_mgr.c  | 6 ------
 modules/rostests/winetests/user32/input.c    | 5 -----
 sdk/include/reactos/wine/commctrl.h          | 5 -----
 7 files changed, 30 deletions(-)

diff --git a/base/applications/wordpad/wordpad.c b/base/applications/wordpad/wordpad.c
index ba4cf537889..4cd8cc21b19 100644
--- a/base/applications/wordpad/wordpad.c
+++ b/base/applications/wordpad/wordpad.c
@@ -21,7 +21,6 @@
  */
 
 #define WIN32_LEAN_AND_MEAN
-#define _WIN32_IE 0x0400
 
 #include <stdio.h>
 #include <assert.h>
diff --git a/dll/win32/riched20/editstr.h b/dll/win32/riched20/editstr.h
index a2e6f8584b7..608901a5e22 100644
--- a/dll/win32/riched20/editstr.h
+++ b/dll/win32/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/modules/rostests/winetests/comctl32/rebar.c
b/modules/rostests/winetests/comctl32/rebar.c
index 501638c758f..6b4a71b0542 100644
--- a/modules/rostests/winetests/comctl32/rebar.c
+++ b/modules/rostests/winetests/comctl32/rebar.c
@@ -17,12 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* make sure the structures work with a comctl32 v5.x */
-#ifndef __REACTOS__
-#define _WIN32_WINNT 0x500
-#define _WIN32_IE 0x500
-#endif
-
 #include <assert.h>
 #include <stdarg.h>
 
diff --git a/modules/rostests/winetests/shell32/systray.c
b/modules/rostests/winetests/shell32/systray.c
index c0f963467d6..ba5832e51c7 100644
--- a/modules/rostests/winetests/shell32/systray.c
+++ b/modules/rostests/winetests/shell32/systray.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __REACTOS__
-#define _WIN32_IE 0x600
-#endif
 #include <stdarg.h>
 
 #include <windows.h>
diff --git a/modules/rostests/winetests/urlmon/sec_mgr.c
b/modules/rostests/winetests/urlmon/sec_mgr.c
index 4d96eba6289..bdf1286132b 100644
--- a/modules/rostests/winetests/urlmon/sec_mgr.c
+++ b/modules/rostests/winetests/urlmon/sec_mgr.c
@@ -21,12 +21,6 @@
 #define COBJMACROS
 #define CONST_VTABLE
 
-/* needed for IInternetZoneManagerEx2 */
-#ifdef __REACTOS__
-#undef _WIN32_IE
-#endif
-#define _WIN32_IE 0x0700
-
 #include <wine/test.h>
 #include <stdarg.h>
 #include <stddef.h>
diff --git a/modules/rostests/winetests/user32/input.c
b/modules/rostests/winetests/user32/input.c
index d856e6916dc..8e1838953e3 100644
--- a/modules/rostests/winetests/user32/input.c
+++ b/modules/rostests/winetests/user32/input.c
@@ -44,11 +44,6 @@
  *
  */
 
-#ifndef __REACTOS__
-#define _WIN32_WINNT 0x401
-#define _WIN32_IE 0x0500
-#endif
-
 #include <stdarg.h>
 #include <assert.h>
 
diff --git a/sdk/include/reactos/wine/commctrl.h b/sdk/include/reactos/wine/commctrl.h
index ab4e957261b..6306fc3e158 100644
--- a/sdk/include/reactos/wine/commctrl.h
+++ b/sdk/include/reactos/wine/commctrl.h
@@ -5,11 +5,6 @@
 #define DPA_GetPtr DPA_GetPtr_wine_hack
 #define FlatSB_SetScrollProp FlatSB_SetScrollProp_wine_hack
 
-#if (_WIN32_IE < 0x501)
-#undef _WIN32_IE
-#define _WIN32_IE 0x0501
-#endif
-
 #include <psdk/commctrl.h>
 
 #ifdef __cplusplus