Skip to content

W
wine-cw
Commit b5b454c5 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Handle seh exception rethrowing in catch_function_nested_handler.

parent b4d30e92
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 7 deletions
dlls/msvcrt/except_i386.c
View file @ b5b454c5
...@@ -374,23 +374,28 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG ...@@ -374,23 +374,28 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG
{ {
PEXCEPTION_RECORD prev_rec = nested_frame->rec; PEXCEPTION_RECORD prev_rec = nested_frame->rec;
if((rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) || if((rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) ||
(rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && (prev_rec->ExceptionCode == CXX_EXCEPTION &&
rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] &&
rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2])) rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2]))
{ {
/* exception was rethrown */ /* exception was rethrown */
rec->ExceptionInformation[1] = prev_rec->ExceptionInformation[1]; *rec = *prev_rec;
rec->ExceptionInformation[2] = prev_rec->ExceptionInformation[2]; rec->ExceptionFlags &= ~EH_UNWINDING;
TRACE("detect rethrow: re-propagate: obj: %lx, type: %lx\n", if(TRACE_ON(seh)) {
rec->ExceptionInformation[1], rec->ExceptionInformation[2]); TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode);
if(rec->ExceptionCode == CXX_EXCEPTION)
TRACE("re-propage: obj: %lx, type: %lx\n",
rec->ExceptionInformation[1], rec->ExceptionInformation[2]);
}
} }
else if (nested_frame->prev_rec && else if (nested_frame->prev_rec && nested_frame->prev_rec->ExceptionCode == CXX_EXCEPTION &&
nested_frame->prev_rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && nested_frame->prev_rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] &&
nested_frame->prev_rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2]) nested_frame->prev_rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2])
{ {
TRACE("detect threw new exception in catch block - not owning old(obj: %lx type: %lx)\n", TRACE("detect threw new exception in catch block - not owning old(obj: %lx type: %lx)\n",
prev_rec->ExceptionInformation[1], prev_rec->ExceptionInformation[2]); prev_rec->ExceptionInformation[1], prev_rec->ExceptionInformation[2]);
} }
else { else if (prev_rec->ExceptionCode == CXX_EXCEPTION) {
/* new exception in exception handler, destroy old */ /* new exception in exception handler, destroy old */
void *object = (void*)prev_rec->ExceptionInformation[1]; void *object = (void*)prev_rec->ExceptionInformation[1];
cxx_exception_type *info = (cxx_exception_type*) prev_rec->ExceptionInformation[2]; cxx_exception_type *info = (cxx_exception_type*) prev_rec->ExceptionInformation[2];
...@@ -399,6 +404,10 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG ...@@ -399,6 +404,10 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG
if(info && info->destructor) if(info && info->destructor)
call_dtor( info->destructor, object ); call_dtor( info->destructor, object );
} }
else
{
TRACE("detect threw new exception in catch block\n");
}
} }
return cxx_frame_handler( rec, nested_frame->cxx_frame, context, return cxx_frame_handler( rec, nested_frame->cxx_frame, context,
......
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