Piotr Caban : msvcrt: Update previous exception stored in cxx_frame_info after frames unwinding.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Mar 23 11:21:02 CDT 2016
Module: wine
Branch: master
Commit: 97567074a5c221a1fc1db221b3e74015b7d43e79
URL: http://source.winehq.org/git/wine.git/?a=commit;h=97567074a5c221a1fc1db221b3e74015b7d43e79
Author: Piotr Caban <piotr at codeweavers.com>
Date: Wed Mar 23 10:44:08 2016 +0100
msvcrt: Update previous exception stored in cxx_frame_info after frames unwinding.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcrt/except_i386.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c
index 3debece..dd807c4 100644
--- a/dlls/msvcrt/except_i386.c
+++ b/dlls/msvcrt/except_i386.c
@@ -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",
More information about the wine-cvs
mailing list