From 108bfdf09f8ae23a517585756707d43a67b35e3c Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Sun, 17 Oct 2004 13:08:26 +0000 Subject: [PATCH] - Fix calling convention of ExInterlocked* functions. svn path=/trunk/; revision=11314 --- reactos/include/ddk/exfuncs.h | 24 ++++++++---------------- reactos/ntoskrnl/ex/interlck.c | 13 ++----------- reactos/ntoskrnl/ex/list.c | 28 ++++++++++++++++------------ reactos/ntoskrnl/ntoskrnl.def | 18 +++++++++--------- reactos/w32api/include/ddk/winddk.h | 14 +++++++------- 5 files changed, 42 insertions(+), 55 deletions(-) diff --git a/reactos/include/ddk/exfuncs.h b/reactos/include/ddk/exfuncs.h index 3513274fce5..f2862dc2a90 100644 --- a/reactos/include/ddk/exfuncs.h +++ b/reactos/include/ddk/exfuncs.h @@ -372,7 +372,7 @@ ExInterlockedAddLargeStatistic ( ); ULONG -FASTCALL +STDCALL ExInterlockedAddUlong ( PULONG Addend, ULONG Increment, @@ -447,55 +447,47 @@ ExInterlockedIncrementLong ( PKSPIN_LOCK Lock ); PLIST_ENTRY -FASTCALL +STDCALL ExInterlockedInsertHeadList ( PLIST_ENTRY ListHead, PLIST_ENTRY ListEntry, PKSPIN_LOCK Lock ); PLIST_ENTRY -FASTCALL +STDCALL ExInterlockedInsertTailList ( PLIST_ENTRY ListHead, PLIST_ENTRY ListEntry, PKSPIN_LOCK Lock ); PSINGLE_LIST_ENTRY -FASTCALL +STDCALL ExInterlockedPopEntryList ( PSINGLE_LIST_ENTRY ListHead, PKSPIN_LOCK Lock ); PSINGLE_LIST_ENTRY -FASTCALL +STDCALL ExInterlockedPopEntrySList ( PSLIST_HEADER ListHead, PKSPIN_LOCK Lock ); PSINGLE_LIST_ENTRY -FASTCALL +STDCALL ExInterlockedPushEntryList ( PSINGLE_LIST_ENTRY ListHead, PSINGLE_LIST_ENTRY ListEntry, PKSPIN_LOCK Lock ); PSINGLE_LIST_ENTRY -FASTCALL +STDCALL ExInterlockedPushEntrySList ( PSLIST_HEADER ListHead, PSINGLE_LIST_ENTRY ListEntry, PKSPIN_LOCK Lock ); - -VOID -ExInterlockedRemoveEntryList ( - PLIST_ENTRY ListHead, - PLIST_ENTRY Entry, - PKSPIN_LOCK Lock - ); - PLIST_ENTRY -FASTCALL +STDCALL ExInterlockedRemoveHeadList ( PLIST_ENTRY Head, PKSPIN_LOCK Lock diff --git a/reactos/ntoskrnl/ex/interlck.c b/reactos/ntoskrnl/ex/interlck.c index efd90aaf375..4232e524058 100644 --- a/reactos/ntoskrnl/ex/interlck.c +++ b/reactos/ntoskrnl/ex/interlck.c @@ -1,4 +1,4 @@ -/* $Id: interlck.c,v 1.16 2004/09/09 18:51:17 hbirr Exp $ +/* $Id: interlck.c,v 1.17 2004/10/17 13:08:26 navaraf Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -17,9 +17,7 @@ /* FUNCTIONS *****************************************************************/ -#ifdef ExInterlockedDecrementLong #undef ExInterlockedDecrementLong -#endif /* * @implemented @@ -44,10 +42,7 @@ ExInterlockedDecrementLong (PLONG Addend, return oldval; } - -#ifdef ExInterlockedExchangeUlong #undef ExInterlockedExchangeUlong -#endif /* * @implemented @@ -74,14 +69,12 @@ ExInterlockedExchangeUlong (PULONG Target, } -#ifdef ExInterlockedAddUlong #undef ExInterlockedAddUlong -#endif /* * @implemented */ -ULONG FASTCALL +ULONG STDCALL ExInterlockedAddUlong (PULONG Addend, ULONG Increment, PKSPIN_LOCK Lock) @@ -150,9 +143,7 @@ ExInterlockedAddLargeInteger (PLARGE_INTEGER Addend, return oldval; } -#ifdef ExInterlockedIncrementLong #undef ExInterlockedIncrementLong -#endif /* * @implemented diff --git a/reactos/ntoskrnl/ex/list.c b/reactos/ntoskrnl/ex/list.c index ee294e29cdb..ca83833f6af 100644 --- a/reactos/ntoskrnl/ex/list.c +++ b/reactos/ntoskrnl/ex/list.c @@ -1,4 +1,4 @@ -/* $Id: list.c,v 1.14 2004/10/12 00:56:46 ion Exp $ +/* $Id: list.c,v 1.15 2004/10/17 13:08:26 navaraf Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -41,7 +41,8 @@ ExInterlockedFlushSList ( /* * @implemented */ -PLIST_ENTRY FASTCALL +PLIST_ENTRY +STDCALL ExInterlockedInsertHeadList(PLIST_ENTRY ListHead, PLIST_ENTRY ListEntry, PKSPIN_LOCK Lock) @@ -76,7 +77,8 @@ ExInterlockedInsertHeadList(PLIST_ENTRY ListHead, /* * @implemented */ -PLIST_ENTRY FASTCALL +PLIST_ENTRY +STDCALL ExInterlockedInsertTailList(PLIST_ENTRY ListHead, PLIST_ENTRY ListEntry, PKSPIN_LOCK Lock) @@ -111,7 +113,8 @@ ExInterlockedInsertTailList(PLIST_ENTRY ListHead, /* * @implemented */ -PLIST_ENTRY FASTCALL +PLIST_ENTRY +STDCALL ExInterlockedRemoveHeadList(PLIST_ENTRY Head, PKSPIN_LOCK Lock) /* @@ -140,6 +143,7 @@ ExInterlockedRemoveHeadList(PLIST_ENTRY Head, PLIST_ENTRY +STDCALL ExInterlockedRemoveTailList(PLIST_ENTRY Head, PKSPIN_LOCK Lock) /* @@ -167,14 +171,13 @@ ExInterlockedRemoveTailList(PLIST_ENTRY Head, } -#ifdef ExInterlockedPopEntrySList #undef ExInterlockedPopEntrySList -#endif /* * @implemented */ -PSINGLE_LIST_ENTRY FASTCALL +PSINGLE_LIST_ENTRY +STDCALL ExInterlockedPopEntrySList(IN PSLIST_HEADER ListHead, IN PKSPIN_LOCK Lock) /* @@ -200,14 +203,13 @@ ExInterlockedPopEntrySList(IN PSLIST_HEADER ListHead, } -#ifdef ExInterlockedPushEntrySList #undef ExInterlockedPushEntrySList -#endif /* * @implemented */ -PSINGLE_LIST_ENTRY FASTCALL +PSINGLE_LIST_ENTRY +STDCALL ExInterlockedPushEntrySList(IN PSLIST_HEADER ListHead, IN PSINGLE_LIST_ENTRY ListEntry, IN PKSPIN_LOCK Lock) @@ -236,7 +238,8 @@ ExInterlockedPushEntrySList(IN PSLIST_HEADER ListHead, /* * @implemented */ -PSINGLE_LIST_ENTRY FASTCALL +PSINGLE_LIST_ENTRY +STDCALL ExInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, IN PKSPIN_LOCK Lock) /* @@ -260,7 +263,8 @@ ExInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, /* * @implemented */ -PSINGLE_LIST_ENTRY FASTCALL +PSINGLE_LIST_ENTRY +STDCALL ExInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead, IN PSINGLE_LIST_ENTRY ListEntry, IN PKSPIN_LOCK Lock) diff --git a/reactos/ntoskrnl/ntoskrnl.def b/reactos/ntoskrnl/ntoskrnl.def index b3be1217a04..81cb77fccc4 100644 --- a/reactos/ntoskrnl/ntoskrnl.def +++ b/reactos/ntoskrnl/ntoskrnl.def @@ -1,4 +1,4 @@ -; $Id: ntoskrnl.def,v 1.193 2004/09/24 16:18:28 weiden Exp $ +; $Id: ntoskrnl.def,v 1.194 2004/10/17 13:08:26 navaraf Exp $ ; ; reactos/ntoskrnl/ntoskrnl.def ; @@ -104,20 +104,20 @@ ExInitializeResourceLite@4 ExInitializeZone@16 ExInterlockedAddLargeInteger@16 @ExInterlockedAddLargeStatistic@8 -@ExInterlockedAddUlong@12 +ExInterlockedAddUlong@12 @ExInterlockedCompareExchange64@16 ExInterlockedDecrementLong@8 ExInterlockedExchangeUlong@12 ExInterlockedExtendZone@16 ExInterlockedIncrementLong@8 @ExInterlockedFlushSList@4 -@ExInterlockedInsertHeadList@12 -@ExInterlockedInsertTailList@12 -@ExInterlockedPopEntryList@8 -@ExInterlockedPopEntrySList@8 -@ExInterlockedPushEntryList@12 -@ExInterlockedPushEntrySList@12 -@ExInterlockedRemoveHeadList@8 +ExInterlockedInsertHeadList@12 +ExInterlockedInsertTailList@12 +ExInterlockedPopEntryList@8 +ExInterlockedPopEntrySList@8 +ExInterlockedPushEntryList@12 +ExInterlockedPushEntrySList@12 +ExInterlockedRemoveHeadList@8 ExIsProcessorFeaturePresent@4 ExIsResourceAcquiredExclusiveLite@4 ExIsResourceAcquiredSharedLite@4 diff --git a/reactos/w32api/include/ddk/winddk.h b/reactos/w32api/include/ddk/winddk.h index a9c1b403e5a..ecabfd36616 100644 --- a/reactos/w32api/include/ddk/winddk.h +++ b/reactos/w32api/include/ddk/winddk.h @@ -4348,7 +4348,7 @@ RtlConvertUlongToLuid( */ #ifndef RtlCopyMemory #define RtlCopyMemory(Destination, Source, Length) \ - memcpy(Destination, Source, Length); + memcpy(Destination, Source, Length) #endif #ifndef RtlCopyBytes @@ -5343,7 +5343,7 @@ ExInterlockedAddLargeStatistic( NTOSAPI ULONG -DDKFASTAPI +DDKAPI ExInterlockedAddUlong( IN PULONG Addend, IN ULONG Increment, @@ -5366,7 +5366,7 @@ ExInterlockedFlushSList( NTOSAPI PLIST_ENTRY -DDKFASTAPI +DDKAPI ExInterlockedInsertHeadList( IN PLIST_ENTRY ListHead, IN PLIST_ENTRY ListEntry, @@ -5374,7 +5374,7 @@ ExInterlockedInsertHeadList( NTOSAPI PLIST_ENTRY -DDKFASTAPI +DDKAPI ExInterlockedInsertTailList( IN PLIST_ENTRY ListHead, IN PLIST_ENTRY ListEntry, @@ -5382,7 +5382,7 @@ ExInterlockedInsertTailList( NTOSAPI PSINGLE_LIST_ENTRY -DDKFASTAPI +DDKAPI ExInterlockedPopEntryList( IN PSINGLE_LIST_ENTRY ListHead, IN PKSPIN_LOCK Lock); @@ -5399,7 +5399,7 @@ ExInterlockedPopEntryList( NTOSAPI PSINGLE_LIST_ENTRY -DDKFASTAPI +DDKAPI ExInterlockedPushEntryList( IN PSINGLE_LIST_ENTRY ListHead, IN PSINGLE_LIST_ENTRY ListEntry, @@ -5419,7 +5419,7 @@ ExInterlockedPushEntryList( NTOSAPI PLIST_ENTRY -DDKFASTAPI +DDKAPI ExInterlockedRemoveHeadList( IN PLIST_ENTRY ListHead, IN PKSPIN_LOCK Lock);