Jacek Caban : ntdll: Export _chkstk from importlib.
Alexandre Julliard
julliard at winehq.org
Tue May 5 14:48:52 CDT 2020
Module: wine
Branch: master
Commit: 93d1eecb6aa4f911e4bf4ea2b32969b21588292c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=93d1eecb6aa4f911e4bf4ea2b32969b21588292c
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue May 5 16:28:42 2020 +0200
ntdll: Export _chkstk from importlib.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernel32/kernel32.spec | 2 +-
dlls/kernelbase/kernelbase.spec | 2 +-
dlls/ntdll/ntdll.spec | 4 ++--
dlls/ntdll/signal_i386.c | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 5d083b0142..0dd3813987 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -1640,7 +1640,7 @@
@ stdcall WriteTapemark(ptr long long long)
@ stdcall -import ZombifyActCtx(ptr)
@ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler
-@ stdcall -arch=arm,x86_64 -private -norelay __chkstk() ntdll.__chkstk
+@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk
@ stub _DebugOut
@ stub _DebugPrintf
@ stdcall _hread(long ptr long)
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index e9a93e551d..e73682af0f 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1736,7 +1736,7 @@
# @ stub _GetMUIStringFromCache
# @ stub _OpenMuiStringCache
@ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler
-@ stdcall -arch=arm,x86_64 -private -norelay __chkstk() ntdll.__chkstk
+@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk
# @ stub __dllonexit3
@ stub __misaligned_access
# @ stub __wgetmainargs
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index b2e467c70c..b19b334bb4 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1413,7 +1413,7 @@
@ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin
@ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt
@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr)
-@ stdcall -private -arch=arm,x86_64 -norelay __chkstk()
+@ cdecl -arch=arm,x86_64 -norelay __chkstk()
@ cdecl __isascii(long) NTDLL___isascii
@ cdecl __iscsym(long) NTDLL___iscsym
@ cdecl __iscsymf(long) NTDLL___iscsymf
@@ -1430,7 +1430,7 @@
@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64)
@ stdcall -arch=i386 -ret64 _aullrem(int64 int64)
@ stdcall -arch=i386 -ret64 _aullshr(int64 long)
-@ stdcall -private -arch=i386 -norelay _chkstk()
+@ cdecl -arch=i386 -norelay _chkstk()
@ stub _fltused
@ cdecl -arch=i386 -ret64 _ftol() NTDLL__ftol
@ cdecl _i64toa(int64 ptr long)
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index e905ed0af1..5396037502 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -3050,7 +3050,7 @@ __ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" )
/**************************************************************************
* _chkstk (NTDLL.@)
*/
-__ASM_STDCALL_FUNC( _chkstk, 0,
+__ASM_GLOBAL_FUNC( _chkstk,
"negl %eax\n\t"
"addl %esp,%eax\n\t"
"xchgl %esp,%eax\n\t"
@@ -3061,7 +3061,7 @@ __ASM_STDCALL_FUNC( _chkstk, 0,
/**************************************************************************
* _alloca_probe (NTDLL.@)
*/
-__ASM_STDCALL_FUNC( _alloca_probe, 0,
+__ASM_GLOBAL_FUNC( _alloca_probe,
"negl %eax\n\t"
"addl %esp,%eax\n\t"
"xchgl %esp,%eax\n\t"
More information about the wine-cvs
mailing list