Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

some %x -> %p fixes

Browse source 
svn path=/trunk/; revision=16416
This commit is contained in:
Thomas Bluemel 2005-07-04 22:11:00 +00:00
parent d8e78cc66b
commit 541151ea53
32 changed files with 240 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/ntoskrnl/cc/copy.c
View file

@ -315,9 +315,9 @@ CcCopyRead (IN PFILE_OBJECT FileObject,
PLIST_ENTRY current_entry; PLIST_ENTRY current_entry;
PCACHE_SEGMENT current; PCACHE_SEGMENT current;
DPRINT("CcCopyRead(FileObject %x, FileOffset %x, " DPRINT("CcCopyRead(FileObject 0x%p, FileOffset %I64x, "
"Length %d, Wait %d, Buffer %x, IoStatus %x)\n", "Length %d, Wait %d, Buffer 0x%p, IoStatus 0x%p)\n",
FileObject, (ULONG)FileOffset->QuadPart, Length, Wait, FileObject, FileOffset->QuadPart, Length, Wait,
Buffer, IoStatus); Buffer, IoStatus);
Bcb = FileObject->SectionObjectPointer->SharedCacheMap; Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
@ -429,9 +429,9 @@ CcCopyWrite (IN PFILE_OBJECT FileObject,
PVOID BaseAddress; PVOID BaseAddress;
BOOLEAN Valid; BOOLEAN Valid;
DPRINT("CcCopyWrite(FileObject %x, FileOffset %x, " DPRINT("CcCopyWrite(FileObject 0x%p, FileOffset %I64x, "
"Length %d, Wait %d, Buffer %x)\n", "Length %d, Wait %d, Buffer 0x%p)\n",
FileObject, (ULONG)FileOffset->QuadPart, Length, Wait, Buffer); FileObject, FileOffset->QuadPart, Length, Wait, Buffer);
Bcb = FileObject->SectionObjectPointer->SharedCacheMap; Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
WriteOffset = (ULONG)FileOffset->QuadPart; WriteOffset = (ULONG)FileOffset->QuadPart;
@ -611,7 +611,7 @@ CcZeroData (IN PFILE_OBJECT FileObject,
IO_STATUS_BLOCK Iosb; IO_STATUS_BLOCK Iosb;
KEVENT Event; KEVENT Event;
DPRINT("CcZeroData(FileObject %x, StartOffset %I64x, EndOffset %I64x, " DPRINT("CcZeroData(FileObject 0x%p, StartOffset %I64x, EndOffset %I64x, "
"Wait %d)\n", FileObject, StartOffset->QuadPart, EndOffset->QuadPart, "Wait %d)\n", FileObject, StartOffset->QuadPart, EndOffset->QuadPart,
Wait); Wait);

4
reactos/ntoskrnl/cc/fs.c
View file

@ -134,7 +134,7 @@ CcSetFileSizes (IN PFILE_OBJECT FileObject,
LIST_ENTRY FreeListHead; LIST_ENTRY FreeListHead;
NTSTATUS Status; NTSTATUS Status;
DPRINT("CcSetFileSizes(FileObject %x, FileSizes %x)\n", DPRINT("CcSetFileSizes(FileObject 0x%p, FileSizes 0x%p)\n",
FileObject, FileSizes); FileObject, FileSizes);
DPRINT("AllocationSize %d, FileSize %d, ValidDataLength %d\n", DPRINT("AllocationSize %d, FileSize %d, ValidDataLength %d\n",
(ULONG)FileSizes->AllocationSize.QuadPart, (ULONG)FileSizes->AllocationSize.QuadPart,
@ -196,7 +196,7 @@ CcSetFileSizes (IN PFILE_OBJECT FileObject,
Status = CcRosInternalFreeCacheSegment(current); Status = CcRosInternalFreeCacheSegment(current);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("CcRosInternalFreeCacheSegment failed, status = %x\n"); DPRINT1("CcRosInternalFreeCacheSegment failed, status = %x\n", Status);
KEBUGCHECK(0); KEBUGCHECK(0);
} }
} }

10
reactos/ntoskrnl/cc/pin.c
View file

@ -39,17 +39,17 @@ CcMapData (IN PFILE_OBJECT FileObject,
PINTERNAL_BCB iBcb; PINTERNAL_BCB iBcb;
ULONG ROffset; ULONG ROffset;
DPRINT("CcMapData(FileObject %x, FileOffset %d, Length %d, Wait %d," DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Wait %d,"
" pBcb %x, pBuffer %x)\n", FileObject, (ULONG)FileOffset->QuadPart, " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart,
Length, Wait, pBcb, pBuffer); Length, Wait, pBcb, pBuffer);
ReadOffset = (ULONG)FileOffset->QuadPart; ReadOffset = (ULONG)FileOffset->QuadPart;
Bcb = FileObject->SectionObjectPointer->SharedCacheMap; Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
ASSERT(Bcb); ASSERT(Bcb);
DPRINT("AllocationSize %d, FileSize %d\n", DPRINT("AllocationSize %I64x, FileSize %I64x\n",
(ULONG)Bcb->AllocationSize.QuadPart, Bcb->AllocationSize.QuadPart,
(ULONG)Bcb->FileSize.QuadPart); Bcb->FileSize.QuadPart);
if (ReadOffset % Bcb->CacheSegmentSize + Length > Bcb->CacheSegmentSize) if (ReadOffset % Bcb->CacheSegmentSize + Length > Bcb->CacheSegmentSize)
{ {

16
reactos/ntoskrnl/cc/view.c
View file

@ -295,7 +295,7 @@ CcRosReleaseCacheSegment(PBCB Bcb,
ASSERT(Bcb); ASSERT(Bcb);
DPRINT("CcReleaseCacheSegment(Bcb %x, CacheSeg %x, Valid %d)\n", DPRINT("CcReleaseCacheSegment(Bcb 0x%p, CacheSeg 0x%p, Valid %d)\n",
Bcb, CacheSeg, Valid); Bcb, CacheSeg, Valid);
CacheSeg->Valid = Valid; CacheSeg->Valid = Valid;
@ -340,7 +340,7 @@ CcRosLookupCacheSegment(PBCB Bcb, ULONG FileOffset)
ASSERT(Bcb); ASSERT(Bcb);
DPRINT("CcRosLookupCacheSegment(Bcb %x, FileOffset %d)\n", Bcb, FileOffset); DPRINT("CcRosLookupCacheSegment(Bcb -x%p, FileOffset %d)\n", Bcb, FileOffset);
KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql);
current_entry = Bcb->BcbSegmentListHead.Flink; current_entry = Bcb->BcbSegmentListHead.Flink;
@ -370,7 +370,7 @@ CcRosMarkDirtyCacheSegment(PBCB Bcb, ULONG FileOffset)
ASSERT(Bcb); ASSERT(Bcb);
DPRINT("CcRosMarkDirtyCacheSegment(Bcb %x, FileOffset %d)\n", Bcb, FileOffset); DPRINT("CcRosMarkDirtyCacheSegment(Bcb 0x%p, FileOffset %d)\n", Bcb, FileOffset);
CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset); CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset);
if (CacheSeg == NULL) if (CacheSeg == NULL)
@ -407,7 +407,7 @@ CcRosUnmapCacheSegment(PBCB Bcb, ULONG FileOffset, BOOLEAN NowDirty)
ASSERT(Bcb); ASSERT(Bcb);
DPRINT("CcRosUnmapCacheSegment(Bcb %x, FileOffset %d, NowDirty %d)\n", DPRINT("CcRosUnmapCacheSegment(Bcb 0x%p, FileOffset %d, NowDirty %d)\n",
Bcb, FileOffset, NowDirty); Bcb, FileOffset, NowDirty);
CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset); CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset);
@ -760,7 +760,7 @@ CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg)
PFN_TYPE Page; PFN_TYPE Page;
KIRQL oldIrql; KIRQL oldIrql;
#endif #endif
DPRINT("Freeing cache segment %x\n", CacheSeg); DPRINT("Freeing cache segment 0x%p\n", CacheSeg);
#ifdef CACHE_BITMAP #ifdef CACHE_BITMAP
RegionSize = CacheSeg->Bcb->CacheSegmentSize / PAGE_SIZE; RegionSize = CacheSeg->Bcb->CacheSegmentSize / PAGE_SIZE;
@ -804,7 +804,7 @@ CcRosFreeCacheSegment(PBCB Bcb, PCACHE_SEGMENT CacheSeg)
ASSERT(Bcb); ASSERT(Bcb);
DPRINT("CcRosFreeCacheSegment(Bcb %x, CacheSeg %x)\n", DPRINT("CcRosFreeCacheSegment(Bcb 0x%p, CacheSeg 0x%p)\n",
Bcb, CacheSeg); Bcb, CacheSeg);
ExAcquireFastMutex(&ViewLock); ExAcquireFastMutex(&ViewLock);
@ -840,7 +840,7 @@ CcFlushCache(IN PSECTION_OBJECT_POINTERS SectionObjectPointers,
NTSTATUS Status; NTSTATUS Status;
KIRQL oldIrql; KIRQL oldIrql;
DPRINT("CcFlushCache(SectionObjectPointers %x, FileOffset %x, Length %d, IoStatus %x)\n", DPRINT("CcFlushCache(SectionObjectPointers 0x%p, FileOffset 0x%p, Length %d, IoStatus 0x%p)\n",
SectionObjectPointers, FileOffset, Length, IoStatus); SectionObjectPointers, FileOffset, Length, IoStatus);
if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap)
@ -1118,7 +1118,7 @@ CcRosInitializeFileCache(PFILE_OBJECT FileObject,
PBCB Bcb; PBCB Bcb;
Bcb = FileObject->SectionObjectPointer->SharedCacheMap; Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
DPRINT("CcRosInitializeFileCache(FileObject %x, *Bcb %x, CacheSegmentSize %d)\n", DPRINT("CcRosInitializeFileCache(FileObject 0x%p, Bcb 0x%p, CacheSegmentSize %d)\n",
FileObject, Bcb, CacheSegmentSize); FileObject, Bcb, CacheSegmentSize);
ExAcquireFastMutex(&ViewLock); ExAcquireFastMutex(&ViewLock);

22
reactos/ntoskrnl/cm/ntfunc.c
View file

@ -49,8 +49,8 @@ CmpFindObject(POBJECT_ATTRIBUTES ObjectAttributes,
PAGED_CODE(); PAGED_CODE();
DPRINT("CmpFindObject(ObjectAttributes %x, ReturnedObject %x, " DPRINT("CmpFindObject(ObjectAttributes 0x%p, ReturnedObject 0x%p, "
"RemainingPath %x)\n",ObjectAttributes,ReturnedObject,RemainingPath); "RemainingPath 0x%p)\n",ObjectAttributes,ReturnedObject,RemainingPath);
DPRINT("ObjectAttributes->ObjectName %wZ\n", DPRINT("ObjectAttributes->ObjectName %wZ\n",
ObjectAttributes->ObjectName); ObjectAttributes->ObjectName);
@ -326,7 +326,7 @@ NtCreateKey(OUT PHANDLE KeyHandle,
PAGED_CODE(); PAGED_CODE();
DPRINT("NtCreateKey (Name %wZ KeyHandle %x Root %x)\n", DPRINT("NtCreateKey (Name %wZ KeyHandle 0x%p Root 0x%p)\n",
ObjectAttributes->ObjectName, ObjectAttributes->ObjectName,
KeyHandle, KeyHandle,
ObjectAttributes->RootDirectory); ObjectAttributes->RootDirectory);
@ -386,7 +386,7 @@ NtCreateKey(OUT PHANDLE KeyHandle,
} }
} }
DPRINT("RemainingPath %S ParentObject %x\n", RemainingPath.Buffer, Object); DPRINT("RemainingPath %S ParentObject 0x%p\n", RemainingPath.Buffer, Object);
Status = ObCreateObject(ExGetPreviousMode(), Status = ObCreateObject(ExGetPreviousMode(),
CmiKeyType, CmiKeyType,
@ -511,7 +511,7 @@ NtDeleteKey(IN HANDLE KeyHandle)
PAGED_CODE(); PAGED_CODE();
DPRINT("NtDeleteKey(KeyHandle %x) called\n", KeyHandle); DPRINT("NtDeleteKey(KeyHandle 0x%p) called\n", KeyHandle);
PreviousMode = ExGetPreviousMode(); PreviousMode = ExGetPreviousMode();
@ -599,7 +599,7 @@ NtEnumerateKey(IN HANDLE KeyHandle,
PreviousMode = ExGetPreviousMode(); PreviousMode = ExGetPreviousMode();
DPRINT("KH %x I %d KIC %x KI %x L %d RL %x\n", DPRINT("KH 0x%p I %d KIC %x KI 0x%p L %d RL 0x%p\n",
KeyHandle, KeyHandle,
Index, Index,
KeyInformationClass, KeyInformationClass,
@ -947,7 +947,7 @@ NtEnumerateValueKey(IN HANDLE KeyHandle,
PAGED_CODE(); PAGED_CODE();
DPRINT("KH %x I %d KVIC %x KVI %x L %d RL %x\n", DPRINT("KH 0x%p I %d KVIC %x KVI 0x%p L %d RL 0x%p\n",
KeyHandle, KeyHandle,
Index, Index,
KeyValueInformationClass, KeyValueInformationClass,
@ -1241,7 +1241,7 @@ NtOpenKey(OUT PHANDLE KeyHandle,
PAGED_CODE(); PAGED_CODE();
DPRINT("NtOpenKey(KH %x DA %x OA %x OA->ON '%wZ'\n", DPRINT("NtOpenKey(KH 0x%p DA %x OA 0x%p OA->ON '%wZ'\n",
KeyHandle, KeyHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
@ -1358,7 +1358,7 @@ NtQueryKey(IN HANDLE KeyHandle,
PAGED_CODE(); PAGED_CODE();
DPRINT("NtQueryKey(KH %x KIC %x KI %x L %d RL %x)\n", DPRINT("NtQueryKey(KH 0x%p KIC %x KI 0x%p L %d RL 0x%p)\n",
KeyHandle, KeyHandle,
KeyInformationClass, KeyInformationClass,
KeyInformation, KeyInformation,
@ -1568,7 +1568,7 @@ NtQueryValueKey(IN HANDLE KeyHandle,
PAGED_CODE(); PAGED_CODE();
DPRINT("NtQueryValueKey(KeyHandle %x ValueName %S Length %x)\n", DPRINT("NtQueryValueKey(KeyHandle 0x%p ValueName %S Length %x)\n",
KeyHandle, ValueName->Buffer, Length); KeyHandle, ValueName->Buffer, Length);
/* Verify that the handle is valid and is a registry key */ /* Verify that the handle is valid and is a registry key */
@ -1810,7 +1810,7 @@ NtSetValueKey(IN HANDLE KeyHandle,
PAGED_CODE(); PAGED_CODE();
DPRINT("NtSetValueKey(KeyHandle %x ValueName '%wZ' Type %d)\n", DPRINT("NtSetValueKey(KeyHandle 0x%p ValueName '%wZ' Type %d)\n",
KeyHandle, ValueName, Type); KeyHandle, ValueName, Type);
DesiredAccess = KEY_SET_VALUE; DesiredAccess = KEY_SET_VALUE;

8
reactos/ntoskrnl/cm/regfile.c
View file

@ -1068,7 +1068,7 @@ CmiCreateVolatileHive(PREGISTRY_HIVE *RegistryHive)
RtlZeroMemory (Hive, RtlZeroMemory (Hive,
sizeof(REGISTRY_HIVE)); sizeof(REGISTRY_HIVE));
DPRINT("Hive %x\n", Hive); DPRINT("Hive 0x%p\n", Hive);
Hive->HiveHeader = (PHIVE_HEADER)ExAllocatePool (NonPagedPool, Hive->HiveHeader = (PHIVE_HEADER)ExAllocatePool (NonPagedPool,
sizeof(HIVE_HEADER)); sizeof(HIVE_HEADER));
@ -1138,7 +1138,7 @@ CmiCreateTempHive(PREGISTRY_HIVE *RegistryHive)
RtlZeroMemory (Hive, RtlZeroMemory (Hive,
sizeof(REGISTRY_HIVE)); sizeof(REGISTRY_HIVE));
DPRINT ("Hive %x\n", Hive); DPRINT ("Hive 0x%p\n", Hive);
Hive->HiveHeader = (PHIVE_HEADER)ExAllocatePool (NonPagedPool, Hive->HiveHeader = (PHIVE_HEADER)ExAllocatePool (NonPagedPool,
REG_BLOCK_SIZE); REG_BLOCK_SIZE);
@ -1151,7 +1151,7 @@ CmiCreateTempHive(PREGISTRY_HIVE *RegistryHive)
RtlZeroMemory (Hive->HiveHeader, RtlZeroMemory (Hive->HiveHeader,
REG_BLOCK_SIZE); REG_BLOCK_SIZE);
DPRINT ("HiveHeader %x\n", Hive->HiveHeader); DPRINT ("HiveHeader 0x%p\n", Hive->HiveHeader);
Hive->Flags = HIVE_NO_FILE; Hive->Flags = HIVE_NO_FILE;
@ -1260,7 +1260,7 @@ CmiLoadHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes,
RtlZeroMemory (Hive, RtlZeroMemory (Hive,
sizeof(REGISTRY_HIVE)); sizeof(REGISTRY_HIVE));
DPRINT ("Hive %x\n", Hive); DPRINT ("Hive 0x%p\n", Hive);
Hive->Flags = (Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0; Hive->Flags = (Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0;
Hive->HiveHeader = (PHIVE_HEADER)ExAllocatePool(NonPagedPool, Hive->HiveHeader = (PHIVE_HEADER)ExAllocatePool(NonPagedPool,

4
reactos/ntoskrnl/cm/registry.c
View file

@ -1270,7 +1270,7 @@ CmiHiveSyncRoutine(PVOID DeferredContext)
ExReleaseResourceLite(&CmiRegistryLock); ExReleaseResourceLite(&CmiRegistryLock);
KeLeaveCriticalRegion(); KeLeaveCriticalRegion();
DPRINT("DeferredContext %x\n", DeferredContext); DPRINT("DeferredContext 0x%p\n", DeferredContext);
ExFreePool(DeferredContext); ExFreePool(DeferredContext);
DPRINT("CmiHiveSyncRoutine() done\n"); DPRINT("CmiHiveSyncRoutine() done\n");
@ -1297,7 +1297,7 @@ CmiHiveSyncDpcRoutine(PKDPC Dpc,
CmiHiveSyncRoutine, CmiHiveSyncRoutine,
WorkQueueItem); WorkQueueItem);
DPRINT("DeferredContext %x\n", WorkQueueItem); DPRINT("DeferredContext 0x%p\n", WorkQueueItem);
ExQueueWorkItem(WorkQueueItem, ExQueueWorkItem(WorkQueueItem,
CriticalWorkQueue); CriticalWorkQueue);
} }

4
reactos/ntoskrnl/cm/regobj.c
View file

@ -196,7 +196,7 @@ CmiObjectParse(PVOID ParsedObject,
RtlpCreateUnicodeString(&FoundObject->Name, RtlpCreateUnicodeString(&FoundObject->Name,
KeyName.Buffer, NonPagedPool); KeyName.Buffer, NonPagedPool);
CmiAddKeyToList(ParsedKey, FoundObject); CmiAddKeyToList(ParsedKey, FoundObject);
DPRINT("Created object 0x%x\n", FoundObject); DPRINT("Created object 0x%p\n", FoundObject);
} }
else else
{ {
@ -578,7 +578,7 @@ CmiAddKeyToList(PKEY_OBJECT ParentKey,
/* to allow a dichotomic search */ /* to allow a dichotomic search */
ParentKey->SubKeys[ParentKey->NumberOfSubKeys++] = NewKey; ParentKey->SubKeys[ParentKey->NumberOfSubKeys++] = NewKey;
DPRINT("Reference parent key: 0x%x\n", ParentKey); DPRINT("Reference parent key: 0x%p\n", ParentKey);
ObReferenceObjectByPointer(ParentKey, ObReferenceObjectByPointer(ParentKey,
STANDARD_RIGHTS_REQUIRED, STANDARD_RIGHTS_REQUIRED,

2
reactos/ntoskrnl/dbgk/debug.c
View file

@ -29,7 +29,7 @@ NtCreateDebugObject(OUT PHANDLE DebugHandle,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtCreateDebugObject(0x%x, 0x%x, 0x%x)\n", DebugHandle, DesiredAccess, ObjectAttributes); DPRINT("NtCreateDebugObject(0x%p, 0x%x, 0x%p)\n", DebugHandle, DesiredAccess, ObjectAttributes);
/* Check Output Safety */ /* Check Output Safety */
if(PreviousMode != KernelMode) { if(PreviousMode != KernelMode) {

6
reactos/ntoskrnl/ex/event.c
View file

@ -103,7 +103,7 @@ NtCreateEvent(OUT PHANDLE EventHandle,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtCreateEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); DPRINT("NtCreateEvent(0x%p, 0x%x, 0x%p)\n", EventHandle, DesiredAccess, ObjectAttributes);
/* Check Output Safety */ /* Check Output Safety */
if(PreviousMode != KernelMode) { if(PreviousMode != KernelMode) {
@ -183,7 +183,7 @@ NtOpenEvent(OUT PHANDLE EventHandle,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtOpenEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); DPRINT("NtOpenEvent(0x%p, 0x%x, 0x%p)\n", EventHandle, DesiredAccess, ObjectAttributes);
/* Check Output Safety */ /* Check Output Safety */
if(PreviousMode != KernelMode) { if(PreviousMode != KernelMode) {
@ -314,7 +314,7 @@ NtQueryEvent(IN HANDLE EventHandle,
PEVENT_BASIC_INFORMATION BasicInfo = (PEVENT_BASIC_INFORMATION)EventInformation; PEVENT_BASIC_INFORMATION BasicInfo = (PEVENT_BASIC_INFORMATION)EventInformation;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtQueryEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, EventInformationClass); DPRINT("NtQueryEvent(0x%p, 0x%x)\n", EventHandle, EventInformationClass);
/* Check buffers and class validity */ /* Check buffers and class validity */
DefaultQueryInfoBufferCheck(EventInformationClass, DefaultQueryInfoBufferCheck(EventInformationClass,

14
reactos/ntoskrnl/ex/evtpair.c
View file

@ -62,7 +62,7 @@ NtCreateEventPair(OUT PHANDLE EventPairHandle,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtCreateEventPair: %x\n", EventPairHandle); DPRINT("NtCreateEventPair: 0x%p\n", EventPairHandle);
/* Check Output Safety */ /* Check Output Safety */
if(PreviousMode == UserMode) { if(PreviousMode == UserMode) {
@ -194,7 +194,7 @@ NtSetHighEventPair(IN HANDLE EventPairHandle)
NTSTATUS Status; NTSTATUS Status;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtSetHighEventPair(EventPairHandle %x)\n", EventPairHandle); DPRINT("NtSetHighEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */ /* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle, Status = ObReferenceObjectByHandle(EventPairHandle,
@ -227,7 +227,7 @@ NtSetHighWaitLowEventPair(IN HANDLE EventPairHandle)
NTSTATUS Status; NTSTATUS Status;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */ /* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle, Status = ObReferenceObjectByHandle(EventPairHandle,
@ -270,7 +270,7 @@ NtSetLowEventPair(IN HANDLE EventPairHandle)
PreviousMode = ExGetPreviousMode(); PreviousMode = ExGetPreviousMode();
DPRINT1("NtSetHighEventPair(EventPairHandle %x)\n", EventPairHandle); DPRINT1("NtSetHighEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */ /* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle, Status = ObReferenceObjectByHandle(EventPairHandle,
@ -303,7 +303,7 @@ NtSetLowWaitHighEventPair(IN HANDLE EventPairHandle)
NTSTATUS Status; NTSTATUS Status;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */ /* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle, Status = ObReferenceObjectByHandle(EventPairHandle,
@ -344,7 +344,7 @@ NtWaitLowEventPair(IN HANDLE EventPairHandle)
NTSTATUS Status; NTSTATUS Status;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */ /* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle, Status = ObReferenceObjectByHandle(EventPairHandle,
@ -381,7 +381,7 @@ NtWaitHighEventPair(IN HANDLE EventPairHandle)
NTSTATUS Status; NTSTATUS Status;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */ /* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle, Status = ObReferenceObjectByHandle(EventPairHandle,

32
reactos/ntoskrnl/ex/handle.c
View file

@ -166,7 +166,7 @@ ExLockHandleTableEntryNoDestructionCheck(IN PHANDLE_TABLE HandleTable,
PAGED_CODE(); PAGED_CODE();
DPRINT("Entering handle table entry 0x%x lock...\n", Entry); DPRINT("Entering handle table entry 0x%p lock...\n", Entry);
ASSERT(HandleTable); ASSERT(HandleTable);
ASSERT(Entry); ASSERT(Entry);
@ -177,7 +177,7 @@ ExLockHandleTableEntryNoDestructionCheck(IN PHANDLE_TABLE HandleTable,
if(!Current) if(!Current)
{ {
DPRINT("Attempted to lock empty handle table entry 0x%x or handle table shut down\n", Entry); DPRINT("Attempted to lock empty handle table entry 0x%p or handle table shut down\n", Entry);
break; break;
} }
@ -188,7 +188,7 @@ ExLockHandleTableEntryNoDestructionCheck(IN PHANDLE_TABLE HandleTable,
(PVOID)New, (PVOID)New,
(PVOID)Current) == (PVOID)Current) (PVOID)Current) == (PVOID)Current)
{ {
DPRINT("SUCCESS handle table 0x%x entry 0x%x lock\n", HandleTable, Entry); DPRINT("SUCCESS handle table 0x%p entry 0x%p lock\n", HandleTable, Entry);
/* we acquired the lock */ /* we acquired the lock */
return TRUE; return TRUE;
} }
@ -399,7 +399,7 @@ ExDupHandleTable(IN PEPROCESS QuotaProcess OPTIONAL,
else else
{ {
freehandletable: freehandletable:
DPRINT1("Failed to duplicate handle table 0x%x\n", SourceHandleTable); DPRINT1("Failed to duplicate handle table 0x%p\n", SourceHandleTable);
ExReleaseHandleTableLock(SourceHandleTable); ExReleaseHandleTableLock(SourceHandleTable);
@ -501,7 +501,7 @@ ExpAllocateHandleTableEntry(IN PHANDLE_TABLE HandleTable,
ASSERT(Handle); ASSERT(Handle);
ASSERT(KeGetCurrentThread() != NULL); ASSERT(KeGetCurrentThread() != NULL);
DPRINT("HT[0x%x]: HandleCount: %d\n", HandleTable, HandleTable->HandleCount); DPRINT("HT[0x%p]: HandleCount: %d\n", HandleTable, HandleTable->HandleCount);
if(HandleTable->HandleCount < EX_MAX_HANDLES) if(HandleTable->HandleCount < EX_MAX_HANDLES)
{ {
@ -549,7 +549,7 @@ ExpAllocateHandleTableEntry(IN PHANDLE_TABLE HandleTable,
ASSERT(ELI_FROM_HANDLE(HandleTable->NextIndexNeedingPool) == 0); ASSERT(ELI_FROM_HANDLE(HandleTable->NextIndexNeedingPool) == 0);
DPRINT("HandleTable->Table[%d] == 0x%x\n", tli, HandleTable->Table[tli]); DPRINT("HandleTable->Table[%d] == 0x%p\n", tli, HandleTable->Table[tli]);
/* allocate a middle level entry list if required */ /* allocate a middle level entry list if required */
nmtbl = HandleTable->Table[tli]; nmtbl = HandleTable->Table[tli];
@ -592,7 +592,7 @@ ExpAllocateHandleTableEntry(IN PHANDLE_TABLE HandleTable,
ASSERT(nmtbl[mli] == NULL); ASSERT(nmtbl[mli] == NULL);
} }
DPRINT("HandleTable->Table[%d][%d] == 0x%x\n", tli, mli, nmtbl[mli]); DPRINT("HandleTable->Table[%d][%d] == 0x%p\n", tli, mli, nmtbl[mli]);
if(HandleTable->QuotaProcess != NULL) if(HandleTable->QuotaProcess != NULL)
{ {
@ -660,7 +660,7 @@ ExpAllocateHandleTableEntry(IN PHANDLE_TABLE HandleTable,
} }
else else
{ {
DPRINT1("Can't allocate any more handles in handle table 0x%x!\n", HandleTable); DPRINT1("Can't allocate any more handles in handle table 0x%p!\n", HandleTable);
} }
return Entry; return Entry;
@ -677,7 +677,7 @@ ExpFreeHandleTableEntry(IN PHANDLE_TABLE HandleTable,
ASSERT(Entry); ASSERT(Entry);
ASSERT(IS_VALID_EX_HANDLE(Handle)); ASSERT(IS_VALID_EX_HANDLE(Handle));
DPRINT("ExpFreeHandleTableEntry HT:0x%x Entry:0x%x\n", HandleTable, Entry); DPRINT("ExpFreeHandleTableEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry);
/* automatically unlock the entry if currently locked. We however don't notify /* automatically unlock the entry if currently locked. We however don't notify
anyone who waited on the handle because we're holding an exclusive lock after anyone who waited on the handle because we're holding an exclusive lock after
@ -713,7 +713,7 @@ ExpLookupHandleTableEntry(IN PHANDLE_TABLE HandleTable,
mlp != NULL && mlp[mli] != NULL && mlp[mli][eli].u1.Object != NULL) mlp != NULL && mlp[mli] != NULL && mlp[mli][eli].u1.Object != NULL)
{ {
Entry = &mlp[mli][eli]; Entry = &mlp[mli][eli];
DPRINT("handle lookup 0x%x -> entry 0x%x [HT:0x%x] ptr: 0x%x\n", Handle, Entry, HandleTable, mlp[mli][eli].u1.Object); DPRINT("handle lookup 0x%x -> entry 0x%p [HT:0x%p] ptr: 0x%p\n", Handle, Entry, HandleTable, mlp[mli][eli].u1.Object);
} }
} }
else else
@ -732,7 +732,7 @@ ExLockHandleTableEntry(IN PHANDLE_TABLE HandleTable,
PAGED_CODE(); PAGED_CODE();
DPRINT("Entering handle table entry 0x%x lock...\n", Entry); DPRINT("Entering handle table entry 0x%p lock...\n", Entry);
ASSERT(HandleTable); ASSERT(HandleTable);
ASSERT(Entry); ASSERT(Entry);
@ -743,7 +743,7 @@ ExLockHandleTableEntry(IN PHANDLE_TABLE HandleTable,
if(!Current || (HandleTable->Flags & EX_HANDLE_TABLE_CLOSING)) if(!Current || (HandleTable->Flags & EX_HANDLE_TABLE_CLOSING))
{ {
DPRINT("Attempted to lock empty handle table entry 0x%x or handle table shut down\n", Entry); DPRINT("Attempted to lock empty handle table entry 0x%p or handle table shut down\n", Entry);
break; break;
} }
@ -754,7 +754,7 @@ ExLockHandleTableEntry(IN PHANDLE_TABLE HandleTable,
(PVOID)New, (PVOID)New,
(PVOID)Current) == (PVOID)Current) (PVOID)Current) == (PVOID)Current)
{ {
DPRINT("SUCCESS handle table 0x%x entry 0x%x lock\n", HandleTable, Entry); DPRINT("SUCCESS handle table 0x%p entry 0x%p lock\n", HandleTable, Entry);
/* we acquired the lock */ /* we acquired the lock */
return TRUE; return TRUE;
} }
@ -785,7 +785,7 @@ ExUnlockHandleTableEntry(IN PHANDLE_TABLE HandleTable,
ASSERT(HandleTable); ASSERT(HandleTable);
ASSERT(Entry); ASSERT(Entry);
DPRINT("ExUnlockHandleTableEntry HT:0x%x Entry:0x%x\n", HandleTable, Entry); DPRINT("ExUnlockHandleTableEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry);
Current = (volatile ULONG_PTR)Entry->u1.Object; Current = (volatile ULONG_PTR)Entry->u1.Object;
@ -885,7 +885,7 @@ ExDestroyHandleByEntry(IN PHANDLE_TABLE HandleTable,
/* This routine requires the entry to be locked */ /* This routine requires the entry to be locked */
ASSERT((ULONG_PTR)Entry->u1.Object & EX_HANDLE_ENTRY_LOCKED); ASSERT((ULONG_PTR)Entry->u1.Object & EX_HANDLE_ENTRY_LOCKED);
DPRINT("DestroyHandleByEntry HT:0x%x Entry:0x%x\n", HandleTable, Entry); DPRINT("DestroyHandleByEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry);
KeEnterCriticalRegion(); KeEnterCriticalRegion();
ExAcquireHandleTableLockExclusive(HandleTable); ExAcquireHandleTableLockExclusive(HandleTable);
@ -914,7 +914,7 @@ ExMapHandleToPointer(IN PHANDLE_TABLE HandleTable,
Handle); Handle);
if (HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry)) if (HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry))
{ {
DPRINT("ExMapHandleToPointer HT:0x%x Entry:0x%x locked\n", HandleTable, HandleTableEntry); DPRINT("ExMapHandleToPointer HT:0x%p Entry:0x%p locked\n", HandleTable, HandleTableEntry);
return HandleTableEntry; return HandleTableEntry;
} }

4
reactos/ntoskrnl/ex/lookas.c
View file

@ -139,7 +139,7 @@ ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside,
ULONG Tag, ULONG Tag,
USHORT Depth) USHORT Depth)
{ {
DPRINT("Initializing nonpaged lookaside list at 0x%X\n", Lookaside); DPRINT("Initializing nonpaged lookaside list at 0x%p\n", Lookaside);
/* Initialize the Header */ /* Initialize the Header */
ExInitializeSListHead(&Lookaside->L.ListHead); ExInitializeSListHead(&Lookaside->L.ListHead);
@ -194,7 +194,7 @@ ExInitializePagedLookasideList (PPAGED_LOOKASIDE_LIST Lookaside,
ULONG Tag, ULONG Tag,
USHORT Depth) USHORT Depth)
{ {
DPRINT("Initializing paged lookaside list at 0x%X\n", Lookaside); DPRINT("Initializing paged lookaside list at 0x%p\n", Lookaside);
/* Initialize the Header */ /* Initialize the Header */
ExInitializeSListHead(&Lookaside->L.ListHead); ExInitializeSListHead(&Lookaside->L.ListHead);

8
reactos/ntoskrnl/ex/mutant.c
View file

@ -40,7 +40,7 @@ STDCALL
ExpDeleteMutant(PVOID ObjectBody) ExpDeleteMutant(PVOID ObjectBody)
{ {
DPRINT("ExpDeleteMutant(ObjectBody %x)\n", ObjectBody); DPRINT("ExpDeleteMutant(ObjectBody 0x%p)\n", ObjectBody);
/* Make sure to release the Mutant */ /* Make sure to release the Mutant */
KeReleaseMutant((PKMUTANT)ObjectBody, KeReleaseMutant((PKMUTANT)ObjectBody,
@ -87,7 +87,7 @@ NtCreateMutant(OUT PHANDLE MutantHandle,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtCreateMutant(0x%x, 0x%x, 0x%x)\n", MutantHandle, DesiredAccess, ObjectAttributes); DPRINT("NtCreateMutant(0x%p, 0x%x, 0x%p)\n", MutantHandle, DesiredAccess, ObjectAttributes);
/* Check Output Safety */ /* Check Output Safety */
if(PreviousMode == UserMode) { if(PreviousMode == UserMode) {
@ -166,7 +166,7 @@ NtOpenMutant(OUT PHANDLE MutantHandle,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtOpenMutant(0x%x, 0x%x, 0x%x)\n", MutantHandle, DesiredAccess, ObjectAttributes); DPRINT("NtOpenMutant(0x%p, 0x%x, 0x%p)\n", MutantHandle, DesiredAccess, ObjectAttributes);
/* Check Output Safety */ /* Check Output Safety */
if(PreviousMode == UserMode) { if(PreviousMode == UserMode) {
@ -296,7 +296,7 @@ NtReleaseMutant(IN HANDLE MutantHandle,
PreviousMode = ExGetPreviousMode(); PreviousMode = ExGetPreviousMode();
DPRINT("NtReleaseMutant(MutantHandle 0%x PreviousCount 0%x)\n", DPRINT("NtReleaseMutant(MutantHandle 0x%p PreviousCount 0x%p)\n",
MutantHandle, MutantHandle,
PreviousCount); PreviousCount);

18
reactos/ntoskrnl/ex/resource.c
View file

@ -100,7 +100,7 @@ ExAcquireResourceExclusiveLite (
{ {
KIRQL oldIrql; KIRQL oldIrql;
DPRINT("ExAcquireResourceExclusiveLite(Resource %x, Wait %d)\n", DPRINT("ExAcquireResourceExclusiveLite(Resource 0x%p, Wait %d)\n",
Resource, Wait); Resource, Wait);
ASSERT_IRQL_LESS(DISPATCH_LEVEL); ASSERT_IRQL_LESS(DISPATCH_LEVEL);
@ -222,7 +222,7 @@ static BOOLEAN EiAddSharedOwner(PERESOURCE Resource)
POWNER_ENTRY freeEntry; POWNER_ENTRY freeEntry;
ULONG i = 0; ULONG i = 0;
DPRINT("EiAddSharedOwner(Resource %x)\n", Resource); DPRINT("EiAddSharedOwner(Resource 0x%p)\n", Resource);
if (Resource->ActiveCount == 0) if (Resource->ActiveCount == 0)
{ {
@ -292,7 +292,7 @@ static BOOLEAN EiAddSharedOwner(PERESOURCE Resource)
} }
} }
DPRINT("Found free entry %x\n", freeEntry); DPRINT("Found free entry 0x%p\n", freeEntry);
if (!freeEntry) if (!freeEntry)
{ {
@ -346,7 +346,7 @@ ExAcquireResourceSharedLite (
{ {
KIRQL oldIrql; KIRQL oldIrql;
DPRINT("ExAcquireResourceSharedLite(Resource %x, Wait %d)\n", DPRINT("ExAcquireResourceSharedLite(Resource 0x%p, Wait %d)\n",
Resource, Wait); Resource, Wait);
ASSERT_IRQL_LESS(DISPATCH_LEVEL); ASSERT_IRQL_LESS(DISPATCH_LEVEL);
@ -438,7 +438,7 @@ ExConvertExclusiveToSharedLite (
ULONG oldWaiters; ULONG oldWaiters;
KIRQL oldIrql; KIRQL oldIrql;
DPRINT("ExConvertExclusiveToSharedLite(Resource %x)\n", Resource); DPRINT("ExConvertExclusiveToSharedLite(Resource 0x%p)\n", Resource);
KeAcquireSpinLock(&Resource->SpinLock, &oldIrql); KeAcquireSpinLock(&Resource->SpinLock, &oldIrql);
@ -519,7 +519,7 @@ ExAcquireSharedStarveExclusive (
{ {
KIRQL oldIrql; KIRQL oldIrql;
DPRINT("ExAcquireSharedStarveExclusive(Resource %x, Wait %d)\n", DPRINT("ExAcquireSharedStarveExclusive(Resource 0x%p, Wait %d)\n",
Resource, Wait); Resource, Wait);
KeAcquireSpinLock(&Resource->SpinLock, &oldIrql); KeAcquireSpinLock(&Resource->SpinLock, &oldIrql);
@ -610,7 +610,7 @@ ExDeleteResourceLite (
PERESOURCE Resource PERESOURCE Resource
) )
{ {
DPRINT("ExDeleteResourceLite(Resource %x)\n", Resource); DPRINT("ExDeleteResourceLite(Resource 0x%p)\n", Resource);
if (Resource->OwnerTable) ExFreePool(Resource->OwnerTable); if (Resource->OwnerTable) ExFreePool(Resource->OwnerTable);
if (Resource->SharedWaiters) ExFreePool(Resource->SharedWaiters); if (Resource->SharedWaiters) ExFreePool(Resource->SharedWaiters);
if (Resource->ExclusiveWaiters) ExFreePool(Resource->ExclusiveWaiters); if (Resource->ExclusiveWaiters) ExFreePool(Resource->ExclusiveWaiters);
@ -652,7 +652,7 @@ ExInitializeResource (
NTSTATUS STDCALL NTSTATUS STDCALL
ExInitializeResourceLite (PERESOURCE Resource) ExInitializeResourceLite (PERESOURCE Resource)
{ {
DPRINT("ExInitializeResourceLite(Resource %x)\n", Resource); DPRINT("ExInitializeResourceLite(Resource 0x%p)\n", Resource);
memset(Resource,0,sizeof(ERESOURCE)); memset(Resource,0,sizeof(ERESOURCE));
Resource->NumberOfSharedWaiters = 0; Resource->NumberOfSharedWaiters = 0;
Resource->NumberOfExclusiveWaiters = 0; Resource->NumberOfExclusiveWaiters = 0;
@ -822,7 +822,7 @@ ExReleaseResourceForThreadLite (
{ {
KIRQL oldIrql; KIRQL oldIrql;
DPRINT("ExReleaseResourceForThreadLite(Resource %x, ResourceThreadId %x)\n", DPRINT("ExReleaseResourceForThreadLite(Resource 0x%p, ResourceThreadId 0x%p)\n",
Resource, ResourceThreadId); Resource, ResourceThreadId);
ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);

32
reactos/ntoskrnl/ex/timer.c
View file

@ -78,7 +78,7 @@ ExTimerRundown(VOID)
ASSERT (Timer->ApcAssociated); ASSERT (Timer->ApcAssociated);
Timer->ApcAssociated = FALSE; Timer->ApcAssociated = FALSE;
DPRINT("Timer, ThreadList: %x, %x\n", Timer, Thread); DPRINT("Timer, ThreadList: 0x%p, 0x%p\n", Timer, Thread);
/* Unlock the list */ /* Unlock the list */
KeReleaseSpinLockFromDpcLevel(&Thread->ActiveTimerListLock); KeReleaseSpinLockFromDpcLevel(&Thread->ActiveTimerListLock);
@ -113,7 +113,7 @@ ExpDeleteTimer(PVOID ObjectBody)
KIRQL OldIrql; KIRQL OldIrql;
PETIMER Timer = ObjectBody; PETIMER Timer = ObjectBody;
DPRINT("ExpDeleteTimer(Timer: %x)\n", Timer); DPRINT("ExpDeleteTimer(Timer: 0x%p)\n", Timer);
/* Lock the Wake List */ /* Lock the Wake List */
KeAcquireSpinLock(&ExpWakeListLock, &OldIrql); KeAcquireSpinLock(&ExpWakeListLock, &OldIrql);
@ -145,7 +145,7 @@ ExpTimerDpcRoutine(PKDPC Dpc,
PETIMER Timer; PETIMER Timer;
KIRQL OldIrql; KIRQL OldIrql;
DPRINT("ExpTimerDpcRoutine(Dpc: %x)\n", Dpc); DPRINT("ExpTimerDpcRoutine(Dpc: 0x%p)\n", Dpc);
/* Get the Timer Object */ /* Get the Timer Object */
Timer = (PETIMER)DeferredContext; Timer = (PETIMER)DeferredContext;
@ -182,7 +182,7 @@ ExpTimerApcKernelRoutine(PKAPC Apc,
/* We need to find out which Timer we are */ /* We need to find out which Timer we are */
Timer = CONTAINING_RECORD(Apc, ETIMER, TimerApc); Timer = CONTAINING_RECORD(Apc, ETIMER, TimerApc);
DPRINT("ExpTimerApcKernelRoutine(Apc: %x. Timer: %x)\n", Apc, Timer); DPRINT("ExpTimerApcKernelRoutine(Apc: 0x%p. Timer: 0x%p)\n", Apc, Timer);
/* Lock the Timer */ /* Lock the Timer */
KeAcquireSpinLock(&Timer->Lock, &OldIrql); KeAcquireSpinLock(&Timer->Lock, &OldIrql);
@ -259,7 +259,7 @@ NtCancelTimer(IN HANDLE TimerHandle,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtCancelTimer(0x%x, 0x%x)\n", TimerHandle, CurrentState); DPRINT("NtCancelTimer(0x%p, 0x%x)\n", TimerHandle, CurrentState);
/* Check Parameter Validity */ /* Check Parameter Validity */
if(CurrentState != NULL && PreviousMode != KernelMode) { if(CurrentState != NULL && PreviousMode != KernelMode) {
@ -287,7 +287,7 @@ NtCancelTimer(IN HANDLE TimerHandle,
/* Check for success */ /* Check for success */
if(NT_SUCCESS(Status)) { if(NT_SUCCESS(Status)) {
DPRINT("Timer Referencced: %x\n", Timer); DPRINT("Timer Referenced: 0x%p\n", Timer);
/* Lock the Timer */ /* Lock the Timer */
KeAcquireSpinLock(&Timer->Lock, &OldIrql); KeAcquireSpinLock(&Timer->Lock, &OldIrql);
@ -300,7 +300,7 @@ NtCancelTimer(IN HANDLE TimerHandle,
* Get the Thread. * Get the Thread.
*/ */
TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb); TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb);
DPRINT("Removing from Thread: %x\n", TimerThread); DPRINT("Removing from Thread: 0x%p\n", TimerThread);
/* Lock its active list */ /* Lock its active list */
KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock);
@ -371,7 +371,7 @@ NtCreateTimer(OUT PHANDLE TimerHandle,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtCreateTimer(Handle: %x, Type: %d)\n", TimerHandle, TimerType); DPRINT("NtCreateTimer(Handle: 0x%p, Type: %d)\n", TimerHandle, TimerType);
/* Check Parameter Validity */ /* Check Parameter Validity */
if (PreviousMode != KernelMode) { if (PreviousMode != KernelMode) {
@ -405,7 +405,7 @@ NtCreateTimer(OUT PHANDLE TimerHandle,
if(NT_SUCCESS(Status)) { if(NT_SUCCESS(Status)) {
/* Initialize the Kernel Timer */ /* Initialize the Kernel Timer */
DPRINT("Initializing Timer: %x\n", Timer); DPRINT("Initializing Timer: 0x%p\n", Timer);
KeInitializeTimerEx(&Timer->KeTimer, TimerType); KeInitializeTimerEx(&Timer->KeTimer, TimerType);
/* Initialize the Timer Lock */ /* Initialize the Timer Lock */
@ -456,7 +456,7 @@ NtOpenTimer(OUT PHANDLE TimerHandle,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtOpenTimer(TimerHandle: %x)\n", TimerHandle); DPRINT("NtOpenTimer(TimerHandle: 0x%p)\n", TimerHandle);
/* Check Parameter Validity */ /* Check Parameter Validity */
if (PreviousMode != KernelMode) { if (PreviousMode != KernelMode) {
@ -519,7 +519,7 @@ NtQueryTimer(IN HANDLE TimerHandle,
PTIMER_BASIC_INFORMATION BasicInfo = (PTIMER_BASIC_INFORMATION)TimerInformation; PTIMER_BASIC_INFORMATION BasicInfo = (PTIMER_BASIC_INFORMATION)TimerInformation;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtQueryTimer(TimerHandle: %x, Class: %d)\n", TimerHandle, TimerInformationClass); DPRINT("NtQueryTimer(TimerHandle: 0x%p, Class: %d)\n", TimerHandle, TimerInformationClass);
/* Check Validity */ /* Check Validity */
DefaultQueryInfoBufferCheck(TimerInformationClass, DefaultQueryInfoBufferCheck(TimerInformationClass,
@ -550,7 +550,7 @@ NtQueryTimer(IN HANDLE TimerHandle,
_SEH_TRY { _SEH_TRY {
/* FIXME: Interrupt correction based on Interrupt Time */ /* FIXME: Interrupt correction based on Interrupt Time */
DPRINT("Returning Information for Timer: %x. Time Remaining: %d\n", Timer, Timer->KeTimer.DueTime.QuadPart); DPRINT("Returning Information for Timer: 0x%p. Time Remaining: %I64x\n", Timer, Timer->KeTimer.DueTime.QuadPart);
BasicInfo->TimeRemaining.QuadPart = Timer->KeTimer.DueTime.QuadPart; BasicInfo->TimeRemaining.QuadPart = Timer->KeTimer.DueTime.QuadPart;
BasicInfo->SignalState = KeReadStateTimer(&Timer->KeTimer); BasicInfo->SignalState = KeReadStateTimer(&Timer->KeTimer);
@ -591,7 +591,7 @@ NtSetTimer(IN HANDLE TimerHandle,
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE(); PAGED_CODE();
DPRINT("NtSetTimer(TimerHandle: %x, DueTime: %d, Apc: %x, Period: %d)\n", TimerHandle, DueTime->QuadPart, TimerApcRoutine, Period); DPRINT("NtSetTimer(TimerHandle: 0x%p, DueTime: %I64x, Apc: 0x%p, Period: %d)\n", TimerHandle, DueTime->QuadPart, TimerApcRoutine, Period);
/* Check Parameter Validity */ /* Check Parameter Validity */
if (PreviousMode != KernelMode) { if (PreviousMode != KernelMode) {
@ -631,7 +631,7 @@ NtSetTimer(IN HANDLE TimerHandle,
if (NT_SUCCESS(Status)) { if (NT_SUCCESS(Status)) {
/* Lock the Timer */ /* Lock the Timer */
DPRINT("Timer Referencced: %x\n", Timer); DPRINT("Timer Referencced: 0x%p\n", Timer);
KeAcquireSpinLock(&Timer->Lock, &OldIrql); KeAcquireSpinLock(&Timer->Lock, &OldIrql);
/* Cancel Running Timer */ /* Cancel Running Timer */
@ -642,7 +642,7 @@ NtSetTimer(IN HANDLE TimerHandle,
* Get the Thread. * Get the Thread.
*/ */
TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb); TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb);
DPRINT("Thread already running. Removing from Thread: %x\n", TimerThread); DPRINT("Thread already running. Removing from Thread: 0x%p\n", TimerThread);
/* Lock its active list */ /* Lock its active list */
KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock);
@ -690,7 +690,7 @@ NtSetTimer(IN HANDLE TimerHandle,
if (TimerApcRoutine) { if (TimerApcRoutine) {
/* Initialize the APC */ /* Initialize the APC */
DPRINT("Initializing APC: %x\n", Timer->TimerApc); DPRINT("Initializing APC: 0x%p\n", Timer->TimerApc);
KeInitializeApc(&Timer->TimerApc, KeInitializeApc(&Timer->TimerApc,
&CurrentThread->Tcb, &CurrentThread->Tcb,
CurrentApcEnvironment, CurrentApcEnvironment,

4
reactos/ntoskrnl/fs/filelock.c
View file

@ -798,7 +798,7 @@ FsRtlpDumpFileLocks(
{ {
Granted = CONTAINING_RECORD(EnumEntry, FILE_LOCK_GRANTED , ListEntry); Granted = CONTAINING_RECORD(EnumEntry, FILE_LOCK_GRANTED , ListEntry);
DPRINT1("%s, start: %i, len: %i, end: %i, key: %i, proc: 0x%X, fob: 0x%X\n", DPRINT1("%s, start: %I64x, len: %I64x, end: %I64x, key: %i, proc: 0x%p, fob: 0x%p\n",
Granted->Lock.ExclusiveLock ? "EXCL" : "SHRD", Granted->Lock.ExclusiveLock ? "EXCL" : "SHRD",
Granted->Lock.StartingByte.QuadPart, Granted->Lock.StartingByte.QuadPart,
Granted->Lock.Length.QuadPart, Granted->Lock.Length.QuadPart,
@ -817,7 +817,7 @@ FsRtlpDumpFileLocks(
Irp = CONTAINING_RECORD(EnumEntry, IRP , Tail.Overlay.ListEntry); Irp = CONTAINING_RECORD(EnumEntry, IRP , Tail.Overlay.ListEntry);
Stack = IoGetCurrentIrpStackLocation(Irp); Stack = IoGetCurrentIrpStackLocation(Irp);
DPRINT1("%s, start: %i, len: %i, end: %i, key: %i, proc: 0x%X, fob: 0x%X\n", DPRINT1("%s, start: %I64x, len: %I64x, end: %I64x, key: %i, proc: 0x%p, fob: 0x%p\n",
(Stack->Flags & SL_EXCLUSIVE_LOCK) ? "EXCL" : "SHRD", (Stack->Flags & SL_EXCLUSIVE_LOCK) ? "EXCL" : "SHRD",
Stack->Parameters.LockControl.ByteOffset.QuadPart, Stack->Parameters.LockControl.ByteOffset.QuadPart,
Stack->Parameters.LockControl.Length->QuadPart, Stack->Parameters.LockControl.Length->QuadPart,

20
reactos/ntoskrnl/io/device.c
View file

@ -290,7 +290,7 @@ IoAttachDeviceByPointer(IN PDEVICE_OBJECT SourceDevice,
PDEVICE_OBJECT AttachedDevice; PDEVICE_OBJECT AttachedDevice;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
DPRINT("IoAttachDeviceByPointer(SourceDevice %x, TargetDevice %x)\n", DPRINT("IoAttachDeviceByPointer(SourceDevice 0x%p, TargetDevice 0x%p)\n",
SourceDevice, TargetDevice); SourceDevice, TargetDevice);
/* Do the Attach */ /* Do the Attach */
@ -322,7 +322,7 @@ IoAttachDeviceToDeviceStack(PDEVICE_OBJECT SourceDevice,
&LocalAttach); &LocalAttach);
/* Return it */ /* Return it */
DPRINT("IoAttachDeviceToDeviceStack DONE: %x\n", LocalAttach); DPRINT("IoAttachDeviceToDeviceStack DONE: 0x%p\n", LocalAttach);
return LocalAttach; return LocalAttach;
} }
@ -338,7 +338,7 @@ IoAttachDeviceToDeviceStackSafe(IN PDEVICE_OBJECT SourceDevice,
PDEVICE_OBJECT AttachedDevice; PDEVICE_OBJECT AttachedDevice;
PDEVOBJ_EXTENSION SourceDeviceExtension; PDEVOBJ_EXTENSION SourceDeviceExtension;
DPRINT("IoAttachDeviceToDeviceStack(SourceDevice %x, TargetDevice %x)\n", DPRINT("IoAttachDeviceToDeviceStack(SourceDevice 0x%p, TargetDevice 0x%p)\n",
SourceDevice, TargetDevice); SourceDevice, TargetDevice);
/* Get the Attached Device and source extension */ /* Get the Attached Device and source extension */
@ -425,7 +425,7 @@ IoCreateDevice(PDRIVER_OBJECT DriverObject,
HANDLE TempHandle; HANDLE TempHandle;
ASSERT_IRQL(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
DPRINT("IoCreateDevice(DriverObject %x)\n",DriverObject); DPRINT("IoCreateDevice(DriverObject 0x%p)\n", DriverObject);
/* Generate a name if we have to */ /* Generate a name if we have to */
if (DeviceCharacteristics & FILE_AUTOGENERATED_DEVICE_NAME) if (DeviceCharacteristics & FILE_AUTOGENERATED_DEVICE_NAME)
@ -477,7 +477,7 @@ IoCreateDevice(PDRIVER_OBJECT DriverObject,
/* Clear the whole Object and extension so we don't null stuff manually */ /* Clear the whole Object and extension so we don't null stuff manually */
RtlZeroMemory(CreatedDeviceObject, TotalSize); RtlZeroMemory(CreatedDeviceObject, TotalSize);
DPRINT("CreatedDeviceObject %x\n", CreatedDeviceObject); DPRINT("CreatedDeviceObject 0x%p\n", CreatedDeviceObject);
/* /*
* Setup the Type and Size. Note that we don't use the aligned size, * Setup the Type and Size. Note that we don't use the aligned size,
@ -492,7 +492,7 @@ IoCreateDevice(PDRIVER_OBJECT DriverObject,
AlignedDeviceExtensionSize); AlignedDeviceExtensionSize);
/* Set the Type and Size. Question: why is Size 0 on Windows? */ /* Set the Type and Size. Question: why is Size 0 on Windows? */
DPRINT("DeviceObjectExtension %x\n", DeviceObjectExtension); DPRINT("DeviceObjectExtension 0x%p\n", DeviceObjectExtension);
DeviceObjectExtension->Type = IO_TYPE_DEVICE_OBJECT_EXTENSION; DeviceObjectExtension->Type = IO_TYPE_DEVICE_OBJECT_EXTENSION;
DeviceObjectExtension->Size = 0; DeviceObjectExtension->Size = 0;
@ -632,7 +632,7 @@ VOID
STDCALL STDCALL
IoDetachDevice(PDEVICE_OBJECT TargetDevice) IoDetachDevice(PDEVICE_OBJECT TargetDevice)
{ {
DPRINT("IoDetachDevice(TargetDevice %x)\n", TargetDevice); DPRINT("IoDetachDevice(TargetDevice 0x%p)\n", TargetDevice);
/* Remove the attachment */ /* Remove the attachment */
TargetDevice->AttachedDevice->DeviceObjectExtension->AttachedTo = NULL; TargetDevice->AttachedDevice->DeviceObjectExtension->AttachedTo = NULL;
@ -942,7 +942,7 @@ IoStartNextPacketByKey(PDEVICE_OBJECT DeviceObject,
IRP, IRP,
Tail.Overlay.DeviceQueueEntry); Tail.Overlay.DeviceQueueEntry);
DeviceObject->CurrentIrp = Irp; DeviceObject->CurrentIrp = Irp;
DPRINT("Next irp is %x\n", Irp); DPRINT("Next irp is 0x%p\n", Irp);
DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp);
} }
else else
@ -969,7 +969,7 @@ IoStartNextPacket(PDEVICE_OBJECT DeviceObject,
PKDEVICE_QUEUE_ENTRY entry; PKDEVICE_QUEUE_ENTRY entry;
PIRP Irp; PIRP Irp;
DPRINT("IoStartNextPacket(DeviceObject %x, Cancelable %d)\n", DPRINT("IoStartNextPacket(DeviceObject 0x%p, Cancelable %d)\n",
DeviceObject, Cancelable); DeviceObject, Cancelable);
entry = KeRemoveDeviceQueue(&DeviceObject->DeviceQueue); entry = KeRemoveDeviceQueue(&DeviceObject->DeviceQueue);
@ -1008,7 +1008,7 @@ IoStartPacket(PDEVICE_OBJECT DeviceObject,
BOOLEAN stat; BOOLEAN stat;
KIRQL oldirql; KIRQL oldirql;
DPRINT("IoStartPacket(Irp %x)\n", Irp); DPRINT("IoStartPacket(Irp 0x%p)\n", Irp);
ASSERT_IRQL(DISPATCH_LEVEL); ASSERT_IRQL(DISPATCH_LEVEL);

6
reactos/ntoskrnl/io/driver.c
View file

@ -130,7 +130,7 @@ IopDeleteDriver(PVOID ObjectBody)
KIRQL OldIrql; KIRQL OldIrql;
PPRIVATE_DRIVER_EXTENSIONS DriverExtension, NextDriverExtension; PPRIVATE_DRIVER_EXTENSIONS DriverExtension, NextDriverExtension;
DPRINT("IopDeleteDriver(ObjectBody %x)\n", ObjectBody); DPRINT("IopDeleteDriver(ObjectBody 0x%p)\n", ObjectBody);
ExFreePool(Object->DriverExtension); ExFreePool(Object->DriverExtension);
ExFreePool(Object->DriverName.Buffer); ExFreePool(Object->DriverName.Buffer);
@ -434,7 +434,7 @@ IopLoadServiceModule(
UNICODE_STRING ServiceImagePath; UNICODE_STRING ServiceImagePath;
NTSTATUS Status; NTSTATUS Status;
DPRINT("IopLoadServiceModule(%wZ, %x)\n", ServiceName, ModuleObject); DPRINT("IopLoadServiceModule(%wZ, 0x%p)\n", ServiceName, ModuleObject);
/* /*
* Get information about the service. * Get information about the service.
@ -824,7 +824,7 @@ IopGetGroupOrderList(PWSTR ValueName,
{ {
PSERVICE_GROUP Group; PSERVICE_GROUP Group;
DPRINT("IopGetGroupOrderList(%S, %x, %x, %x, %x, %x)\n", DPRINT("IopGetGroupOrderList(%S, %x, 0x%p, %x, 0x%p, 0x%p)\n",
ValueName, ValueType, ValueData, ValueLength, Context, EntryContext); ValueName, ValueType, ValueData, ValueLength, Context, EntryContext);
if (ValueType == REG_BINARY && if (ValueType == REG_BINARY &&

58
reactos/ntoskrnl/io/file.c
View file

@ -50,7 +50,7 @@ IopCreateFile(PVOID ObjectBody,
POBJECT_TYPE ParentObjectType; POBJECT_TYPE ParentObjectType;
NTSTATUS Status; NTSTATUS Status;
DPRINT("IopCreateFile(ObjectBody %x, Parent %x, RemainingPath %S)\n", DPRINT("IopCreateFile(ObjectBody 0x%p, Parent 0x%p, RemainingPath %S)\n",
ObjectBody, ObjectBody,
Parent, Parent,
RemainingPath); RemainingPath);
@ -81,7 +81,7 @@ IopCreateFile(PVOID ObjectBody,
UserMode); UserMode);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
CPRINT("Failed to reference parent object %x\n", Parent); CPRINT("Failed to reference parent object 0x%p\n", Parent);
return(Status); return(Status);
} }
@ -89,7 +89,7 @@ IopCreateFile(PVOID ObjectBody,
{ {
/* Parent is a devce object */ /* Parent is a devce object */
DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)Parent); DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)Parent);
DPRINT("DeviceObject %x\n", DeviceObject); DPRINT("DeviceObject 0x%p\n", DeviceObject);
if (RemainingPath == NULL) if (RemainingPath == NULL)
{ {
@ -143,7 +143,7 @@ IopCreateFile(PVOID ObjectBody,
} }
DeviceObject = ((PFILE_OBJECT)Parent)->DeviceObject; DeviceObject = ((PFILE_OBJECT)Parent)->DeviceObject;
DPRINT("DeviceObject %x\n", DeviceObject); DPRINT("DeviceObject 0x%p\n", DeviceObject);
FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; FileObject->RelatedFileObject = (PFILE_OBJECT)Parent;
@ -154,7 +154,7 @@ IopCreateFile(PVOID ObjectBody,
DPRINT("FileObject->FileName %wZ\n", DPRINT("FileObject->FileName %wZ\n",
&FileObject->FileName); &FileObject->FileName);
FileObject->DeviceObject = DeviceObject; FileObject->DeviceObject = DeviceObject;
DPRINT("FileObject %x DeviceObject %x\n", DPRINT("FileObject 0x%p DeviceObject 0x%p\n",
FileObject, FileObject,
DeviceObject); DeviceObject);
FileObject->Vpb = DeviceObject->Vpb; FileObject->Vpb = DeviceObject->Vpb;
@ -531,10 +531,10 @@ IopDeviceFsIoControl(IN HANDLE DeviceHandle,
BOOLEAN LocalEvent = FALSE; BOOLEAN LocalEvent = FALSE;
KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
DPRINT("IopDeviceFsIoControl(DeviceHandle %x Event %x UserApcRoutine %x " DPRINT("IopDeviceFsIoControl(DeviceHandle 0x%p Event 0x%p UserApcRoutine 0x%p "
"UserApcContext %x IoStatusBlock %x IoControlCode %x " "UserApcContext 0x%p IoStatusBlock 0x%p IoControlCode %x "
"InputBuffer %x InputBufferLength %x OutputBuffer %x " "InputBuffer 0x%p InputBufferLength %x OutputBuffer 0x%p "
"OutputBufferLength %x)\n", "OutputBufferLength 0x%p)\n",
DeviceHandle,Event,UserApcRoutine,UserApcContext,IoStatusBlock, DeviceHandle,Event,UserApcRoutine,UserApcContext,IoStatusBlock,
IoControlCode,InputBuffer,InputBufferLength,OutputBuffer, IoControlCode,InputBuffer,InputBufferLength,OutputBuffer,
OutputBufferLength); OutputBufferLength);
@ -758,8 +758,8 @@ IoCreateFile(OUT PHANDLE FileHandle,
PVOID SystemEaBuffer = NULL; PVOID SystemEaBuffer = NULL;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
DPRINT("IoCreateFile(FileHandle %x, DesiredAccess %x, " DPRINT("IoCreateFile(FileHandle 0x%p, DesiredAccess %x, "
"ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", "ObjectAttributes 0x%p ObjectAttributes->ObjectName->Buffer %S)\n",
FileHandle,DesiredAccess,ObjectAttributes, FileHandle,DesiredAccess,ObjectAttributes,
ObjectAttributes->ObjectName->Buffer); ObjectAttributes->ObjectName->Buffer);
@ -933,8 +933,8 @@ IoCreateFile(OUT PHANDLE FileHandle,
KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE);
KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE);
DPRINT("FileObject %x\n", FileObject); DPRINT("FileObject 0x%p\n", FileObject);
DPRINT("FileObject->DeviceObject %x\n", FileObject->DeviceObject); DPRINT("FileObject->DeviceObject 0x%p\n", FileObject->DeviceObject);
/* /*
* Create a new IRP to hand to * Create a new IRP to hand to
* the FS driver: this may fail * the FS driver: this may fail
@ -1048,7 +1048,7 @@ IoCreateFile(OUT PHANDLE FileHandle,
ASSERT_IRQL(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
DPRINT("Finished IoCreateFile() (*FileHandle) %x\n", (*FileHandle)); DPRINT("Finished IoCreateFile() (*FileHandle) 0x%p\n", (*FileHandle));
return Status; return Status;
} }
@ -1112,7 +1112,7 @@ IoCreateStreamFileObject(PFILE_OBJECT FileObject,
reason. These hacks need to be removed. reason. These hacks need to be removed.
*/ */
DPRINT("IoCreateStreamFileObject(FileObject %x, DeviceObject %x)\n", DPRINT("IoCreateStreamFileObject(FileObject 0x%p, DeviceObject 0x%p)\n",
FileObject, DeviceObject); FileObject, DeviceObject);
PAGED_CODE(); PAGED_CODE();
@ -1134,7 +1134,7 @@ IoCreateStreamFileObject(PFILE_OBJECT FileObject,
/* Choose Device Object */ /* Choose Device Object */
if (FileObject) DeviceObject = FileObject->DeviceObject; if (FileObject) DeviceObject = FileObject->DeviceObject;
DPRINT("DeviceObject %x\n", DeviceObject); DPRINT("DeviceObject 0x%p\n", DeviceObject);
/* HACK */ /* HACK */
DeviceObject = IoGetAttachedDevice(DeviceObject); DeviceObject = IoGetAttachedDevice(DeviceObject);
@ -1238,7 +1238,7 @@ IoQueryFileInformation(IN PFILE_OBJECT FileObject,
KernelMode); KernelMode);
if (!NT_SUCCESS(Status)) return(Status); if (!NT_SUCCESS(Status)) return(Status);
DPRINT("FileObject %x\n", FileObject); DPRINT("FileObject 0x%p\n", FileObject);
/* Get the Device Object */ /* Get the Device Object */
DeviceObject = IoGetRelatedDeviceObject(FileObject); DeviceObject = IoGetRelatedDeviceObject(FileObject);
@ -1498,8 +1498,8 @@ NtCreateMailslotFile(OUT PHANDLE FileHandle,
{ {
MAILSLOT_CREATE_PARAMETERS Buffer; MAILSLOT_CREATE_PARAMETERS Buffer;
DPRINT("NtCreateMailslotFile(FileHandle %x, DesiredAccess %x, " DPRINT("NtCreateMailslotFile(FileHandle 0x%p, DesiredAccess %x, "
"ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", "ObjectAttributes 0x%p ObjectAttributes->ObjectName->Buffer %S)\n",
FileHandle,DesiredAccess,ObjectAttributes, FileHandle,DesiredAccess,ObjectAttributes,
ObjectAttributes->ObjectName->Buffer); ObjectAttributes->ObjectName->Buffer);
PAGED_CODE(); PAGED_CODE();
@ -1559,8 +1559,8 @@ NtCreateNamedPipeFile(PHANDLE FileHandle,
{ {
NAMED_PIPE_CREATE_PARAMETERS Buffer; NAMED_PIPE_CREATE_PARAMETERS Buffer;
DPRINT("NtCreateNamedPipeFile(FileHandle %x, DesiredAccess %x, " DPRINT("NtCreateNamedPipeFile(FileHandle 0x%p, DesiredAccess %x, "
"ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", "ObjectAttributes 0x%p ObjectAttributes->ObjectName->Buffer %S)\n",
FileHandle,DesiredAccess,ObjectAttributes, FileHandle,DesiredAccess,ObjectAttributes,
ObjectAttributes->ObjectName->Buffer); ObjectAttributes->ObjectName->Buffer);
PAGED_CODE(); PAGED_CODE();
@ -2401,7 +2401,7 @@ NtQueryInformationFile(HANDLE FileHandle,
ASSERT(IoStatusBlock != NULL); ASSERT(IoStatusBlock != NULL);
ASSERT(FileInformation != NULL); ASSERT(FileInformation != NULL);
DPRINT("NtQueryInformationFile(Handle %x StatBlk %x FileInfo %x Length %d " DPRINT("NtQueryInformationFile(Handle 0x%p StatBlk 0x%p FileInfo 0x%p Length %d "
"Class %d)\n", FileHandle, IoStatusBlock, FileInformation, "Class %d)\n", FileHandle, IoStatusBlock, FileInformation,
Length, FileInformationClass); Length, FileInformationClass);
@ -2444,7 +2444,7 @@ NtQueryInformationFile(HANDLE FileHandle,
return STATUS_ACCESS_DENIED; return STATUS_ACCESS_DENIED;
} }
DPRINT("FileObject %x\n", FileObject); DPRINT("FileObject 0x%p\n", FileObject);
/* Check if this is a direct open or not */ /* Check if this is a direct open or not */
if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN)
@ -2587,8 +2587,8 @@ NtReadFile(IN HANDLE FileHandle,
BOOLEAN LocalEvent = FALSE; BOOLEAN LocalEvent = FALSE;
PKEVENT EventObject = NULL; PKEVENT EventObject = NULL;
DPRINT("NtReadFile(FileHandle %x Buffer %x Length %x ByteOffset %x, " DPRINT("NtReadFile(FileHandle 0x%p Buffer 0x%p Length %x ByteOffset 0x%p, "
"IoStatusBlock %x)\n", FileHandle, Buffer, Length, ByteOffset, "IoStatusBlock 0x%p)\n", FileHandle, Buffer, Length, ByteOffset,
IoStatusBlock); IoStatusBlock);
PAGED_CODE(); PAGED_CODE();
@ -2812,7 +2812,7 @@ NtSetInformationFile(HANDLE FileHandle,
ASSERT(IoStatusBlock != NULL); ASSERT(IoStatusBlock != NULL);
ASSERT(FileInformation != NULL); ASSERT(FileInformation != NULL);
DPRINT("NtSetInformationFile(Handle %x StatBlk %x FileInfo %x Length %d " DPRINT("NtSetInformationFile(Handle 0x%p StatBlk 0x%p FileInfo 0x%p Length %d "
"Class %d)\n", FileHandle, IoStatusBlock, FileInformation, "Class %d)\n", FileHandle, IoStatusBlock, FileInformation,
Length, FileInformationClass); Length, FileInformationClass);
@ -2860,7 +2860,7 @@ NtSetInformationFile(HANDLE FileHandle,
return STATUS_ACCESS_DENIED; return STATUS_ACCESS_DENIED;
} }
DPRINT("FileObject %x\n", FileObject); DPRINT("FileObject 0x%p\n", FileObject);
/* FIXME: Later, we can implement a lot of stuff here and avoid a driver call */ /* FIXME: Later, we can implement a lot of stuff here and avoid a driver call */
/* Handle IO Completion Port quickly */ /* Handle IO Completion Port quickly */
@ -3175,8 +3175,8 @@ NtWriteFile (IN HANDLE FileHandle,
BOOLEAN LocalEvent = FALSE; BOOLEAN LocalEvent = FALSE;
PKEVENT EventObject = NULL; PKEVENT EventObject = NULL;
DPRINT("NtWriteFile(FileHandle %x Buffer %x Length %x ByteOffset %x, " DPRINT("NtWriteFile(FileHandle 0x%p Buffer 0x%p Length %x ByteOffset 0x%p, "
"IoStatusBlock %x)\n", FileHandle, Buffer, Length, ByteOffset, "IoStatusBlock 0x%p)\n", FileHandle, Buffer, Length, ByteOffset,
IoStatusBlock); IoStatusBlock);
/* Validate User-Mode Buffers */ /* Validate User-Mode Buffers */

16
reactos/ntoskrnl/io/fs.c
View file

@ -129,7 +129,7 @@ IopMountFileSystem(PDEVICE_OBJECT DeviceObject,
PIRP Irp; PIRP Irp;
NTSTATUS Status; NTSTATUS Status;
DPRINT("IopMountFileSystem(DeviceObject %x, DeviceToMount %x)\n", DPRINT("IopMountFileSystem(DeviceObject 0x%p, DeviceToMount 0x%p)\n",
DeviceObject,DeviceToMount); DeviceObject,DeviceToMount);
ASSERT_IRQL(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
@ -142,7 +142,7 @@ IopMountFileSystem(PDEVICE_OBJECT DeviceObject,
} }
Irp->UserIosb = &IoStatusBlock; Irp->UserIosb = &IoStatusBlock;
DPRINT("Irp->UserIosb %x\n", Irp->UserIosb); DPRINT("Irp->UserIosb 0x%p\n", Irp->UserIosb);
Irp->UserEvent = &Event; Irp->UserEvent = &Event;
Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->Tail.Overlay.Thread = PsGetCurrentThread();
@ -178,7 +178,7 @@ IopLoadFileSystem(IN PDEVICE_OBJECT DeviceObject)
PIRP Irp; PIRP Irp;
NTSTATUS Status; NTSTATUS Status;
DPRINT("IopLoadFileSystem(DeviceObject %x)\n", DeviceObject); DPRINT("IopLoadFileSystem(DeviceObject 0x%p)\n", DeviceObject);
ASSERT_IRQL(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
@ -190,7 +190,7 @@ IopLoadFileSystem(IN PDEVICE_OBJECT DeviceObject)
} }
Irp->UserIosb = &IoStatusBlock; Irp->UserIosb = &IoStatusBlock;
DPRINT("Irp->UserIosb %x\n", Irp->UserIosb); DPRINT("Irp->UserIosb 0x%p\n", Irp->UserIosb);
Irp->UserEvent = &Event; Irp->UserEvent = &Event;
Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->Tail.Overlay.Thread = PsGetCurrentThread();
@ -232,7 +232,7 @@ IoMountVolume(IN PDEVICE_OBJECT DeviceObject,
ASSERT_IRQL(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
DPRINT("IoMountVolume(DeviceObject %x AllowRawMount %x)\n", DPRINT("IoMountVolume(DeviceObject 0x%p AllowRawMount %x)\n",
DeviceObject, AllowRawMount); DeviceObject, AllowRawMount);
switch (DeviceObject->DeviceType) switch (DeviceObject->DeviceType)
@ -347,7 +347,7 @@ IoVerifyVolume(IN PDEVICE_OBJECT DeviceObject,
NTSTATUS Status; NTSTATUS Status;
PDEVICE_OBJECT DevObject; PDEVICE_OBJECT DevObject;
DPRINT("IoVerifyVolume(DeviceObject %x AllowRawMount %x)\n", DPRINT("IoVerifyVolume(DeviceObject 0x%p AllowRawMount %x)\n",
DeviceObject, AllowRawMount); DeviceObject, AllowRawMount);
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;
@ -471,7 +471,7 @@ IoRegisterFileSystem(IN PDEVICE_OBJECT DeviceObject)
{ {
PFILE_SYSTEM_OBJECT Fs; PFILE_SYSTEM_OBJECT Fs;
DPRINT("IoRegisterFileSystem(DeviceObject %x)\n",DeviceObject); DPRINT("IoRegisterFileSystem(DeviceObject 0x%p)\n", DeviceObject);
Fs = ExAllocatePoolWithTag(NonPagedPool, Fs = ExAllocatePoolWithTag(NonPagedPool,
sizeof(FILE_SYSTEM_OBJECT), sizeof(FILE_SYSTEM_OBJECT),
@ -507,7 +507,7 @@ IoUnregisterFileSystem(IN PDEVICE_OBJECT DeviceObject)
PLIST_ENTRY current_entry; PLIST_ENTRY current_entry;
PFILE_SYSTEM_OBJECT current; PFILE_SYSTEM_OBJECT current;
DPRINT("IoUnregisterFileSystem(DeviceObject %x)\n",DeviceObject); DPRINT("IoUnregisterFileSystem(DeviceObject 0x%p)\n", DeviceObject);
KeEnterCriticalRegion(); KeEnterCriticalRegion();
ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE);

40
reactos/ntoskrnl/io/irp.c
View file

@ -142,12 +142,12 @@ IopCompleteRequest(PKAPC Apc,
PKEVENT UserEvent; PKEVENT UserEvent;
BOOLEAN SyncIrp; BOOLEAN SyncIrp;
if (Apc) DPRINT("IoSecondStageCompletition with APC: %x\n", Apc); if (Apc) DPRINT("IoSecondStageCompletition with APC: 0x%p\n", Apc);
/* Get data from the APC */ /* Get data from the APC */
FileObject = (PFILE_OBJECT)(*SystemArgument1); FileObject = (PFILE_OBJECT)(*SystemArgument1);
Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc); Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc);
DPRINT("IoSecondStageCompletition, %x\n", Irp); DPRINT("IoSecondStageCompletition, 0x%p\n", Irp);
/* Save the User Event */ /* Save the User Event */
UserEvent = Irp->UserEvent; UserEvent = Irp->UserEvent;
@ -560,9 +560,9 @@ IoBuildAsynchronousFsdRequest(ULONG MajorFunction,
PIO_STACK_LOCATION StackPtr; PIO_STACK_LOCATION StackPtr;
LOCK_OPERATION AccessType; LOCK_OPERATION AccessType;
DPRINT("IoBuildAsynchronousFsdRequest(MajorFunction %x, DeviceObject %x, " DPRINT("IoBuildAsynchronousFsdRequest(MajorFunction %x, DeviceObject 0x%p, "
"Buffer %x, Length %x, StartingOffset %x, " "Buffer 0x%p, Length %x, StartingOffset 0x%p, "
"IoStatusBlock %x\n",MajorFunction,DeviceObject,Buffer,Length, "IoStatusBlock 0x%p\n",MajorFunction,DeviceObject,Buffer,Length,
StartingOffset,IoStatusBlock); StartingOffset,IoStatusBlock);
/* Allocate IRP */ /* Allocate IRP */
@ -701,10 +701,10 @@ IoBuildDeviceIoControlRequest (ULONG IoControlCode,
ULONG BufferLength; ULONG BufferLength;
LOCK_OPERATION AccessType; LOCK_OPERATION AccessType;
DPRINT("IoBuildDeviceIoRequest(IoControlCode %x, DeviceObject %x, " DPRINT("IoBuildDeviceIoRequest(IoControlCode %x, DeviceObject 0x%p, "
"InputBuffer %x, InputBufferLength %x, OutputBuffer %x, " "InputBuffer 0x%p, InputBufferLength %x, OutputBuffer 0x%p, "
"OutputBufferLength %x, InternalDeviceIoControl %x " "OutputBufferLength %x, InternalDeviceIoControl %x "
"Event %x, IoStatusBlock %x\n",IoControlCode,DeviceObject, "Event 0x%p, IoStatusBlock 0x%p\n",IoControlCode,DeviceObject,
InputBuffer,InputBufferLength,OutputBuffer,OutputBufferLength, InputBuffer,InputBufferLength,OutputBuffer,OutputBufferLength,
InternalDeviceIoControl,Event,IoStatusBlock); InternalDeviceIoControl,Event,IoStatusBlock);
@ -901,9 +901,9 @@ IoBuildSynchronousFsdRequest(ULONG MajorFunction,
{ {
PIRP Irp; PIRP Irp;
DPRINT("IoBuildSynchronousFsdRequest(MajorFunction %x, DeviceObject %x, " DPRINT("IoBuildSynchronousFsdRequest(MajorFunction %x, DeviceObject 0x%p, "
"Buffer %x, Length %x, StartingOffset %x, Event %x, " "Buffer 0x%p, Length %x, StartingOffset 0x%p, Event 0x%p, "
"IoStatusBlock %x\n",MajorFunction,DeviceObject,Buffer,Length, "IoStatusBlock 0x%p\n",MajorFunction,DeviceObject,Buffer,Length,
StartingOffset,Event,IoStatusBlock); StartingOffset,Event,IoStatusBlock);
/* Do the big work to set up the IRP */ /* Do the big work to set up the IRP */
@ -932,7 +932,7 @@ IoCancelIrp(PIRP Irp)
KIRQL oldlvl; KIRQL oldlvl;
PDRIVER_CANCEL CancelRoutine; PDRIVER_CANCEL CancelRoutine;
DPRINT("IoCancelIrp(Irp %x)\n",Irp); DPRINT("IoCancelIrp(Irp 0x%p)\n",Irp);
IoAcquireCancelSpinLock(&oldlvl); IoAcquireCancelSpinLock(&oldlvl);
@ -1060,7 +1060,7 @@ IofCallDriver(PDEVICE_OBJECT DeviceObject,
PDRIVER_OBJECT DriverObject; PDRIVER_OBJECT DriverObject;
PIO_STACK_LOCATION Param; PIO_STACK_LOCATION Param;
DPRINT("IofCallDriver(DeviceObject %x, Irp %x)\n",DeviceObject,Irp); DPRINT("IofCallDriver(DeviceObject 0x%p, Irp 0x%p)\n",DeviceObject,Irp);
/* Get the Driver Object */ /* Get the Driver Object */
DriverObject = DeviceObject->DriverObject; DriverObject = DeviceObject->DriverObject;
@ -1071,7 +1071,7 @@ IofCallDriver(PDEVICE_OBJECT DeviceObject,
/* Get the current one */ /* Get the current one */
Param = IoGetCurrentIrpStackLocation(Irp); Param = IoGetCurrentIrpStackLocation(Irp);
DPRINT("IrpSp 0x%X\n", Param); DPRINT("IrpSp 0x0x%p\n", Param);
/* Get the Device Object */ /* Get the Device Object */
Param->DeviceObject = DeviceObject; Param->DeviceObject = DeviceObject;
@ -1105,7 +1105,7 @@ IofCompleteRequest(PIRP Irp,
NTSTATUS Status; NTSTATUS Status;
PMDL Mdl; PMDL Mdl;
DPRINT("IofCompleteRequest(Irp %x, PriorityBoost %d) Event %x THread %x\n", DPRINT("IofCompleteRequest(Irp 0x%p, PriorityBoost %d) Event 0x%p THread 0x%p\n",
Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread()); Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread());
ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);
@ -1244,7 +1244,7 @@ IofCompleteRequest(PIRP Irp,
Mdl = Irp->MdlAddress; Mdl = Irp->MdlAddress;
while (Mdl) while (Mdl)
{ {
DPRINT("Unlocking MDL: %x\n", Mdl); DPRINT("Unlocking MDL: 0x%p\n", Mdl);
MmUnlockPages(Mdl); MmUnlockPages(Mdl);
Mdl = Mdl->Next; Mdl = Mdl->Next;
} }
@ -1442,7 +1442,7 @@ IoInitializeIrp(PIRP Irp,
{ {
ASSERT(Irp != NULL); ASSERT(Irp != NULL);
DPRINT("IoInitializeIrp(StackSize %x, Irp %x)\n",StackSize, Irp); DPRINT("IoInitializeIrp(StackSize %x, Irp 0x%p)\n",StackSize, Irp);
/* Clear it */ /* Clear it */
RtlZeroMemory(Irp, PacketSize); RtlZeroMemory(Irp, PacketSize);
@ -1458,7 +1458,7 @@ IoInitializeIrp(PIRP Irp,
/* Initialize the Thread List */ /* Initialize the Thread List */
InitializeListHead(&Irp->ThreadListEntry); InitializeListHead(&Irp->ThreadListEntry);
DPRINT("Irp->Tail.Overlay.CurrentStackLocation %x\n", Irp->Tail.Overlay.CurrentStackLocation); DPRINT("Irp->Tail.Overlay.CurrentStackLocation 0x%p\n", Irp->Tail.Overlay.CurrentStackLocation);
} }
/* /*
@ -1556,7 +1556,7 @@ IoPageRead(PFILE_OBJECT FileObject,
PIO_STACK_LOCATION StackPtr; PIO_STACK_LOCATION StackPtr;
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
DPRINT("IoPageRead(FileObject %x, Mdl %x)\n", DPRINT("IoPageRead(FileObject 0x%p, Mdl 0x%p)\n",
FileObject, Mdl); FileObject, Mdl);
/* Get the Device Object */ /* Get the Device Object */
@ -1658,7 +1658,7 @@ IoSynchronousPageWrite(PFILE_OBJECT FileObject,
PIO_STACK_LOCATION StackPtr; PIO_STACK_LOCATION StackPtr;
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
DPRINT("IoSynchronousPageWrite(FileObject %x, Mdl %x)\n", DPRINT("IoSynchronousPageWrite(FileObject 0x%p, Mdl 0x%p)\n",
FileObject, Mdl); FileObject, Mdl);
/* Get the Device Object */ /* Get the Device Object */

2
reactos/ntoskrnl/io/mdl.c
View file

@ -89,7 +89,7 @@ IoBuildPartialMdl(PMDL SourceMdl,
ULONG Count; ULONG Count;
ULONG Delta; ULONG Delta;
DPRINT("VirtualAddress %x, SourceMdl->StartVa %x, SourceMdl->MappedSystemVa %x\n", DPRINT("VirtualAddress 0x%p, SourceMdl->StartVa 0x%p, SourceMdl->MappedSystemVa 0x%p\n",
VirtualAddress, SourceMdl->StartVa, SourceMdl->MappedSystemVa); VirtualAddress, SourceMdl->StartVa, SourceMdl->MappedSystemVa);
TargetMdl->StartVa = (PVOID)PAGE_ROUND_DOWN(VirtualAddress); TargetMdl->StartVa = (PVOID)PAGE_ROUND_DOWN(VirtualAddress);

14
reactos/ntoskrnl/io/pnpmgr.c
View file

@ -61,7 +61,7 @@ IoGetDeviceProperty(
PVOID Data = NULL; PVOID Data = NULL;
PWSTR Ptr; PWSTR Ptr;
DPRINT("IoGetDeviceProperty(%x %d)\n", DeviceObject, DeviceProperty); DPRINT("IoGetDeviceProperty(0x%p %d)\n", DeviceObject, DeviceProperty);
if (DeviceNode == NULL) if (DeviceNode == NULL)
return STATUS_INVALID_DEVICE_REQUEST; return STATUS_INVALID_DEVICE_REQUEST;
@ -158,7 +158,7 @@ IoGetDeviceProperty(
KeyNameBuffer = ExAllocatePool(PagedPool, KeyNameBuffer = ExAllocatePool(PagedPool,
(49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length); (49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length);
DPRINT("KeyNameBuffer: %x, value %S\n", DPRINT("KeyNameBuffer: 0x%p, value %S\n",
KeyNameBuffer, RegistryPropertyName); KeyNameBuffer, RegistryPropertyName);
if (KeyNameBuffer == NULL) if (KeyNameBuffer == NULL)
@ -508,7 +508,7 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode,
NTSTATUS Status; NTSTATUS Status;
KIRQL OldIrql; KIRQL OldIrql;
DPRINT("ParentNode %x PhysicalDeviceObject %x\n", DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p\n",
ParentNode, PhysicalDeviceObject); ParentNode, PhysicalDeviceObject);
Node = (PDEVICE_NODE)ExAllocatePool(NonPagedPool, sizeof(DEVICE_NODE)); Node = (PDEVICE_NODE)ExAllocatePool(NonPagedPool, sizeof(DEVICE_NODE));
@ -726,9 +726,9 @@ IopTraverseDeviceTree(
{ {
NTSTATUS Status; NTSTATUS Status;
DPRINT("Context %x\n", Context); DPRINT("Context 0x%p\n", Context);
DPRINT("IopTraverseDeviceTree(DeviceNode %x FirstDeviceNode %x Action %x Context %x)\n", DPRINT("IopTraverseDeviceTree(DeviceNode 0x%p FirstDeviceNode 0x%p Action %x Context 0x%p)\n",
Context->DeviceNode, Context->FirstDeviceNode, Context->Action, Context->Context); Context->DeviceNode, Context->FirstDeviceNode, Context->Action, Context->Context);
/* Start from the specified device node */ /* Start from the specified device node */
@ -1164,7 +1164,7 @@ IopActionInterrogateDeviceStack(
DEVICE_CAPABILITIES DeviceCapabilities; DEVICE_CAPABILITIES DeviceCapabilities;
DPRINT("IopActionInterrogateDeviceStack(%p, %p)\n", DeviceNode, Context); DPRINT("IopActionInterrogateDeviceStack(%p, %p)\n", DeviceNode, Context);
DPRINT("PDO %x\n", DeviceNode->PhysicalDeviceObject); DPRINT("PDO 0x%p\n", DeviceNode->PhysicalDeviceObject);
ParentDeviceNode = (PDEVICE_NODE)Context; ParentDeviceNode = (PDEVICE_NODE)Context;
@ -1882,7 +1882,7 @@ IopInvalidateDeviceRelations(
NTSTATUS Status; NTSTATUS Status;
ULONG i; ULONG i;
DPRINT("DeviceNode %x\n", DeviceNode); DPRINT("DeviceNode 0x%p\n", DeviceNode);
DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n"); DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n");

8
reactos/ntoskrnl/io/pnproot.c
View file

@ -825,7 +825,7 @@ PnpRootQueryBusRelations(
return Status; return Status;
} }
DPRINT("Created PDO %x\n", Device->Pdo); DPRINT("Created PDO 0x%p\n", Device->Pdo);
Device->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; Device->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE;
@ -1057,7 +1057,7 @@ PnpRootPnpControl(
DeviceExtension = (PPNPROOT_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DeviceExtension = (PPNPROOT_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
DPRINT("DeviceObject %x DeviceExtension %x IsFDO %d\n", DPRINT("DeviceObject 0x%p DeviceExtension 0x%p IsFDO %d\n",
DeviceObject, DeviceObject,
DeviceExtension, DeviceExtension,
DeviceExtension->IsFDO); DeviceExtension->IsFDO);
@ -1137,12 +1137,12 @@ PnpRootAddDevice(
PhysicalDeviceObject); PhysicalDeviceObject);
if (!PnpRootDeviceObject) { if (!PnpRootDeviceObject) {
CPRINT("PnpRootDeviceObject 0x%X\n", PnpRootDeviceObject); CPRINT("PnpRootDeviceObject 0x%p\n", PnpRootDeviceObject);
KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
} }
if (!PhysicalDeviceObject) { if (!PhysicalDeviceObject) {
CPRINT("PhysicalDeviceObject 0x%X\n", PhysicalDeviceObject); CPRINT("PhysicalDeviceObject 0x%p\n", PhysicalDeviceObject);
KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
} }

72
reactos/ntoskrnl/io/rawfs.c
View file

@ -102,7 +102,7 @@ static LONG RawFsQueueCount = 0;
BOOLEAN BOOLEAN
RawFsIsRawFileSystemDeviceObject(IN PDEVICE_OBJECT DeviceObject) RawFsIsRawFileSystemDeviceObject(IN PDEVICE_OBJECT DeviceObject)
{ {
DPRINT("RawFsIsRawFileSystemDeviceObject(DeviceObject %x)\n", DeviceObject); DPRINT("RawFsIsRawFileSystemDeviceObject(DeviceObject 0x%p)\n", DeviceObject);
if (DeviceObject == DiskDeviceObject) if (DeviceObject == DiskDeviceObject)
return TRUE; return TRUE;
@ -129,7 +129,7 @@ RawFsReadDisk(IN PDEVICE_OBJECT pDeviceObject,
KeInitializeEvent(&Event, NotificationEvent, FALSE); KeInitializeEvent(&Event, NotificationEvent, FALSE);
DPRINT("RawFsReadDisk(pDeviceObject %x, Offset %I64x, Length %d, Buffer %x)\n", DPRINT("RawFsReadDisk(pDeviceObject 0x%p, Offset %I64x, Length %d, Buffer 0x%p)\n",
pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer);
DPRINT ("Building synchronous FSD Request...\n"); DPRINT ("Building synchronous FSD Request...\n");
@ -146,26 +146,26 @@ RawFsReadDisk(IN PDEVICE_OBJECT pDeviceObject,
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
DPRINT("Calling IO Driver... with irp %x\n", Irp); DPRINT("Calling IO Driver... with irp 0x%p\n", Irp);
Status = IoCallDriver(pDeviceObject, Irp); Status = IoCallDriver(pDeviceObject, Irp);
DPRINT("Waiting for IO Operation for %x\n", Irp); DPRINT("Waiting for IO Operation for 0x%p\n", Irp);
if (Status == STATUS_PENDING) if (Status == STATUS_PENDING)
{ {
DPRINT("Operation pending\n"); DPRINT("Operation pending\n");
KeWaitForSingleObject (&Event, Suspended, KernelMode, FALSE, NULL); KeWaitForSingleObject (&Event, Suspended, KernelMode, FALSE, NULL);
DPRINT("Getting IO Status... for %x\n", Irp); DPRINT("Getting IO Status... for 0x%p\n", Irp);
Status = IoStatus.Status; Status = IoStatus.Status;
} }
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT("RawFsReadDisk() failed. Status %x\n", Status); DPRINT("RawFsReadDisk() failed. Status %x\n", Status);
DPRINT("(pDeviceObject %x, Offset %I64x, Size %d, Buffer %x\n", DPRINT("(pDeviceObject 0x%p, Offset %I64x, Size %d, Buffer 0x%p\n",
pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer);
return Status; return Status;
} }
DPRINT("Block request succeeded for %x\n", Irp); DPRINT("Block request succeeded for 0x%p\n", Irp);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -180,7 +180,7 @@ RawFsWriteDisk(IN PDEVICE_OBJECT pDeviceObject,
KEVENT Event; KEVENT Event;
PIRP Irp; PIRP Irp;
DPRINT("RawFsWriteDisk(pDeviceObject %x, Offset %I64x, Size %d, Buffer %x)\n", DPRINT("RawFsWriteDisk(pDeviceObject 0x%p, Offset %I64x, Size %d, Buffer 0x%p)\n",
pDeviceObject, WriteOffset->QuadPart, WriteLength, Buffer); pDeviceObject, WriteOffset->QuadPart, WriteLength, Buffer);
KeInitializeEvent(&Event, NotificationEvent, FALSE); KeInitializeEvent(&Event, NotificationEvent, FALSE);
@ -212,7 +212,7 @@ RawFsWriteDisk(IN PDEVICE_OBJECT pDeviceObject,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT("RawFsWriteDisk() failed. Status %x\n", Status); DPRINT("RawFsWriteDisk() failed. Status %x\n", Status);
DPRINT("(pDeviceObject %x, Offset %I64x, Size %d, Buffer %x\n", DPRINT("(pDeviceObject 0x%p, Offset %I64x, Size %d, Buffer 0x%p\n",
pDeviceObject, WriteOffset->QuadPart, WriteLength, Buffer); pDeviceObject, WriteOffset->QuadPart, WriteLength, Buffer);
return Status; return Status;
} }
@ -234,9 +234,9 @@ RawFsBlockDeviceIoControl(IN PDEVICE_OBJECT DeviceObject,
IO_STATUS_BLOCK IoStatus; IO_STATUS_BLOCK IoStatus;
NTSTATUS Status; NTSTATUS Status;
DPRINT("RawFsBlockDeviceIoControl(DeviceObject %x, CtlCode %x, " DPRINT("RawFsBlockDeviceIoControl(DeviceObject 0x%p, CtlCode %x, "
"InputBuffer %x, InputBufferSize %x, OutputBuffer %x, " "InputBuffer 0x%p, InputBufferSize %x, OutputBuffer 0x%p, "
"POutputBufferSize %x (%x)\n", DeviceObject, CtlCode, "POutputBufferSize 0x%p (%x)\n", DeviceObject, CtlCode,
InputBuffer, InputBufferSize, OutputBuffer, pOutputBufferSize, InputBuffer, InputBufferSize, OutputBuffer, pOutputBufferSize,
pOutputBufferSize ? *pOutputBufferSize : 0); pOutputBufferSize ? *pOutputBufferSize : 0);
@ -263,15 +263,15 @@ RawFsBlockDeviceIoControl(IN PDEVICE_OBJECT DeviceObject,
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
} }
DPRINT("Calling IO Driver... with irp %x\n", Irp); DPRINT("Calling IO Driver... with irp 0x%p\n", Irp);
Status = IoCallDriver(DeviceObject, Irp); Status = IoCallDriver(DeviceObject, Irp);
DPRINT("Waiting for IO Operation for %x\n", Irp); DPRINT("Waiting for IO Operation for 0x%p\n", Irp);
if (Status == STATUS_PENDING) if (Status == STATUS_PENDING)
{ {
DPRINT("Operation pending\n"); DPRINT("Operation pending\n");
KeWaitForSingleObject (&Event, Suspended, KernelMode, FALSE, NULL); KeWaitForSingleObject (&Event, Suspended, KernelMode, FALSE, NULL);
DPRINT("Getting IO Status... for %x\n", Irp); DPRINT("Getting IO Status... for 0x%p\n", Irp);
Status = IoStatus.Status; Status = IoStatus.Status;
} }
if (OutputBufferSize) if (OutputBufferSize)
@ -327,7 +327,7 @@ RawFsAllocateIrpContext(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
PRAWFS_IRP_CONTEXT IrpContext; PRAWFS_IRP_CONTEXT IrpContext;
UCHAR MajorFunction; UCHAR MajorFunction;
DPRINT("RawFsAllocateIrpContext(DeviceObject %x, Irp %x)\n", DeviceObject, Irp); DPRINT("RawFsAllocateIrpContext(DeviceObject 0x%p, Irp 0x%p)\n", DeviceObject, Irp);
ASSERT(DeviceObject); ASSERT(DeviceObject);
ASSERT(Irp); ASSERT(Irp);
@ -364,7 +364,7 @@ RawFsAllocateIrpContext(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
static VOID static VOID
RawFsFreeIrpContext(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsFreeIrpContext(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsFreeIrpContext(IrpContext %x)\n", IrpContext); DPRINT("RawFsFreeIrpContext(IrpContext 0x%p)\n", IrpContext);
ASSERT(IrpContext); ASSERT(IrpContext);
@ -378,7 +378,7 @@ STDCALL RawFsDoRequest(PVOID IrpContext)
Count = InterlockedDecrement(&RawFsQueueCount); Count = InterlockedDecrement(&RawFsQueueCount);
DPRINT("RawFsDoRequest(IrpContext %x), MajorFunction %x, %d\n", DPRINT("RawFsDoRequest(IrpContext 0x%p), MajorFunction %x, %d\n",
IrpContext, ((PRAWFS_IRP_CONTEXT) IrpContext)->MajorFunction, Count); IrpContext, ((PRAWFS_IRP_CONTEXT) IrpContext)->MajorFunction, Count);
RawFsDispatchRequest((PRAWFS_IRP_CONTEXT) IrpContext); RawFsDispatchRequest((PRAWFS_IRP_CONTEXT) IrpContext);
@ -394,7 +394,7 @@ RawFsQueueRequest(PRAWFS_IRP_CONTEXT IrpContext)
Count = InterlockedIncrement(&RawFsQueueCount); Count = InterlockedIncrement(&RawFsQueueCount);
DPRINT("RawFsQueueRequest (IrpContext %x), %d\n", IrpContext, Count); DPRINT("RawFsQueueRequest (IrpContext 0x%p), %d\n", IrpContext, Count);
IrpContext->Flags |= IRPCONTEXT_CANWAIT; IrpContext->Flags |= IRPCONTEXT_CANWAIT;
IoMarkIrpPending (IrpContext->Irp); IoMarkIrpPending (IrpContext->Irp);
@ -406,7 +406,7 @@ RawFsQueueRequest(PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS static NTSTATUS
RawFsClose(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsClose(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsClose(IrpContext %x)\n", IrpContext); DPRINT("RawFsClose(IrpContext 0x%p)\n", IrpContext);
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
@ -469,7 +469,7 @@ RawFsCreate(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
NTSTATUS Status; NTSTATUS Status;
DPRINT("RawFsCreate(IrpContext %x)\n", IrpContext); DPRINT("RawFsCreate(IrpContext 0x%p)\n", IrpContext);
ASSERT(IrpContext); ASSERT(IrpContext);
@ -504,7 +504,7 @@ RawFsCreate(IN PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS static NTSTATUS
RawFsRead(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsRead(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsRead(IrpContext %x)\n", IrpContext); DPRINT("RawFsRead(IrpContext 0x%p)\n", IrpContext);
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
@ -512,7 +512,7 @@ RawFsRead(IN PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS static NTSTATUS
RawFsWrite(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsWrite(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsWrite(IrpContext %x)\n", IrpContext); DPRINT("RawFsWrite(IrpContext 0x%p)\n", IrpContext);
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
@ -531,7 +531,7 @@ RawFsMount(IN PRAWFS_IRP_CONTEXT IrpContext)
NTSTATUS Status; NTSTATUS Status;
ULONG Size; ULONG Size;
DPRINT("RawFsMount(IrpContext %x)\n", IrpContext); DPRINT("RawFsMount(IrpContext 0x%p)\n", IrpContext);
ASSERT(IrpContext); ASSERT(IrpContext);
@ -669,7 +669,7 @@ RawFsFileSystemControl(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
NTSTATUS Status; NTSTATUS Status;
DPRINT("RawFsFileSystemControl(IrpContext %x)\n", IrpContext); DPRINT("RawFsFileSystemControl(IrpContext 0x%p)\n", IrpContext);
ASSERT(IrpContext); ASSERT(IrpContext);
@ -707,7 +707,7 @@ RawFsFileSystemControl(IN PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS static NTSTATUS
RawFsQueryInformation(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsQueryInformation(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsQueryInformation(IrpContext %x)\n", IrpContext); DPRINT("RawFsQueryInformation(IrpContext 0x%p)\n", IrpContext);
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
@ -715,7 +715,7 @@ RawFsQueryInformation(IN PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS static NTSTATUS
RawFsSetInformation(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsSetInformation(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsSetInformation(IrpContext %x)\n", IrpContext); DPRINT("RawFsSetInformation(IrpContext 0x%p)\n", IrpContext);
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
@ -723,7 +723,7 @@ RawFsSetInformation(IN PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS static NTSTATUS
RawFsDirectoryControl(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsDirectoryControl(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsDirectoryControl(IrpContext %x)\n", IrpContext); DPRINT("RawFsDirectoryControl(IrpContext 0x%p)\n", IrpContext);
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
@ -731,7 +731,7 @@ RawFsDirectoryControl(IN PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS static NTSTATUS
RawFsQueryVolumeInformation(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsQueryVolumeInformation(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsQueryVolumeInformation(IrpContext %x)\n", IrpContext); DPRINT("RawFsQueryVolumeInformation(IrpContext 0x%p)\n", IrpContext);
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
@ -739,7 +739,7 @@ RawFsQueryVolumeInformation(IN PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS static NTSTATUS
RawFsSetVolumeInformation(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsSetVolumeInformation(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsSetVolumeInformation(IrpContext %x)\n", IrpContext); DPRINT("RawFsSetVolumeInformation(IrpContext 0x%p)\n", IrpContext);
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
@ -747,7 +747,7 @@ RawFsSetVolumeInformation(IN PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS static NTSTATUS
RawFsLockControl(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsLockControl(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsLockControl(IrpContext %x)\n", IrpContext); DPRINT("RawFsLockControl(IrpContext 0x%p)\n", IrpContext);
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
@ -755,7 +755,7 @@ RawFsLockControl(IN PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS static NTSTATUS
RawFsCleanup(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsCleanup(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsCleanup(IrpContext %x)\n", IrpContext); DPRINT("RawFsCleanup(IrpContext 0x%p)\n", IrpContext);
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
@ -763,7 +763,7 @@ RawFsCleanup(IN PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS static NTSTATUS
RawFsFlush(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsFlush(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsFlush(IrpContext %x)\n", IrpContext); DPRINT("RawFsFlush(IrpContext 0x%p)\n", IrpContext);
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
@ -771,7 +771,7 @@ RawFsFlush(IN PRAWFS_IRP_CONTEXT IrpContext)
static NTSTATUS STDCALL static NTSTATUS STDCALL
RawFsShutdown(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) RawFsShutdown(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
{ {
DPRINT("RawFsShutdown(DeviceObject %x, Irp %x)\n", DeviceObject, Irp); DPRINT("RawFsShutdown(DeviceObject 0x%p, Irp 0x%p)\n", DeviceObject, Irp);
/* /*
* Note: Do NOT call UNIMPLEMENTED here! * Note: Do NOT call UNIMPLEMENTED here!
@ -784,7 +784,7 @@ RawFsShutdown(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
static NTSTATUS static NTSTATUS
RawFsDispatchRequest(IN PRAWFS_IRP_CONTEXT IrpContext) RawFsDispatchRequest(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsDispatchRequest(IrpContext %x), MajorFunction %x\n", DPRINT("RawFsDispatchRequest(IrpContext 0x%p), MajorFunction %x\n",
IrpContext, IrpContext->MajorFunction); IrpContext, IrpContext->MajorFunction);
ASSERT(IrpContext); ASSERT(IrpContext);
@ -833,7 +833,7 @@ RawFsBuildRequest(IN PDEVICE_OBJECT DeviceObject,
PRAWFS_IRP_CONTEXT IrpContext; PRAWFS_IRP_CONTEXT IrpContext;
NTSTATUS Status; NTSTATUS Status;
DPRINT("RawFsBuildRequest(DeviceObject %x, Irp %x)\n", DeviceObject, Irp); DPRINT("RawFsBuildRequest(DeviceObject 0x%p, Irp 0x%p)\n", DeviceObject, Irp);
ASSERT(DeviceObject); ASSERT(DeviceObject);
ASSERT(Irp); ASSERT(Irp);

2
reactos/ntoskrnl/io/share.c
View file

@ -269,7 +269,7 @@ IoSetInformation(IN PFILE_OBJECT FileObject,
return(Status); return(Status);
} }
DPRINT("FileObject %x\n", FileObject); DPRINT("FileObject 0x%p\n", FileObject);
DeviceObject = FileObject->DeviceObject; DeviceObject = FileObject->DeviceObject;

12
reactos/ntoskrnl/io/timer.c
View file

@ -56,7 +56,7 @@ IopTimerDispatch(IN PKDPC Dpc,
Timer = CONTAINING_RECORD(TimerEntry, IO_TIMER, IoTimerList); Timer = CONTAINING_RECORD(TimerEntry, IO_TIMER, IoTimerList);
if (Timer->TimerEnabled) { if (Timer->TimerEnabled) {
DPRINT("Dispatching a Timer Routine: %x for Device Object: %x \n", DPRINT("Dispatching a Timer Routine: 0x%p for Device Object: 0x%p \n",
Timer->TimerRoutine, Timer->TimerRoutine,
Timer->DeviceObject); Timer->DeviceObject);
Timer->TimerRoutine(Timer->DeviceObject, Timer->Context); Timer->TimerRoutine(Timer->DeviceObject, Timer->Context);
@ -129,7 +129,7 @@ IoInitializeTimer(PDEVICE_OBJECT DeviceObject,
* RETURNS: Status * RETURNS: Status
*/ */
{ {
DPRINT("IoInitializeTimer() called for Device Object: %x with Routine: %x \n", DeviceObject, TimerRoutine); DPRINT("IoInitializeTimer() called for Device Object: 0x%p with Routine: 0x%p \n", DeviceObject, TimerRoutine);
/* Allocate Timer */ /* Allocate Timer */
if (!DeviceObject->Timer) { if (!DeviceObject->Timer) {
@ -172,7 +172,7 @@ IoStartTimer(PDEVICE_OBJECT DeviceObject)
{ {
KIRQL OldIrql; KIRQL OldIrql;
DPRINT("IoStartTimer for Device Object: %x\n", DeviceObject); DPRINT("IoStartTimer for Device Object: 0x%p\n", DeviceObject);
/* Lock Timers */ /* Lock Timers */
KeAcquireSpinLock(&IopTimerLock, &OldIrql); KeAcquireSpinLock(&IopTimerLock, &OldIrql);
@ -185,7 +185,7 @@ IoStartTimer(PDEVICE_OBJECT DeviceObject)
/* Unlock Timers */ /* Unlock Timers */
KeReleaseSpinLock(&IopTimerLock, OldIrql); KeReleaseSpinLock(&IopTimerLock, OldIrql);
DPRINT("IoStartTimer Completed for Device Object: %x New Count: %x \n", DeviceObject, IopTimerCount); DPRINT("IoStartTimer Completed for Device Object: 0x%p New Count: %x \n", DeviceObject, IopTimerCount);
} }
/* /*
@ -203,7 +203,7 @@ IoStopTimer(PDEVICE_OBJECT DeviceObject)
{ {
KIRQL OldIrql; KIRQL OldIrql;
DPRINT("IoStopTimer for Device Object: %x\n", DeviceObject); DPRINT("IoStopTimer for Device Object: 0x%p\n", DeviceObject);
/* Lock Timers */ /* Lock Timers */
KeAcquireSpinLock(&IopTimerLock, &OldIrql); KeAcquireSpinLock(&IopTimerLock, &OldIrql);
@ -216,7 +216,7 @@ IoStopTimer(PDEVICE_OBJECT DeviceObject)
/* Unlock Timers */ /* Unlock Timers */
KeReleaseSpinLock(&IopTimerLock, OldIrql); KeReleaseSpinLock(&IopTimerLock, OldIrql);
DPRINT("IoStopTimer Completed for Device Object: %x New Count: %x \n", DeviceObject, IopTimerCount); DPRINT("IoStopTimer Completed for Device Object: 0x%p New Count: %x \n", DeviceObject, IopTimerCount);
} }

15
reactos/ntoskrnl/kdbg/kdb.c
View file

@ -264,7 +264,7 @@ KdbpShouldStepOverInstruction(ULONG_PTR Eip)
if (!NT_SUCCESS(KdbpSafeReadMemory(Mem, (PVOID)Eip, sizeof (Mem)))) if (!NT_SUCCESS(KdbpSafeReadMemory(Mem, (PVOID)Eip, sizeof (Mem))))
{ {
KdbpPrint("Couldn't access memory at 0x%x\n", (UINT)Eip); KdbpPrint("Couldn't access memory at 0x%p\n", Eip);
return FALSE; return FALSE;
} }
@ -332,7 +332,7 @@ KdbpStepIntoInstruction(ULONG_PTR Eip)
/* Read memory */ /* Read memory */
if (!NT_SUCCESS(KdbpSafeReadMemory(Mem, (PVOID)Eip, sizeof (Mem)))) if (!NT_SUCCESS(KdbpSafeReadMemory(Mem, (PVOID)Eip, sizeof (Mem))))
{ {
/*KdbpPrint("Couldn't access memory at 0x%x\n", (UINT)Eip);*/ /*KdbpPrint("Couldn't access memory at 0x%p\n", Eip);*/
return FALSE; return FALSE;
} }
@ -363,7 +363,7 @@ KdbpStepIntoInstruction(ULONG_PTR Eip)
/* Get the interrupt descriptor */ /* Get the interrupt descriptor */
if (!NT_SUCCESS(KdbpSafeReadMemory(IntDesc, (PVOID)(Idtr.Base + (IntVect * 8)), sizeof (IntDesc)))) if (!NT_SUCCESS(KdbpSafeReadMemory(IntDesc, (PVOID)(Idtr.Base + (IntVect * 8)), sizeof (IntDesc))))
{ {
/*KdbpPrint("Couldn't access memory at 0x%x\n", (UINT)Idtr.Base + (IntVect * 8));*/ /*KdbpPrint("Couldn't access memory at 0x%p\n", (ULONG_PTR)Idtr.Base + (IntVect * 8));*/
return FALSE; return FALSE;
} }
@ -510,7 +510,7 @@ KdbpInsertBreakPoint(
{ {
if ((Address % Size) != 0) if ((Address % Size) != 0)
{ {
KdbpPrint("Address (0x%x) must be aligned to a multiple of the size (%d)\n", Address, Size); KdbpPrint("Address (0x%p) must be aligned to a multiple of the size (%d)\n", Address, Size);
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
if (AccessType == KdbAccessExec && Size != 1) if (AccessType == KdbAccessExec && Size != 1)
@ -752,7 +752,7 @@ KdbpEnableBreakPoint(
0xCC, &BreakPoint->Data.SavedInstruction); 0xCC, &BreakPoint->Data.SavedInstruction);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
KdbpPrint("Couldn't access memory at 0x%x\n", BreakPoint->Address); KdbpPrint("Couldn't access memory at 0x%p\n", BreakPoint->Address);
return FALSE; return FALSE;
} }
KdbSwBreakPoints[KdbSwBreakPointCount++] = BreakPoint; KdbSwBreakPoints[KdbSwBreakPointCount++] = BreakPoint;
@ -1423,10 +1423,11 @@ KdbEnterDebuggerException(
if (ExpNr == 14) if (ExpNr == 14)
{ {
/* FIXME: Add noexec memory stuff */ /* FIXME: Add noexec memory stuff */
ULONG Cr2, Err; ULONG_PTR Cr2;
ULONG Err;
asm volatile("movl %%cr2, %0" : "=r"(Cr2)); asm volatile("movl %%cr2, %0" : "=r"(Cr2));
Err = TrapFrame->ErrorCode; Err = TrapFrame->ErrorCode;
DbgPrint("Memory at 0x%x could not be %s: ", Cr2, (Err & (1 << 1)) ? "written" : "read"); DbgPrint("Memory at 0x%p could not be %s: ", Cr2, (Err & (1 << 1)) ? "written" : "read");
if ((Err & (1 << 0)) == 0) if ((Err & (1 << 0)) == 0)
DbgPrint("Page not present.\n"); DbgPrint("Page not present.\n");
else else

6
reactos/ntoskrnl/kdbg/kdb_cli.c
View file

@ -575,7 +575,7 @@ KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[])
break; break;
if (!NT_SUCCESS(KdbpSafeReadMemory(&Address, (PVOID)(Frame + sizeof(ULONG_PTR)), sizeof (ULONG_PTR)))) if (!NT_SUCCESS(KdbpSafeReadMemory(&Address, (PVOID)(Frame + sizeof(ULONG_PTR)), sizeof (ULONG_PTR))))
{ {
KdbpPrint("Couldn't access memory at 0x%x!\n", Frame + sizeof(ULONG_PTR)); KdbpPrint("Couldn't access memory at 0x%p!\n", Frame + sizeof(ULONG_PTR));
break; break;
} }
if (!KdbSymPrintAddress((PVOID)Address)) if (!KdbSymPrintAddress((PVOID)Address))
@ -586,7 +586,7 @@ KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[])
break; break;
if (!NT_SUCCESS(KdbpSafeReadMemory(&Frame, (PVOID)Frame, sizeof (ULONG_PTR)))) if (!NT_SUCCESS(KdbpSafeReadMemory(&Frame, (PVOID)Frame, sizeof (ULONG_PTR))))
{ {
KdbpPrint("Couldn't access memory at 0x%x!\n", Frame); KdbpPrint("Couldn't access memory at 0x%p!\n", Frame);
break; break;
} }
} }
@ -1185,7 +1185,7 @@ KdbpCmdMod(ULONG Argc, PCHAR Argv[])
if (!KdbpSymFindModuleByAddress((PVOID)Address, &Info)) if (!KdbpSymFindModuleByAddress((PVOID)Address, &Info))
{ {
KdbpPrint("No module containing address 0x%x found!\n", Address); KdbpPrint("No module containing address 0x%p found!\n", Address);
return TRUE; return TRUE;
} }
DisplayOnlyOneModule = TRUE; DisplayOnlyOneModule = TRUE;

2
reactos/ntoskrnl/ke/catch.c
View file

@ -196,7 +196,7 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
if (Value != ExceptionContinueExecution || if (Value != ExceptionContinueExecution ||
0 != (ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE)) 0 != (ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE))
{ {
DPRINT("ExceptionRecord->ExceptionAddress = 0x%x\n", ExceptionRecord->ExceptionAddress); DPRINT("ExceptionRecord->ExceptionAddress = 0x%p\n", ExceptionRecord->ExceptionAddress);
/* Enter KDB if available */ /* Enter KDB if available */
Action = KdpEnterDebuggerException(ExceptionRecord, Action = KdpEnterDebuggerException(ExceptionRecord,