ntdll: Pass a nonnull handler_data in when continuing after a collided unwind.

This matches what was done for RtlUnwindEx in 93ecc54a, applying the same change in call_function_handlers (when called from raise_exception). Signed-off-by: Martin Storsjo <martin@martin.st> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Pass a nonnull handler_data in when continuing after a collided unwind.
8e4f0b2a · Martin Storsjo · Alexandre Julliard · d6e97952 · 8e4f0b2a
Commit 8e4f0b2a authored May 28, 2020 by Martin Storsjo Committed by Alexandre Julliard May 28, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -859,7 +859,7 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con
                dispatch.ContextRecord = &context;
                RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase,
                                  dispatch.ControlPc, dispatch.FunctionEntry,
-                                  &context, NULL, &frame, NULL );
+                                  &context, &dispatch.HandlerData, &frame, NULL );
                goto unwind_done;
            }
            default:
@@ -889,7 +889,7 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con
                dispatch.ContextRecord = &context;
                RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase,
                                  dispatch.ControlPc, dispatch.FunctionEntry,
-                                  &context, NULL, &frame, NULL );
+                                  &context, &dispatch.HandlerData, &frame, NULL );
                teb_frame = teb_frame->Prev;
                goto unwind_done;
            }