Martin Storsjo : ntdll: Clear ExceptionFlags on arm64 after running an exception handler.

Alexandre Julliard julliard at winehq.org
Tue Oct 6 15:33:10 CDT 2020


Module: wine
Branch: master
Commit: b09acd526d0093962131ff900445cc2dae1f33c4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b09acd526d0093962131ff900445cc2dae1f33c4

Author: Martin Storsjo <martin at martin.st>
Date:   Tue Oct  6 11:49:42 2020 +0300

ntdll: Clear ExceptionFlags on arm64 after running an exception handler.

This applies the beahviour from a69762541a18107fbd8e9fb8362c3af8ddf1d90b
(on x86_64) to arm64 as well.

Signed-off-by: Martin Storsjo <martin at martin.st>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/signal_arm64.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c
index c9f44e92d3..cc620eb1b4 100644
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -341,6 +341,7 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C
     res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch );
     TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res );
 
+    rec->ExceptionFlags &= EH_NONCONTINUABLE;
     __wine_pop_frame( &frame );
     return res;
 }




More information about the wine-cvs mailing list