Module: wine Branch: master Commit: 7770e26f2d773dcade6f073585b6fac2661e1eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7770e26f2d773dcade6f07358...
Author: Serge Gautherie winehq-git_serge_180711@gautherie.fr Date: Fri Mar 20 19:04:23 2020 +0100
include: Remove now useless forced _WIN32_IE defines.
Signed-off-by: Serge Gautherie winehq-git_serge_180711@gautherie.fr Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 ---- programs/explorer/systray.c | 1 - programs/wordpad/wordpad.c | 1 - 8 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 6c82295d40..21b655b197 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 a2e6f8584b..608901a5e2 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 0d815a6011..ba5832e51c 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 0577af4ecc..4d61079ab8 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 ddaf7541e4..3fc84f6108 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 b503f9ef24..dfd2f4a37d 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/programs/explorer/systray.c b/programs/explorer/systray.c index f9e6661af4..dcd75f4e76 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 579291be80..c8e3132b34 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>