[PATCH 2/3] ntdll/tests: Fix test_user_apc() on Windows < 7.

Zebediah Figura wine at gitlab.winehq.org
Mon Jun 27 16:20:40 CDT 2022


From: Zebediah Figura <zfigura at codeweavers.com>

---
 dlls/ntdll/tests/exception.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 86f2f5d6cb2..748ee0e52ee 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -8801,6 +8801,9 @@ static void test_user_apc(void)
 
         memcpy(code_mem, code, sizeof(code));
         func(RtlCaptureContext, &context);
+        /* work around broken RtlCaptureContext on Windows < 7 which doesn't set
+         * ContextFlags */
+        context.ContextFlags = CONTEXT_FULL;
     }
 #else
     RtlCaptureContext(&context);
@@ -8824,8 +8827,7 @@ static void test_user_apc(void)
         ok(!status, "Got unexpected status %#lx.\n", status);
         status = NtContinue(&c[0], TRUE );
 
-        /* Broken before Win7, in that case NtContinue returns here instead of restoring context after calling APC. */
-        ok(broken(TRUE), "Should not get here, status %#lx.\n", status);
+        ok(0, "Should not get here, status %#lx.\n", status);
         return;
     }
     ok(pass == 3, "Got unexpected pass %ld.\n", pass);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/327



More information about the wine-devel mailing list