Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[dgorbachev] 37824: Silence compiler warnings (2/11).

by dgorbachev＠svn.reactos.org

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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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(a)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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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 */

15 years, 9 months

[dgorbachev] 37823: Silence compiler warnings (1/11).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Dec 3 11:28:24 2008 New Revision: 37823 URL: http://svn.reactos.org/svn/reactos?rev=37823&view=rev Log: Silence compiler warnings (1/11). Modified: trunk/reactos/include/ddk/ntstrsafe.h trunk/reactos/include/host/typedefs.h trunk/reactos/include/ndk/dbgktypes.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/reactos/dll/desk/deskcplx.h trunk/reactos/include/reactos/probe.h Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -140,13 +140,13 @@ IN va_list argList) { NTSTATUS Status = STATUS_SUCCESS; - ULONG Return; + LONG Return; SIZE_T MaxLength, LocalNewLength = 0; MaxLength = Length - 1; Return = _vsnprintf(Destination, MaxLength, Format, argList); - if ((Return < 0) || (Return > MaxLength)) + if ((Return < 0) || ((SIZE_T)Return > MaxLength)) { Destination += MaxLength; *Destination = ANSI_NULL; @@ -155,7 +155,7 @@ Status = STATUS_BUFFER_OVERFLOW; } - else if (Return == MaxLength) + else if ((SIZE_T)Return == MaxLength) { Destination += MaxLength; *Destination = ANSI_NULL; Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -153,8 +153,8 @@ ListHead->Blink = Entry; } +static __inline BOOLEAN -static __inline IsListEmpty( IN const LIST_ENTRY * ListHead ) Modified: trunk/reactos/include/ndk/dbgktypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgktypes.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgktypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/dbgktypes.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -191,7 +191,7 @@ { PORT_MESSAGE h; DBGKM_APINUMBER ApiNumber; - ULONG ReturnedStatus; + NTSTATUS ReturnedStatus; union { DBGKM_EXCEPTION Exception; Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -77,8 +77,8 @@ ListHead->Blink = Entry; } -BOOLEAN FORCEINLINE +BOOLEAN IsListEmpty( IN const LIST_ENTRY * ListHead ) Modified: trunk/reactos/include/reactos/dll/desk/deskcplx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/desk/d… ============================================================================== --- trunk/reactos/include/reactos/dll/desk/deskcplx.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/dll/desk/deskcplx.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -44,7 +44,7 @@ LONG WINAPI DisplaySaveSettings(PVOID pContext, HWND hwndPropSheet); -static PDESK_EXT_INTERFACE __inline +static __inline PDESK_EXT_INTERFACE QueryDeskCplExtInterface(IDataObject *pdo) { PDESK_EXT_INTERFACE pRecvBuffer, pExtIface = NULL; @@ -80,7 +80,7 @@ return pExtIface; } -static LPTSTR __inline +static __inline LPTSTR QueryDeskCplString(IDataObject *pdo, UINT cfFormat) { FORMATETC fetc; @@ -118,7 +118,7 @@ return lpStr; } -static LONG __inline +static __inline LONG DeskCplExtDisplaySaveSettings(PDESK_EXT_INTERFACE DeskExtInterface, HWND hwndDlg) { Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… ============================================================================== --- trunk/reactos/include/reactos/probe.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/probe.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -5,7 +5,7 @@ #error Header intended for use by NTOSKRNL/WIN32K only! #endif -static const UNICODE_STRING __emptyUnicodeString = {0}; +static const UNICODE_STRING __emptyUnicodeString = {0, 0, NULL}; static const LARGE_INTEGER __emptyLargeInteger = {{0, 0}}; static const ULARGE_INTEGER __emptyULargeInteger = {{0, 0}}; static const IO_STATUS_BLOCK __emptyIoStatusBlock = {{0}, 0};

15 years, 9 months

