Skip to content

W
wine-winehq
Commit 9f4c0c4d authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard
Browse files
Options

ntdll: Set EH_NESTED_CALL flag in call_stack_handlers() on x64.

parent e5679b5f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
dlls/ntdll/signal_x86_64.c
View file @ 9f4c0c4d
......@@ -351,7 +351,7 @@ static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_
CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher )
{
if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)))
rec->ExceptionFlags |= EH_NESTED_CALL;
return ExceptionNestedException;
return ExceptionContinueSearch;
}
......@@ -360,7 +360,6 @@ static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_
* call_handler
*
* Call a single exception handler.
* FIXME: Handle nested exceptions.
*/
static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch )
{
......@@ -447,7 +446,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex
case ExceptionContinueSearch:
break;
case ExceptionNestedException:
FIXME_(seh)( "nested exception\n" );
rec->ExceptionFlags |= EH_NESTED_CALL;
TRACE_(seh)( "nested exception\n" );
break;
case ExceptionCollidedUnwind: {
ULONG64 frame;
......@@ -477,7 +477,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex
case ExceptionContinueSearch:
break;
case ExceptionNestedException:
FIXME_(seh)( "nested exception\n" );
rec->ExceptionFlags |= EH_NESTED_CALL;
TRACE_(seh)( "nested exception\n" );
break;
case ExceptionCollidedUnwind: {
ULONG64 frame;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment