Paul Gofman : vcruntime140_1: Handle rethrowing from nested try blocks on x64.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c25a611d95a449946273415f0fb3733edd485699
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c25a611d95a449946273415f0...

Author: Paul Gofman <pgofman(a)codeweavers.com>
Date:   Tue Sep  8 23:36:41 2020 +0300

vcruntime140_1: Handle rethrowing from nested try blocks on x64.

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

---

 dlls/vcruntime140_1/except_x86_64.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c
index 0e27b02db1..f66ae43721 100644
--- a/dlls/vcruntime140_1/except_x86_64.c
+++ b/dlls/vcruntime140_1/except_x86_64.c
@@ -103,6 +103,7 @@ typedef struct
     BOOL rethrow;
     INT search_state;
     INT unwind_state;
+    EXCEPTION_RECORD *prev_rec;
 } cxx_catch_ctx;
 
 typedef struct
@@ -473,7 +474,7 @@ static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c)
     FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx->search_state);
     if (rec->ExceptionCode != CXX_EXCEPTION)
         return EXCEPTION_CONTINUE_SEARCH;
-    if (rec->ExceptionInformation[1] == ((EXCEPTION_RECORD*)*__current_exception())->ExceptionInformation[1])
+    if (rec->ExceptionInformation[1] == ctx->prev_rec->ExceptionInformation[1])
         ctx->rethrow = TRUE;
     return EXCEPTION_CONTINUE_SEARCH;
 }
@@ -503,6 +504,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec)
     __CxxRegisterExceptionObject(&ep, &ctx.frame_info);
     ctx.search_state = rec->ExceptionInformation[2];
     ctx.unwind_state = rec->ExceptionInformation[3];
+    ctx.prev_rec = prev_rec;
     (*__processing_throw())--;
     __TRY
     {
@@ -685,6 +687,12 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame,
 
     if (rec->ExceptionCode == CXX_EXCEPTION)
     {
+        if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2])
+        {
+            TRACE("rethrow detected.\n");
+            *rec = *(EXCEPTION_RECORD*)*__current_exception();
+        }
+
         exc_type = (cxx_exception_type *)rec->ExceptionInformation[2];
 
         if (TRACE_ON(seh))