[tkreuzer] 37822: - Implement iInitializeCouFeatures, replacing KiSetCR0Bits. This allows us to save / restore xmm registers - check supported cpu features

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 3 11:24:40 2008 New Revision: 37822 URL: http://svn.reactos.org/svn/reactos?rev=37822&view=rev Log: - Implement iInitializeCouFeatures, replacing KiSetCR0Bits. This allows us to save / restore xmm registers - check supported cpu features Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Wed Dec 3 11:24:40 2008 @@ -120,10 +120,6 @@ VOID NTAPI -KiSetCR0Bits(VOID); - -VOID -NTAPI KiGetCacheInformation(VOID); BOOLEAN @@ -145,6 +141,10 @@ ULONG NTAPI KiGetFeatureBits(VOID); + +VOID +NTAPI +KiInitializeCpuFeatures(); ULONG KeAllocateGdtSelector(ULONG Desc[2]); VOID KeFreeGdtSelector(ULONG Entry); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Wed Dec 3 11:24:40 2008 @@ -240,6 +240,21 @@ VOID NTAPI +KiInitializeCpuFeatures() +{ + /* Enable Write-Protection */ + __writecr0(__readcr0() | CR0_WP); + + /* Disable fpu monitoring */ + __writecr0(__readcr0() & ~CR0_MP); + + /* Enable fx save restore support */ + __writecr4(__readcr4() | CR4_FXSR); + +} + +VOID +NTAPI KiGetCacheInformation(VOID) { PKIPCR Pcr = (PKIPCR)KeGetPcr(); @@ -348,23 +363,6 @@ VOID -NTAPI -KiSetCR0Bits(VOID) -{ - ULONG64 Cr0; - - /* Save current CR0 */ - Cr0 = __readcr0(); - - /* If this is a 486, enable Write-Protection */ - if (KeGetCurrentPrcb()->CpuType > 3) Cr0 |= CR0_WP; - - /* Set new Cr0 */ - __writecr0(Cr0); -} - - -VOID FASTCALL Ki386InitializeTss(IN PKTSS64 Tss, IN PKIDTENTRY Idt, Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Wed Dec 3 11:24:40 2008 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/ke/i386/kiinit.c * PURPOSE: Kernel Initialization for x86 CPUs * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -11,6 +12,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#define REQUIRED_FEATURE_BITS (KF_RDTSC|KF_CR4|KF_CMPXCHG8B|KF_XMMI|KF_XMMI64| \ + KF_NX_BIT) /* GLOBALS *******************************************************************/ @@ -393,7 +397,6 @@ IN CCHAR Number, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - BOOLEAN NpxPresent; ULONG FeatureBits; ULONG PageDirectory[2]; PVOID DpcStack; @@ -401,14 +404,20 @@ /* Detect and set the CPU Type */ KiSetProcessorType(); - /* Set CR0 features based on detected CPU */ - KiSetCR0Bits(); - /* Initialize the Power Management Support for this PRCB */ // PoInitializePrcb(Prcb); /* Get the processor features for the CPU */ FeatureBits = KiGetFeatureBits(); + + /* Check if we support all needed features */ + if ((FeatureBits & REQUIRED_FEATURE_BITS) != REQUIRED_FEATURE_BITS) + { + /* If not, bugcheck system */ + DPRINT1("CPU doesn't have needed features! Has: 0x%x, required: 0x%x\n", + FeatureBits, REQUIRED_FEATURE_BITS); + KeBugCheck(0); + } /* Set the default NX policy (opt-in) */ SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; @@ -442,6 +451,9 @@ /* Save feature bits */ Prcb->FeatureBits = FeatureBits; + + /* Initialize the CPU features */ + KiInitializeCpuFeatures(); /* Save CPU state */ KiSaveProcessorControlState(&Prcb->ProcessorState); @@ -461,7 +473,7 @@ KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; /* Set boot-level flags */ - KeI386NpxPresent = NpxPresent; + KeI386NpxPresent = TRUE; KeI386CpuType = Prcb->CpuType; KeI386CpuStep = Prcb->CpuStep; KeProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; @@ -758,9 +770,12 @@ /* Check for break-in */ // if (KdPollBreakIn()) DbgBreakPointWithStatus(1); } +DPRINT1("after KdInitSystem\n"); /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); + +FrLdrDbgPrint("before KiSetupStackAndInitializeKernel\n"); /* Switch to new kernel stack and start kernel bootstrapping */ KiSetupStackAndInitializeKernel(&KiInitialProcess.Pcb,

15 years, 9 months

[tkreuzer] 37821: fix UNIMPLEMENTED asm macro

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 3 11:15:09 2008 New Revision: 37821 URL: http://svn.reactos.org/svn/reactos?rev=37821&view=rev Log: fix UNIMPLEMENTED asm macro Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S [iso-8859-1] Wed Dec 3 11:15:09 2008 @@ -63,11 +63,11 @@ .macro .endprolog .endm -.macro UNIMPLEMENTED2 line, func +.macro UNIMPLEMENTED2 file, line, func jmp 3f .equ expr, 12 1: .asciz "\func" -2: .asciz __FILE__ +2: .asciz "\file" 3: sub rsp, 0x20 lea rcx, _MsgUnimplemented[rip] @@ -77,5 +77,5 @@ call _DbgPrint add rsp, 0x20 .endm -#define UNIMPLEMENTED UNIMPLEMENTED2 __LINE__, +#define UNIMPLEMENTED UNIMPLEMENTED2 __FILE__, __LINE__,

15 years, 9 months

