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

msvcrt: Update previous exception stored in cxx_frame_info after frames unwinding. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2016-03-23 10:44:08 +01:00 committed by Alexandre Julliard
parent f24526e79f
commit 97567074a5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/msvcrt/except_i386.c
View File

@ -412,6 +412,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame
struct catch_func_nested_frame nested_frame;
int trylevel = frame->trylevel;
DWORD save_esp = ((DWORD*)frame)[-1];
thread_data_t *data;
for (i = 0; i < descr->tryblock_count; i++)
{
@ -452,7 +453,10 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame
RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 );
cxx_local_unwind( frame, descr, tryblock->start_level );
frame->trylevel = tryblock->end_level + 1;
msvcrt_get_thread_data()->exc_record = rec;
data = msvcrt_get_thread_data();
nested_frame.frame_info.rec = data->exc_record;
data->exc_record = rec;
/* call the catch block */
TRACE( "calling catch block %p addr %p ebp %p\n",