ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Pass catch_func_nested_frame struct to cxx_frame_handler. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-01-13 14:44:18 +01:00 committed by Alexandre Julliard
parent 8d05256172
commit ea20974cdd
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dlls/msvcrt/except_i386.c
View File

@ -96,6 +96,16 @@ typedef struct __cxx_function_descr
UINT flags; /* flags when magic >= VC8 */ UINT flags; /* flags when magic >= VC8 */
} cxx_function_descr; } cxx_function_descr;
/* exception frame for nested exceptions in catch block */
typedef struct
{
EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */
cxx_exception_frame *cxx_frame; /* frame of parent exception */
const cxx_function_descr *descr; /* descriptor of parent exception */
int trylevel; /* current try level */
cxx_frame_info frame_info;
} catch_func_nested_frame;
typedef struct typedef struct
{ {
cxx_exception_frame *frame; cxx_exception_frame *frame;
@ -135,7 +145,7 @@ typedef struct
DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame,
PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch,
const cxx_function_descr *descr, const cxx_function_descr *descr,
EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ) DECLSPEC_HIDDEN; catch_func_nested_frame* nested_frame ) DECLSPEC_HIDDEN;
/* call a copy constructor */ /* call a copy constructor */
extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase );
@ -332,21 +342,11 @@ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_des
frame->trylevel = last_level; frame->trylevel = last_level;
} }
/* exception frame for nested exceptions in catch block */
struct catch_func_nested_frame
{
EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */
cxx_exception_frame *cxx_frame; /* frame of parent exception */
const cxx_function_descr *descr; /* descriptor of parent exception */
int trylevel; /* current try level */
cxx_frame_info frame_info;
};
/* handler for exceptions happening while calling a catch function */ /* handler for exceptions happening while calling a catch function */
static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher )
{ {
struct catch_func_nested_frame *nested_frame = (struct catch_func_nested_frame *)frame; catch_func_nested_frame *nested_frame = (catch_func_nested_frame *)frame;
if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))
{ {
@ -382,8 +382,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG
} }
return cxx_frame_handler( rec, nested_frame->cxx_frame, context, return cxx_frame_handler( rec, nested_frame->cxx_frame, context,
NULL, nested_frame->descr, &nested_frame->frame, NULL, nested_frame->descr, nested_frame );
nested_frame->trylevel );
} }
/* find and call the appropriate catch block for an exception */ /* find and call the appropriate catch block for an exception */
@ -397,7 +396,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context,
UINT i; UINT i;
int j; int j;
void *addr, *object = (void *)rec->ExceptionInformation[1]; void *addr, *object = (void *)rec->ExceptionInformation[1];
struct catch_func_nested_frame nested_frame; catch_func_nested_frame nested_frame;
int trylevel = frame->trylevel; int trylevel = frame->trylevel;
DWORD save_esp = ((DWORD*)frame)[-1]; DWORD save_esp = ((DWORD*)frame)[-1];
thread_data_t *data = msvcrt_get_thread_data(); thread_data_t *data = msvcrt_get_thread_data();
@ -560,8 +559,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c )
DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame,
PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch,
const cxx_function_descr *descr, const cxx_function_descr *descr,
EXCEPTION_REGISTRATION_RECORD* nested_frame, catch_func_nested_frame* nested_frame )
int nested_trylevel )
{ {
cxx_exception_type *exc_type; cxx_exception_type *exc_type;
@ -577,7 +575,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame
if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND))
{ {
if (descr->unwind_count && !nested_trylevel) cxx_local_unwind( frame, descr, -1 ); if (descr->unwind_count && !nested_frame) cxx_local_unwind( frame, descr, -1 );
return ExceptionContinueSearch; return ExceptionContinueSearch;
} }
if (!descr->tryblock_count) return ExceptionContinueSearch; if (!descr->tryblock_count) return ExceptionContinueSearch;
@ -602,8 +600,9 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame
if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 && if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 &&
exc_type->custom_handler) exc_type->custom_handler)
{ {
return exc_type->custom_handler( rec, frame, context, dispatch, return exc_type->custom_handler( rec, frame, context, dispatch, descr,
descr, nested_trylevel, nested_frame, 0 ); nested_frame ? nested_frame->trylevel : 0,
nested_frame ? &nested_frame->frame : NULL, 0 );
} }
if (TRACE_ON(seh)) if (TRACE_ON(seh))
@ -628,7 +627,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame
ctx.frame = frame; ctx.frame = frame;
ctx.descr = descr; ctx.descr = descr;
ctx.nested_frame = nested_frame; ctx.nested_frame = nested_frame ? &nested_frame->frame : NULL;
__TRY __TRY
{ {
except_ptrs.ExceptionRecord = rec; except_ptrs.ExceptionRecord = rec;
@ -643,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame
} }
call_catch_block( rec, context, frame, descr, call_catch_block( rec, context, frame, descr,
frame->trylevel, nested_frame, exc_type ); frame->trylevel, nested_frame ? &nested_frame->frame : NULL, exc_type );
return ExceptionContinueSearch; return ExceptionContinueSearch;
} }
@ -654,23 +653,21 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame
extern DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, extern DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame,
PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch );
__ASM_GLOBAL_FUNC( __CxxFrameHandler, __ASM_GLOBAL_FUNC( __CxxFrameHandler,
"pushl $0\n\t" /* nested_trylevel */
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
"pushl $0\n\t" /* nested_frame */ "pushl $0\n\t" /* nested_frame */
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
"pushl %eax\n\t" /* descr */ "pushl %eax\n\t" /* descr */
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
"pushl 28(%esp)\n\t" /* dispatch */ "pushl 24(%esp)\n\t" /* dispatch */
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
"pushl 28(%esp)\n\t" /* context */ "pushl 24(%esp)\n\t" /* context */
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
"pushl 28(%esp)\n\t" /* frame */ "pushl 24(%esp)\n\t" /* frame */
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
"pushl 28(%esp)\n\t" /* rec */ "pushl 24(%esp)\n\t" /* rec */
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
"call " __ASM_NAME("cxx_frame_handler") "\n\t" "call " __ASM_NAME("cxx_frame_handler") "\n\t"
"add $28,%esp\n\t" "add $24,%esp\n\t"
__ASM_CFI(".cfi_adjust_cfa_offset -28\n\t") __ASM_CFI(".cfi_adjust_cfa_offset -24\n\t")
"ret" ) "ret" )