[PATCH 0/1] MR6341: vcruntime140_1: Store exception record in ExceptionInformation[6] during unwinding.

[Piotr Caban (＠piotr)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6341

[PATCH 1/1] vcruntime140_1: Store exception record in ExceptionInformation[6] during unwinding.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 dlls/msvcrt/handler4.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c
index 8ffdbdbf063..e05a9528b24 100644
--- a/dlls/msvcrt/handler4.c
+++ b/dlls/msvcrt/handler4.c
@@ -400,8 +400,8 @@ static void CALLBACK cxx_catch_cleanup(BOOL normal, void *c)
 
 static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec)
 {
-    EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[4];
-    EXCEPTION_RECORD *untrans_rec = (void*)rec->ExceptionInformation[6];
+    EXCEPTION_RECORD *untrans_rec = (void*)rec->ExceptionInformation[4];
+    EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[6];
     CONTEXT *context = (void*)rec->ExceptionInformation[7];
     EXCEPTION_POINTERS ep = { prev_rec, context };
     cxx_catch_ctx ctx;
@@ -534,9 +534,10 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context,
             catch_record.ExceptionInformation[1] = orig_frame;
             catch_record.ExceptionInformation[2] = tryblock.catch_level;
             catch_record.ExceptionInformation[3] = tryblock.start_level;
-            catch_record.ExceptionInformation[4] = (ULONG_PTR)rec;
+            catch_record.ExceptionInformation[4] = (ULONG_PTR)untrans_rec;
             catch_record.ExceptionInformation[5] = (ULONG_PTR)rtti_rva(ci.handler, dispatch->ImageBase);
-            catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec;
+            /* 3ds Max plugin expect ExceptionInformation[6] to contain exception record */
+            catch_record.ExceptionInformation[6] = (ULONG_PTR)rec;
             catch_record.ExceptionInformation[7] = (ULONG_PTR)context;
             if (ci.ret_addr[0])
             {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6341

[PATCH 1/1] vcruntime140_1: Store exception record in ExceptionInformation[6] during unwinding.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=147934

Your paranoid android.


=== debian11b (64 bit WoW report) ===

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000006100E8, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032