Modified: trunk/reactos/ntoskrnl/cc/copy.c
Modified: trunk/reactos/ntoskrnl/cc/fs.c
Modified: trunk/reactos/ntoskrnl/cc/pin.c
Modified: trunk/reactos/ntoskrnl/cc/view.c
Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c
Modified: trunk/reactos/ntoskrnl/cm/regfile.c
Modified: trunk/reactos/ntoskrnl/cm/registry.c
Modified: trunk/reactos/ntoskrnl/cm/regobj.c
Modified: trunk/reactos/ntoskrnl/dbgk/debug.c
Modified: trunk/reactos/ntoskrnl/ex/event.c
Modified: trunk/reactos/ntoskrnl/ex/evtpair.c
Modified: trunk/reactos/ntoskrnl/ex/handle.c
Modified: trunk/reactos/ntoskrnl/ex/lookas.c
Modified: trunk/reactos/ntoskrnl/ex/mutant.c
Modified: trunk/reactos/ntoskrnl/ex/resource.c
Modified: trunk/reactos/ntoskrnl/ex/timer.c
Modified: trunk/reactos/ntoskrnl/fs/filelock.c
Modified: trunk/reactos/ntoskrnl/io/device.c
Modified: trunk/reactos/ntoskrnl/io/disk.c
Modified: trunk/reactos/ntoskrnl/io/driver.c
Modified: trunk/reactos/ntoskrnl/io/file.c
Modified: trunk/reactos/ntoskrnl/io/fs.c
Modified: trunk/reactos/ntoskrnl/io/irp.c
Modified: trunk/reactos/ntoskrnl/io/mdl.c
Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c
Modified: trunk/reactos/ntoskrnl/io/pnproot.c
Modified: trunk/reactos/ntoskrnl/io/rawfs.c
Modified: trunk/reactos/ntoskrnl/io/share.c
Modified: trunk/reactos/ntoskrnl/io/timer.c
Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c
Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c
Modified: trunk/reactos/ntoskrnl/ke/catch.c
--- trunk/reactos/ntoskrnl/cc/copy.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/cc/copy.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -315,9 +315,9 @@
PLIST_ENTRY current_entry;
PCACHE_SEGMENT current;
- DPRINT("CcCopyRead(FileObject %x, FileOffset %x, "
- "Length %d, Wait %d, Buffer %x, IoStatus %x)\n",
- FileObject, (ULONG)FileOffset->QuadPart, Length, Wait,
+ DPRINT("CcCopyRead(FileObject 0x%p, FileOffset %I64x, "
+ "Length %d, Wait %d, Buffer 0x%p, IoStatus 0x%p)\n",
+ FileObject, FileOffset->QuadPart, Length, Wait,
Buffer, IoStatus);
Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
@@ -429,9 +429,9 @@
PVOID BaseAddress;
BOOLEAN Valid;
- DPRINT("CcCopyWrite(FileObject %x, FileOffset %x, "
- "Length %d, Wait %d, Buffer %x)\n",
- FileObject, (ULONG)FileOffset->QuadPart, Length, Wait, Buffer);
+ DPRINT("CcCopyWrite(FileObject 0x%p, FileOffset %I64x, "
+ "Length %d, Wait %d, Buffer 0x%p)\n",
+ FileObject, FileOffset->QuadPart, Length, Wait, Buffer);
Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
WriteOffset = (ULONG)FileOffset->QuadPart;
@@ -611,7 +611,7 @@
IO_STATUS_BLOCK Iosb;
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);
--- trunk/reactos/ntoskrnl/cc/fs.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/cc/fs.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -134,7 +134,7 @@
LIST_ENTRY FreeListHead;
NTSTATUS Status;
- DPRINT("CcSetFileSizes(FileObject %x, FileSizes %x)\n",
+ DPRINT("CcSetFileSizes(FileObject 0x%p, FileSizes 0x%p)\n",
FileObject, FileSizes);
DPRINT("AllocationSize %d, FileSize %d, ValidDataLength %d\n",
(ULONG)FileSizes->AllocationSize.QuadPart,
@@ -196,7 +196,7 @@
Status = CcRosInternalFreeCacheSegment(current);
if (!NT_SUCCESS(Status))
{
- DPRINT1("CcRosInternalFreeCacheSegment failed, status = %x\n");
+ DPRINT1("CcRosInternalFreeCacheSegment failed, status = %x\n", Status);
KEBUGCHECK(0);
}
}
--- trunk/reactos/ntoskrnl/cc/pin.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/cc/pin.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -39,17 +39,17 @@
PINTERNAL_BCB iBcb;
ULONG ROffset;
- DPRINT("CcMapData(FileObject %x, FileOffset %d, Length %d, Wait %d,"
- " pBcb %x, pBuffer %x)\n", FileObject, (ULONG)FileOffset->QuadPart,
+ DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Wait %d,"
+ " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart,
Length, Wait, pBcb, pBuffer);
ReadOffset = (ULONG)FileOffset->QuadPart;
Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
ASSERT(Bcb);
- DPRINT("AllocationSize %d, FileSize %d\n",
- (ULONG)Bcb->AllocationSize.QuadPart,
- (ULONG)Bcb->FileSize.QuadPart);
+ DPRINT("AllocationSize %I64x, FileSize %I64x\n",
+ Bcb->AllocationSize.QuadPart,
+ Bcb->FileSize.QuadPart);
if (ReadOffset % Bcb->CacheSegmentSize + Length > Bcb->CacheSegmentSize)
{
--- trunk/reactos/ntoskrnl/cc/view.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/cc/view.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -295,7 +295,7 @@
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);
CacheSeg->Valid = Valid;
@@ -340,7 +340,7 @@
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);
current_entry = Bcb->BcbSegmentListHead.Flink;
@@ -370,7 +370,7 @@
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);
if (CacheSeg == NULL)
@@ -407,7 +407,7 @@
ASSERT(Bcb);
- DPRINT("CcRosUnmapCacheSegment(Bcb %x, FileOffset %d, NowDirty %d)\n",
+ DPRINT("CcRosUnmapCacheSegment(Bcb 0x%p, FileOffset %d, NowDirty %d)\n",
Bcb, FileOffset, NowDirty);
CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset);
@@ -760,7 +760,7 @@
PFN_TYPE Page;
KIRQL oldIrql;
#endif
- DPRINT("Freeing cache segment %x\n", CacheSeg);
+ DPRINT("Freeing cache segment 0x%p\n", CacheSeg);
#ifdef CACHE_BITMAP
RegionSize = CacheSeg->Bcb->CacheSegmentSize / PAGE_SIZE;
@@ -804,7 +804,7 @@
ASSERT(Bcb);
- DPRINT("CcRosFreeCacheSegment(Bcb %x, CacheSeg %x)\n",
+ DPRINT("CcRosFreeCacheSegment(Bcb 0x%p, CacheSeg 0x%p)\n",
Bcb, CacheSeg);
ExAcquireFastMutex(&ViewLock);
@@ -840,7 +840,7 @@
NTSTATUS Status;
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);
if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap)
@@ -1118,7 +1118,7 @@
PBCB Bcb;
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);
ExAcquireFastMutex(&ViewLock);
--- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -49,8 +49,8 @@
PAGED_CODE();
- DPRINT("CmpFindObject(ObjectAttributes %x, ReturnedObject %x, "
- "RemainingPath %x)\n",ObjectAttributes,ReturnedObject,RemainingPath);
+ DPRINT("CmpFindObject(ObjectAttributes 0x%p, ReturnedObject 0x%p, "
+ "RemainingPath 0x%p)\n",ObjectAttributes,ReturnedObject,RemainingPath);
DPRINT("ObjectAttributes->ObjectName %wZ\n",
ObjectAttributes->ObjectName);
@@ -326,7 +326,7 @@
PAGED_CODE();
- DPRINT("NtCreateKey (Name %wZ KeyHandle %x Root %x)\n",
+ DPRINT("NtCreateKey (Name %wZ KeyHandle 0x%p Root 0x%p)\n",
ObjectAttributes->ObjectName,
KeyHandle,
ObjectAttributes->RootDirectory);
@@ -386,7 +386,7 @@
}
}
- DPRINT("RemainingPath %S ParentObject %x\n", RemainingPath.Buffer, Object);
+ DPRINT("RemainingPath %S ParentObject 0x%p\n", RemainingPath.Buffer, Object);
Status = ObCreateObject(ExGetPreviousMode(),
CmiKeyType,
@@ -511,7 +511,7 @@
PAGED_CODE();
- DPRINT("NtDeleteKey(KeyHandle %x) called\n", KeyHandle);
+ DPRINT("NtDeleteKey(KeyHandle 0x%p) called\n", KeyHandle);
PreviousMode = ExGetPreviousMode();
@@ -599,7 +599,7 @@
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,
Index,
KeyInformationClass,
@@ -947,7 +947,7 @@
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,
Index,
KeyValueInformationClass,
@@ -1241,7 +1241,7 @@
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,
DesiredAccess,
ObjectAttributes,
@@ -1358,7 +1358,7 @@
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,
KeyInformationClass,
KeyInformation,
@@ -1568,7 +1568,7 @@
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);
/* Verify that the handle is valid and is a registry key */
@@ -1810,7 +1810,7 @@
PAGED_CODE();
- DPRINT("NtSetValueKey(KeyHandle %x ValueName '%wZ' Type %d)\n",
+ DPRINT("NtSetValueKey(KeyHandle 0x%p ValueName '%wZ' Type %d)\n",
KeyHandle, ValueName, Type);
DesiredAccess = KEY_SET_VALUE;
--- trunk/reactos/ntoskrnl/cm/regfile.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -1068,7 +1068,7 @@
RtlZeroMemory (Hive,
sizeof(REGISTRY_HIVE));
- DPRINT("Hive %x\n", Hive);
+ DPRINT("Hive 0x%p\n", Hive);
Hive->HiveHeader = (PHIVE_HEADER)ExAllocatePool (NonPagedPool,
sizeof(HIVE_HEADER));
@@ -1138,7 +1138,7 @@
RtlZeroMemory (Hive,
sizeof(REGISTRY_HIVE));
- DPRINT ("Hive %x\n", Hive);
+ DPRINT ("Hive 0x%p\n", Hive);
Hive->HiveHeader = (PHIVE_HEADER)ExAllocatePool (NonPagedPool,
REG_BLOCK_SIZE);
@@ -1151,7 +1151,7 @@
RtlZeroMemory (Hive->HiveHeader,
REG_BLOCK_SIZE);
- DPRINT ("HiveHeader %x\n", Hive->HiveHeader);
+ DPRINT ("HiveHeader 0x%p\n", Hive->HiveHeader);
Hive->Flags = HIVE_NO_FILE;
@@ -1260,7 +1260,7 @@
RtlZeroMemory (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->HiveHeader = (PHIVE_HEADER)ExAllocatePool(NonPagedPool,
--- trunk/reactos/ntoskrnl/cm/registry.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/cm/registry.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -1270,7 +1270,7 @@
ExReleaseResourceLite(&CmiRegistryLock);
KeLeaveCriticalRegion();
- DPRINT("DeferredContext %x\n", DeferredContext);
+ DPRINT("DeferredContext 0x%p\n", DeferredContext);
ExFreePool(DeferredContext);
DPRINT("CmiHiveSyncRoutine() done\n");
@@ -1297,7 +1297,7 @@
CmiHiveSyncRoutine,
WorkQueueItem);
- DPRINT("DeferredContext %x\n", WorkQueueItem);
+ DPRINT("DeferredContext 0x%p\n", WorkQueueItem);
ExQueueWorkItem(WorkQueueItem,
CriticalWorkQueue);
}
--- trunk/reactos/ntoskrnl/cm/regobj.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -196,7 +196,7 @@
RtlpCreateUnicodeString(&FoundObject->Name,
KeyName.Buffer, NonPagedPool);
CmiAddKeyToList(ParsedKey, FoundObject);
- DPRINT("Created object 0x%x\n", FoundObject);
+ DPRINT("Created object 0x%p\n", FoundObject);
}
else
{
@@ -578,7 +578,7 @@
/* to allow a dichotomic search */
ParentKey->SubKeys[ParentKey->NumberOfSubKeys++] = NewKey;
- DPRINT("Reference parent key: 0x%x\n", ParentKey);
+ DPRINT("Reference parent key: 0x%p\n", ParentKey);
ObReferenceObjectByPointer(ParentKey,
STANDARD_RIGHTS_REQUIRED,
--- trunk/reactos/ntoskrnl/dbgk/debug.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/dbgk/debug.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -29,7 +29,7 @@
NTSTATUS Status = STATUS_SUCCESS;
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 */
if(PreviousMode != KernelMode) {
--- trunk/reactos/ntoskrnl/ex/event.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/ex/event.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -103,7 +103,7 @@
NTSTATUS Status = STATUS_SUCCESS;
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 */
if(PreviousMode != KernelMode) {
@@ -183,7 +183,7 @@
NTSTATUS Status = STATUS_SUCCESS;
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 */
if(PreviousMode != KernelMode) {
@@ -314,7 +314,7 @@
PEVENT_BASIC_INFORMATION BasicInfo = (PEVENT_BASIC_INFORMATION)EventInformation;
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 */
DefaultQueryInfoBufferCheck(EventInformationClass,
--- trunk/reactos/ntoskrnl/ex/evtpair.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/ex/evtpair.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -62,7 +62,7 @@
NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE();
- DPRINT("NtCreateEventPair: %x\n", EventPairHandle);
+ DPRINT("NtCreateEventPair: 0x%p\n", EventPairHandle);
/* Check Output Safety */
if(PreviousMode == UserMode) {
@@ -194,7 +194,7 @@
NTSTATUS Status;
PAGED_CODE();
- DPRINT("NtSetHighEventPair(EventPairHandle %x)\n", EventPairHandle);
+ DPRINT("NtSetHighEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle,
@@ -227,7 +227,7 @@
NTSTATUS Status;
PAGED_CODE();
- DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle);
+ DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle,
@@ -270,7 +270,7 @@
PreviousMode = ExGetPreviousMode();
- DPRINT1("NtSetHighEventPair(EventPairHandle %x)\n", EventPairHandle);
+ DPRINT1("NtSetHighEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle,
@@ -303,7 +303,7 @@
NTSTATUS Status;
PAGED_CODE();
- DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle);
+ DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle,
@@ -344,7 +344,7 @@
NTSTATUS Status;
PAGED_CODE();
- DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle);
+ DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle,
@@ -381,7 +381,7 @@
NTSTATUS Status;
PAGED_CODE();
- DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle);
+ DPRINT("NtSetHighWaitLowEventPair(EventPairHandle 0x%p)\n", EventPairHandle);
/* Open the Object */
Status = ObReferenceObjectByHandle(EventPairHandle,
--- trunk/reactos/ntoskrnl/ex/handle.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/ex/handle.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -166,7 +166,7 @@
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(Entry);
@@ -177,7 +177,7 @@
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;
}
@@ -188,7 +188,7 @@
(PVOID)New,
(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 */
return TRUE;
}
@@ -399,7 +399,7 @@
else
{
freehandletable:
- DPRINT1("Failed to duplicate handle table 0x%x\n", SourceHandleTable);
+ DPRINT1("Failed to duplicate handle table 0x%p\n", SourceHandleTable);
ExReleaseHandleTableLock(SourceHandleTable);
@@ -501,7 +501,7 @@
ASSERT(Handle);
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)
{
@@ -549,7 +549,7 @@
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 */
nmtbl = HandleTable->Table[tli];
@@ -592,7 +592,7 @@
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)
{
@@ -660,7 +660,7 @@
}
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;
@@ -677,7 +677,7 @@
ASSERT(Entry);
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
anyone who waited on the handle because we're holding an exclusive lock after
@@ -713,7 +713,7 @@
mlp != NULL && mlp[mli] != NULL && mlp[mli][eli].u1.Object != NULL)
{
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
@@ -732,7 +732,7 @@
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(Entry);
@@ -743,7 +743,7 @@
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;
}
@@ -754,7 +754,7 @@
(PVOID)New,
(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 */
return TRUE;
}
@@ -785,7 +785,7 @@
ASSERT(HandleTable);
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;
@@ -885,7 +885,7 @@
/* This routine requires the entry to be 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();
ExAcquireHandleTableLockExclusive(HandleTable);
@@ -914,7 +914,7 @@
Handle);
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;
}
--- trunk/reactos/ntoskrnl/ex/lookas.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/ex/lookas.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -139,7 +139,7 @@
ULONG Tag,
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 */
ExInitializeSListHead(&Lookaside->L.ListHead);
@@ -194,7 +194,7 @@
ULONG Tag,
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 */
ExInitializeSListHead(&Lookaside->L.ListHead);
--- trunk/reactos/ntoskrnl/ex/mutant.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/ex/mutant.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -40,7 +40,7 @@
ExpDeleteMutant(PVOID ObjectBody)
{
- DPRINT("ExpDeleteMutant(ObjectBody %x)\n", ObjectBody);
+ DPRINT("ExpDeleteMutant(ObjectBody 0x%p)\n", ObjectBody);
/* Make sure to release the Mutant */
KeReleaseMutant((PKMUTANT)ObjectBody,
@@ -87,7 +87,7 @@
NTSTATUS Status = STATUS_SUCCESS;
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 */
if(PreviousMode == UserMode) {
@@ -166,7 +166,7 @@
NTSTATUS Status = STATUS_SUCCESS;
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 */
if(PreviousMode == UserMode) {
@@ -296,7 +296,7 @@
PreviousMode = ExGetPreviousMode();
- DPRINT("NtReleaseMutant(MutantHandle 0%x PreviousCount 0%x)\n",
+ DPRINT("NtReleaseMutant(MutantHandle 0x%p PreviousCount 0x%p)\n",
MutantHandle,
PreviousCount);
--- trunk/reactos/ntoskrnl/ex/resource.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/ex/resource.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -100,7 +100,7 @@
{
KIRQL oldIrql;
- DPRINT("ExAcquireResourceExclusiveLite(Resource %x, Wait %d)\n",
+ DPRINT("ExAcquireResourceExclusiveLite(Resource 0x%p, Wait %d)\n",
Resource, Wait);
ASSERT_IRQL_LESS(DISPATCH_LEVEL);
@@ -222,7 +222,7 @@
POWNER_ENTRY freeEntry;
ULONG i = 0;
- DPRINT("EiAddSharedOwner(Resource %x)\n", Resource);
+ DPRINT("EiAddSharedOwner(Resource 0x%p)\n", Resource);
if (Resource->ActiveCount == 0)
{
@@ -292,7 +292,7 @@
}
}
- DPRINT("Found free entry %x\n", freeEntry);
+ DPRINT("Found free entry 0x%p\n", freeEntry);
if (!freeEntry)
{
@@ -346,7 +346,7 @@
{
KIRQL oldIrql;
- DPRINT("ExAcquireResourceSharedLite(Resource %x, Wait %d)\n",
+ DPRINT("ExAcquireResourceSharedLite(Resource 0x%p, Wait %d)\n",
Resource, Wait);
ASSERT_IRQL_LESS(DISPATCH_LEVEL);
@@ -438,7 +438,7 @@
ULONG oldWaiters;
KIRQL oldIrql;
- DPRINT("ExConvertExclusiveToSharedLite(Resource %x)\n", Resource);
+ DPRINT("ExConvertExclusiveToSharedLite(Resource 0x%p)\n", Resource);
KeAcquireSpinLock(&Resource->SpinLock, &oldIrql);
@@ -519,7 +519,7 @@
{
KIRQL oldIrql;
- DPRINT("ExAcquireSharedStarveExclusive(Resource %x, Wait %d)\n",
+ DPRINT("ExAcquireSharedStarveExclusive(Resource 0x%p, Wait %d)\n",
Resource, Wait);
KeAcquireSpinLock(&Resource->SpinLock, &oldIrql);
@@ -610,7 +610,7 @@
PERESOURCE Resource
)
{
- DPRINT("ExDeleteResourceLite(Resource %x)\n", Resource);
+ DPRINT("ExDeleteResourceLite(Resource 0x%p)\n", Resource);
if (Resource->OwnerTable) ExFreePool(Resource->OwnerTable);
if (Resource->SharedWaiters) ExFreePool(Resource->SharedWaiters);
if (Resource->ExclusiveWaiters) ExFreePool(Resource->ExclusiveWaiters);
@@ -652,7 +652,7 @@
NTSTATUS STDCALL
ExInitializeResourceLite (PERESOURCE Resource)
{
- DPRINT("ExInitializeResourceLite(Resource %x)\n", Resource);
+ DPRINT("ExInitializeResourceLite(Resource 0x%p)\n", Resource);
memset(Resource,0,sizeof(ERESOURCE));
Resource->NumberOfSharedWaiters = 0;
Resource->NumberOfExclusiveWaiters = 0;
@@ -822,7 +822,7 @@
{
KIRQL oldIrql;
- DPRINT("ExReleaseResourceForThreadLite(Resource %x, ResourceThreadId %x)\n",
+ DPRINT("ExReleaseResourceForThreadLite(Resource 0x%p, ResourceThreadId 0x%p)\n",
Resource, ResourceThreadId);
ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);
--- trunk/reactos/ntoskrnl/ex/timer.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/ex/timer.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -78,7 +78,7 @@
ASSERT (Timer->ApcAssociated);
Timer->ApcAssociated = FALSE;
- DPRINT("Timer, ThreadList: %x, %x\n", Timer, Thread);
+ DPRINT("Timer, ThreadList: 0x%p, 0x%p\n", Timer, Thread);
/* Unlock the list */
KeReleaseSpinLockFromDpcLevel(&Thread->ActiveTimerListLock);
@@ -113,7 +113,7 @@
KIRQL OldIrql;
PETIMER Timer = ObjectBody;
- DPRINT("ExpDeleteTimer(Timer: %x)\n", Timer);
+ DPRINT("ExpDeleteTimer(Timer: 0x%p)\n", Timer);
/* Lock the Wake List */
KeAcquireSpinLock(&ExpWakeListLock, &OldIrql);
@@ -145,7 +145,7 @@
PETIMER Timer;
KIRQL OldIrql;
- DPRINT("ExpTimerDpcRoutine(Dpc: %x)\n", Dpc);
+ DPRINT("ExpTimerDpcRoutine(Dpc: 0x%p)\n", Dpc);
/* Get the Timer Object */
Timer = (PETIMER)DeferredContext;
@@ -182,7 +182,7 @@
/* We need to find out which Timer we are */
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 */
KeAcquireSpinLock(&Timer->Lock, &OldIrql);
@@ -259,7 +259,7 @@
NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE();
- DPRINT("NtCancelTimer(0x%x, 0x%x)\n", TimerHandle, CurrentState);
+ DPRINT("NtCancelTimer(0x%p, 0x%x)\n", TimerHandle, CurrentState);
/* Check Parameter Validity */
if(CurrentState != NULL && PreviousMode != KernelMode) {
@@ -287,7 +287,7 @@
/* Check for success */
if(NT_SUCCESS(Status)) {
- DPRINT("Timer Referencced: %x\n", Timer);
+ DPRINT("Timer Referenced: 0x%p\n", Timer);
/* Lock the Timer */
KeAcquireSpinLock(&Timer->Lock, &OldIrql);
@@ -300,7 +300,7 @@
* Get the Thread.
*/
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 */
KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock);
@@ -371,7 +371,7 @@
NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE();
- DPRINT("NtCreateTimer(Handle: %x, Type: %d)\n", TimerHandle, TimerType);
+ DPRINT("NtCreateTimer(Handle: 0x%p, Type: %d)\n", TimerHandle, TimerType);
/* Check Parameter Validity */
if (PreviousMode != KernelMode) {
@@ -405,7 +405,7 @@
if(NT_SUCCESS(Status)) {
/* Initialize the Kernel Timer */
- DPRINT("Initializing Timer: %x\n", Timer);
+ DPRINT("Initializing Timer: 0x%p\n", Timer);
KeInitializeTimerEx(&Timer->KeTimer, TimerType);
/* Initialize the Timer Lock */
@@ -456,7 +456,7 @@
NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE();
- DPRINT("NtOpenTimer(TimerHandle: %x)\n", TimerHandle);
+ DPRINT("NtOpenTimer(TimerHandle: 0x%p)\n", TimerHandle);
/* Check Parameter Validity */
if (PreviousMode != KernelMode) {
@@ -519,7 +519,7 @@
PTIMER_BASIC_INFORMATION BasicInfo = (PTIMER_BASIC_INFORMATION)TimerInformation;
PAGED_CODE();
- DPRINT("NtQueryTimer(TimerHandle: %x, Class: %d)\n", TimerHandle, TimerInformationClass);
+ DPRINT("NtQueryTimer(TimerHandle: 0x%p, Class: %d)\n", TimerHandle, TimerInformationClass);
/* Check Validity */
DefaultQueryInfoBufferCheck(TimerInformationClass,
@@ -550,7 +550,7 @@
_SEH_TRY {
/* 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->SignalState = KeReadStateTimer(&Timer->KeTimer);
@@ -591,7 +591,7 @@
NTSTATUS Status = STATUS_SUCCESS;
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 */
if (PreviousMode != KernelMode) {
@@ -631,7 +631,7 @@
if (NT_SUCCESS(Status)) {
/* Lock the Timer */
- DPRINT("Timer Referencced: %x\n", Timer);
+ DPRINT("Timer Referencced: 0x%p\n", Timer);
KeAcquireSpinLock(&Timer->Lock, &OldIrql);
/* Cancel Running Timer */
@@ -642,7 +642,7 @@
* Get the Thread.
*/
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 */
KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock);
@@ -690,7 +690,7 @@
if (TimerApcRoutine) {
/* Initialize the APC */
- DPRINT("Initializing APC: %x\n", Timer->TimerApc);
+ DPRINT("Initializing APC: 0x%p\n", Timer->TimerApc);
KeInitializeApc(&Timer->TimerApc,
&CurrentThread->Tcb,
CurrentApcEnvironment,
--- trunk/reactos/ntoskrnl/fs/filelock.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/fs/filelock.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -798,7 +798,7 @@
{
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.StartingByte.QuadPart,
Granted->Lock.Length.QuadPart,
@@ -817,7 +817,7 @@
Irp = CONTAINING_RECORD(EnumEntry, IRP , Tail.Overlay.ListEntry);
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->Parameters.LockControl.ByteOffset.QuadPart,
Stack->Parameters.LockControl.Length->QuadPart,
--- trunk/reactos/ntoskrnl/io/device.c 2005-07-04 21:54:36 UTC (rev 16415)
+++ trunk/reactos/ntoskrnl/io/device.c 2005-07-04 22:11:00 UTC (rev 16416)
@@ -290,7 +290,7 @@
PDEVICE_OBJECT AttachedDevice;
NTSTATUS Status = STATUS_SUCCESS;
- DPRINT("IoAttachDeviceByPointer(SourceDevice %x, TargetDevice %x)\n",
+ DPRINT("IoAttachDeviceByPointer(SourceDevice 0x%p, TargetDevice 0x%p)\n",
SourceDevice, TargetDevice);
/* Do the Attach */
@@ -322,7 +322,7 @@
&LocalAttach);
/* Return it */
- DPRINT("IoAttachDeviceToDeviceStack DONE: %x\n", LocalAttach);
+ DPRINT("IoAttachDeviceToDeviceStack DONE: 0x%p\n", LocalAttach);
return LocalAttach;
}
@@ -338,7 +338,7 @@
PDEVICE_OBJECT AttachedDevice;
PDEVOBJ_EXTENSION SourceDeviceExtension;
- DPRINT("IoAttachDeviceToDeviceStack(SourceDevice %x, TargetDevice %x)\n",
+ DPRINT("IoAttachDeviceToDeviceStack(SourceDevice 0x%p, TargetDevice 0x%p)\n",
SourceDevice, TargetDevice);
/* Get the Attached Device and source extension */
@@ -425,7 +425,7 @@
HANDLE TempHandle;
ASSERT_IRQL(PASSIVE_LEVEL);
- DPRINT("IoCreateDevice(DriverObject %x)\n",DriverObject);
+ DPRINT("IoCreateDevice(DriverObject 0x%p)\n", DriverObject);
/* Generate a name if we have to */
if (DeviceCharacteristics & FILE_AUTOGENERATED_DEVICE_NAME)
@@ -477,7 +477,7 @@
/* Clear the whole Object and extension so we don't null stuff manually */
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,
@@ -492,7 +492,7 @@
AlignedDeviceExtensionSize);
/* 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->Size = 0;
@@ -632,7 +632,7 @@
STDCALL
IoDetachDevice(PDEVICE_OBJECT TargetDevice)
{
- DPRINT("IoDetachDevice(TargetDevice %x)\n", TargetDevice);
+ DPRINT("IoDetachDevice(TargetDevice 0x%p)\n", TargetDevice);
/* Remove the attachment */
TargetDevice->AttachedDevice->DeviceObjectExtension->AttachedTo = NULL;
@@ -942,7 +942,7 @@
IRP,
Tail.Overlay.DeviceQueueEntry);
DeviceObject->CurrentIrp = Irp;
- DPRINT("Next irp is %x\n", Irp);
+ DPRINT("Next irp is 0x%p\n", Irp);
DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp);
}
else
@@ -969,8 +969,8 @@
PKDEVICE_QUEUE_ENTRY entry;
PIRP Irp;
[truncated at 1000 lines; 1060 more skipped]