[PATCH 1/2] ntdll: Clear ExceptionFlags on arm64 after running an exception handler

Martin Storsjo martin at martin.st
Tue Oct 6 03:49:42 CDT 2020


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

Signed-off-by: Martin Storsjo <martin at martin.st>
---
This fixes one aspect of
https://github.com/microsoft/compiler-tests/blob/master/seh/seh0027.c
on arm64.
---
 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 c9f44e92d30..cc620eb1b46 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;
 }
-- 
2.17.1




More information about the wine-devel mailing list