Alexandre Julliard : ntdll/tests: Fix a couple of test failures on older Windows versions.
Alexandre Julliard
julliard at winehq.org
Thu Feb 4 16:15:19 CST 2021
Module: wine
Branch: master
Commit: 85c52b397ac203c8cdc1e32222c52d1e52314eff
URL: https://source.winehq.org/git/wine.git/?a=commit;h=85c52b397ac203c8cdc1e32222c52d1e52314eff
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Feb 4 14:04:35 2021 +0100
ntdll/tests: Fix a couple of test failures on older Windows versions.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/tests/info.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index 1673686bddf..5d7673deffe 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -1740,7 +1740,8 @@ static void test_query_process_image_info(void)
ok( info.MinorSubsystemVersion == nt->OptionalHeader.MinorSubsystemVersion,
"wrong minor version %x/%x\n",
info.MinorSubsystemVersion, nt->OptionalHeader.MinorSubsystemVersion );
- ok( info.MajorOperatingSystemVersion == nt->OptionalHeader.MajorOperatingSystemVersion,
+ ok( info.MajorOperatingSystemVersion == nt->OptionalHeader.MajorOperatingSystemVersion ||
+ broken( !info.MajorOperatingSystemVersion ), /* <= win8 */
"wrong major OS version %x/%x\n",
info.MajorOperatingSystemVersion, nt->OptionalHeader.MajorOperatingSystemVersion );
ok( info.MinorOperatingSystemVersion == nt->OptionalHeader.MinorOperatingSystemVersion,
@@ -2752,7 +2753,8 @@ static void test_wow64(void)
}
#endif
ok( !NtCurrentTeb()->GdiBatchCount, "GdiBatchCount set to %x\n", NtCurrentTeb()->GdiBatchCount );
- ok( !NtCurrentTeb()->WowTebOffset, "WowTebOffset set to %x\n", NtCurrentTeb()->WowTebOffset );
+ ok( !NtCurrentTeb()->WowTebOffset || broken( NtCurrentTeb()->WowTebOffset == 1 ), /* vista */
+ "WowTebOffset set to %x\n", NtCurrentTeb()->WowTebOffset );
}
static void test_debug_object(void)
More information about the wine-cvs
mailing list