Module: wine Branch: master Commit: 2b6e32f3585823c9708c70aa70aa70036ca8f957 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b6e32f3585823c9708c70aa70aa700...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Jun 14 11:15:36 2023 +0200
ntdll: Don't define stdcall functions on non-i386.
---
dlls/ntdll/exception.c | 9 +++++++-- dlls/ntdll/signal_arm.c | 8 ++++---- dlls/ntdll/signal_arm64.c | 8 ++++---- dlls/ntdll/signal_x86_64.c | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index f6855bf651e..48d79c0cd18 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -670,7 +670,6 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) __ENDTRY return FALSE; } -__ASM_STDCALL_IMPORT(IsBadStringPtrA,8)
/************************************************************* * IsBadStringPtrW @@ -692,8 +691,14 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) __ENDTRY return FALSE; } -__ASM_STDCALL_IMPORT(IsBadStringPtrW,8)
+#ifdef __i386__ +__ASM_STDCALL_IMPORT(IsBadStringPtrA,8) +__ASM_STDCALL_IMPORT(IsBadStringPtrW,8) +#else +__ASM_GLOBAL_IMPORT(IsBadStringPtrA) +__ASM_GLOBAL_IMPORT(IsBadStringPtrW) +#endif
/********************************************************************** * RtlGetEnabledExtendedFeatures (NTDLL.@) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 73759191bea..f5b2f8c1252 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -103,7 +103,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ -__ASM_STDCALL_FUNC( RtlCaptureContext, 4, +__ASM_GLOBAL_FUNC( RtlCaptureContext, "str r1, [r0, #0x8]\n\t" /* context->R1 */ "mov r1, #0x0200000\n\t" /* CONTEXT_ARM */ "add r1, r1, #0x7\n\t" /* CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_FLOATING_POINT */ @@ -1451,7 +1451,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, /*********************************************************************** * RtlRaiseException (NTDLL.@) */ -__ASM_STDCALL_FUNC( RtlRaiseException, 4, +__ASM_GLOBAL_FUNC( RtlRaiseException, "push {r0, lr}\n\t" __ASM_EHABI(".save {r0, lr}\n\t") __ASM_SEH(".seh_save_regs {r0, lr}\n\t") @@ -1498,11 +1498,11 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "udf #0xfe; bx lr; nop; nop; nop; nop" ); +__ASM_GLOBAL_FUNC( DbgBreakPoint, "udf #0xfe; bx lr; nop; nop; nop; nop" );
/********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "udf #0xfe; bx lr; nop; nop; nop; nop" ); +__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "udf #0xfe; bx lr; nop; nop; nop; nop" );
#endif /* __arm__ */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index a19aa2f54b0..dfc5c0e31ed 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -110,7 +110,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "ret") /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ -__ASM_STDCALL_FUNC( RtlCaptureContext, 8, +__ASM_GLOBAL_FUNC( RtlCaptureContext, "str xzr, [x0, #0x8]\n\t" /* context->X0 */ "stp x1, x2, [x0, #0x10]\n\t" /* context->X1,X2 */ "stp x3, x4, [x0, #0x20]\n\t" /* context->X3,X4 */ @@ -1489,7 +1489,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, /*********************************************************************** * RtlRaiseException (NTDLL.@) */ -__ASM_STDCALL_FUNC( RtlRaiseException, 4, +__ASM_GLOBAL_FUNC( RtlRaiseException, "sub sp, sp, #0x3b0\n\t" /* 0x390 (context) + 0x20 */ "stp x29, x30, [sp]\n\t" __ASM_SEH(".seh_stackalloc 0x3b0\n\t") @@ -1535,14 +1535,14 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "brk #0xf000; ret" +__ASM_GLOBAL_FUNC( DbgBreakPoint, "brk #0xf000; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" );
/********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "brk #0xf000; ret" +__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "brk #0xf000; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" );
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index d514ece8787..66cabfd5e64 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1614,14 +1614,14 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret" +__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" );
/********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret" +__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" );