msvcrt: Fix handling of multiple nested exceptions.

Save in each nested frame a pointer to the original exception record. Only one refence in thread_data isn't enough when we have multiple nested frames.

msvcrt: Fix handling of multiple nested exceptions.
be07b6db · Peter Beutner · Alexandre Julliard · 62dc7f52 · be07b6db
Commit be07b6db authored Feb 22, 2006 by Peter Beutner Committed by Alexandre Julliard Feb 22, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

cppexcept.c dlls/msvcrt/cppexcept.c +3 -1

No files found.
--- a/dlls/msvcrt/cppexcept.c
+++ b/dlls/msvcrt/cppexcept.c
@@ -229,6 +229,7 @@ struct catch_func_nested_frame
    cxx_exception_frame          *cxx_frame; /* frame of parent exception */
    cxx_function_descr           *descr;     /* descriptor of parent exception */
    int                           trylevel;  /* current try level */
+    EXCEPTION_RECORD             *rec;       /* rec associated with frame */
 };

 /* handler for exceptions happening while calling a catch function */
@@ -247,7 +248,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG

    if(rec->ExceptionCode == CXX_EXCEPTION)
    {
-        PEXCEPTION_RECORD prev_rec = msvcrt_get_thread_data()->exc_record;
+        PEXCEPTION_RECORD prev_rec = nested_frame->rec;
        if(rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0)
        {
            /* exception was rethrown */
@@ -330,6 +331,7 @@ inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame 
            nested_frame.cxx_frame = frame;
            nested_frame.descr     = descr;
            nested_frame.trylevel  = nested_trylevel + 1;
+            nested_frame.rec = rec;

            __wine_push_frame( &nested_frame.frame );
            thread_data->exc_record = rec;