Alexandre Julliard : ntdll: Fix some stdcall/cdecl calling convention mismatches.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8b36885973466ca96d049445521faf8483cf8d7c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8b36885973466ca96d0494455...

Author: Alexandre Julliard 
Date:   Fri Jun 26 20:40:00 2020 +0200

ntdll: Fix some stdcall/cdecl calling convention mismatches.

Signed-off-by: Alexandre Julliard

---

dlls/ntdll/relay.c    | 6 +++---
 dlls/ntdll/resource.c | 2 +-
 dlls/ntdll/rtl.c      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c
index acccf08881..72aeb9eab4 100644
--- a/dlls/ntdll/relay.c
+++ b/dlls/ntdll/relay.c
@@ -395,7 +395,7 @@ DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigne
 }

extern LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx );
-__ASM_GLOBAL_FUNC( relay_call,
+__ASM_STDCALL_FUNC( relay_call, 8,
                    "pushl %ebp\n\t"
                    __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
                    __ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
@@ -414,7 +414,7 @@ __ASM_GLOBAL_FUNC( relay_call,
                    "pushl %esi\n\t"
                    "pushl 12(%ebp)\n\t"
                    "pushl 8(%ebp)\n\t"
-                   "call " __ASM_NAME("relay_trace_entry") "\n\t"
+                   "call " __ASM_STDCALL("relay_trace_entry",16) "\n\t"
                    /* copy the arguments*/
                    "movzwl -16(%ebp),%ecx\n\t"  /* number of args */
                    "jecxz 1f\n\t"
@@ -441,7 +441,7 @@ __ASM_GLOBAL_FUNC( relay_call,
                    "pushl 16(%ebp)\n\t"
                    "pushl 12(%ebp)\n\t"
                    "pushl 8(%ebp)\n\t"
-                   "call " __ASM_NAME("relay_trace_exit") "\n\t"
+                   "call " __ASM_STDCALL("relay_trace_exit",20) "\n\t"
                    /* restore return value and return */
                    "leal -12(%ebp),%esp\n\t"
                    "movl %esi,%eax\n\t"
diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c
index 13b6812808..9dd2f745b6 100644
--- a/dlls/ntdll/resource.c
+++ b/dlls/ntdll/resource.c
@@ -367,7 +367,7 @@ __ASM_STDCALL_FUNC( LdrAccessResource, 16,
     "pushl 16(%ebp)\n\t"
     "pushl 12(%ebp)\n\t"
     "pushl 8(%ebp)\n\t"
-    "call " __ASM_NAME("access_resource") "\n\t"
+    "call " __ASM_STDCALL("access_resource",16) "\n\t"
     "leave\n\t"
     "ret $16"
 )
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 4a4a7b31de..caf00ecdb1 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -439,7 +439,7 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM
 /******************************************************************************
  *  RtlEnumerateGenericTableWithoutSplaying           [NTDLL.@]
  */
-void * RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *previous)
+void * WINAPI RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *previous)
 {
     static int warn_once;

@@ -451,7 +451,7 @@ void * RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *p
 /******************************************************************************
  *  RtlNumberGenericTableElements           [NTDLL.@]
  */
-ULONG RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table)
+ULONG WINAPI RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table)
 {
     FIXME("(%p) stub!\n", table);
     return 0;