Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix calling convention of ExInterlocked* functions.

Browse source 
svn path=/trunk/; revision=11314
This commit is contained in:
Filip Navara 2004-10-17 13:08:26 +00:00
parent 7090b2771a
commit 108bfdf09f
5 changed files with 42 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reactos/include/ddk/exfuncs.h
View file

@ -372,7 +372,7 @@ ExInterlockedAddLargeStatistic (
); );
ULONG ULONG
FASTCALL STDCALL
ExInterlockedAddUlong ( ExInterlockedAddUlong (
PULONG Addend, PULONG Addend,
ULONG Increment, ULONG Increment,
@ -447,55 +447,47 @@ ExInterlockedIncrementLong (
PKSPIN_LOCK Lock PKSPIN_LOCK Lock
); );
PLIST_ENTRY PLIST_ENTRY
FASTCALL STDCALL
ExInterlockedInsertHeadList ( ExInterlockedInsertHeadList (
PLIST_ENTRY ListHead, PLIST_ENTRY ListHead,
PLIST_ENTRY ListEntry, PLIST_ENTRY ListEntry,
PKSPIN_LOCK Lock PKSPIN_LOCK Lock
); );
PLIST_ENTRY PLIST_ENTRY
FASTCALL STDCALL
ExInterlockedInsertTailList ( ExInterlockedInsertTailList (
PLIST_ENTRY ListHead, PLIST_ENTRY ListHead,
PLIST_ENTRY ListEntry, PLIST_ENTRY ListEntry,
PKSPIN_LOCK Lock PKSPIN_LOCK Lock
); );
PSINGLE_LIST_ENTRY PSINGLE_LIST_ENTRY
FASTCALL STDCALL
ExInterlockedPopEntryList ( ExInterlockedPopEntryList (
PSINGLE_LIST_ENTRY ListHead, PSINGLE_LIST_ENTRY ListHead,
PKSPIN_LOCK Lock PKSPIN_LOCK Lock
); );
PSINGLE_LIST_ENTRY PSINGLE_LIST_ENTRY
FASTCALL STDCALL
ExInterlockedPopEntrySList ( ExInterlockedPopEntrySList (
PSLIST_HEADER ListHead, PSLIST_HEADER ListHead,
PKSPIN_LOCK Lock PKSPIN_LOCK Lock
); );
PSINGLE_LIST_ENTRY PSINGLE_LIST_ENTRY
FASTCALL STDCALL
ExInterlockedPushEntryList ( ExInterlockedPushEntryList (
PSINGLE_LIST_ENTRY ListHead, PSINGLE_LIST_ENTRY ListHead,
PSINGLE_LIST_ENTRY ListEntry, PSINGLE_LIST_ENTRY ListEntry,
PKSPIN_LOCK Lock PKSPIN_LOCK Lock
); );
PSINGLE_LIST_ENTRY PSINGLE_LIST_ENTRY
FASTCALL STDCALL
ExInterlockedPushEntrySList ( ExInterlockedPushEntrySList (
PSLIST_HEADER ListHead, PSLIST_HEADER ListHead,
PSINGLE_LIST_ENTRY ListEntry, PSINGLE_LIST_ENTRY ListEntry,
PKSPIN_LOCK Lock PKSPIN_LOCK Lock
); );
VOID
ExInterlockedRemoveEntryList (
PLIST_ENTRY ListHead,
PLIST_ENTRY Entry,
PKSPIN_LOCK Lock
);
PLIST_ENTRY PLIST_ENTRY
FASTCALL STDCALL
ExInterlockedRemoveHeadList ( ExInterlockedRemoveHeadList (
PLIST_ENTRY Head, PLIST_ENTRY Head,
PKSPIN_LOCK Lock PKSPIN_LOCK Lock

13
reactos/ntoskrnl/ex/interlck.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -17,9 +17,7 @@
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
#ifdef ExInterlockedDecrementLong
#undef ExInterlockedDecrementLong #undef ExInterlockedDecrementLong
#endif
/* /*
* @implemented * @implemented
@ -44,10 +42,7 @@ ExInterlockedDecrementLong (PLONG Addend,
return oldval; return oldval;
} }
#ifdef ExInterlockedExchangeUlong
#undef ExInterlockedExchangeUlong #undef ExInterlockedExchangeUlong
#endif
/* /*
* @implemented * @implemented
@ -74,14 +69,12 @@ ExInterlockedExchangeUlong (PULONG Target,
} }
#ifdef ExInterlockedAddUlong
#undef ExInterlockedAddUlong #undef ExInterlockedAddUlong
#endif
/* /*
* @implemented * @implemented
*/ */
ULONG FASTCALL ULONG STDCALL
ExInterlockedAddUlong (PULONG Addend, ExInterlockedAddUlong (PULONG Addend,
ULONG Increment, ULONG Increment,
PKSPIN_LOCK Lock) PKSPIN_LOCK Lock)
@ -150,9 +143,7 @@ ExInterlockedAddLargeInteger (PLARGE_INTEGER Addend,
return oldval; return oldval;
} }
#ifdef ExInterlockedIncrementLong
#undef ExInterlockedIncrementLong #undef ExInterlockedIncrementLong
#endif
/* /*
* @implemented * @implemented

28
reactos/ntoskrnl/ex/list.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -41,7 +41,8 @@ ExInterlockedFlushSList (
/* /*
* @implemented * @implemented
*/ */
PLIST_ENTRY FASTCALL PLIST_ENTRY
STDCALL
ExInterlockedInsertHeadList(PLIST_ENTRY ListHead, ExInterlockedInsertHeadList(PLIST_ENTRY ListHead,
PLIST_ENTRY ListEntry, PLIST_ENTRY ListEntry,
PKSPIN_LOCK Lock) PKSPIN_LOCK Lock)
@ -76,7 +77,8 @@ ExInterlockedInsertHeadList(PLIST_ENTRY ListHead,
/* /*
* @implemented * @implemented
*/ */
PLIST_ENTRY FASTCALL PLIST_ENTRY
STDCALL
ExInterlockedInsertTailList(PLIST_ENTRY ListHead, ExInterlockedInsertTailList(PLIST_ENTRY ListHead,
PLIST_ENTRY ListEntry, PLIST_ENTRY ListEntry,
PKSPIN_LOCK Lock) PKSPIN_LOCK Lock)
@ -111,7 +113,8 @@ ExInterlockedInsertTailList(PLIST_ENTRY ListHead,
/* /*
* @implemented * @implemented
*/ */
PLIST_ENTRY FASTCALL PLIST_ENTRY
STDCALL
ExInterlockedRemoveHeadList(PLIST_ENTRY Head, ExInterlockedRemoveHeadList(PLIST_ENTRY Head,
PKSPIN_LOCK Lock) PKSPIN_LOCK Lock)
/* /*
@ -140,6 +143,7 @@ ExInterlockedRemoveHeadList(PLIST_ENTRY Head,
PLIST_ENTRY PLIST_ENTRY
STDCALL
ExInterlockedRemoveTailList(PLIST_ENTRY Head, ExInterlockedRemoveTailList(PLIST_ENTRY Head,
PKSPIN_LOCK Lock) PKSPIN_LOCK Lock)
/* /*
@ -167,14 +171,13 @@ ExInterlockedRemoveTailList(PLIST_ENTRY Head,
} }
#ifdef ExInterlockedPopEntrySList
#undef ExInterlockedPopEntrySList #undef ExInterlockedPopEntrySList
#endif
/* /*
* @implemented * @implemented
*/ */
PSINGLE_LIST_ENTRY FASTCALL PSINGLE_LIST_ENTRY
STDCALL
ExInterlockedPopEntrySList(IN PSLIST_HEADER ListHead, ExInterlockedPopEntrySList(IN PSLIST_HEADER ListHead,
IN PKSPIN_LOCK Lock) IN PKSPIN_LOCK Lock)
/* /*
@ -200,14 +203,13 @@ ExInterlockedPopEntrySList(IN PSLIST_HEADER ListHead,
} }
#ifdef ExInterlockedPushEntrySList
#undef ExInterlockedPushEntrySList #undef ExInterlockedPushEntrySList
#endif
/* /*
* @implemented * @implemented
*/ */
PSINGLE_LIST_ENTRY FASTCALL PSINGLE_LIST_ENTRY
STDCALL
ExInterlockedPushEntrySList(IN PSLIST_HEADER ListHead, ExInterlockedPushEntrySList(IN PSLIST_HEADER ListHead,
IN PSINGLE_LIST_ENTRY ListEntry, IN PSINGLE_LIST_ENTRY ListEntry,
IN PKSPIN_LOCK Lock) IN PKSPIN_LOCK Lock)
@ -236,7 +238,8 @@ ExInterlockedPushEntrySList(IN PSLIST_HEADER ListHead,
/* /*
* @implemented * @implemented
*/ */
PSINGLE_LIST_ENTRY FASTCALL PSINGLE_LIST_ENTRY
STDCALL
ExInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, ExInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead,
IN PKSPIN_LOCK Lock) IN PKSPIN_LOCK Lock)
/* /*
@ -260,7 +263,8 @@ ExInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead,
/* /*
* @implemented * @implemented
*/ */
PSINGLE_LIST_ENTRY FASTCALL PSINGLE_LIST_ENTRY
STDCALL
ExInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead, ExInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead,
IN PSINGLE_LIST_ENTRY ListEntry, IN PSINGLE_LIST_ENTRY ListEntry,
IN PKSPIN_LOCK Lock) IN PKSPIN_LOCK Lock)

18
reactos/ntoskrnl/ntoskrnl.def
View file

@ -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 ; reactos/ntoskrnl/ntoskrnl.def
; ;
@ -104,20 +104,20 @@ ExInitializeResourceLite@4
ExInitializeZone@16 ExInitializeZone@16
ExInterlockedAddLargeInteger@16 ExInterlockedAddLargeInteger@16
@ExInterlockedAddLargeStatistic@8 @ExInterlockedAddLargeStatistic@8
@ExInterlockedAddUlong@12 ExInterlockedAddUlong@12
@ExInterlockedCompareExchange64@16 @ExInterlockedCompareExchange64@16
ExInterlockedDecrementLong@8 ExInterlockedDecrementLong@8
ExInterlockedExchangeUlong@12 ExInterlockedExchangeUlong@12
ExInterlockedExtendZone@16 ExInterlockedExtendZone@16
ExInterlockedIncrementLong@8 ExInterlockedIncrementLong@8
@ExInterlockedFlushSList@4 @ExInterlockedFlushSList@4
@ExInterlockedInsertHeadList@12 ExInterlockedInsertHeadList@12
@ExInterlockedInsertTailList@12 ExInterlockedInsertTailList@12
@ExInterlockedPopEntryList@8 ExInterlockedPopEntryList@8
@ExInterlockedPopEntrySList@8 ExInterlockedPopEntrySList@8
@ExInterlockedPushEntryList@12 ExInterlockedPushEntryList@12
@ExInterlockedPushEntrySList@12 ExInterlockedPushEntrySList@12
@ExInterlockedRemoveHeadList@8 ExInterlockedRemoveHeadList@8
ExIsProcessorFeaturePresent@4 ExIsProcessorFeaturePresent@4
ExIsResourceAcquiredExclusiveLite@4 ExIsResourceAcquiredExclusiveLite@4
ExIsResourceAcquiredSharedLite@4 ExIsResourceAcquiredSharedLite@4

14
reactos/w32api/include/ddk/winddk.h
View file

@ -4348,7 +4348,7 @@ RtlConvertUlongToLuid(
*/ */
#ifndef RtlCopyMemory #ifndef RtlCopyMemory
#define RtlCopyMemory(Destination, Source, Length) \ #define RtlCopyMemory(Destination, Source, Length) \
memcpy(Destination, Source, Length); memcpy(Destination, Source, Length)
#endif #endif
#ifndef RtlCopyBytes #ifndef RtlCopyBytes
@ -5343,7 +5343,7 @@ ExInterlockedAddLargeStatistic(
NTOSAPI NTOSAPI
ULONG ULONG
DDKFASTAPI DDKAPI
ExInterlockedAddUlong( ExInterlockedAddUlong(
IN PULONG Addend, IN PULONG Addend,
IN ULONG Increment, IN ULONG Increment,
@ -5366,7 +5366,7 @@ ExInterlockedFlushSList(
NTOSAPI NTOSAPI
PLIST_ENTRY PLIST_ENTRY
DDKFASTAPI DDKAPI
ExInterlockedInsertHeadList( ExInterlockedInsertHeadList(
IN PLIST_ENTRY ListHead, IN PLIST_ENTRY ListHead,
IN PLIST_ENTRY ListEntry, IN PLIST_ENTRY ListEntry,
@ -5374,7 +5374,7 @@ ExInterlockedInsertHeadList(
NTOSAPI NTOSAPI
PLIST_ENTRY PLIST_ENTRY
DDKFASTAPI DDKAPI
ExInterlockedInsertTailList( ExInterlockedInsertTailList(
IN PLIST_ENTRY ListHead, IN PLIST_ENTRY ListHead,
IN PLIST_ENTRY ListEntry, IN PLIST_ENTRY ListEntry,
@ -5382,7 +5382,7 @@ ExInterlockedInsertTailList(
NTOSAPI NTOSAPI
PSINGLE_LIST_ENTRY PSINGLE_LIST_ENTRY
DDKFASTAPI DDKAPI
ExInterlockedPopEntryList( ExInterlockedPopEntryList(
IN PSINGLE_LIST_ENTRY ListHead, IN PSINGLE_LIST_ENTRY ListHead,
IN PKSPIN_LOCK Lock); IN PKSPIN_LOCK Lock);
@ -5399,7 +5399,7 @@ ExInterlockedPopEntryList(
NTOSAPI NTOSAPI
PSINGLE_LIST_ENTRY PSINGLE_LIST_ENTRY
DDKFASTAPI DDKAPI
ExInterlockedPushEntryList( ExInterlockedPushEntryList(
IN PSINGLE_LIST_ENTRY ListHead, IN PSINGLE_LIST_ENTRY ListHead,
IN PSINGLE_LIST_ENTRY ListEntry, IN PSINGLE_LIST_ENTRY ListEntry,
@ -5419,7 +5419,7 @@ ExInterlockedPushEntryList(
NTOSAPI NTOSAPI
PLIST_ENTRY PLIST_ENTRY
DDKFASTAPI DDKAPI
ExInterlockedRemoveHeadList( ExInterlockedRemoveHeadList(
IN PLIST_ENTRY ListHead, IN PLIST_ENTRY ListHead,
IN PKSPIN_LOCK Lock); IN PKSPIN_LOCK Lock);