ntdll: Fix nested exceptions on arm64.

This mirrors ae07938b (from x86_64) to arm64. Signed-off-by: Martin Storsjo <martin@martin.st> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Fix nested exceptions on arm64.
0a6e46e4 · Martin Storsjo · Alexandre Julliard · b09acd52 · 0a6e46e4
Commit 0a6e46e4 authored Oct 06, 2020 by Martin Storsjo Committed by Alexandre Julliard Oct 06, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

No files found.
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -315,10 +315,10 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT 
 static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
                                               CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher )
 {
-    if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) return ExceptionContinueSearch;
+    if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)))
+        rec->ExceptionFlags |= EH_NESTED_CALL;

-    /* FIXME */
-    return ExceptionNestedException;
+    return ExceptionContinueSearch;
 }