msvcrt: Hook up __C_specific_handler and __jump_unwind for arm.

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

Also hook them up similarly in msvcr110, msvcr120 and msvcr120_app.

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Martin Storsjö 2022-05-15 14:49:46 +03:00 committed by Alexandre Julliard
parent e2d79b395d
commit ce4fdb1517
4 changed files with 8 additions and 7 deletions

View File

@ -872,7 +872,7 @@
@ cdecl __AdjustPointer(ptr ptr) @ cdecl __AdjustPointer(ptr ptr)
@ stub __BuildCatchObject @ stub __BuildCatchObject
@ stub __BuildCatchObjectHelper @ stub __BuildCatchObjectHelper
@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler
@ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr)
@ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr)
@ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr)
@ -948,7 +948,7 @@
@ cdecl __iscsymf(long) @ cdecl __iscsymf(long)
@ stub __iswcsym @ stub __iswcsym
@ stub __iswcsymf @ stub __iswcsymf
@ stub -arch=arm __jump_unwind @ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind
# extern __lconv # extern __lconv
@ cdecl __lconv_init() @ cdecl __lconv_init()
@ cdecl -arch=i386 -norelay __libm_sse2_acos() @ cdecl -arch=i386 -norelay __libm_sse2_acos()

View File

@ -856,7 +856,7 @@
@ cdecl __AdjustPointer(ptr ptr) @ cdecl __AdjustPointer(ptr ptr)
@ stub __BuildCatchObject @ stub __BuildCatchObject
@ stub __BuildCatchObjectHelper @ stub __BuildCatchObjectHelper
@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler
@ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr)
@ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr)
@ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr)
@ -938,7 +938,7 @@
@ cdecl __iscsymf(long) @ cdecl __iscsymf(long)
@ stub __iswcsym @ stub __iswcsym
@ stub __iswcsymf @ stub __iswcsymf
@ stub -arch=arm __jump_unwind @ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind
# extern __lconv # extern __lconv
@ cdecl __lconv_init() @ cdecl __lconv_init()
@ cdecl -arch=i386 -norelay __libm_sse2_acos() @ cdecl -arch=i386 -norelay __libm_sse2_acos()

View File

@ -850,7 +850,7 @@
@ cdecl __AdjustPointer(ptr ptr) msvcr120.__AdjustPointer @ cdecl __AdjustPointer(ptr ptr) msvcr120.__AdjustPointer
@ stub __BuildCatchObject @ stub __BuildCatchObject
@ stub __BuildCatchObjectHelper @ stub __BuildCatchObjectHelper
@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) msvcr120.__C_specific_handler @ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) msvcr120.__C_specific_handler
@ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr) msvcr120.__CppXcptFilter @ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr) msvcr120.__CppXcptFilter
@ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) msvcr120.__CxxDetectRethrow @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) msvcr120.__CxxDetectRethrow
@ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) msvcr120.__CxxExceptionFilter @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) msvcr120.__CxxExceptionFilter
@ -914,7 +914,7 @@
@ cdecl __iscsymf(long) msvcr120.__iscsymf @ cdecl __iscsymf(long) msvcr120.__iscsymf
@ stub __iswcsym @ stub __iswcsym
@ stub __iswcsymf @ stub __iswcsymf
@ stub -arch=arm __jump_unwind @ stdcall -arch=arm __jump_unwind(ptr ptr) msvcr120.__jump_unwind
# extern __lconv # extern __lconv
@ cdecl __lconv_init() msvcr120.__lconv_init @ cdecl __lconv_init() msvcr120.__lconv_init
@ cdecl -arch=i386 -norelay __libm_sse2_acos() msvcr120.__libm_sse2_acos @ cdecl -arch=i386 -norelay __libm_sse2_acos() msvcr120.__libm_sse2_acos

View File

@ -172,7 +172,7 @@
@ extern _HUGE MSVCRT__HUGE @ extern _HUGE MSVCRT__HUGE
@ cdecl _Strftime(ptr long str ptr ptr) @ cdecl _Strftime(ptr long str ptr ptr)
@ cdecl _XcptFilter(long 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) @ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr)
# stub __CxxCallUnwindDelDtor # stub __CxxCallUnwindDelDtor
# stub __CxxCallUnwindDtor # stub __CxxCallUnwindDtor
@ -218,6 +218,7 @@
@ cdecl __isascii(long) @ cdecl __isascii(long)
@ cdecl __iscsym(long) @ cdecl __iscsym(long)
@ cdecl __iscsymf(long) @ cdecl __iscsymf(long)
@ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind
@ extern __lc_codepage MSVCRT___lc_codepage @ extern __lc_codepage MSVCRT___lc_codepage
@ stub __lc_collate @ stub __lc_collate
@ extern __lc_collate_cp MSVCRT___lc_collate_cp @ extern __lc_collate_cp MSVCRT___lc_collate_cp