[ros-diffs] [dgorbachev] 37824: Silence compiler warnings (2/11).
dgorbachev at svn.reactos.org
dgorbachev at svn.reactos.org
Wed Dec 3 18:28:33 CET 2008
Author: dgorbachev
Date: Wed Dec 3 11:28:33 2008
New Revision: 37824
URL: http://svn.reactos.org/svn/reactos?rev=37824&view=rev
Log:
Silence compiler warnings (2/11).
Modified:
trunk/reactos/ntoskrnl/include/internal/cm_x.h
trunk/reactos/ntoskrnl/include/internal/ex.h
trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h
trunk/reactos/ntoskrnl/include/internal/io_x.h
trunk/reactos/ntoskrnl/include/internal/ke_x.h
trunk/reactos/ntoskrnl/include/internal/lpc_x.h
trunk/reactos/ntoskrnl/include/internal/mm.h
trunk/reactos/ntoskrnl/include/internal/ob_x.h
trunk/reactos/ntoskrnl/include/internal/ps_x.h
Modified: trunk/reactos/ntoskrnl/include/internal/cm_x.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/cm_x.h?rev=37824&r1=37823&r2=37824&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/cm_x.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/cm_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008
@@ -9,8 +9,8 @@
//
// Returns whether or not this is a small valued key
//
+FORCEINLINE
BOOLEAN
-FORCEINLINE
CmpIsKeyValueSmall(OUT PULONG RealLength,
IN ULONG Length)
{
@@ -30,8 +30,8 @@
//
// Returns whether or not this is a big valued key
//
+FORCEINLINE
BOOLEAN
-FORCEINLINE
CmpIsKeyValueBig(IN PHHIVE Hive,
IN ULONG Length)
{
Modified: trunk/reactos/ntoskrnl/include/internal/ex.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/ex.h?rev=37824&r1=37823&r2=37824&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Wed Dec 3 11:28:33 2008
@@ -431,8 +431,8 @@
/* CALLBACKS *****************************************************************/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ExDoCallBack(IN OUT PEX_CALLBACK Callback,
IN PVOID Context,
IN PVOID Argument1,
@@ -462,7 +462,7 @@
#define ExpChangeRundown(x, y, z) InterlockedCompareExchange64((PLONGLONG)x, y, z)
#define ExpSetRundown(x, y) InterlockedExchange64((PLONGLONG)x, y)
#else
-#define ExpChangeRundown(x, y, z) InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z))
+#define ExpChangeRundown(x, y, z) PtrToUlong(InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z)))
#define ExpChangePushlock(x, y, z) LongToPtr(InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z)))
#define ExpSetRundown(x, y) InterlockedExchange((PLONG)x, y)
#endif
@@ -484,8 +484,8 @@
* function.
*
*--*/
-BOOLEAN
-FORCEINLINE
+FORCEINLINE
+BOOLEAN
_ExAcquireRundownProtection(IN PEX_RUNDOWN_REF RunRef)
{
ULONG_PTR Value, NewValue;
@@ -525,8 +525,8 @@
* function.
*
*--*/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
_ExReleaseRundownProtection(IN PEX_RUNDOWN_REF RunRef)
{
ULONG_PTR Value, NewValue;
@@ -568,8 +568,8 @@
* @remarks This is the internal macro for system use only.
*
*--*/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
_ExInitializeRundownProtection(IN PEX_RUNDOWN_REF RunRef)
{
/* Set the count to zero */
@@ -592,8 +592,8 @@
* necessary, then the slow path is taken through the exported function.
*
*--*/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
_ExWaitForRundownProtectionRelease(IN PEX_RUNDOWN_REF RunRef)
{
ULONG_PTR Value;
@@ -622,8 +622,8 @@
* @remarks This is the internal macro for system use only.
*
*--*/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
_ExRundownCompleted(IN PEX_RUNDOWN_REF RunRef)
{
/* Sanity check */
@@ -672,8 +672,8 @@
* @remarks None.
*
*--*/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ExInitializePushLock(IN PULONG_PTR PushLock)
{
/* Set the value to 0 */
@@ -699,8 +699,8 @@
* This macro should usually be paired up with KeAcquireCriticalRegion.
*
*--*/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ExAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock)
{
/* Try acquiring the lock */
@@ -733,8 +733,8 @@
* This macro should usually be paired up with KeAcquireCriticalRegion.
*
*--*/
-BOOLEAN
-FORCEINLINE
+FORCEINLINE
+BOOLEAN
ExTryToAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock)
{
/* Try acquiring the lock */
@@ -768,8 +768,8 @@
* This macro should usually be paired up with KeAcquireCriticalRegion.
*
*--*/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ExAcquirePushLockShared(PEX_PUSH_LOCK PushLock)
{
EX_PUSH_LOCK NewValue;
@@ -803,8 +803,8 @@
* to simply set the lock bit and remove any other bits.
*
*--*/
-BOOLEAN
-FORCEINLINE
+FORCEINLINE
+BOOLEAN
ExConvertPushLockSharedToExclusive(IN PEX_PUSH_LOCK PushLock)
{
EX_PUSH_LOCK OldValue;
@@ -842,8 +842,8 @@
* Callers of ExWaitOnPushLock must be running at IRQL <= APC_LEVEL.
*
*--*/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ExWaitOnPushLock(PEX_PUSH_LOCK PushLock)
{
/* Check if we're locked */
@@ -877,8 +877,8 @@
* This macro should usually be paired up with KeLeaveCriticalRegion.
*
*--*/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ExReleasePushLockShared(PEX_PUSH_LOCK PushLock)
{
EX_PUSH_LOCK OldValue;
@@ -917,8 +917,8 @@
* This macro should usually be paired up with KeLeaveCriticalRegion.
*
*--*/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ExReleasePushLockExclusive(PEX_PUSH_LOCK PushLock)
{
EX_PUSH_LOCK OldValue;
@@ -962,8 +962,8 @@
* This macro should usually be paired up with KeLeaveCriticalRegion.
*
*--*/
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ExReleasePushLock(PEX_PUSH_LOCK PushLock)
{
EX_PUSH_LOCK OldValue = *PushLock;
Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h?rev=37824&r1=37823&r2=37824&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Wed Dec 3 11:28:33 2008
@@ -115,8 +115,8 @@
#elif defined(_MSC_VER)
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386Wrmsr(IN ULONG Register,
IN ULONG Var1,
IN ULONG Var2)
@@ -126,8 +126,8 @@
__asm wrmsr;
}
+FORCEINLINE
ULONGLONG
-FORCEINLINE
Ke386Rdmsr(IN ULONG Register,
IN ULONG Var1,
IN ULONG Var2)
@@ -137,8 +137,8 @@
__asm rdmsr;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ki386Cpuid(IN ULONG Operation,
OUT PULONG Var1,
OUT PULONG Var2,
@@ -153,87 +153,87 @@
__asm mov [Var4], edx;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386FnInit(VOID)
{
__asm fninit;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386HaltProcessor(VOID)
{
__asm hlt;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386GetInterruptDescriptorTable(OUT KDESCRIPTOR Descriptor)
{
__asm sidt Descriptor;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetInterruptDescriptorTable(IN KDESCRIPTOR Descriptor)
{
__asm lidt Descriptor;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386GetGlobalDescriptorTable(OUT KDESCRIPTOR Descriptor)
{
__asm sgdt Descriptor;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetGlobalDescriptorTable(IN KDESCRIPTOR Descriptor)
{
__asm lgdt Descriptor;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386GetLocalDescriptorTable(OUT USHORT Descriptor)
{
__asm sldt Descriptor;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetLocalDescriptorTable(IN USHORT Descriptor)
{
__asm lldt Descriptor;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SaveFlags(IN ULONG Flags)
{
__asm pushf;
__asm pop Flags;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386RestoreFlags(IN ULONG Flags)
{
__asm push Flags;
__asm popf;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetTr(IN USHORT Tr)
{
__asm ltr Tr;
}
+FORCEINLINE
USHORT
-FORCEINLINE
Ke386GetTr(IN USHORT Tr)
{
__asm str Tr;
@@ -242,8 +242,8 @@
//
// CR Macros
//
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetCr2(IN ULONG Value)
{
__asm mov eax, Value;
@@ -253,90 +253,90 @@
//
// DR Macros
//
-ULONG
-FORCEINLINE
+FORCEINLINE
+ULONG
Ke386GetDr0(VOID)
{
__asm mov eax, dr0;
}
-ULONG
-FORCEINLINE
+FORCEINLINE
+ULONG
Ke386GetDr1(VOID)
{
__asm mov eax, dr1;
}
-ULONG
-FORCEINLINE
+FORCEINLINE
+ULONG
Ke386GetDr2(VOID)
{
__asm mov eax, dr2;
}
-ULONG
-FORCEINLINE
+FORCEINLINE
+ULONG
Ke386GetDr3(VOID)
{
__asm mov eax, dr3;
}
-ULONG
-FORCEINLINE
+FORCEINLINE
+ULONG
Ke386GetDr6(VOID)
{
__asm mov eax, dr6;
}
-ULONG
-FORCEINLINE
+FORCEINLINE
+ULONG
Ke386GetDr7(VOID)
{
__asm mov eax, dr7;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetDr0(IN ULONG Value)
{
__asm mov eax, Value;
__asm mov dr0, eax;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetDr1(IN ULONG Value)
{
__asm mov eax, Value;
__asm mov dr1, eax;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetDr2(IN ULONG Value)
{
__asm mov eax, Value;
__asm mov dr2, eax;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetDr3(IN ULONG Value)
{
__asm mov eax, Value;
__asm mov dr3, eax;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetDr6(IN ULONG Value)
{
__asm mov eax, Value;
__asm mov dr6, eax;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetDr7(IN ULONG Value)
{
__asm mov eax, Value;
@@ -346,60 +346,60 @@
//
// Segment Macros
//
+FORCEINLINE
USHORT
-FORCEINLINE
Ke386GetSs(VOID)
{
__asm mov ax, ss;
}
+FORCEINLINE
USHORT
-FORCEINLINE
Ke386GetFs(VOID)
{
__asm mov ax, fs;
}
+FORCEINLINE
USHORT
-FORCEINLINE
Ke386GetDs(VOID)
{
__asm mov ax, ds;
}
+FORCEINLINE
USHORT
-FORCEINLINE
Ke386GetEs(VOID)
{
__asm mov ax, es;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetSs(IN USHORT Value)
{
__asm mov ax, Value;
__asm mov ss, ax;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetFs(IN USHORT Value)
{
__asm mov ax, Value;
__asm mov fs, ax;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetDs(IN USHORT Value)
{
__asm mov ax, Value;
__asm mov ds, ax;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
Ke386SetEs(IN USHORT Value)
{
__asm mov ax, Value;
Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/io_x.h?rev=37824&r1=37823&r2=37824&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/io_x.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/io_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008
@@ -6,8 +6,9 @@
* PROGRAMMERS: Alex Ionescu (alex.ionescu at reactos.org)
*/
+static
+__inline
VOID
-static __inline
IopLockFileObject(IN PFILE_OBJECT FileObject)
{
/* Lock the FO and check for contention */
@@ -19,8 +20,9 @@
InterlockedDecrement((PLONG)&FileObject->Waiters);
}
+static
+__inline
VOID
-static __inline
IopUnlockFileObject(IN PFILE_OBJECT FileObject)
{
/* Unlock the FO and wake any waiters up */
@@ -28,8 +30,8 @@
if (FileObject->Waiters) KeSetEvent(&FileObject->Lock, 0, FALSE);
}
+FORCEINLINE
VOID
-FORCEINLINE
IopQueueIrpToThread(IN PIRP Irp)
{
KIRQL OldIrql;
@@ -44,8 +46,8 @@
KeLowerIrql(OldIrql);
}
+FORCEINLINE
VOID
-FORCEINLINE
IopUnQueueIrpFromThread(IN PIRP Irp)
{
/* Remove it from the list and reset it */
@@ -53,8 +55,9 @@
InitializeListHead(&Irp->ThreadListEntry);
}
+static
+__inline
VOID
-static __inline
IopUpdateOperationCount(IN IOP_TRANSFER_TYPE Type)
{
PLARGE_INTEGER CountToChange;
@@ -86,8 +89,9 @@
}
}
+static
+__inline
BOOLEAN
-static __inline
IopValidateOpenPacket(IN POPEN_PACKET OpenPacket)
{
/* Validate the packet */
Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/ke_x.h?rev=37824&r1=37823&r2=37824&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008
@@ -89,8 +89,8 @@
#endif /* _M_IX86 */
#ifndef _M_ARM
+FORCEINLINE
PRKTHREAD
-FORCEINLINE
KeGetCurrentThread(VOID)
{
#ifdef _M_IX86
@@ -102,8 +102,8 @@
#endif
}
+FORCEINLINE
UCHAR
-FORCEINLINE
KeGetPreviousMode(VOID)
{
/* Return the current mode */
@@ -111,8 +111,8 @@
}
#endif
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KeFlushProcessTb(VOID)
{
/* Flush the TLB by resetting CR3 */
@@ -243,8 +243,8 @@
//
// This routine protects against multiple CPU acquires, it's meaningless on UP.
//
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KiAcquireDispatcherObject(IN DISPATCHER_HEADER* Object)
{
UNREFERENCED_PARAMETER(Object);
@@ -253,39 +253,39 @@
//
// This routine protects against multiple CPU acquires, it's meaningless on UP.
//
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KiReleaseDispatcherObject(IN DISPATCHER_HEADER* Object)
{
UNREFERENCED_PARAMETER(Object);
}
+FORCEINLINE
KIRQL
-FORCEINLINE
KiAcquireDispatcherLock(VOID)
{
/* Raise to DPC level */
return KeRaiseIrqlToDpcLevel();
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KiReleaseDispatcherLock(IN KIRQL OldIrql)
{
/* Just exit the dispatcher */
KiExitDispatcher(OldIrql);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KiAcquireDispatcherLockAtDpcLevel(VOID)
{
/* This is a no-op at DPC Level for UP systems */
return;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KiReleaseDispatcherLockFromDpcLevel(VOID)
{
/* This is a no-op at DPC Level for UP systems */
@@ -492,8 +492,8 @@
InterlockedAnd((PLONG)SpinLock, 0);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KiAcquireDispatcherObject(IN DISPATCHER_HEADER* Object)
{
LONG OldValue;
@@ -521,8 +521,8 @@
OldValue) != OldValue);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KiReleaseDispatcherObject(IN DISPATCHER_HEADER* Object)
{
/* Make sure we're at a safe level to touch the lock */
@@ -532,16 +532,16 @@
InterlockedAnd(&Object->Lock, ~KOBJECT_LOCK_BIT);
}
+FORCEINLINE
KIRQL
-FORCEINLINE
KiAcquireDispatcherLock(VOID)
{
/* Raise to synchronization level and acquire the dispatcher lock */
return KeAcquireQueuedSpinLockRaiseToSynch(LockQueueDispatcherLock);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KiReleaseDispatcherLock(IN KIRQL OldIrql)
{
/* First release the lock */
@@ -552,16 +552,16 @@
KiExitDispatcher(OldIrql);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KiAcquireDispatcherLockAtDpcLevel(VOID)
{
/* Acquire the dispatcher lock */
KeAcquireQueuedSpinLockAtDpcLevel(LockQueueDispatcherLock);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KiReleaseDispatcherLockFromDpcLevel(VOID)
{
/* Release the dispatcher lock */
@@ -1003,8 +1003,8 @@
//
// Recalculates the due time
//
+FORCEINLINE
PLARGE_INTEGER
-FORCEINLINE
KiRecalculateDueTime(IN PLARGE_INTEGER OriginalDueTime,
IN PLARGE_INTEGER DueTime,
IN OUT PLARGE_INTEGER NewDueTime)
@@ -1103,8 +1103,8 @@
// Called from KiCompleteTimer, KiInsertTreeTimer, KeSetSystemTime
// to remove timer entries
// See Windows HPI blog for more information.
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KiRemoveEntryTimer(IN PKTIMER Timer)
{
ULONG Hand;
@@ -1134,8 +1134,8 @@
// Called by Wait and Queue code to insert a timer for dispatching.
// Also called by KeSetTimerEx to insert a timer from the caller.
//
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KxInsertTimer(IN PKTIMER Timer,
IN ULONG Hand)
{
@@ -1162,8 +1162,8 @@
// Called by KeSetTimerEx and KiInsertTreeTimer to calculate Due Time
// See the Windows HPI Blog for more information
//
+FORCEINLINE
BOOLEAN
-FORCEINLINE
KiComputeDueTime(IN PKTIMER Timer,
IN LARGE_INTEGER DueTime,
OUT PULONG Hand)
@@ -1214,8 +1214,8 @@
// Also called by timer code when canceling an inserted timer.
// Removes a timer from it's tree.
//
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KxRemoveTreeTimer(IN PKTIMER Timer)
{
ULONG Hand = Timer->Header.Hand;
@@ -1244,8 +1244,8 @@
KiReleaseTimerLock(LockQueue);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
KxSetTimerForThreadWait(IN PKTIMER Timer,
IN LARGE_INTEGER Interval,
OUT PULONG Hand)
@@ -1632,7 +1632,8 @@
KiSelectReadyThread(IN KPRIORITY Priority,
IN PKPRCB Prcb)
{
- ULONG PrioritySet, HighPriority;
+ ULONG PrioritySet;
+ LONG HighPriority;
PLIST_ENTRY ListEntry;
PKTHREAD Thread = NULL;
@@ -1676,8 +1677,8 @@
// This routine computes the new priority for a thread. It is only valid for
// threads with priorities in the dynamic priority range.
//
+FORCEINLINE
SCHAR
-FORCEINLINE
KiComputeNewPriority(IN PKTHREAD Thread,
IN SCHAR Adjustment)
{
Modified: trunk/reactos/ntoskrnl/include/internal/lpc_x.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/lpc_x.h?rev=37824&r1=37823&r2=37824&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/lpc_x.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/lpc_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008
@@ -95,8 +95,8 @@
//
// Allocates a new message
//
+FORCEINLINE
PLPCP_MESSAGE
-FORCEINLINE
LpcpAllocateFromPortZone(VOID)
{
PLPCP_MESSAGE Message;
@@ -124,8 +124,8 @@
//
// Get the LPC Message associated to the Thread
//
+FORCEINLINE
PLPCP_MESSAGE
-FORCEINLINE
LpcpGetMessageFromThread(IN PETHREAD Thread)
{
/* Check if the port flag is set */
@@ -139,8 +139,8 @@
return (PVOID)((ULONG_PTR)Thread->LpcReplyMessage & ~LPCP_THREAD_FLAGS);
}
+FORCEINLINE
PLPCP_PORT_OBJECT
-FORCEINLINE
LpcpGetPortFromThread(IN PETHREAD Thread)
{
/* Check if the port flag is set */
@@ -155,8 +155,8 @@
return NULL;
}
+FORCEINLINE
VOID
-FORCEINLINE
LpcpSetPortToThread(IN PETHREAD Thread,
IN PLPCP_PORT_OBJECT Port)
{
Modified: trunk/reactos/ntoskrnl/include/internal/mm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/mm.h?rev=37824&r1=37823&r2=37824&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Dec 3 11:28:33 2008
@@ -166,10 +166,10 @@
#define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \
- InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand)
+ (ULONG)InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand)
#define InterlockedExchangePte(PointerPte, Value) \
- InterlockedExchange((PLONG)(PointerPte), Value)
+ (ULONG)InterlockedExchange((PLONG)(PointerPte), Value)
typedef struct
{
@@ -1016,7 +1016,8 @@
NTAPI
MmGetLockCountPage(PFN_TYPE Page);
-static __inline
+static
+__inline
KIRQL
NTAPI
MmAcquirePageListLock()
Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/ob_x.h?rev=37824&r1=37823&r2=37824&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008
@@ -17,16 +17,16 @@
#define OBP_NAME_LOOKASIDE_MAX_SIZE 248
+FORCEINLINE
ULONG
-FORCEINLINE
ObpSelectObjectLockSlot(IN POBJECT_HEADER ObjectHeader)
{
/* We have 4 locks total, this will return a 0-index slot */
return (((ULONG_PTR)ObjectHeader) >> 8) & 3;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpAcquireObjectLock(IN POBJECT_HEADER ObjectHeader)
{
ULONG Slot;
@@ -43,8 +43,8 @@
ExAcquireResourceExclusiveLite(&ObjectType->ObjectLocks[Slot], TRUE);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpAcquireObjectLockShared(IN POBJECT_HEADER ObjectHeader)
{
ULONG Slot;
@@ -61,8 +61,8 @@
ExAcquireResourceSharedLite(&ObjectType->ObjectLocks[Slot], TRUE);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpReleaseObjectLock(IN POBJECT_HEADER ObjectHeader)
{
ULONG Slot;
@@ -79,8 +79,8 @@
ASSERT(KeGetCurrentIrql() <= APC_LEVEL);
}
+FORCEINLINE
POBJECT_HEADER_NAME_INFO
-FORCEINLINE
ObpReferenceNameInfo(IN POBJECT_HEADER ObjectHeader)
{
POBJECT_HEADER_NAME_INFO ObjectNameInfo;
@@ -120,8 +120,8 @@
return ObjectNameInfo;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpDereferenceNameInfo(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo)
{
POBJECT_DIRECTORY Directory;
@@ -151,8 +151,8 @@
}
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory,
IN POBP_LOOKUP_CONTEXT Context)
{
@@ -167,8 +167,8 @@
Context->LockStateSignature = OBP_LOCK_STATE_POST_ACQUISITION_SHARED;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory,
IN POBP_LOOKUP_CONTEXT Context)
{
@@ -187,8 +187,8 @@
Context->DirectoryLocked = TRUE;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory,
IN POBP_LOOKUP_CONTEXT Context)
{
@@ -198,8 +198,8 @@
KeLeaveCriticalRegion();
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpInitializeLookupContext(IN POBP_LOOKUP_CONTEXT Context)
{
/* Initialize a null context */
@@ -209,8 +209,8 @@
Context->LockStateSignature = OBP_LOCK_STATE_INITIALIZED;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context)
{
POBJECT_HEADER ObjectHeader;
@@ -232,8 +232,8 @@
}
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpReleaseLookupContext(IN POBP_LOOKUP_CONTEXT Context)
{
/* Check if we came back with the directory locked */
@@ -249,8 +249,8 @@
ObpReleaseLookupContextObject(Context);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpEnterObjectTypeMutex(IN POBJECT_TYPE ObjectType)
{
/* Sanity check */
@@ -261,8 +261,8 @@
ExAcquireResourceExclusiveLite(&ObjectType->Mutex, TRUE);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpLeaveObjectTypeMutex(IN POBJECT_TYPE ObjectType)
{
/* Enter a critical region and acquire the resource */
@@ -273,8 +273,8 @@
ASSERT(KeGetCurrentIrql() <= APC_LEVEL);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpReleaseObjectCreateInformation(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo)
{
/* Check if we have a security descriptor */
@@ -288,8 +288,8 @@
}
}
+FORCEINLINE
PVOID
-FORCEINLINE
ObpAllocateObjectCreateInfoBuffer(IN PP_NPAGED_LOOKASIDE_NUMBER Type)
{
PVOID Buffer;
@@ -325,8 +325,8 @@
return Buffer;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpFreeCapturedAttributes(IN PVOID Buffer,
IN PP_NPAGED_LOOKASIDE_NUMBER Type)
{
@@ -369,8 +369,8 @@
}
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpFreeObjectCreateInformation(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo)
{
/* First release the attributes, then free them from the lookaside list */
@@ -379,16 +379,16 @@
}
#if DBG
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpCalloutStart(IN PKIRQL CalloutIrql)
{
/* Save the callout IRQL */
*CalloutIrql = KeGetCurrentIrql();
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpCalloutEnd(IN KIRQL CalloutIrql,
IN PCHAR Procedure,
IN POBJECT_TYPE ObjectType,
@@ -406,16 +406,16 @@
}
}
#else
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpCalloutStart(IN PKIRQL CalloutIrql)
{
/* No-op */
UNREFERENCED_PARAMETER(CalloutIrql);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
ObpCalloutEnd(IN KIRQL CalloutIrql,
IN PCHAR Procedure,
IN POBJECT_TYPE ObjectType,
Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/ps_x.h?rev=37824&r1=37823&r2=37824&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/ps_x.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/ps_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008
@@ -35,8 +35,8 @@
#define PspClearProcessFlag(Process, Flag) \
InterlockedAnd((PLONG)&Process->Flags, ~Flag)
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspRunCreateThreadNotifyRoutines(IN PETHREAD CurrentThread,
IN BOOLEAN Create)
{
@@ -57,8 +57,8 @@
}
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspRunCreateProcessNotifyRoutines(IN PEPROCESS CurrentProcess,
IN BOOLEAN Create)
{
@@ -79,8 +79,8 @@
}
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspRunLoadImageNotifyRoutines(PUNICODE_STRING FullImageName,
HANDLE ProcessId,
PIMAGE_INFO ImageInfo)
@@ -98,16 +98,16 @@
}
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspRunLegoRoutine(IN PKTHREAD Thread)
{
/* Call it */
if (PspLegoNotifyRoutine) PspLegoNotifyRoutine(Thread);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspLockProcessSecurityShared(IN PEPROCESS Process)
{
/* Enter a Critical Region */
@@ -117,8 +117,8 @@
ExAcquirePushLockShared(&Process->ProcessLock);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspUnlockProcessSecurityShared(IN PEPROCESS Process)
{
/* Unlock the Process */
@@ -128,8 +128,8 @@
KeLeaveCriticalRegion();
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspLockProcessSecurityExclusive(IN PEPROCESS Process)
{
/* Enter a Critical Region */
@@ -139,8 +139,8 @@
ExAcquirePushLockExclusive(&Process->ProcessLock);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspUnlockProcessSecurityExclusive(IN PEPROCESS Process)
{
/* Unlock the Process */
@@ -150,8 +150,8 @@
KeLeaveCriticalRegion();
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspLockThreadSecurityShared(IN PETHREAD Thread)
{
/* Enter a Critical Region */
@@ -161,8 +161,8 @@
ExAcquirePushLockShared(&Thread->ThreadLock);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspUnlockThreadSecurityShared(IN PETHREAD Thread)
{
/* Unlock the Thread */
@@ -172,8 +172,8 @@
KeLeaveCriticalRegion();
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspLockThreadSecurityExclusive(IN PETHREAD Thread)
{
/* Enter a Critical Region */
@@ -183,8 +183,8 @@
ExAcquirePushLockExclusive(&Thread->ThreadLock);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
PspUnlockThreadSecurityExclusive(IN PETHREAD Thread)
{
/* Unlock the Process */
@@ -194,8 +194,8 @@
KeLeaveCriticalRegion();
}
+FORCEINLINE
PEPROCESS
-FORCEINLINE
_PsGetCurrentProcess(VOID)
{
/* Get the current process */
More information about the Ros-diffs
mailing list