[PATCH 0/1] MR2418: ucrtbase: adding CxxFrameHandler4 to spec

[James McDonnell (＠ElementalWarrior)]

Add missing function to spec for affinity photo

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

[PATCH 1/1] ucrtbase: adding CxxFrameHandler4 to spec

[James McDonnell]

From: James McDonnell <topgamer7(a)gmail.com>

---
 dlls/ucrtbase/ucrtbase.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index c7bff96ee26..a55b038cb7d 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -54,6 +54,7 @@
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler(ptr ptr ptr ptr)
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler
+@ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler4(ptr ptr ptr ptr) __CxxFrameHandler
 @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
 @ cdecl -arch=i386,x86_64,arm,arm64 __CxxQueryExceptionSize()
 @ cdecl __CxxRegisterExceptionObject(ptr ptr)
-- 
GitLab

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

[Piotr Caban (＠piotr)]

Piotr Caban (@piotr) commented about dlls/ucrtbase/ucrtbase.spec:
> @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler(ptr ptr ptr ptr)
>  @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler
>  @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler
> +@ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler4(ptr ptr ptr ptr) __CxxFrameHandler
> The `__CxxFrameHandler4` is x86_64 only export. `__CxxFrameHandler` can't be used as the implementation (it stores exception related information differently).

The function is partially implemented in vcruntime140_1.dll. It would be best to move except_x86_64.c file to dlls/msvcrt directory and use PARENTSRC in vcruntime140 to avoid code duplication.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2418#note_27029

[PATCH 0/1] MR2418: ucrtbase: adding CxxFrameHandler4 to spec - closed

[Piotr Caban (＠piotr)]

This merge request was closed by Piotr Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2418

[Piotr Caban (＠piotr)]

The implementation from !2506 was merged.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2418#note_28183