Signed-off-by: Serge Gautherie winehq-git_serge_180711@gautherie.fr --- dlls/comctl32/tests/subclass.c | 2 -- dlls/kernel32/tests/file.c | 3 --- dlls/kernel32/tests/sync.c | 1 - dlls/kernel32/tests/thread.c | 3 --- dlls/kernel32/tests/timer.c | 2 -- dlls/kernel32/tests/version.c | 3 --- dlls/psapi/tests/psapi_main.c | 3 --- dlls/user32/tests/broadcast.c | 2 -- dlls/user32/tests/class.c | 3 --- dlls/user32/tests/menu.c | 2 -- dlls/user32/tests/win.c | 3 --- 11 files changed, 27 deletions(-)
diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index fc778d6..b2b4731 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define _WIN32_WINNT 0x0501 /* For SetWindowSubclass/etc */ - #include <assert.h> #include <stdarg.h>
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 785bd60..90338f5 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -20,9 +20,6 @@ * */
-/* ReplaceFile requires Windows 2000 or newer */ -#define _WIN32_WINNT 0x0500 - #include <stdarg.h> #include <stdlib.h> #include <time.h> diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 40cad1c..d05a038 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define _WIN32_WINNT 0x500 #include <stdarg.h> #include <stdlib.h> #include <stdio.h> diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 3b9a407..b14fea3 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-/* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */ -#define _WIN32_WINNT 0x0600 - #include <assert.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/kernel32/tests/timer.c b/dlls/kernel32/tests/timer.c index bcc800c..d2a6138 100644 --- a/dlls/kernel32/tests/timer.c +++ b/dlls/kernel32/tests/timer.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define _WIN32_WINNT 0x0501 - #include "wine/test.h" #include "winbase.h"
diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 5fdc961..861b870 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-/* Needed for PRODUCT_* defines and GetProductInfo() */ -#define _WIN32_WINNT 0x0600 - #include "wine/test.h" #include "winbase.h" #include "winternl.h" diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 0ea1b1f..da7524d 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-/* 0x0600 makes PROCESS_ALL_ACCESS not compatible with pre-Vista versions */ -#define _WIN32_WINNT 0x0500 - #include <stdarg.h>
#include "ntstatus.h" diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 1a21695..f80d455 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define _WIN32_WINNT 0x0501 - #include <stdarg.h> #include <stdio.h>
diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 606a29a..94dd810 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-/* To get CS_DROPSHADOW with the MSVC headers */ -#define _WIN32_WINNT 0x0501 - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 1ca4141..cc0a9e6 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define _WIN32_WINNT 0x0501 - #include <stdarg.h> #include <stdio.h> #include <string.h> diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 56072be..25d643f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-/* To get ICON_SMALL2 with the MSVC headers */ -#define _WIN32_WINNT 0x0501 - #include <assert.h> #include <limits.h> #include <stdlib.h>
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=67711
Your paranoid android.
=== w1064v1809 (64 bit report) ===
kernel32: sync.c:1841: Test failed: SleepConditionVariableCS should still return TRUE on crit unlock delay
=== w1064v1809_ar (32 bit report) ===
user32: menu.c:2337: Test failed: test 6 menu.c:2337: Test failed: test 8 menu.c:2337: Test failed: test 10 menu.c:2337: Test failed: test 12 menu.c:2337: Test failed: test 14 menu.c:2337: Test failed: test 16
=== w1064v1809_he (32 bit report) ===
user32: menu.c:2337: Test failed: test 6 menu.c:2337: Test failed: test 8 menu.c:2337: Test failed: test 10 menu.c:2337: Test failed: test 12 menu.c:2337: Test failed: test 14 menu.c:2337: Test failed: test 16
=== w1064v1809 (32 bit report) ===
user32: win.c:3164: Test failed: GetActiveWindow() = 00030060 win.c:3188: Test failed: GetActiveWindow() = 00030060 win.c:3889: Test failed: hwnd 000200E4/00060102 message 0737 win.c:3894: Test failed: hwnd 00060102/00060102 message 0202 win.c:3899: Test failed: hwnd 00060102/00060102 message 0203
=== w1064v1809_2scr (32 bit report) ===
user32: win.c:3164: Test failed: GetActiveWindow() = 00060078 win.c:3167: Test failed: GetFocus() = 00000000 win.c:3179: Test failed: GetFocus() = 00000000 win.c:3182: Test failed: GetFocus() = 00000000 win.c:3185: Test failed: GetFocus() = 00000000 win.c:3188: Test failed: GetActiveWindow() = 00060078 win.c:3192: Test failed: GetFocus() = 00000000 win.c:3195: Test failed: GetFocus() = 00000000 win.c:3889: Test failed: hwnd 00040052/000B031A message 0737 win.c:3894: Test failed: hwnd 000B031A/000B031A message 0202 win.c:3899: Test failed: hwnd 000B031A/000B031A message 0203 win.c:3903: Test failed: message 0202 available
=== w1064v1809_ja (32 bit report) ===
user32: win.c:3724: Test failed: message 0738 available win.c:3849: Test failed: hwnd 000202F0 message 7fff win.c:3928: Test failed: hwnd 000202F0/00040360 message 7fff win.c:3931: Test failed: hwnd 000202F0/00040360 message 7fff
=== w1064v1809_zh_CN (32 bit report) ===
user32: win.c:3849: Test failed: hwnd 00010388 message 0282 win.c:3928: Test failed: hwnd 00010388/000C03D6 message 0282 win.c:3931: Test failed: hwnd 00010388/000C03D6 message 0282
=== w1064v1809 (64 bit report) ===
user32: win.c:3164: Test failed: GetActiveWindow() = 0000000000030296 win.c:3167: Test failed: GetFocus() = 0000000000000000 win.c:3179: Test failed: GetFocus() = 0000000000000000 win.c:3182: Test failed: GetFocus() = 0000000000000000 win.c:3185: Test failed: GetFocus() = 0000000000000000 win.c:3188: Test failed: GetActiveWindow() = 0000000000030296 win.c:3192: Test failed: GetFocus() = 0000000000000000 win.c:3195: Test failed: GetFocus() = 0000000000000000 win.c:3889: Test failed: hwnd 0000000000020174/00000000002D00E0 message 0737 win.c:3894: Test failed: hwnd 00000000002D00E0/00000000002D00E0 message 0202 win.c:3899: Test failed: hwnd 00000000002D00E0/00000000002D00E0 message 0203 win.c:3903: Test failed: message 0202 available
=== debiant (32 bit WoW report) ===
user32: win.c:10116: Test failed: Expected foreground window 0, got 00E100E4 win.c:10122: Test failed: Expected foreground window 0006006C, got 00E100E4
On 21/03/2020 08:09, Marvin wrote:
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=67711
Your paranoid android.
Not caused by my patch.
kernel32: sync.c:1841: Test failed: SleepConditionVariableCS should still return TRUE on crit unlock delay
Not reproduced: https://testbot.winehq.org/JobDetails.pl?Key=67749
user32: menu.c:2337: Test failed: test 6
Already failing: https://testbot.winehq.org/JobDetails.pl?Key=67728
user32: win.c:3164: Test failed: GetActiveWindow() = 00030060
Already failing: https://testbot.winehq.org/JobDetails.pl?Key=67729
-
Marvin -
Serge Gautherie