winebuild: Use stdcall for fastcall wrappers.

This allows catching mismatched argument lists. Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winebuild: Use stdcall for fastcall wrappers.
26bbbb7b · Alexandre Julliard · 5e1b3b2f · 26bbbb7b · 26bbbb7b · 26bbbb7b
Commit 26bbbb7b authored Mar 01, 2019 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

hal.c dlls/hal/hal.c +2 -2

rtl.c dlls/ntdll/rtl.c +1 -1

ntoskrnl_private.h dlls/ntoskrnl.exe/ntoskrnl_private.h +2 -2

spec32.c tools/winebuild/spec32.c +1 -1

No files found.
--- a/dlls/hal/hal.c
+++ b/dlls/hal/hal.c
@@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl);

 #ifdef __i386__
 #define DEFINE_FASTCALL1_WRAPPER(func) \
-    __ASM_GLOBAL_FUNC( __fastcall_ ## func, \
+    __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \
                       "popl %eax\n\t" \
                       "pushl %ecx\n\t" \
                       "pushl %eax\n\t" \
                       "jmp " __ASM_NAME(#func) __ASM_STDCALL(4) )
 #define DEFINE_FASTCALL_WRAPPER(func,args) \
-    __ASM_GLOBAL_FUNC( __fastcall_ ## func, \
+    __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \
                       "popl %eax\n\t" \
                       "pushl %edx\n\t" \
                       "pushl %ecx\n\t" \

--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll);

 #ifdef __i386__
 #define DEFINE_FASTCALL_WRAPPER(func,args) \
-    __ASM_GLOBAL_FUNC( __fastcall_ ## func, \
+    __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \
                       "popl %eax\n\t" \
                       "pushl %edx\n\t" \
                       "pushl %ecx\n\t" \

--- a/dlls/ntoskrnl.exe/ntoskrnl_private.h
+++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h
@@ -30,13 +30,13 @@ struct _OBJECT_TYPE {

 #ifdef __i386__
 #define DEFINE_FASTCALL1_WRAPPER(func) \
-    __ASM_GLOBAL_FUNC( __fastcall_ ## func, \
+    __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \
                       "popl %eax\n\t" \
                       "pushl %ecx\n\t" \
                       "pushl %eax\n\t" \
                       "jmp " __ASM_NAME(#func) __ASM_STDCALL(4) )
 #define DEFINE_FASTCALL_WRAPPER(func,args) \
-    __ASM_GLOBAL_FUNC( __fastcall_ ## func, \
+    __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \
                       "popl %eax\n\t" \
                       "pushl %edx\n\t" \
                       "pushl %ecx\n\t" \

--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -968,7 +968,7 @@ void output_def_file( DLLSPEC *spec, int include_private )
            else if (strcmp(name, odp->link_name)) /* try to reduce output */
            {
                output( "=%s", odp->link_name );
-                if (!kill_at && target_cpu == CPU_x86 && !(odp->flags & (FLAG_THISCALL | FLAG_FASTCALL)))
+                if (!kill_at && target_cpu == CPU_x86 && !(odp->flags & FLAG_THISCALL))
                    output( "@%d", at_param );
            }
            break;