[tkreuzer] 37820: add more stuff to x64 asm.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 3 10:39:26 2008 New Revision: 37820 URL: http://svn.reactos.org/svn/reactos?rev=37820&view=rev Log: add more stuff to x64 asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] Wed Dec 3 10:39:26 2008 @@ -50,6 +50,11 @@ #define KTHREAD_STACK_LIMIT 0x30 #define KTHREAD_WAIT_IRQL 0x156 +// +// KPRCB Offsets +// +#define KPRCB_CurrentThread 0x08 + // // KPCR Offsets @@ -57,10 +62,63 @@ #define KPCR_TSS_BASE 0x08 #define KPCR_SELF 0x18 #define KPCR_STALL_SCALE_FACTOR 0x64 - -// -// Trap Frame Offsets -// +#define KPCR_PRCB 0x180 + +// +// KTRAP_FRAME Offsets +// +#define KTRAP_FRAME_P1Home 0x00 +#define KTRAP_FRAME_P2Home 0x08 +#define KTRAP_FRAME_P3Home 0x10 +#define KTRAP_FRAME_P4Home 0x18 +#define KTRAP_FRAME_P5 0x20 +#define KTRAP_FRAME_PreviousMode 0x28 +#define KTRAP_FRAME_PreviousIrql 0x29 +#define KTRAP_FRAME_FaultIndicator 0x2A +#define KTRAP_FRAME_ExceptionActive 0x2B +#define KTRAP_FRAME_MxCsr 0x2C +#define KTRAP_FRAME_Rax 0x30 +#define KTRAP_FRAME_Rcx 0x38 +#define KTRAP_FRAME_Rdx 0x40 +#define KTRAP_FRAME_R8 0x48 +#define KTRAP_FRAME_R9 0x50 +#define KTRAP_FRAME_R10 0x58 +#define KTRAP_FRAME_R11 0x60 +#define KTRAP_FRAME_Spare0 0x68 +#define KTRAP_FRAME_Xmm0 0x70 +#define KTRAP_FRAME_Xmm1 0x80 +#define KTRAP_FRAME_Xmm2 0x90 +#define KTRAP_FRAME_Xmm3 0xA0 +#define KTRAP_FRAME_Xmm4 0xB0 +#define KTRAP_FRAME_Xmm5 0xC0 +#define KTRAP_FRAME_FaultAddress 0xD0 +#define KTRAP_FRAME_Dr0 0xD8 +#define KTRAP_FRAME_Dr1 0xE0 +#define KTRAP_FRAME_Dr2 0xE8 +#define KTRAP_FRAME_Dr3 0xF0 +#define KTRAP_FRAME_Dr6 0xF8 +#define KTRAP_FRAME_Dr7 0x100 +#define KTRAP_FRAME_DebugControl 0x108 +#define KTRAP_FRAME_LastBranchToRip 0x110 +#define KTRAP_FRAME_LastBranchFromRip 0x118 +#define KTRAP_FRAME_LastExceptionToRip 0x120 +#define KTRAP_FRAME_LastExceptionFromRip 0x128 +#define KTRAP_FRAME_SegDs 0x130 +#define KTRAP_FRAME_SegEs 0x132 +#define KTRAP_FRAME_SegFs 0x134 +#define KTRAP_FRAME_SegGs 0x136 +#define KTRAP_FRAME_TrapFrame 0x138 +#define KTRAP_FRAME_Rbx 0x140 +#define KTRAP_FRAME_Rdi 0x148 +#define KTRAP_FRAME_Rsi 0x150 +#define KTRAP_FRAME_Rbp 0x158 +#define KTRAP_FRAME_ErrorCode 0x160 +#define KTRAP_FRAME_Rip 0x168 +#define KTRAP_FRAME_SegCs 0x170 +#define KTRAP_FRAME_EFlags 0x178 +#define KTRAP_FRAME_Rsp 0x180 +#define KTRAP_FRAME_SegSs 0x188 +#define SIZE_KTRAP_FRAME 0x190 #define KTRAP_FRAME_ALIGN 0x10 #define KTRAP_FRAME_LENGTH 0x190 @@ -132,60 +190,15 @@ #define CONTEXT_LastExceptionFromRip 0x4c8 // -// KTRAP_FRAME Offsets -// -#define KTRAP_FRAME_P1Home 0x00 -#define KTRAP_FRAME_P2Home 0x08 -#define KTRAP_FRAME_P3Home 0x10 -#define KTRAP_FRAME_P4Home 0x18 -#define KTRAP_FRAME_P5 0x20 -#define KTRAP_FRAME_PreviousMode 0x28 -#define KTRAP_FRAME_PreviousIrql 0x29 -#define KTRAP_FRAME_FaultIndicator 0x2A -#define KTRAP_FRAME_ExceptionActive 0x2B -#define KTRAP_FRAME_MxCsr 0x2C -#define KTRAP_FRAME_Rax 0x30 -#define KTRAP_FRAME_Rcx 0x38 -#define KTRAP_FRAME_Rdx 0x40 -#define KTRAP_FRAME_R8 0x48 -#define KTRAP_FRAME_R9 0x50 -#define KTRAP_FRAME_R10 0x58 -#define KTRAP_FRAME_R11 0x60 -#define KTRAP_FRAME_Spare0 0x68 -#define KTRAP_FRAME_Xmm0 0x70 -#define KTRAP_FRAME_Xmm1 0x80 -#define KTRAP_FRAME_Xmm2 0x90 -#define KTRAP_FRAME_Xmm3 0xA0 -#define KTRAP_FRAME_Xmm4 0xB0 -#define KTRAP_FRAME_Xmm5 0xC0 -#define KTRAP_FRAME_FaultAddress 0xD0 -#define KTRAP_FRAME_Dr0 0xD8 -#define KTRAP_FRAME_Dr1 0xE0 -#define KTRAP_FRAME_Dr2 0xE8 -#define KTRAP_FRAME_Dr3 0xF0 -#define KTRAP_FRAME_Dr6 0xF8 -#define KTRAP_FRAME_Dr7 0x100 -#define KTRAP_FRAME_DebugControl 0x108 -#define KTRAP_FRAME_LastBranchToRip 0x110 -#define KTRAP_FRAME_LastBranchFromRip 0x118 -#define KTRAP_FRAME_LastExceptionToRip 0x120 -#define KTRAP_FRAME_LastExceptionFromRip 0x128 -#define KTRAP_FRAME_SegDs 0x130 -#define KTRAP_FRAME_SegEs 0x132 -#define KTRAP_FRAME_SegFs 0x134 -#define KTRAP_FRAME_SegGs 0x136 -#define KTRAP_FRAME_TrapFrame 0x138 -#define KTRAP_FRAME_Rbx 0x140 -#define KTRAP_FRAME_Rdi 0x148 -#define KTRAP_FRAME_Rsi 0x150 -#define KTRAP_FRAME_Rbp 0x158 -#define KTRAP_FRAME_ErrorCode 0x160 -#define KTRAP_FRAME_Rip 0x168 -#define KTRAP_FRAME_SegCs 0x170 -#define KTRAP_FRAME_EFlags 0x178 -#define KTRAP_FRAME_Rsp 0x180 -#define KTRAP_FRAME_SegSs 0x188 -#define SIZE_KTRAP_FRAME 0x190 +// EXCEPTION_RECORD Offsets +// +#define EXCEPTION_RECORD_ExceptionCode 0x00 +#define EXCEPTION_RECORD_ExceptionFlags 0x04 +#define EXCEPTION_RECORD_ExceptionRecord 0x08 +#define EXCEPTION_RECORD_ExceptionAddress 0x10 +#define EXCEPTION_RECORD_NumberParameters 0x18 +#define EXCEPTION_RECORD_ExceptionInformation 0x20 +#define SIZE_EXCEPTION_RECORD 0x98 // // CR0 @@ -203,6 +216,20 @@ #define CR0_PG 0x80000000 // +// CR4 +// +#define CR4_VME 0x1 +#define CR4_PVI 0x2 +#define CR4_TSD 0x4 +#define CR4_DE 0x8 +#define CR4_PSE 0x10 +#define CR4_PAE 0x20 +#define CR4_MCE 0x40 +#define CR4_PGE 0x80 +#define CR4_FXSR 0x200 +#define CR4_XMMEXCPT 0x400 + +// // Generic Definitions // #define PRIMARY_VECTOR_BASE 0x30 @@ -233,6 +260,43 @@ #define EFLAG_SELECT (EFLAG_SIGN + EFLAG_ZERO) #define EFLAGS_USER_SANITIZE 0x3F4DD7 +// +// NTSTATUS and Bugcheck Codes +// +#define STATUS_ACCESS_VIOLATION 0xC0000005 +#define STATUS_IN_PAGE_ERROR 0xC0000006 +#define STATUS_GUARD_PAGE_VIOLATION 0x80000001 +#define STATUS_PRIVILEGED_INSTRUCTION 0xC0000096 +#define STATUS_STACK_OVERFLOW 0xC00000FD +#define KI_EXCEPTION_ACCESS_VIOLATION 0x10000004 +#define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C +#define STATUS_NO_CALLBACK_ACTIVE 0xC0000258 +#define STATUS_CALLBACK_POP_STACK 0xC0000423 +#define STATUS_ARRAY_BOUNDS_EXCEEDED 0xC000008C +#define STATUS_ILLEGAL_INSTRUCTION 0xC000001D +#define STATUS_INVALID_LOCK_SEQUENCE 0xC000001E +#define STATUS_BREAKPOINT 0x80000003 +#define STATUS_SINGLE_STEP 0x80000004 +#define STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000094 +#define STATUS_INTEGER_OVERFLOW 0xC0000095 +#define STATUS_FLOAT_DENORMAL_OPERAND 0xC000008D +#define STATUS_FLOAT_DIVIDE_BY_ZERO 0xC000008E +#define STATUS_FLOAT_INEXACT_RESULT 0xC000008F +#define STATUS_FLOAT_INVALID_OPERATION 0xC0000090 +#define STATUS_FLOAT_OVERFLOW 0xC0000091 +#define STATUS_FLOAT_STACK_CHECK 0xC0000092 +#define STATUS_FLOAT_UNDERFLOW 0xC0000093 +#define STATUS_FLOAT_MULTIPLE_FAULTS 0xC00002B4 +#define STATUS_FLOAT_MULTIPLE_TRAPS 0xC00002B5 +#define APC_INDEX_MISMATCH 0x01 +#define IRQL_NOT_GREATER_OR_EQUAL 0x09 +#define IRQL_NOT_LESS_OR_EQUAL 0x0A +#define TRAP_CAUSE_UNKNOWN 0x12 +#define KMODE_EXCEPTION_NOT_HANDLED 0x13 +#define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A +#define UNEXPECTED_KERNEL_MODE_TRAP 0x7F +#define ATTEMPTED_SWITCH_FROM_DPC 0xB8 +#define HARDWARE_INTERRUPT_STORM 0xF2 // // IRQL Levels

