[PATCH v2 0/2] MR5333: vcruntime140_1: Pass original frame to catch block on stack.

[Daniel Lehman (＠dlehman25)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56451

local variables with alignas(32) or higher may cause the unwinding code to
fetch the original frame from a different spot on the stack from where
the catch block code places it

--
  v2: Apply 1 suggestion(s) to 1 file(s)
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5333

[PATCH v2 1/2] vcruntime140_1: Pass original frame to catch block on stack.

[Daniel Lehman]

From: Daniel Lehman <dlehman25(a)gmail.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56451

local variables with alignas(32) or higher may cause the unwinding code to
fetch the original frame from a different spot on the stack from where
the catch block code places it
---
 dlls/msvcrt/handler4.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c
index 2e225b21458..4360b3fbc46 100644
--- a/dlls/msvcrt/handler4.c
+++ b/dlls/msvcrt/handler4.c
@@ -27,6 +27,7 @@
 
 #include "wine/exception.h"
 #include "wine/debug.h"
+#include "wine/asm.h"
 #include "cppexcept.h"
 #include "msvcrt.h"
 
@@ -522,13 +523,28 @@ static void CALLBACK cxx_catch_cleanup(BOOL normal, void *c)
     FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx->unwind_state);
 }
 
+typedef void* (__cdecl *handler_function)(ULONG64, ULONG64);
+void* __cdecl catch_block_wrapper(handler_function handler, ULONG64 frame);
+__ASM_GLOBAL_FUNC( catch_block_wrapper,
+                   "subq $0x28,%rsp\n\t"
+                   __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t")
+                   __ASM_SEH(".seh_stackalloc 0x28\n\t")
+                   __ASM_SEH(".seh_endprologue\n\t")
+                   "movq %rcx, %rax\n\t"
+                   "movq %rdx, 0x10(%rsp)\n\t"  /* pass frame on stack in addition to register */
+                   "xorq %rcx, %rcx\n\t"
+                   "callq *%rax\n\t"            /* call catch(0, frame) */
+                   "addq $0x28,%rsp\n\t"
+                   __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t")
+                   "ret")
+
 static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec)
 {
     ULONG64 frame = rec->ExceptionInformation[1];
     EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[4];
     EXCEPTION_RECORD *untrans_rec = (void*)rec->ExceptionInformation[6];
     CONTEXT *context = (void*)rec->ExceptionInformation[7];
-    void* (__cdecl *handler)(ULONG64 unk, ULONG64 rbp) = (void*)rec->ExceptionInformation[5];
+    handler_function handler = (handler_function)rec->ExceptionInformation[5];
     EXCEPTION_POINTERS ep = { prev_rec, context };
     cxx_catch_ctx ctx;
     void *ret_addr = NULL;
@@ -545,7 +561,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec)
     {
         __TRY
         {
-            ret_addr = handler(0, frame);
+            ret_addr = catch_block_wrapper(handler, frame);
         }
         __EXCEPT_CTX(cxx_rethrow_filter, &ctx)
         {
-- 
GitLab


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

[PATCH v2 2/2] Apply 1 suggestion(s) to 1 file(s)

[Piotr Caban]

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

---
 dlls/msvcrt/handler4.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c
index 4360b3fbc46..01187a3e75d 100644
--- a/dlls/msvcrt/handler4.c
+++ b/dlls/msvcrt/handler4.c
@@ -530,10 +530,10 @@ __ASM_GLOBAL_FUNC( catch_block_wrapper,
                    __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t")
                    __ASM_SEH(".seh_stackalloc 0x28\n\t")
                    __ASM_SEH(".seh_endprologue\n\t")
-                   "movq %rcx, %rax\n\t"
+                   "movq %rcx, 0x0(%rsp)\n\t"
+                   "movl $0x100, 0x8(%rsp)\n\t"
                    "movq %rdx, 0x10(%rsp)\n\t"  /* pass frame on stack in addition to register */
-                   "xorq %rcx, %rcx\n\t"
-                   "callq *%rax\n\t"            /* call catch(0, frame) */
+                   "callq *%rax\n\t"            /* call catch(catch, frame) */
                    "addq $0x28,%rsp\n\t"
                    __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t")
                    "ret")
-- 
GitLab

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