ntdll: Set handler_data correctly in arm64 RtlVirtualUnwind.

This matches what tests show is done on actual windows, in the current testcases; in all currently tested cases, handler_data is reset to NULL when no handler is returned. Signed-off-by: Martin Storsjo <martin@martin.st> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Set handler_data correctly in arm64 RtlVirtualUnwind.
a729af0e · Martin Storsjo · Alexandre Julliard · dae6979e · a729af0e · a729af0e
Commit a729af0e authored Aug 25, 2020 by Martin Storsjo Committed by Alexandre Julliard Aug 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

signal_arm64.c dlls/ntdll/signal_arm64.c +2 -0

exception.c dlls/ntdll/tests/exception.c +4 -0

No files found.
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -889,6 +889,8 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc,

    TRACE( "type %x pc %lx sp %lx func %lx\n", type, pc, context->Sp, base + func->BeginAddress );

+    *handler_data = NULL;
+
    if (func->u.s.Flag)
        handler = unwind_packed_data( base, pc, func, context, ctx_ptr );
    else

--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -4331,6 +4331,10 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test )
        else
        {
            ok( handler == NULL, "%u/%u: handler %p instead of NULL\n", testnum, i, handler );
+            ok( data == (test->results[i].handler < 0 ?
+                        (void *)0xdeadbeef : NULL),
+                "%u/%u: handler data set to %p/%p\n", testnum, i, data,
+                (test->results[i].handler < 0 ? (void *)0xdeadbeef : NULL) );
        }

        ok( context.Pc == test->results[i].pc, "%u/%u: wrong pc %p/%p\n",