15 years, 9 months

[tkreuzer] 37819: Simplyfy KiGetFeatureBits

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 3 09:40:26 2008 New Revision: 37819 URL: http://svn.reactos.org/svn/reactos?rev=37819&view=rev Log: Simplyfy KiGetFeatureBits Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Wed Dec 3 09:40:26 2008 @@ -161,7 +161,6 @@ ULONG Vendor; ULONG FeatureBits = KF_WORKING_PTE; INT Reg[4]; - BOOLEAN ExtendedCPUID = TRUE; ULONG CpuFeatures = 0; /* Get the Vendor ID */ @@ -176,96 +175,8 @@ /* Set the initial APIC ID */ Prcb->InitialApicId = (UCHAR)(Reg[1] >> 24); - /* Check for AMD CPU */ - if (Vendor == CPU_AMD) - { - /* Check if this is a K5 or higher. */ - if ((Reg[0] & 0x0F00) >= 0x0500) - { - /* Check if this is a K5 specifically. */ - if ((Reg[0] & 0x0F00) == 0x0500) - { - /* Get the Model Number */ - switch (Reg[0] & 0x00F0) - { - /* Check if this is the Model 1 */ - case 0x0010: - - /* Check if this is Step 0 or 1. They don't support PGE */ - if ((Reg[0] & 0x000F) > 0x03) break; - - case 0x0000: - - /* Model 0 doesn't support PGE at all. */ - Reg[3] &= ~0x2000; - break; - - case 0x0080: - - /* K6-2, Step 8 and over have support for MTRR. */ - if ((Reg[0] & 0x000F) >= 0x8) FeatureBits |= KF_AMDK6MTRR; - break; - - case 0x0090: - - /* As does the K6-3 */ - FeatureBits |= KF_AMDK6MTRR; - break; - - default: - break; - } - } - } - else - { - /* Families below 5 don't support PGE, PSE or CMOV at all */ - Reg[3] &= ~(0x08 | 0x2000 | 0x8000); - - /* They also don't support advanced CPUID functions. */ - ExtendedCPUID = FALSE; - } - - /* Set the current features */ - CpuFeatures = Reg[3]; - } - - /* Now check if this is Intel */ - if (Vendor == CPU_INTEL) - { - /* Check if it's a P6 */ - if (Prcb->CpuType == 6) - { - /* Perform the special sequence to get the MicroCode Signature */ - __writemsr(0x8B, 0); - __cpuid(Reg, 1); - Prcb->UpdateSignature.QuadPart = __readmsr(0x8B); - } - else if (Prcb->CpuType == 5) - { - /* On P5, enable workaround for the LOCK errata. */ - KiI386PentiumLockErrataPresent = TRUE; - } - - /* Check for broken P6 with bad SMP PTE implementation */ - if (((Reg[0] & 0x0FF0) == 0x0610 && (Reg[0] & 0x000F) <= 0x9) || - ((Reg[0] & 0x0FF0) == 0x0630 && (Reg[0] & 0x000F) <= 0x4)) - { - /* Remove support for correct PTE support. */ - FeatureBits &= ~KF_WORKING_PTE; - } - - /* Check if the CPU is too old to support SYSENTER */ - if ((Prcb->CpuType < 6) || - ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0303))) - { - /* Disable it */ - Reg[3] &= ~0x800; - } - - /* Set the current features */ - CpuFeatures = Reg[3]; - } + /* Set the current features */ + CpuFeatures = Reg[3]; /* Convert all CPUID Feature bits into our format */ if (CpuFeatures & 0x00000002) FeatureBits |= KF_V86_VIS | KF_CR4; @@ -300,29 +211,25 @@ Prcb->LogicalProcessorsPerPhysicalProcessor = 1; } - /* Check if CPUID 0x80000000 is supported */ - if (ExtendedCPUID) - { - /* Do the call */ - __cpuid(Reg, 0x80000000); - if ((Reg[0] & 0xffffff00) == 0x80000000) + /* Check extended cpuid features */ + __cpuid(Reg, 0x80000000); + if ((Reg[0] & 0xffffff00) == 0x80000000) + { + /* Check if CPUID 0x80000001 is supported */ + if (Reg[0] >= 0x80000001) { - /* Check if CPUID 0x80000001 is supported */ - if (Reg[0] >= 0x80000001) + /* Check which extended features are available. */ + __cpuid(Reg, 0x80000001); + + /* Check if NX-bit is supported */ + if (Reg[3] & 0x00100000) FeatureBits |= KF_NX_BIT; + + /* Now handle each features for each CPU Vendor */ + switch (Vendor) { - /* Check which extended features are available. */ - __cpuid(Reg, 0x80000001); - - /* Check if NX-bit is supported */ - if (Reg[3] & 0x00100000) FeatureBits |= KF_NX_BIT; - - /* Now handle each features for each CPU Vendor */ - switch (Vendor) - { - case CPU_AMD: - if (Reg[3] & 0x80000000) FeatureBits |= KF_3DNOW; - break; - } + case CPU_AMD: + if (Reg[3] & 0x80000000) FeatureBits |= KF_3DNOW; + break; } } }

