Alexandre Julliard : ntdll: Add appropriate stdcall decorations to assembly functions.

Alexandre Julliard julliard at winehq.org
Mon Jun 15 07:59:04 CDT 2009


Module: wine
Branch: master
Commit: e65ebee63f58ab6a63e2ed7cee505bcb94d1b5e6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e65ebee63f58ab6a63e2ed7cee505bcb94d1b5e6

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sun Jun 14 15:34:09 2009 +0200

ntdll: Add appropriate stdcall decorations to assembly functions.

---

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

diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c
index 5f3e845..b9d2a6b 100644
--- a/dlls/ntdll/resource.c
+++ b/dlls/ntdll/resource.c
@@ -357,7 +357,7 @@ static inline NTSTATUS access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_
  * "call access_resource" instruction being there.
  */
 #ifdef __i386__
-__ASM_GLOBAL_FUNC( LdrAccessResource,
+__ASM_STDCALL_FUNC( LdrAccessResource, 16,
     "pushl %ebp\n\t"
     "movl %esp, %ebp\n\t"
     "subl $4,%esp\n\t"
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 4959946..16533b2 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -405,7 +405,7 @@ RtlDeleteSecurityObject( PSECURITY_DESCRIPTOR *ObjectDescriptor )
  * Glorified "enter xxxx".
  */
 #ifdef __i386__
-__ASM_GLOBAL_FUNC( _chkstk,
+__ASM_STDCALL_FUNC( _chkstk, 0,
                    "negl %eax\n\t"
                    "addl %esp,%eax\n\t"
                    "xchgl %esp,%eax\n\t"
@@ -420,7 +420,7 @@ __ASM_GLOBAL_FUNC( _chkstk,
  * Glorified "enter xxxx".
  */
 #ifdef __i386__
-__ASM_GLOBAL_FUNC( _alloca_probe,
+__ASM_STDCALL_FUNC( _alloca_probe, 0,
                    "negl %eax\n\t"
                    "addl %esp,%eax\n\t"
                    "xchgl %esp,%eax\n\t"
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 13896f6..dc1f12c 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2267,17 +2267,17 @@ DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 )
 /**********************************************************************
  *		DbgBreakPoint   (NTDLL.@)
  */
-__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret")
+__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret")
 
 /**********************************************************************
  *		DbgUserBreakPoint   (NTDLL.@)
  */
-__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret")
+__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret")
 
 /**********************************************************************
  *           NtCurrentTeb   (NTDLL.@)
  */
-__ASM_GLOBAL_FUNC( NtCurrentTeb, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" )
+__ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" )
 
 
 /**********************************************************************
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 1748221..4987643 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -1668,11 +1668,11 @@ void __wine_enter_vm86( CONTEXT *context )
 /**********************************************************************
  *		DbgBreakPoint   (NTDLL.@)
  */
-__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret")
+__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret")
 
 /**********************************************************************
  *		DbgUserBreakPoint   (NTDLL.@)
  */
-__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret")
+__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret")
 
 #endif  /* __x86_64__ */




More information about the wine-cvs mailing list