Piotr Caban : ntdll: Ignore ExceptionFlags changes done by exception handlers.
Module: wine Branch: master Commit: a69762541a18107fbd8e9fb8362c3af8ddf1d90b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a69762541a18107fbd8e9fb83... Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 21 11:33:26 2019 +0200 ntdll: Ignore ExceptionFlags changes done by exception handlers. Fixes exceptions rethrowing in 64-bit .Net. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index fbb2daff90..d8fcc54743 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2390,6 +2390,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; }
participants (1)
-
Alexandre Julliard