15 years, 9 months

[tkreuzer] 37818: fix ULONG/ULONG_PTR issue

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 3 08:10:19 2008 New Revision: 37818 URL: http://svn.reactos.org/svn/reactos?rev=37818&view=rev Log: fix ULONG/ULONG_PTR issue Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Dec 3 08:10:19 2008 @@ -135,7 +135,7 @@ ProcessBasicInfo->UniqueProcessId = (ULONG_PTR)Process-> UniqueProcessId; ProcessBasicInfo->InheritedFromUniqueProcessId = - (ULONG)Process->InheritedFromUniqueProcessId; + (ULONG_PTR)Process->InheritedFromUniqueProcessId; ProcessBasicInfo->BasePriority = Process->Pcb.BasePriority; } @@ -255,7 +255,7 @@ _SEH_TRY { /* Write back the Session ID */ - SessionInfo->SessionId = Process->Session; + SessionInfo->SessionId = PtrToUlong(Process->Session); /* Set the return length */ Length = sizeof(PROCESS_SESSION_INFORMATION); @@ -682,7 +682,7 @@ if (!NT_SUCCESS(Status)) break; /* Write the session ID in the EPROCESS */ - Process->Session = SessionInfo.SessionId; + Process->Session = UlongToPtr(SessionInfo.SessionId); /* Check if the process also has a PEB */ if (Process->Peb)

15 years, 9 months

