Piotr Caban : msvcrt: Restore exception object stored in thread storage after frames unwinding.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fdcdbf306a7339c486c69346bcff0e6d5e0e58a9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fdcdbf306a7339c486c69346bc...

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Mon Mar 21 19:16:02 2016 +0100

msvcrt: Restore exception object stored in thread storage after frames unwinding.

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/msvcrt/except_i386.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c
index 418c68b..9adda79 100644
--- a/dlls/msvcrt/except_i386.c
+++ b/dlls/msvcrt/except_i386.c
@@ -450,6 +450,7 @@ 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;
 
             /* call the catch block */
             TRACE( "calling catch block %p addr %p ebp %p\n",