Skip to content

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

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

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f24526e7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
dlls/msvcrt/except_i386.c
View file @ 97567074
......@@ -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",
......
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