[sginsberg] 37817: - Make imagehlp compile warning free (don't mix Wine and ros debug style, add missing casts)

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Dec 3 07:05:54 2008 New Revision: 37817 URL: http://svn.reactos.org/svn/reactos?rev=37817&view=rev Log: - Make imagehlp compile warning free (don't mix Wine and ros debug style, add missing casts) Modified: trunk/reactos/dll/win32/imagehlp/access.c trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild trunk/reactos/dll/win32/imagehlp/imagehlp_main.c trunk/reactos/dll/win32/imagehlp/integrity.c trunk/reactos/dll/win32/imagehlp/modify.c Modified: trunk/reactos/dll/win32/imagehlp/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/access.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] Wed Dec 3 07:05:54 2008 @@ -20,8 +20,6 @@ #include "precomp.h" -//#define NDEBUG -#include <debug.h> #define _WINNT_H #include "wine/debug.h" @@ -122,7 +120,7 @@ /* Move to the Next DLL */ Head = &ImageLoadListHead; Next = Head->Flink; - DPRINT("Trying to find library: %s in current ListHead \n", DllName); + TRACE("Trying to find library: %s in current ListHead \n", DllName); /* Split the path */ _splitpath(DllName, Drive, Dir, Filename, Ext); @@ -135,7 +133,7 @@ { /* Get the Loaded Image Structure */ LoadedImage = CONTAINING_RECORD(Next, LOADED_IMAGE, Links); - DPRINT("Found: %s in current ListHead \n", LoadedImage->ModuleName); + TRACE("Found: %s in current ListHead \n", LoadedImage->ModuleName); /* Check if we didn't have a complete name */ if (!CompleteName) @@ -156,7 +154,7 @@ /* Check if the Names Match */ if (!_stricmp(DllName, FullName)) { - DPRINT("Found it, returning it\n"); + TRACE("Found it, returning it\n"); return LoadedImage; } @@ -165,7 +163,7 @@ } /* Allocate memory for the Structure, and write the Module Name under */ - DPRINT("Didn't find it...allocating it for you now\n"); + TRACE("Didn't find it...allocating it for you now\n"); LoadedImage = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*LoadedImage) + strlen(DllName) + 1); @@ -255,14 +253,14 @@ ImageName, DotDll ? ".dll" : ".exe", MAX_PATH, - Buffer, + (PSTR)Buffer, &FilePart); /* Check if it was successful */ if (Tried && (Tried < MAX_PATH)) { /* Change the filename to use, and try again */ - FileToOpen = Buffer; + FileToOpen = (PSTR)Buffer; continue; } } Modified: trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild [iso-8859-1] Wed Dec 3 07:05:54 2008 @@ -1,4 +1,4 @@ -<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" allowwarnings="true"> +<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll"> <importlibrary definition="imagehlp.spec" /> <include base="imagehlp">.</include> <define name="_IMAGEHLP_SOURCE_"></define> Modified: trunk/reactos/dll/win32/imagehlp/imagehlp_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/imagehlp_main.c [iso-8859-1] Wed Dec 3 07:05:54 2008 @@ -24,8 +24,6 @@ #include "precomp.h" -//#define NDEBUG -#include <debug.h> #define _WINNT_H #include "wine/debug.h" Modified: trunk/reactos/dll/win32/imagehlp/integrity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/integri… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/integrity.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/integrity.c [iso-8859-1] Wed Dec 3 07:05:54 2008 @@ -28,8 +28,6 @@ #include "precomp.h" -//#define NDEBUG -#include <debug.h> #define _WINNT_H #include "wine/debug.h" @@ -293,7 +291,7 @@ const size_t cert_hdr_size = sizeof *Certificateheader - sizeof Certificateheader->bCertificate; - DPRINT("%p %ld %p\n", FileHandle, CertificateIndex, Certificateheader); + TRACE("%p %ld %p\n", FileHandle, CertificateIndex, Certificateheader); if( !IMAGEHLP_GetCertificateOffset( FileHandle, CertificateIndex, &ofs, &size ) ) return FALSE; @@ -354,7 +352,7 @@ PIMAGE_NT_HEADERS Header; DWORD CalcSum; DWORD HdrSum; - DPRINT("stub\n"); + TRACE("stub\n"); CalcSum = (DWORD)CalcCheckSum(0, BaseAddress, Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] Wed Dec 3 07:05:54 2008 @@ -21,8 +21,6 @@ #include "precomp.h" -//#define NDEBUG -#include <debug.h> #define _WINNT_H #include "wine/debug.h" @@ -159,12 +157,12 @@ strcat(DllName, ".DLL"); /* Load it */ - DPRINT("Loading the Thunk Library: %s \n", DllName); + TRACE("Loading the Thunk Library: %s \n", DllName); Library = ImageLoad(DllName, DllPath); if (!Library) return ForwarderString; /* Move past the name */ - DPRINT("It Loaded at: %p \n", Library->MappedAddress); + TRACE("It Loaded at: %p \n", Library->MappedAddress); FunctionName = TempDllName += 1; /* Load Exports */ @@ -275,7 +273,7 @@ ExportsBase += OptionalHeader->ImageBase; /* Is this yet another Forward? */ - DPRINT("I've thunked it\n"); + TRACE("I've thunked it\n"); if ((ForwardedAddress > ExportsBase) && (ForwardedAddress < (ExportsBase + ExportSize))) { @@ -289,7 +287,7 @@ else { /* Update the pointer and return success */ - ForwarderString = (PUCHAR)ForwardedAddress; + ForwarderString = (PCHAR)ForwardedAddress; *ForwarderBound = TRUE; } @@ -323,7 +321,7 @@ PIMAGE_OPTIONAL_HEADER LibraryOptionalHeader = NULL; BOOL ForwarderBound = FALSE; PUCHAR ForwarderName; - DPRINT("Binding a Thunk\n"); + TRACE("Binding a Thunk\n"); /* Get the Pointers to the Tables */ AddressOfNames = ImageRvaToVa(Library->FileHeader, @@ -351,7 +349,7 @@ ImportName = (PIMAGE_IMPORT_BY_NAME)NameBuffer; /* Setup the name for this ordinal */ - sprintf(ImportName->Name, "Ordinal%lx\n", OrdinalNumber); + sprintf((PCHAR)ImportName->Name, "Ordinal%lx\n", OrdinalNumber); } else { @@ -372,7 +370,7 @@ (ULONG)AddressOfNames[HintIndex], &Library->LastRvaSection); /* Check if it's the one we want */ - if (!strcmp(ImportName->Name, ExportName)) + if (!strcmp((PCHAR)ImportName->Name, ExportName)) { OrdinalNumber = AddressOfOrdinals[HintIndex]; } @@ -390,7 +388,7 @@ &Library->LastRvaSection); /* Check if it's the one we want */ - if (!strcmp(ImportName->Name, ExportName)) + if (!strcmp((PCHAR)ImportName->Name, ExportName)) { OrdinalNumber = AddressOfOrdinals[HintIndex]; break; @@ -423,7 +421,7 @@ /* Make sure we have a descriptor */ if (BoundImportDescriptor) { - DPRINT("This Thunk is a forward...calling forward thunk bounder\n"); + TRACE("This Thunk is a forward...calling forward thunk bounder\n"); /* Get the VA of the pointer containg the name */ ForwarderName = ImageRvaToVa(Library->FileHeader, @@ -434,10 +432,10 @@ /* Replace the Forwarder String by the actual name */ ThunkFunction->u1.ForwarderString = PtrToUlong(BindpAddForwarderReference(Image->ModuleName, - ImportName->Name, + (PCHAR)ImportName->Name, BoundImportDescriptor, DllPath, - ForwarderName, + (PCHAR)ForwarderName, &ForwarderBound)); } @@ -493,7 +491,7 @@ /* Add Terminator for PE Loader*/ BoundImportTableSize += sizeof(IMAGE_BOUND_IMPORT_DESCRIPTOR); - DPRINT("Table size: %lx\n", BoundImportTableSize); + TRACE("Table size: %lx\n", BoundImportTableSize); /* Name of Libraries Bound in Bound Import Table */ BoundLibraryNamesSize = (ULONG)((ULONG_PTR)BoundLibrariesPointer - @@ -521,7 +519,7 @@ { /* Copy the data */ BoundTableEntry->TimeDateStamp = Descriptor->TimeDateStamp; - BoundTableEntry->OffsetModuleName = (USHORT)(BoundImportTableSize + + BoundTableEntry->OffsetModuleName = (USHORT)(ULONG_PTR)(BoundImportTableSize + (Descriptor->ModuleName - (ULONG_PTR)BoundLibraries)); BoundTableEntry->NumberOfModuleForwarderRefs = Descriptor->ForwaderReferences; @@ -533,7 +531,7 @@ { /* Copy the data */ BoundForwarder->TimeDateStamp = Forwarder->TimeDateStamp; - BoundForwarder->OffsetModuleName = (USHORT)(BoundImportTableSize + + BoundForwarder->OffsetModuleName = (USHORT)(ULONG_PTR)(BoundImportTableSize + (Forwarder->ModuleName - (ULONG_PTR)BoundLibraries)); @@ -601,7 +599,7 @@ ULONG BoundImportTableSize, OldBoundImportTableSize; ULONG VirtBytesFree, HeaderBytesFree, FirstFreeByte, PhysBytesFree; BOOL ThunkStatus; - DPRINT("BindpWalkAndBindImports Called\n"); + TRACE("BindpWalkAndBindImports Called\n"); /* Assume untouched image */ *UpdateImage = FALSE; @@ -636,7 +634,7 @@ &File->LastRvaSection); if (ImportedLibrary) { - DPRINT("Loading Imported DLL: %s \n", ImportedLibrary); + TRACE("Loading Imported DLL: %s \n", ImportedLibrary); /* Load the DLL */ LoadedLibrary = ImageLoad(ImportedLibrary, DllPath); @@ -654,7 +652,7 @@ } /* Now load the Exports */ - DPRINT("DLL Loaded at: %p \n", LoadedLibrary->MappedAddress); + TRACE("DLL Loaded at: %p \n", LoadedLibrary->MappedAddress); Exports = ImageDirectoryEntryToData(LoadedLibrary->MappedAddress, FALSE, IMAGE_DIRECTORY_ENTRY_EXPORT, @@ -673,7 +671,7 @@ if (!(Thunks) || !(Thunks->u1.Function)) continue; /* Create Bound Import Descriptor */ - DPRINT("Creating Bound Descriptor for this DLL\n"); + TRACE("Creating Bound Descriptor for this DLL\n"); BoundImportDescriptor = BindpAddImportDescriptor(&TopBoundDescriptor, Imports, ImportedLibrary, @@ -695,7 +693,7 @@ SizeOfThunks); /* Setup the initial data pointers */ - DPRINT("Binding Thunks\n"); + TRACE("Binding Thunks\n"); TempThunk = Thunks; TempBoundThunk = BoundThunks; TopForwarderChain = -1; @@ -760,7 +758,7 @@ if (memcmp(TempThunk, BoundThunks, SizeOfThunks)) { /* Copy the Pointers and let caller know */ - DPRINT("Copying Bound Thunks\n"); + TRACE("Copying Bound Thunks\n"); RtlCopyMemory(TempThunk, BoundThunks, SizeOfThunks); *UpdateImage = TRUE; } @@ -786,13 +784,13 @@ /* Free the Allocated Memory */ HeapFree(IMAGEHLP_hHeap, 0, BoundThunks); - DPRINT("Moving to next File\n"); + TRACE("Moving to next File\n"); Imports++; } } /* Create the Bound Import Table */ - DPRINT("Creating Bound Import Section\n"); + TRACE("Creating Bound Import Section\n"); BoundImportTable = BindpCreateNewImportSection(&TopBoundDescriptor, &BoundImportTableSize); @@ -817,7 +815,7 @@ OptionalHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].Size = 0; /* Check if we have enough space */ - DPRINT("Calculating Space\n"); + TRACE("Calculating Space\n"); FirstFreeByte = GetImageUnusedHeaderBytes(File, &VirtBytesFree); HeaderBytesFree = File->Sections->VirtualAddress - OptionalHeader->SizeOfHeaders + VirtBytesFree; @@ -830,7 +828,7 @@ /* Check if we have no space a tall */ if (BoundImportTableSize > HeaderBytesFree) { - DPRINT1("Not enough Space\n"); + ERR("Not enough Space\n"); return; /* Fail...not enough space */ } @@ -838,7 +836,7 @@ if (BoundImportTableSize <= PhysBytesFree) { /* We have enough NULLs to add it, simply enlarge header data */ - DPRINT("Header Recalculation\n"); + TRACE("Header Recalculation\n"); OptionalHeader->SizeOfHeaders = OptionalHeader->SizeOfHeaders - VirtBytesFree + BoundImportTableSize + @@ -848,7 +846,7 @@ else { /* Resize the Headers */ - DPRINT1("UNIMPLEMENTED: Header Resizing\n"); + FIXME("UNIMPLEMENTED: Header Resizing\n"); /* Recalculate Headers */ FileHeader = &File->FileHeader->FileHeader; @@ -863,7 +861,7 @@ [IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].Size = BoundImportTableSize; /* Copy the Bound Import Table */ - DPRINT("Copying Bound Import Table\n"); + TRACE("Copying Bound Import Table\n"); RtlCopyMemory(File->MappedAddress + FirstFreeByte, BoundImportTable, BoundImportTableSize); @@ -890,7 +888,7 @@ FILETIME LastWriteTime; BOOLEAN UpdateImage; DWORD DataSize; - DPRINT("BindImageEx Called for: %s \n", ImageName); + TRACE("BindImageEx Called for: %s \n", ImageName); /* Set and Clear Buffer */ File = &FileData; @@ -900,7 +898,7 @@ if (MapAndLoad(ImageName, DllPath, File, TRUE, FALSE)) { /* Write the image's name */ - DPRINT("Image Mapped and Loaded\n"); + TRACE("Image Mapped and Loaded\n"); File->ModuleName = ImageName; /* Check if the image is valid and if it should be bound */ @@ -938,7 +936,7 @@ /* FIXME: Update symbols */ /* Update Checksum */ - DPRINT("Binding Completed, getting Checksum\n"); + TRACE("Binding Completed, getting Checksum\n"); OldChecksum = File->FileHeader->OptionalHeader.CheckSum; CheckSumMappedFile(File->MappedAddress, GetFileSize(File->hFile, NULL), @@ -947,11 +945,11 @@ File->FileHeader->OptionalHeader.CheckSum = CheckSum; /* Save Changes */ - DPRINT("Saving Changes to file\n"); + TRACE("Saving Changes to file\n"); FlushViewOfFile(File->MappedAddress, File->SizeOfImage); /* Save new Modified Time */ - DPRINT("Setting time\n"); + TRACE("Setting time\n"); GetSystemTime(&SystemTime); SystemTimeToFileTime(&SystemTime, &LastWriteTime); SetFileTime(File->hFile, NULL, NULL, &LastWriteTime); @@ -971,7 +969,7 @@ if (!(Flags & BIND_CACHE_IMPORT_DLLS)) UnloadAllImages(); /* Return success */ - DPRINT("Done\n"); + TRACE("Done\n"); return TRUE; }

15 years, 9 months

[sginsberg] 37816: - Patch by hto: Correct definitions of PSN_* constants See issue #3925 for more details.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Dec 3 06:48:53 2008 New Revision: 37816 URL: http://svn.reactos.org/svn/reactos?rev=37816&view=rev Log: - Patch by hto: Correct definitions of PSN_* constants See issue #3925 for more details. Modified: trunk/reactos/include/psdk/prsht.h Modified: trunk/reactos/include/psdk/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/prsht.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/prsht.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/prsht.h [iso-8859-1] Wed Dec 3 06:48:53 2008 @@ -97,20 +97,22 @@ #define PSM_SETHEADERSUBTITLEA 1151 #define PSM_SETHEADERSUBTITLEW 1152 #endif -#define PSN_FIRST (-200) -#define PSN_LAST (-299) -#define PSN_APPLY (-202) -#define PSN_HELP (-205) -#define PSN_KILLACTIVE (-201) -#define PSN_QUERYCANCEL (-209) -#define PSN_GETOBJECT (PSN_FIRST-10) -#define PSN_TRANSLATEACCELERATOR (PSN_FIRST-12) -#define PSN_QUERYINITIALFOCUS (PSN_FIRST-13) -#define PSN_RESET (-203) -#define PSN_SETACTIVE (-200) -#define PSN_WIZBACK (-206) -#define PSN_WIZFINISH (-208) -#define PSN_WIZNEXT (-207) + +#define PSN_FIRST (0U - 200U) +#define PSN_SETACTIVE (PSN_FIRST - 0) +#define PSN_KILLACTIVE (PSN_FIRST - 1) +#define PSN_APPLY (PSN_FIRST - 2) +#define PSN_RESET (PSN_FIRST - 3) +#define PSN_HELP (PSN_FIRST - 5) +#define PSN_WIZBACK (PSN_FIRST - 6) +#define PSN_WIZNEXT (PSN_FIRST - 7) +#define PSN_WIZFINISH (PSN_FIRST - 8) +#define PSN_QUERYCANCEL (PSN_FIRST - 9) +#define PSN_GETOBJECT (PSN_FIRST - 10) +#define PSN_TRANSLATEACCELERATOR (PSN_FIRST - 12) +#define PSN_QUERYINITIALFOCUS (PSN_FIRST - 13) +#define PSN_LAST (PSN_FIRST - 99) + #define PSNRET_NOERROR 0 #define PSNRET_INVALID 1 #define PSNRET_INVALID_NOCHANGEPAGE 2

15 years, 9 months

[ekohl] 37814: Sync to wine-1.1.1 (Patch 8 of 10): - Rob Shearman <robertshearman@gmail.com> Fri, 4 Jul 2008 widl: Remove some unnecessary calls to duptype.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Dec 2 15:08:02 2008 New Revision: 37814 URL: http://svn.reactos.org/svn/reactos?rev=37814&view=rev Log: Sync to wine-1.1.1 (Patch 8 of 10): - Rob Shearman <robertshearman(a)gmail.com> Fri, 4 Jul 2008 widl: Remove some unnecessary calls to duptype. Modified: trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Tue Dec 2 15:08:02 2008 @@ -3635,7 +3635,7 @@ case 222: #line 822 "parser.y" - { (yyval.type) = duptype(find_type("float", 0), 1); ;} + { (yyval.type) = find_type("float", 0); ;} break; case 223: @@ -4065,7 +4065,7 @@ case 295: #line 1072 "parser.y" - { (yyval.type) = duptype(find_type_or_error("void", 0), 1); ;} + { (yyval.type) = find_type_or_error("void", 0); ;} break; case 296: @@ -5076,7 +5076,7 @@ static type_t *make_safearray(type_t *type) { - type_t *sa = duptype(find_type_or_error("SAFEARRAY", 0), 1); + type_t *sa = find_type_or_error("SAFEARRAY", 0); sa->ref = type; return make_type(pointer_default, sa); } Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Tue Dec 2 15:08:02 2008 @@ -819,7 +819,7 @@ } | tUNSIGNED { $$ = make_int(-1); } | tFLOAT { $$ = make_builtin($<str>1); } - | tSINGLE { $$ = duptype(find_type("float", 0), 1); } + | tSINGLE { $$ = find_type("float", 0); } | tDOUBLE { $$ = make_builtin($<str>1); } | tBOOLEAN { $$ = make_builtin($<str>1); } | tERRORSTATUST { $$ = make_builtin($<str>1); } @@ -1069,7 +1069,7 @@ } ; -type: tVOID { $$ = duptype(find_type_or_error("void", 0), 1); } +type: tVOID { $$ = find_type_or_error("void", 0); } | aKNOWNTYPE { $$ = find_type_or_error($1, 0); } | base_type { $$ = $1; } | enumdef { $$ = $1; } @@ -1761,7 +1761,7 @@ static type_t *make_safearray(type_t *type) { - type_t *sa = duptype(find_type_or_error("SAFEARRAY", 0), 1); + type_t *sa = find_type_or_error("SAFEARRAY", 0); sa->ref = type; return make_type(pointer_default, sa); }

15 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008