[PATCH 0/1] MR70: msvcrt: Hook up __C_specific_handler and __jump_unwind for arm

[Martin Storsjö]

This was set up for arm in ntdll and ucrtbase in
3ef9a04f9181fb7d28832c60b5439337460005b6, but msvcrt was missed.

Signed-off-by: Martin Storsjö <martin(a)martin.st>

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

[PATCH 1/1] msvcrt: Hook up __C_specific_handler and __jump_unwind for arm

[Martin Storsjö]

From: Martin Storsjö <martin(a)martin.st>

This was set up for arm in ntdll and ucrtbase in
3ef9a04f9181fb7d28832c60b5439337460005b6, but msvcrt was missed.

Signed-off-by: Martin Storsjö <martin(a)martin.st>
---
 dlls/msvcrt/msvcrt.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index de7cf0116d8..3aab3600e1d 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -172,7 +172,7 @@
 @ extern _HUGE MSVCRT__HUGE
 @ cdecl _Strftime(ptr long str ptr ptr)
 @ cdecl _XcptFilter(long ptr)
-@ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler
+@ stdcall -arch=x86_64,arm,arm64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler
 @ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr)
 # stub __CxxCallUnwindDelDtor
 # stub __CxxCallUnwindDtor
@@ -218,6 +218,7 @@
 @ cdecl __isascii(long)
 @ cdecl __iscsym(long)
 @ cdecl __iscsymf(long)
+@ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind
 @ extern __lc_codepage MSVCRT___lc_codepage
 @ stub __lc_collate
 @ extern __lc_collate_cp MSVCRT___lc_collate_cp
-- 
GitLab

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

[Piotr Caban (＠piotr)]

> This was set up for arm in ntdll and ucrtbase in 3ef9a04f9181fb7d28832c60b5439337460005b6, but msvcrt was missed.
> Could you please also add it to other msvcrXX.dlls? There's a __jump_unwind stub in msvcr110 and msvcr120.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/70#note_880