[PATCH v2 4/4] ntdll/tests: Add basic test for NtContinueEx()

[Dāvis Mosāns]

From: Dāvis Mosāns

---
 dlls/ntdll/tests/exception.c | 38 +++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index c9223c6108e..54505d56731 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -4413,13 +4413,13 @@ static void test_thread_context(void)
 #undef COMPARE
 }

-static void test_continue(void)
+static void test_continue(BOOL testContinueEx)
 {
     struct context_pair {
         CONTEXT before;
         CONTEXT after;
     } contexts;
-    NTSTATUS (*func_ptr)( struct context_pair *, BOOL alertable, void *continue_func, void *capture_func ) = code_mem;
+    NTSTATUS (*func_ptr)( struct context_pair *, void *arg2, void *continue_func, void *capture_func ) = code_mem;

static const BYTE call_func[] =
     {
@@ -4487,7 +4487,7 @@ static void test_continue(void)

/* load args */
         0x48, 0x8b, 0x4c, 0x24, 0x50, /* mov 8*10(%rsp), %rcx; context   */
-        0x48, 0x8b, 0x54, 0x24, 0x58, /* mov 8*11(%rsp), %rdx; alertable */
+        0x48, 0x8b, 0x54, 0x24, 0x58, /* mov 8*11(%rsp), %rdx; arg2      */
         0x48, 0x83, 0xec, 0x70,       /* sub $0x70, %rsp; change stack   */

/* setup context to return to label 1 */
@@ -4548,7 +4548,16 @@ static void test_continue(void)
     memcpy( func_ptr, call_func, sizeof(call_func) );
     FlushInstructionCache( GetCurrentProcess(), func_ptr, sizeof(call_func) );

-    func_ptr( &contexts, FALSE, NtContinue, pRtlCaptureContext );
+    if (testContinueEx)
+    {
+        CONTINUE_OPTIONS opts = { 0 };
+        opts.ContinueType = CONTINUE_UNWIND; /* Nothing else is implemented */
+        opts.ContinueFlags = 0; /* Disable test alert */
+        func_ptr( &contexts, &opts, NtContinueEx, pRtlCaptureContext );
+    } else
+    {
+        func_ptr( &contexts, FALSE, NtContinue, pRtlCaptureContext );
+    }

#define COMPARE(reg) \
     ok( contexts.before.reg == contexts.after.reg, "wrong " #reg " %p/%p\n", (void *)(ULONG64)contexts.before.reg, (void *)(ULONG64)contexts.after.reg )
@@ -9032,14 +9041,14 @@ static void test_debug_service(DWORD numexc)
     /* not supported */
 }

-static void test_continue(void)
+static void test_continue(BOOL testContinueEx)
 {
     struct context_pair {
         CONTEXT before;
         CONTEXT after;
     } contexts;
     unsigned int i;
-    NTSTATUS (*func_ptr)( struct context_pair *, BOOL alertable, void *continue_func, void *capture_func ) = code_mem;
+    NTSTATUS (*func_ptr)( struct context_pair *, void *arg2, void *continue_func, void *capture_func ) = code_mem;

static const DWORD call_func[] =
     {
@@ -9139,7 +9148,16 @@ static void test_continue(void)
 #define COMPARE_INDEXED(reg) \
     ok( contexts.before.reg == contexts.after.reg, "wrong " #reg " i: %u, %p/%p\n", i, (void *)(ULONG64)contexts.before.reg, (void *)(ULONG64)contexts.after.reg )

-    func_ptr( &contexts, FALSE, NtContinue, pRtlCaptureContext );
+    if (testContinueEx)
+    {
+        CONTINUE_OPTIONS opts = { 0 };
+        opts.ContinueType = CONTINUE_UNWIND; /* Nothing else is implemented */
+        opts.ContinueFlags = 0; /* Disable test alert */
+        func_ptr( &contexts, &opts, NtContinueEx, pRtlCaptureContext );
+    } else
+    {
+        func_ptr( &contexts, FALSE, NtContinue, pRtlCaptureContext );
+    }

for (i = 1; i < 29; i++) COMPARE_INDEXED( X[i] );

@@ -12618,7 +12636,8 @@ START_TEST(exception)
     test_debug_registers_wow64();
     test_debug_service(1);
     test_simd_exceptions();
-    test_continue();
+    test_continue(FALSE /* NtContinue */);
+    test_continue(TRUE /* NtContinueEx */);
     test_virtual_unwind();
     test___C_specific_handler();
     test_restore_context();
@@ -12641,7 +12660,8 @@ START_TEST(exception)

#elif defined(__aarch64__)

-    test_continue();
+    test_continue(FALSE /* NtContinue */);
+    test_continue(TRUE /* NtContinueEx */);
     test_virtual_unwind();

#elif defined(__arm__)