From d471558dbcb7e3ae3db0c2c42b802f6224729910 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Fri, 13 Mar 2020 23:50:33 +0100 Subject: [PATCH] [WINETESTS] */generated.c: Remove forced 0x0501 API versions This actually affects 2 modules only: * kernel32: this file is still commented out, these defines were going to be deactivated anyway. * rpcrt4: I don't know why it had these defines (still) activated. Anyway. Import https://source.winehq.org/git/wine.git/commit/aa384d36429110970aa72acbc5043158de6aff03 --- modules/rostests/winetests/gdi32/generated.c | 6 ------ modules/rostests/winetests/kernel32/generated.c | 4 ---- modules/rostests/winetests/ntdll/generated.c | 6 ------ modules/rostests/winetests/rpcrt4/generated.c | 4 ---- modules/rostests/winetests/shell32/generated.c | 6 ------ modules/rostests/winetests/shlwapi/generated.c | 6 ------ modules/rostests/winetests/urlmon/generated.c | 6 ------ modules/rostests/winetests/user32/generated.c | 6 ------ modules/rostests/winetests/wininet/generated.c | 6 ------ modules/rostests/winetests/winmm/generated.c | 4 ---- 10 files changed, 54 deletions(-) diff --git a/modules/rostests/winetests/gdi32/generated.c b/modules/rostests/winetests/gdi32/generated.c index 7a2bcfbfaff..fe3ecd937d3 100644 --- a/modules/rostests/winetests/gdi32/generated.c +++ b/modules/rostests/winetests/gdi32/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include "windows.h" diff --git a/modules/rostests/winetests/kernel32/generated.c b/modules/rostests/winetests/kernel32/generated.c index 2f0126edb35..e465ca55ad3 100644 --- a/modules/rostests/winetests/kernel32/generated.c +++ b/modules/rostests/winetests/kernel32/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/modules/rostests/winetests/ntdll/generated.c b/modules/rostests/winetests/ntdll/generated.c index d6a5c4286f8..d277e02073b 100644 --- a/modules/rostests/winetests/ntdll/generated.c +++ b/modules/rostests/winetests/ntdll/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include "ntdll_test.h" diff --git a/modules/rostests/winetests/rpcrt4/generated.c b/modules/rostests/winetests/rpcrt4/generated.c index 7eb8faa0731..72672cd3a91 100644 --- a/modules/rostests/winetests/rpcrt4/generated.c +++ b/modules/rostests/winetests/rpcrt4/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include diff --git a/modules/rostests/winetests/shell32/generated.c b/modules/rostests/winetests/shell32/generated.c index d30857b9d21..55f4eab8942 100644 --- a/modules/rostests/winetests/shell32/generated.c +++ b/modules/rostests/winetests/shell32/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include diff --git a/modules/rostests/winetests/shlwapi/generated.c b/modules/rostests/winetests/shlwapi/generated.c index e509e5c49b5..3a8e4269fc7 100644 --- a/modules/rostests/winetests/shlwapi/generated.c +++ b/modules/rostests/winetests/shlwapi/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include diff --git a/modules/rostests/winetests/urlmon/generated.c b/modules/rostests/winetests/urlmon/generated.c index 75358140a1c..45fd5d84f30 100644 --- a/modules/rostests/winetests/urlmon/generated.c +++ b/modules/rostests/winetests/urlmon/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include diff --git a/modules/rostests/winetests/user32/generated.c b/modules/rostests/winetests/user32/generated.c index 87dda5ec115..be1b698a2ce 100644 --- a/modules/rostests/winetests/user32/generated.c +++ b/modules/rostests/winetests/user32/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include "windows.h" diff --git a/modules/rostests/winetests/wininet/generated.c b/modules/rostests/winetests/wininet/generated.c index 34369a8d536..f88834ab9dd 100644 --- a/modules/rostests/winetests/wininet/generated.c +++ b/modules/rostests/winetests/wininet/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include diff --git a/modules/rostests/winetests/winmm/generated.c b/modules/rostests/winetests/winmm/generated.c index dd5e21ce489..8cb4d93fae4 100644 --- a/modules/rostests/winetests/winmm/generated.c +++ b/modules/rostests/winetests/winmm/generated.c @@ -7,10 +7,6 @@ #ifdef __REACTOS__ #define _WINE -#else -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 #endif #define WINE_NOWINSOCK