Module: wine Branch: master Commit: 7b68705d3cf5642f7a71e5c18b9bf66a768452c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b68705d3cf5642f7a71e5c18...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Mar 25 19:22:41 2020 +0100
krnl386: Fix some calling convention mismatches.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/krnl386.exe16/selector.c | 18 +++++++++--------- dlls/krnl386.exe16/thunk.c | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 8c45d6af04..765d2ee9b8 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -575,7 +575,7 @@ __ASM_STDCALL_FUNC( SUnMapLS, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_8, 0, "movl 8(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,8(%ebp)\n\t" "ret" )
@@ -584,7 +584,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_8, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_12, 0, "movl 12(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,12(%ebp)\n\t" "ret" )
@@ -593,7 +593,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_12, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_16, 0, "movl 16(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,16(%ebp)\n\t" "ret" )
@@ -602,7 +602,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_16, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_20, 0, "movl 20(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,20(%ebp)\n\t" "ret" )
@@ -611,7 +611,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_20, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_24, 0, "movl 24(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,24(%ebp)\n\t" "ret" )
@@ -620,7 +620,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_24, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_28, 0, "movl 28(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,28(%ebp)\n\t" "ret" )
@@ -629,7 +629,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_28, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_32, 0, "movl 32(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,32(%ebp)\n\t" "ret" )
@@ -638,7 +638,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_32, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_36, 0, "movl 36(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,36(%ebp)\n\t" "ret" )
@@ -647,7 +647,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_36, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_40, 0, "movl 40(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,40(%ebp)\n\t" "ret" )
diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 91a24f19c4..3b54bd4edc 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -148,10 +148,10 @@ SEGPTR CALL32_CBClientEx_RetAddr = 0;
extern int call_entry_point( void *func, int nb_args, const DWORD *args ); extern void __wine_call_from_16_thunk(void); -extern void FT_Prolog(void); -extern void FT_PrologPrime(void); -extern void QT_Thunk(void); -extern void QT_ThunkPrime(void); +extern void WINAPI FT_Prolog(void); +extern void WINAPI FT_PrologPrime(void); +extern void WINAPI QT_Thunk(void); +extern void WINAPI QT_ThunkPrime(void);
/*********************************************************************** * *
-
Alexandre Julliard