[NTOSKRNL]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 31 Aug 2013 16:02:13 +0000 (16:02 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 31 Aug 2013 16:02:13 +0000 (16:02 +0000)
* Fix several print specifiers.
* Add some missing variables to debug prints.

svn path=/trunk/; revision=59923

63 files changed:
reactos/ntoskrnl/cache/section/newmm.h
reactos/ntoskrnl/cache/section/swapout.c
reactos/ntoskrnl/config/cmlazy.c
reactos/ntoskrnl/config/ntapi.c
reactos/ntoskrnl/dbgk/dbgkobj.c
reactos/ntoskrnl/ex/event.c
reactos/ntoskrnl/ex/hdlsterm.c
reactos/ntoskrnl/ex/init.c
reactos/ntoskrnl/ex/resource.c
reactos/ntoskrnl/ex/sysinfo.c
reactos/ntoskrnl/ex/work.c
reactos/ntoskrnl/fsrtl/filelock.c
reactos/ntoskrnl/fsrtl/largemcb.c
reactos/ntoskrnl/fsrtl/notify.c
reactos/ntoskrnl/fstub/disksup.c
reactos/ntoskrnl/fstub/fstubex.c
reactos/ntoskrnl/io/iomgr/deviface.c
reactos/ntoskrnl/io/iomgr/driver.c
reactos/ntoskrnl/io/iomgr/iofunc.c
reactos/ntoskrnl/io/iomgr/remlock.c
reactos/ntoskrnl/io/pnpmgr/plugplay.c
reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
reactos/ntoskrnl/io/pnpmgr/pnpres.c
reactos/ntoskrnl/io/pnpmgr/pnproot.c
reactos/ntoskrnl/ke/i386/cpu.c
reactos/ntoskrnl/ke/i386/exp.c
reactos/ntoskrnl/ke/i386/ldt.c
reactos/ntoskrnl/ke/i386/patpge.c
reactos/ntoskrnl/ke/i386/traphdlr.c
reactos/ntoskrnl/ke/timerobj.c
reactos/ntoskrnl/lpc/complete.c
reactos/ntoskrnl/lpc/connect.c
reactos/ntoskrnl/lpc/create.c
reactos/ntoskrnl/lpc/listen.c
reactos/ntoskrnl/lpc/reply.c
reactos/ntoskrnl/lpc/send.c
reactos/ntoskrnl/mm/ARM3/expool.c
reactos/ntoskrnl/mm/ARM3/i386/init.c
reactos/ntoskrnl/mm/ARM3/mminit.c
reactos/ntoskrnl/mm/ARM3/pagfault.c
reactos/ntoskrnl/mm/ARM3/pfnlist.c
reactos/ntoskrnl/mm/ARM3/pool.c
reactos/ntoskrnl/mm/ARM3/procsup.c
reactos/ntoskrnl/mm/ARM3/special.c
reactos/ntoskrnl/mm/balance.c
reactos/ntoskrnl/mm/freelist.c
reactos/ntoskrnl/mm/i386/page.c
reactos/ntoskrnl/mm/marea.c
reactos/ntoskrnl/mm/mmfault.c
reactos/ntoskrnl/mm/pagefile.c
reactos/ntoskrnl/mm/section.c
reactos/ntoskrnl/ob/obdir.c
reactos/ntoskrnl/ob/obhandle.c
reactos/ntoskrnl/ob/oblink.c
reactos/ntoskrnl/po/poshtdwn.c
reactos/ntoskrnl/po/povolume.c
reactos/ntoskrnl/po/power.c
reactos/ntoskrnl/ps/debug.c
reactos/ntoskrnl/ps/kill.c
reactos/ntoskrnl/rtl/libsupp.c
reactos/ntoskrnl/se/sd.c
reactos/ntoskrnl/se/token.c
reactos/ntoskrnl/wmi/wmi.c

index c2753f4..43df777 100644 (file)
@@ -36,7 +36,7 @@
 #define SEC_CACHE                           (0x20000000)
 
 #define MiWaitForPageEvent(Process,Address) do {                         \
-    DPRINT("MiWaitForPageEvent %p:%Ix #\n", Process, Address);            \
+    DPRINT("MiWaitForPageEvent %p:%p #\n", Process, Address);            \
     KeWaitForSingleObject(&MmWaitPageEvent, 0, KernelMode, FALSE, NULL); \
 } while(0)
 
index e0f2b9d..f59c5bf 100644 (file)
@@ -90,7 +90,7 @@ MmWithdrawSectionPage(PMM_SECTION_SEGMENT Segment,
 {
     ULONG_PTR Entry;
 
-    DPRINT("MmWithdrawSectionPage(%x,%08x%08x,%x)\n",
+    DPRINT("MmWithdrawSectionPage(%p,%08x%08x,%p)\n",
            Segment,
            FileOffset->HighPart,
            FileOffset->LowPart,
@@ -133,7 +133,7 @@ MmWithdrawSectionPage(PMM_SECTION_SEGMENT Segment,
     }
     else
     {
-        DPRINT1("SWAP ENTRY?! (%x:%08x%08x)\n",
+        DPRINT1("SWAP ENTRY?! (%p:%08x%08x)\n",
                 Segment,
                 FileOffset->HighPart,
                 FileOffset->LowPart);
@@ -174,7 +174,7 @@ MmFinalizeSectionPageOut(PMM_SECTION_SEGMENT Segment,
     /* Bail early if the reference count isn't where we need it */
     if (MmGetReferenceCountPage(Page) != 1)
     {
-        DPRINT1("Cannot page out locked page %x with ref count %d\n",
+        DPRINT1("Cannot page out locked page %x with ref count %lu\n",
                 Page,
                 MmGetReferenceCountPage(Page));
         return STATUS_UNSUCCESSFUL;
@@ -185,8 +185,8 @@ MmFinalizeSectionPageOut(PMM_SECTION_SEGMENT Segment,
 
     if (Dirty)
     {
-        DPRINT("Finalize (dirty) Segment %x Page %x\n", Segment, Page);
-        DPRINT("Segment->FileObject %x\n", Segment->FileObject);
+        DPRINT("Finalize (dirty) Segment %p Page %x\n", Segment, Page);
+        DPRINT("Segment->FileObject %p\n", Segment->FileObject);
         DPRINT("Segment->Flags %x\n", Segment->Flags);
 
         WriteZero = TRUE;
@@ -203,7 +203,7 @@ MmFinalizeSectionPageOut(PMM_SECTION_SEGMENT Segment,
 
     if (WritePage)
     {
-        DPRINT("MiWriteBackPage(Segment %x FileObject %x Offset %x)\n",
+        DPRINT("MiWriteBackPage(Segment %p FileObject %p Offset %x)\n",
                Segment,
                Segment->FileObject,
                FileOffset->LowPart);
@@ -218,7 +218,7 @@ MmFinalizeSectionPageOut(PMM_SECTION_SEGMENT Segment,
 
     if (WriteZero && NT_SUCCESS(Status))
     {
-        DPRINT("Setting page entry in segment %x:%x to swap %x\n",
+        DPRINT("Setting page entry in segment %p:%x to swap %x\n",
                Segment,
                FileOffset->LowPart,
                Swap);
@@ -229,7 +229,7 @@ MmFinalizeSectionPageOut(PMM_SECTION_SEGMENT Segment,
     }
     else
     {
-        DPRINT("Setting page entry in segment %x:%x to page %x\n",
+        DPRINT("Setting page entry in segment %p:%x to page %x\n",
                Segment,
                FileOffset->LowPart,
                Page);
@@ -361,7 +361,7 @@ MmpPageOutPhysicalAddress(PFN_NUMBER Page)
     ExAcquireFastMutex(&MiGlobalPageOperation);
     if ((Segment = MmGetSectionAssociation(Page, &FileOffset)))
     {
-        DPRINTC("Withdrawing page (%x) %x:%x\n",
+        DPRINTC("Withdrawing page (%x) %p:%x\n",
                 Page,
                 Segment,
                 FileOffset.LowPart);
@@ -407,7 +407,7 @@ MmpPageOutPhysicalAddress(PFN_NUMBER Page)
         Process = entry->Process;
         Address = entry->Address;
 
-        DPRINTC("Process %x Address %x Page %x\n", Process, Address, Page);
+        DPRINTC("Process %p Address %p Page %x\n", Process, Address, Page);
 
         if (RMAP_IS_SEGMENT(Address))
         {
@@ -454,7 +454,7 @@ MmpPageOutPhysicalAddress(PFN_NUMBER Page)
                 goto bail;
             }
 
-            DPRINTC("Type %x (%x -> %x)\n",
+            DPRINTC("Type %x (%p -> %p)\n",
                     MemoryArea->Type,
                     MemoryArea->StartingAddress,
                     MemoryArea->EndingAddress);
@@ -464,7 +464,7 @@ MmpPageOutPhysicalAddress(PFN_NUMBER Page)
 
             ASSERT(KeGetCurrentIrql() <= APC_LEVEL);
 
-            DPRINT("%x:%x, page %x %x\n",
+            DPRINT("%p:%p, page %x %x\n",
                    Process,
                    Address,
                    Page,
@@ -494,7 +494,7 @@ MmpPageOutPhysicalAddress(PFN_NUMBER Page)
             }
             else if (Status == STATUS_MORE_PROCESSING_REQUIRED)
             {
-                DPRINTC("DoAcquisition %x\n", Resources.DoAcquisition);
+                DPRINTC("DoAcquisition %p\n", Resources.DoAcquisition);
 
                 Status = Resources.DoAcquisition(AddressSpace,
                                                  MemoryArea,
@@ -524,7 +524,7 @@ MmpPageOutPhysicalAddress(PFN_NUMBER Page)
         ASSERT(!MM_IS_WAIT_PTE(MmGetPfnForProcess(Process, Address)));
         entry = MmGetRmapListHeadPage(Page);
 
-        DPRINTC("Entry %x\n", entry);
+        DPRINTC("Entry %p\n", entry);
     }
 
     ExReleaseFastMutex(&RmapListLock);
@@ -536,7 +536,7 @@ bail:
     {
         ULONG RefCount;
 
-        DPRINTC("About to finalize section page %x (%x:%x) Status %x %s\n",
+        DPRINTC("About to finalize section page %x (%p:%x) Status %x %s\n",
                 Page,
                 Segment,
                 FileOffset.LowPart,
@@ -638,7 +638,7 @@ MiRosTrimCache(ULONG Target,
     PMM_SECTION_SEGMENT Segment;
     *NrFreed = 0;
 
-    DPRINT1("Need to trim %d cache pages\n", Target);
+    DPRINT1("Need to trim %lu cache pages\n", Target);
     for (Entry = MiSegmentList.Flink;
          *NrFreed < Target && Entry != &MiSegmentList;
          Entry = Entry->Flink) {
@@ -647,7 +647,7 @@ MiRosTrimCache(ULONG Target,
         Freed = MiCacheEvictPages(Segment, Target);
         *NrFreed += Freed;
     }
-    DPRINT1("Evicted %d cache pages\n", Target);
+    DPRINT1("Evicted %lu cache pages\n", Target);
 
     if (!IsListEmpty(&MiSegmentList)) {
         Entry = MiSegmentList.Flink;
index 295acf1..1577c0c 100644 (file)
@@ -78,7 +78,7 @@ CmpDoFlushNextHive(IN BOOLEAN ForceFlush,
             {
                 /* Do the sync */
                 DPRINT1("Flushing: %wZ\n", CmHive->FileFullPath);
-                DPRINT1("Handle: %lx\n", CmHive->FileHandles[HFILE_TYPE_PRIMARY]);
+                DPRINT1("Handle: %p\n", CmHive->FileHandles[HFILE_TYPE_PRIMARY]);
                 Status = HvSyncHive(&CmHive->Hive);
                 if(!NT_SUCCESS(Status))
                 {
index 95f6116..fe72872 100644 (file)
@@ -235,7 +235,7 @@ NtEnumerateKey(IN HANDLE KeyHandle,
     REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo;
     REG_POST_OPERATION_INFORMATION PostOperationInfo;
     PAGED_CODE();
-    DPRINT("NtEnumerateKey() KH 0x%x, Index 0x%x, KIC %d, Length %d\n",
+    DPRINT("NtEnumerateKey() KH 0x%p, Index 0x%x, KIC %d, Length %lu\n",
            KeyHandle, Index, KeyInformationClass, Length);
 
     /* Reject classes we don't know about */
@@ -319,7 +319,7 @@ NtEnumerateValueKey(IN HANDLE KeyHandle,
     REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo;
     REG_POST_OPERATION_INFORMATION PostOperationInfo;
     PAGED_CODE();
-    DPRINT("NtEnumerateValueKey() KH 0x%x, Index 0x%x, KVIC %d, Length %d\n",
+    DPRINT("NtEnumerateValueKey() KH 0x%p, Index 0x%x, KVIC %d, Length %lu\n",
            KeyHandle, Index, KeyValueInformationClass, Length);
 
     /* Reject classes we don't know about */
@@ -404,7 +404,7 @@ NtQueryKey(IN HANDLE KeyHandle,
     REG_POST_OPERATION_INFORMATION PostOperationInfo;
     OBJECT_HANDLE_INFORMATION HandleInfo;
     PAGED_CODE();
-    DPRINT("NtQueryKey() KH 0x%x, KIC %d, Length %d\n",
+    DPRINT("NtQueryKey() KH 0x%p, KIC %d, Length %lu\n",
            KeyHandle, KeyInformationClass, Length);
 
     /* Reject invalid classes */
@@ -517,7 +517,7 @@ NtQueryValueKey(IN HANDLE KeyHandle,
     REG_POST_OPERATION_INFORMATION PostOperationInfo;
     UNICODE_STRING ValueNameCopy = *ValueName;
     PAGED_CODE();
-    DPRINT("NtQueryValueKey() KH 0x%x, VN '%wZ', KVIC %d, Length %d\n",
+    DPRINT("NtQueryValueKey() KH 0x%p, VN '%wZ', KVIC %d, Length %lu\n",
         KeyHandle, ValueName, KeyValueInformationClass, Length);
 
     /* Verify that the handle is valid and is a registry key */
@@ -610,7 +610,7 @@ NtSetValueKey(IN HANDLE KeyHandle,
     REG_POST_OPERATION_INFORMATION PostOperationInfo;
     UNICODE_STRING ValueNameCopy = *ValueName;
     PAGED_CODE();
-    DPRINT("NtSetValueKey() KH 0x%x, VN '%wZ', TI %x, T %d, DS %d\n",
+    DPRINT("NtSetValueKey() KH 0x%p, VN '%wZ', TI %x, T %lu, DS %lu\n",
         KeyHandle, ValueName, TitleIndex, Type, DataSize);
 
     /* Verify that the handle is valid and is a registry key */
index cdf081f..7fcf14c 100644 (file)
@@ -133,7 +133,7 @@ DbgkpQueueMessage(IN PEPROCESS Process,
         if (!DebugObject->DebuggerInactive)
         {
             /* Add the event into the object's list */
-            DBGKTRACE(DBGK_MESSAGE_DEBUG, "Inserting: %lx %p\n",
+            DBGKTRACE(DBGK_MESSAGE_DEBUG, "Inserting: %p %d\n",
                       DebugEvent, Message->ApiNumber);
             InsertTailList(&DebugObject->EventList, &DebugEvent->EventList);
 
@@ -326,7 +326,7 @@ DbgkForwardException(IN PEXCEPTION_RECORD ExceptionRecord,
     BOOLEAN UseLpc = FALSE;
     PAGED_CODE();
     DBGKTRACE(DBGK_EXCEPTION_DEBUG,
-              "ExceptionRecord: %p Port: %p\n", ExceptionRecord, DebugPort);
+              "ExceptionRecord: %p Port: %u\n", ExceptionRecord, DebugPort);
 
     /* Setup the API Message */
     ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 |
@@ -1657,7 +1657,7 @@ NtDebugContinue(IN HANDLE DebugHandle,
     BOOLEAN NeedsWake = FALSE;
     CLIENT_ID ClientId;
     PAGED_CODE();
-    DBGKTRACE(DBGK_OBJECT_DEBUG, "Handle: %p Status: %p\n",
+    DBGKTRACE(DBGK_OBJECT_DEBUG, "Handle: %p Status: %d\n",
               DebugHandle, ContinueStatus);
 
     /* Check if we were called from user mode*/
index 03ec137..4238a82 100644 (file)
@@ -252,7 +252,7 @@ NtPulseEvent(IN HANDLE EventHandle,
     KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
     NTSTATUS Status;
     PAGED_CODE();
-    DPRINT("NtPulseEvent(EventHandle 0%x PreviousState 0%x)\n",
+    DPRINT("NtPulseEvent(EventHandle 0%p PreviousState 0%p)\n",
             EventHandle, PreviousState);
 
     /* Check if we were called from user-mode */
@@ -393,7 +393,7 @@ NtResetEvent(IN HANDLE EventHandle,
     KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
     NTSTATUS Status;
     PAGED_CODE();
-    DPRINT("NtResetEvent(EventHandle 0%x PreviousState 0%x)\n",
+    DPRINT("NtResetEvent(EventHandle 0%p PreviousState 0%p)\n",
             EventHandle, PreviousState);
 
     /* Check if we were called from user-mode */
@@ -462,7 +462,7 @@ NtSetEvent(IN HANDLE EventHandle,
     KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
     NTSTATUS Status;
     PAGED_CODE();
-    DPRINT("NtSetEvent(EventHandle 0%x PreviousState 0%x)\n",
+    DPRINT("NtSetEvent(EventHandle 0%p PreviousState 0%p)\n",
            EventHandle, PreviousState);
 
     /* Check if we were called from user-mode */
index 0eddf85..2e8e130 100644 (file)
@@ -138,7 +138,7 @@ HeadlessInit(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
     HeadlessGlobals->IsMMIODevice = HeadlessBlock->IsMMIODevice;
     HeadlessGlobals->TerminalType = HeadlessBlock->TerminalType;
     HeadlessGlobals->SystemGUID = HeadlessBlock->SystemGUID;
-    DPRINT1("EMS on Port %d (0x%lx) at %d bps\n",
+    DPRINT1("EMS on Port %lu (0x%p) at %lu bps\n",
              HeadlessGlobals->TerminalPortNumber,
              HeadlessGlobals->TerminalPortAddress,
              HeadlessGlobals->TerminalBaudRate);
index 186584a..e19acba 100644 (file)
@@ -866,7 +866,7 @@ ExBurnMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
     PLIST_ENTRY ListEntry;
     PMEMORY_ALLOCATION_DESCRIPTOR MemDescriptor;
 
-    DPRINT1("Burn RAM amount: %d pages\n", PagesToDestroy);
+    DPRINT1("Burn RAM amount: %lu pages\n", PagesToDestroy);
 
     /* Loop the memory descriptors, beginning at the end */
     for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Blink;
index 1d33a45..2496776 100644 (file)
@@ -656,7 +656,7 @@ ExpWaitForResource(IN PERESOURCE Resource,
             ExAcquireResourceLock(Resource, &LockHandle);
 
             /* Dump debug information */
-            DPRINT1("Resource @ %lx\n", Resource);
+            DPRINT1("Resource @ %p\n", Resource);
             DPRINT1(" ActiveEntries = %04lx  Flags = %s%s%s\n",
                     Resource->ActiveEntries,
                     IsOwnedExclusive(Resource) ? "IsOwnedExclusive " : "",
index 0a6fb18..fb6b77d 100644 (file)
@@ -481,7 +481,7 @@ QSI_DEF(SystemProcessorInformation)
     Spi->Reserved = 0;
     Spi->ProcessorFeatureBits = KeFeatureBits;
 
-    DPRINT("Arch %d Level %d Rev 0x%x\n", Spi->ProcessorArchitecture,
+    DPRINT("Arch %u Level %u Rev 0x%x\n", Spi->ProcessorArchitecture,
         Spi->ProcessorLevel, Spi->ProcessorRevision);
 
     return STATUS_SUCCESS;
@@ -712,7 +712,7 @@ QSI_DEF(SystemProcessInformation)
                 !(Process->ActiveThreads) &&
                 (IsListEmpty(&Process->Pcb.ThreadListHead)))
             {
-                DPRINT1("Process %p (%s:%lx) is a zombie\n",
+                DPRINT1("Process %p (%s:%p) is a zombie\n",
                         Process, Process->ImageFileName, Process->UniqueProcessId);
                 CurrentSize = 0;
                 ImageNameMaximumLength = 0;
@@ -1287,7 +1287,7 @@ QSI_DEF(SystemFullMemoryInformation)
 
     TheIdleProcess = PsIdleProcess;
 
-    DPRINT("PID: %d, KernelTime: %u PFFree: %d PFUsed: %d\n",
+    DPRINT("PID: %p, KernelTime: %u PFFree: %lu PFUsed: %lu\n",
            TheIdleProcess->UniqueProcessId,
            TheIdleProcess->Pcb.KernelTime,
            MiFreeSwapPages,
index d3cf4b5..1ae191d 100644 (file)
@@ -165,7 +165,7 @@ ProcessLoop:
         if (Thread->Tcb.SpecialApcDisable)
         {
             /* We're nice and do it behind your back */
-            DPRINT1("Warning: Broken Worker Thread: %p %lx %p came back "
+            DPRINT1("Warning: Broken Worker Thread: %p %p %p came back "
                     "with APCs disabled!\n",
                     WorkItem->WorkerRoutine,
                     WorkItem->Parameter,
@@ -348,7 +348,7 @@ ExpDetectWorkerThreadDeadlock(VOID)
             (Queue->DynamicThreadCount < 16))
         {
             /* Stuff is still on the queue and nobody did anything about it */
-            DPRINT1("EX: Work Queue Deadlock detected: %d\n", i);
+            DPRINT1("EX: Work Queue Deadlock detected: %lu\n", i);
             ExpCreateWorkerThread(i, TRUE);
             DPRINT1("Dynamic threads queued %d\n", Queue->DynamicThreadCount);
         }
@@ -736,7 +736,7 @@ ExQueueWorkItem(IN PWORK_QUEUE_ITEM WorkItem,
         (WorkQueue->DynamicThreadCount < 16))
     {
         /* Let the balance manager know about it */
-        DPRINT1("Requesting a new thread. CurrentCount: %d. MaxCount: %d\n",
+        DPRINT1("Requesting a new thread. CurrentCount: %lu. MaxCount: %lu\n",
                 WorkQueue->WorkerQueue.CurrentCount,
                 WorkQueue->WorkerQueue.MaximumCount);
         KeSetEvent(&ExpThreadSetManagerEvent, 0, FALSE);
index 6fe7bfd..943ed9f 100644 (file)
@@ -72,7 +72,7 @@ static PVOID NTAPI LockAllocate(PRTL_GENERIC_TABLE Table, CLONG Bytes)
 {
     PVOID Result;
     Result = ExAllocatePoolWithTag(NonPagedPool, Bytes, TAG_TABLE);
-    DPRINT("LockAllocate(%d) => %p\n", Bytes, Result);
+    DPRINT("LockAllocate(%lu) => %p\n", Bytes, Result);
     return Result;
 }
 
@@ -347,7 +347,7 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock,
     ULARGE_INTEGER UnsignedStart;
     ULARGE_INTEGER UnsignedEnd;
     
-    DPRINT("FsRtlPrivateLock(%wZ, Offset %08x%08x (%d), Length %08x%08x (%d), Key %x, FailImmediately %d, Exclusive %d)\n", 
+    DPRINT("FsRtlPrivateLock(%wZ, Offset %08x%08x (%d), Length %08x%08x (%d), Key %x, FailImmediately %u, Exclusive %u)\n", 
            &FileObject->FileName, 
            FileOffset->HighPart,
            FileOffset->LowPart, 
@@ -432,7 +432,7 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock,
     {
         if (Conflict->Exclusive.FileLock.ExclusiveLock || ExclusiveLock)
         {
-            DPRINT("Conflict %08x%08x:%08x%08x Exc %d (Want Exc %d)\n",
+            DPRINT("Conflict %08x%08x:%08x%08x Exc %u (Want Exc %u)\n",
                    Conflict->Exclusive.FileLock.StartingByte.HighPart,
                    Conflict->Exclusive.FileLock.StartingByte.LowPart,
                    Conflict->Exclusive.FileLock.EndingByte.HighPart,
@@ -613,7 +613,7 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock,
     }
     else
     {
-        DPRINT("Inserted new lock %wZ %08x%08x %08x%08x exclusive %d\n",
+        DPRINT("Inserted new lock %wZ %08x%08x %08x%08x exclusive %u\n",
                &FileObject->FileName,
                Conflict->Exclusive.FileLock.StartingByte.HighPart,
                Conflict->Exclusive.FileLock.StartingByte.LowPart,
@@ -868,7 +868,7 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock,
         return STATUS_RANGE_NOT_LOCKED;
     }
 
-    DPRINT("Found lock entry: Exclusive %d %08x%08x:%08x%08x %wZ\n",
+    DPRINT("Found lock entry: Exclusive %u %08x%08x:%08x%08x %wZ\n",
            Entry->Exclusive.FileLock.ExclusiveLock,
            Entry->Exclusive.FileLock.StartingByte.HighPart,
            Entry->Exclusive.FileLock.StartingByte.LowPart,
index a29bd6d..0de3b55 100644 (file)
@@ -60,7 +60,7 @@ static PVOID NTAPI McbMappingAllocate(PRTL_GENERIC_TABLE Table, CLONG Bytes)
     PVOID Result;
     PBASE_MCB Mcb = (PBASE_MCB)Table->TableContext;
     Result = ExAllocatePoolWithTag(Mcb->PoolType, Bytes, 'LMCB');
-    DPRINT("McbMappingAllocate(%d) => %p\n", Bytes, Result);
+    DPRINT("McbMappingAllocate(%lu) => %p\n", Bytes, Result);
     return Result;
 }
 
@@ -227,7 +227,7 @@ FsRtlAddBaseMcbEntry(IN PBASE_MCB OpaqueMcb,
 
     /* finally insert the resulting run */
     Existing = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Node, sizeof(Node), &NewElement);
-    DPRINT("Existing %x, NewElement %d\n", Existing, NewElement);
+    DPRINT("Existing %p, NewElement %u\n", Existing, NewElement);
     ASSERT(NewElement);
 
     // NB: Two consecutive runs can only be merged, if actual LBNs also match!
@@ -294,7 +294,7 @@ FsRtlAddLargeMcbEntry(IN PLARGE_MCB Mcb,
 {
     BOOLEAN Result;
 
-    DPRINT("Mcb %x Vbn %lld Lbn %lld SectorCount %lld\n", Mcb, Vbn, Lbn, SectorCount);
+    DPRINT("Mcb %p Vbn %lld Lbn %lld SectorCount %lld\n", Mcb, Vbn, Lbn, SectorCount);
 
     KeAcquireGuardedMutex(Mcb->GuardedMutex);
     Result = FsRtlAddBaseMcbEntry(&(Mcb->BaseMcb),
@@ -303,7 +303,7 @@ FsRtlAddLargeMcbEntry(IN PLARGE_MCB Mcb,
                                   SectorCount);
     KeReleaseGuardedMutex(Mcb->GuardedMutex);
 
-    DPRINT("Done %d\n", Result);
+    DPRINT("Done %u\n", Result);
 
     return Result;
 }
@@ -390,9 +390,9 @@ FsRtlGetNextBaseMcbEntry(IN PBASE_MCB OpaqueMcb,
         break;
     }
 
-    if (RunFound) DPRINT("RunFound(%d %d %d)\n", RunFound->RunStartVbn.LowPart, RunFound->RunEndVbn.LowPart, RunFound->StartingLbn.LowPart);
-    if (RunFoundLower) DPRINT("RunFoundLower(%d %d %d)\n", RunFoundLower->RunStartVbn.LowPart, RunFoundLower->RunEndVbn.LowPart, RunFoundLower->StartingLbn.LowPart);
-    if (RunFoundHigher) DPRINT("RunFoundHigher(%d %d %d)\n", RunFoundHigher->RunStartVbn.LowPart, RunFoundHigher->RunEndVbn.LowPart, RunFoundHigher->StartingLbn.LowPart);
+    if (RunFound) DPRINT("RunFound(%lu %lu %lu)\n", RunFound->RunStartVbn.LowPart, RunFound->RunEndVbn.LowPart, RunFound->StartingLbn.LowPart);
+    if (RunFoundLower) DPRINT("RunFoundLower(%lu %lu %lu)\n", RunFoundLower->RunStartVbn.LowPart, RunFoundLower->RunEndVbn.LowPart, RunFoundLower->StartingLbn.LowPart);
+    if (RunFoundHigher) DPRINT("RunFoundHigher(%lu %lu %lu)\n", RunFoundHigher->RunStartVbn.LowPart, RunFoundHigher->RunEndVbn.LowPart, RunFoundHigher->StartingLbn.LowPart);
 
     if (RunFound)
     {
@@ -440,7 +440,7 @@ FsRtlGetNextLargeMcbEntry(IN PLARGE_MCB Mcb,
 {
     BOOLEAN Result;
 
-    DPRINT("FsRtlGetNextLargeMcbEntry Mcb %p RunIndex %d\n", Mcb, RunIndex);
+    DPRINT("FsRtlGetNextLargeMcbEntry Mcb %p RunIndex %lu\n", Mcb, RunIndex);
 
     KeAcquireGuardedMutex(Mcb->GuardedMutex);
     Result = FsRtlGetNextBaseMcbEntry(&(Mcb->BaseMcb),
@@ -450,7 +450,7 @@ FsRtlGetNextLargeMcbEntry(IN PLARGE_MCB Mcb,
                                       SectorCount);
     KeReleaseGuardedMutex(Mcb->GuardedMutex);
 
-    DPRINT("Done %d\n", Result);
+    DPRINT("Done %u\n", Result);
 
     return Result;
 }
@@ -660,7 +660,7 @@ FsRtlLookupLargeMcbEntry(IN PLARGE_MCB Mcb,
 {
     BOOLEAN Result;
 
-    DPRINT("FsRtlLookupLargeMcbEntry Mcb %x Vbn %x\n", Mcb, (ULONG)Vbn);
+    DPRINT("FsRtlLookupLargeMcbEntry Mcb %p Vbn %x\n", Mcb, (ULONG)Vbn);
 
     KeAcquireGuardedMutex(Mcb->GuardedMutex);
     Result = FsRtlLookupBaseMcbEntry(&(Mcb->BaseMcb),
@@ -672,7 +672,7 @@ FsRtlLookupLargeMcbEntry(IN PLARGE_MCB Mcb,
                                      Index);
     KeReleaseGuardedMutex(Mcb->GuardedMutex);
 
-    DPRINT("Done %d\n", Result);
+    DPRINT("Done %u\n", Result);
 
     return Result;
 }
@@ -753,7 +753,7 @@ FsRtlLookupLastLargeMcbEntryAndIndex(IN PLARGE_MCB OpaqueMcb,
 {
     BOOLEAN Result;
 
-    DPRINT("FsRtlLookupLastLargeMcbEntryAndIndex %x\n", OpaqueMcb);
+    DPRINT("FsRtlLookupLastLargeMcbEntryAndIndex %p\n", OpaqueMcb);
 
     KeAcquireGuardedMutex(OpaqueMcb->GuardedMutex);
     Result = FsRtlLookupLastBaseMcbEntryAndIndex(&(OpaqueMcb->BaseMcb),
@@ -762,7 +762,7 @@ FsRtlLookupLastLargeMcbEntryAndIndex(IN PLARGE_MCB OpaqueMcb,
                                                  Index);
     KeReleaseGuardedMutex(OpaqueMcb->GuardedMutex);
 
-    DPRINT("Done %d\n", Result);
+    DPRINT("Done %u\n", Result);
 
     return Result;
 }
@@ -792,7 +792,7 @@ FsRtlLookupLastLargeMcbEntry(IN PLARGE_MCB Mcb,
 {
     BOOLEAN Result;
 
-    DPRINT("FsRtlLookupLastLargeMcbEntry Mcb %x\n", Mcb);
+    DPRINT("FsRtlLookupLastLargeMcbEntry Mcb %p\n", Mcb);
 
     KeAcquireGuardedMutex(Mcb->GuardedMutex);
     Result = FsRtlLookupLastBaseMcbEntry(&(Mcb->BaseMcb),
@@ -800,7 +800,7 @@ FsRtlLookupLastLargeMcbEntry(IN PLARGE_MCB Mcb,
                                          Lbn);
     KeReleaseGuardedMutex(Mcb->GuardedMutex);
 
-    DPRINT("Done %d\n", Result);
+    DPRINT("Done %u\n", Result);
 
     return Result;
 }
@@ -841,14 +841,14 @@ FsRtlNumberOfRunsInLargeMcb(IN PLARGE_MCB Mcb)
 {
     ULONG NumberOfRuns;
 
-    DPRINT("FsRtlNumberOfRunsInLargeMcb Mcb %x\n", Mcb);
+    DPRINT("FsRtlNumberOfRunsInLargeMcb Mcb %p\n", Mcb);
 
     /* Read the number of runs while holding the MCB lock */
     KeAcquireGuardedMutex(Mcb->GuardedMutex);
     NumberOfRuns = FsRtlNumberOfRunsInBaseMcb(&(Mcb->BaseMcb));
     KeReleaseGuardedMutex(Mcb->GuardedMutex);
 
-    DPRINT("Done %d\n", NumberOfRuns);
+    DPRINT("Done %lu\n", NumberOfRuns);
 
     /* Return the count */
     return NumberOfRuns;
@@ -920,7 +920,7 @@ FsRtlRemoveLargeMcbEntry(IN PLARGE_MCB Mcb,
                          IN LONGLONG Vbn,
                          IN LONGLONG SectorCount)
 {
-    DPRINT("FsRtlRemoveLargeMcbEntry Mcb %x, Vbn %I64d, SectorCount %I64d\n", Mcb, Vbn, SectorCount);
+    DPRINT("FsRtlRemoveLargeMcbEntry Mcb %p, Vbn %I64d, SectorCount %I64d\n", Mcb, Vbn, SectorCount);
 
     KeAcquireGuardedMutex(Mcb->GuardedMutex);
     FsRtlRemoveBaseMcbEntry(&(Mcb->BaseMcb), Vbn, SectorCount);
@@ -1033,7 +1033,7 @@ FsRtlSplitLargeMcb(IN PLARGE_MCB Mcb,
 {
     BOOLEAN Result;
 
-    DPRINT("FsRtlSplitLargeMcb %x, Vbn %x, Amount %x\n", Mcb, (ULONG)Vbn, (ULONG)Amount);
+    DPRINT("FsRtlSplitLargeMcb %p, Vbn %x, Amount %x\n", Mcb, (ULONG)Vbn, (ULONG)Amount);
 
     KeAcquireGuardedMutex(Mcb->GuardedMutex);
     Result = FsRtlSplitBaseMcb(&(Mcb->BaseMcb),
@@ -1041,7 +1041,7 @@ FsRtlSplitLargeMcb(IN PLARGE_MCB Mcb,
                                Amount);
     KeReleaseGuardedMutex(Mcb->GuardedMutex);
 
-    DPRINT("Done %d\n", Result);
+    DPRINT("Done %u\n", Result);
 
     return Result;
 }
@@ -1066,7 +1066,7 @@ NTAPI
 FsRtlTruncateLargeMcb(IN PLARGE_MCB Mcb,
                       IN LONGLONG Vbn)
 {
-    DPRINT("FsRtlTruncateLargeMcb %x Vbn %x\n", Mcb, (ULONG)Vbn);
+    DPRINT("FsRtlTruncateLargeMcb %p Vbn %x\n", Mcb, (ULONG)Vbn);
     KeAcquireGuardedMutex(Mcb->GuardedMutex);
     FsRtlTruncateBaseMcb(&(Mcb->BaseMcb), Vbn);
     KeReleaseGuardedMutex(Mcb->GuardedMutex);
index 0fffc62..799030f 100644 (file)
@@ -508,7 +508,7 @@ FsRtlNotifyFilterChangeDirectory(IN PNOTIFY_SYNC NotifySync,
 
     PAGED_CODE();
 
-    DPRINT("FsRtlNotifyFilterChangeDirectory(): %p, %p, %p, %wZ, %d, %d, %u, %p, %p, %p, %p\n",
+    DPRINT("FsRtlNotifyFilterChangeDirectory(): %p, %p, %p, %wZ, %u, %u, %u, %p, %p, %p, %p\n",
     NotifySync, NotifyList, FsContext, FullDirectoryName, WatchTree, IgnoreBuffer, CompletionFilter, NotifyIrp,
     TraverseCallback, SubjectContext, FilterCallback);
 
index 210f0d0..df2ce49 100644 (file)
@@ -95,7 +95,7 @@ HalpAssignDrive(IN PUNICODE_STRING PartitionName,
         }
     }
 
-    DPRINT("DriveNumber %d\n", DriveNumber);
+    DPRINT("DriveNumber %lu\n", DriveNumber);
 
     /* Build drive name */
     swprintf(DriveNameBuffer,
@@ -369,7 +369,7 @@ xHalQueryDriveLayout(IN PUNICODE_STRING DeviceName,
         }
     }
 
-    DPRINT("DiskGeometry.BytesPerSector: %d\n",
+    DPRINT("DiskGeometry.BytesPerSector: %lu\n",
         DiskGeometry.BytesPerSector);
 
     if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA)
@@ -444,7 +444,7 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
 
     RDiskCount = xHalpGetRDiskCount();
 
-    DPRINT("RDiskCount %d\n", RDiskCount);
+    DPRINT("RDiskCount %lu\n", RDiskCount);
 
     Buffer1 = ExAllocatePoolWithTag(PagedPool,
         64 * sizeof(WCHAR),
@@ -493,14 +493,11 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
     }
 
     /* Create PhysicalDrive links */
-    DPRINT("Physical disk drives: %d\n", ConfigInfo->DiskCount);
+    DPRINT("Physical disk drives: %lu\n", ConfigInfo->DiskCount);
     for (i = 0; i < ConfigInfo->DiskCount; i++)
     {
-        swprintf(Buffer1,
-            L"\\Device\\Harddisk%d\\Partition0",
-            i);
-        RtlInitUnicodeString(&UnicodeString1,
-            Buffer1);
+        swprintf(Buffer1, L"\\Device\\Harddisk%lu\\Partition0", i);
+        RtlInitUnicodeString(&UnicodeString1, Buffer1);
 
         InitializeObjectAttributes(&ObjectAttributes,
             &UnicodeString1,
@@ -518,11 +515,8 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
         {
             ZwClose(FileHandle);
 
-            swprintf(Buffer2,
-                L"\\??\\PhysicalDrive%d",
-                i);
-            RtlInitUnicodeString(&UnicodeString2,
-                Buffer2);
+            swprintf(Buffer2, L"\\??\\PhysicalDrive%lu", i);
+            RtlInitUnicodeString(&UnicodeString2, Buffer2);
 
             DPRINT("Creating link: %S ==> %S\n",
                 Buffer2,
@@ -551,14 +545,10 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
         ConfigInfo->DiskCount * sizeof(PDRIVE_LAYOUT_INFORMATION));
     for (i = 0; i < ConfigInfo->DiskCount; i++)
     {
-        swprintf(Buffer1,
-            L"\\Device\\Harddisk%d\\Partition0",
-            i);
-        RtlInitUnicodeString(&UnicodeString1,
-            Buffer1);
+        swprintf(Buffer1, L"\\Device\\Harddisk%lu\\Partition0", i);
+        RtlInitUnicodeString(&UnicodeString1, Buffer1);
 
-        Status = xHalQueryDriveLayout(&UnicodeString1,
-            &LayoutArray[i]);
+        Status = xHalQueryDriveLayout(&UnicodeString1, &LayoutArray[i]);
         if (!NT_SUCCESS(Status))
         {
             DbgPrint("xHalQueryDriveLayout() failed (Status = 0x%lx)\n",
@@ -637,11 +627,10 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
                                         LayoutArray[i]->PartitionEntry[j].RewritePartition == FALSE)
                                     {
                                         swprintf(Buffer2,
-                                            L"\\Device\\Harddisk%d\\Partition%d",
-                                            i,
-                                            LayoutArray[i]->PartitionEntry[j].PartitionNumber);
-                                        RtlInitUnicodeString(&UnicodeString2,
-                                            Buffer2);
+                                                 L"\\Device\\Harddisk%lu\\Partition%lu",
+                                                 i,
+                                                 LayoutArray[i]->PartitionEntry[j].PartitionNumber);
+                                        RtlInitUnicodeString(&UnicodeString2, Buffer2);
 
                                         /* Assign drive */
                                         DPRINT("  %wZ\n", &UnicodeString2);
@@ -689,11 +678,10 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
                     if (LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition == FALSE)
                     {
                         swprintf(Buffer2,
-                            L"\\Device\\Harddisk%lu\\Partition%d",
-                            DiskNumber,
-                            LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber);
-                        RtlInitUnicodeString(&UnicodeString2,
-                            Buffer2);
+                                 L"\\Device\\Harddisk%lu\\Partition%lu",
+                                 DiskNumber,
+                                 LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber);
+                        RtlInitUnicodeString(&UnicodeString2, Buffer2);
 
                         /* Assign drive */
                         DPRINT("  %wZ\n", &UnicodeString2);
@@ -730,11 +718,10 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
                     IsRecognizedPartition(LayoutArray[DiskNumber]->PartitionEntry[j].PartitionType))
                 {
                     swprintf(Buffer2,
-                        L"\\Device\\Harddisk%d\\Partition%d",
-                        DiskNumber,
-                        LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber);
-                    RtlInitUnicodeString(&UnicodeString2,
-                        Buffer2);
+                             L"\\Device\\Harddisk%lu\\Partition%lu",
+                             DiskNumber,
+                             LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber);
+                    RtlInitUnicodeString(&UnicodeString2, Buffer2);
 
                     /* Assign drive */
                     DPRINT("  %wZ\n",
@@ -771,11 +758,10 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
                     LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber != 0)
                 {
                     swprintf(Buffer2,
-                        L"\\Device\\Harddisk%d\\Partition%d",
-                        DiskNumber,
-                        LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber);
-                    RtlInitUnicodeString(&UnicodeString2,
-                        Buffer2);
+                             L"\\Device\\Harddisk%lu\\Partition%lu",
+                             DiskNumber,
+                             LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber);
+                    RtlInitUnicodeString(&UnicodeString2, Buffer2);
 
                     /* Assign drive */
                     DPRINT("  %wZ\n",
@@ -808,11 +794,10 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
                     IsRecognizedPartition(LayoutArray[DiskNumber]->PartitionEntry[j].PartitionType))
                 {
                     swprintf(Buffer2,
-                        L"\\Device\\Harddisk%d\\Partition%d",
-                        DiskNumber,
-                        LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber);
-                    RtlInitUnicodeString(&UnicodeString2,
-                        Buffer2);
+                             L"\\Device\\Harddisk%lu\\Partition%lu",
+                             DiskNumber,
+                             LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber);
+                    RtlInitUnicodeString(&UnicodeString2, Buffer2);
 
                     /* Assign drive */
                     DPRINT("  %wZ\n",
@@ -846,11 +831,10 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
                     LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber != 0)
                 {
                     swprintf(Buffer2,
-                        L"\\Device\\Harddisk%d\\Partition%d",
-                        DiskNumber,
-                        LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber);
-                    RtlInitUnicodeString(&UnicodeString2,
-                        Buffer2);
+                             L"\\Device\\Harddisk%lu\\Partition%lu",
+                             DiskNumber,
+                             LayoutArray[DiskNumber]->PartitionEntry[j].PartitionNumber);
+                    RtlInitUnicodeString(&UnicodeString2, Buffer2);
 
                     /* Assign drive */
                     DPRINT("  %wZ\n",
@@ -880,11 +864,8 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
             if (LayoutArray[i]->PartitionCount == 1 &&
                 LayoutArray[i]->PartitionEntry[0].PartitionType == 0)
             {
-                swprintf(Buffer2,
-                    L"\\Device\\Harddisk%d\\Partition1",
-                    i);
-                RtlInitUnicodeString(&UnicodeString2,
-                    Buffer2);
+                swprintf(Buffer2, L"\\Device\\Harddisk%lu\\Partition1", i);
+                RtlInitUnicodeString(&UnicodeString2, Buffer2);
 
                 /* Assign drive */
                 DPRINT("  %wZ\n",
@@ -911,14 +892,11 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
 end_assign_disks:
 
     /* Assign floppy drives */
-    DPRINT("Floppy drives: %d\n", ConfigInfo->FloppyCount);
+    DPRINT("Floppy drives: %lu\n", ConfigInfo->FloppyCount);
     for (i = 0; i < ConfigInfo->FloppyCount; i++)
     {
-        swprintf(Buffer1,
-            L"\\Device\\Floppy%d",
-            i);
-        RtlInitUnicodeString(&UnicodeString1,
-            Buffer1);
+        swprintf(Buffer1, L"\\Device\\Floppy%lu", i);
+        RtlInitUnicodeString(&UnicodeString1, Buffer1);
 
         /* Assign drive letters A: or B: or first free drive letter */
         DPRINT("  %wZ\n",
@@ -934,14 +912,11 @@ end_assign_disks:
     }
 
     /* Assign cdrom drives */
-    DPRINT("CD-Rom drives: %d\n", ConfigInfo->CdRomCount);
+    DPRINT("CD-Rom drives: %lu\n", ConfigInfo->CdRomCount);
     for (i = 0; i < ConfigInfo->CdRomCount; i++)
     {
-        swprintf(Buffer1,
-            L"\\Device\\CdRom%d",
-            i);
-        RtlInitUnicodeString(&UnicodeString1,
-            Buffer1);
+        swprintf(Buffer1, L"\\Device\\CdRom%lu", i);
+        RtlInitUnicodeString(&UnicodeString1, Buffer1);
 
         /* Assign first free drive letter */
         DPRINT("  %wZ\n", &UnicodeString1);
@@ -1731,7 +1706,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject,
 
                 /* Also update the maximum sector */
                 MaxSector = GET_PARTITION_LENGTH(PartitionDescriptor);
-                DPRINT1("FSTUB: MaxSector now = %#08lx\n", MaxSector);
+                DPRINT1("FSTUB: MaxSector now = %I64d\n", MaxSector);
                 break;
             }
         }
@@ -1768,7 +1743,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject,
             DPRINT1("FSTUB: Drive %#p has no valid MBR. Make it into a "
                     "super-floppy\n",
                     DeviceObject);
-            DPRINT1("FSTUB: Drive has %#08lx sectors and is %#016I64x "
+            DPRINT1("FSTUB: Drive has %I64d sectors and is %#016I64x "
                     "bytes large\n",
                     EndSector, EndSector * DiskGeometry.BytesPerSector);
 
index fabda98..a668cdf 100644 (file)
@@ -543,7 +543,7 @@ FstubDbgPrintDriveLayoutEx(IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout)
         case PARTITION_STYLE_MBR:
             if (DriveLayout->PartitionCount % 4 != 0)
             {
-                DPRINT("Warning: Partition count isn't a 4-factor: %ld!\n", DriveLayout->PartitionCount);
+                DPRINT("Warning: Partition count isn't a 4-factor: %lu!\n", DriveLayout->PartitionCount);
             }
 
             DPRINT("Signature: %8.8x\n", DriveLayout->Mbr.Signature);
@@ -558,7 +558,7 @@ FstubDbgPrintDriveLayoutEx(IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout)
             DPRINT("DiskId: %s\n", Guid);
             DPRINT("StartingUsableOffset: %I64x\n", DriveLayout->Gpt.StartingUsableOffset.QuadPart);
             DPRINT("UsableLength: %I64x\n", DriveLayout->Gpt.UsableLength.QuadPart);
-            DPRINT("MaxPartitionCount: %ld\n", DriveLayout->Gpt.MaxPartitionCount);
+            DPRINT("MaxPartitionCount: %lu\n", DriveLayout->Gpt.MaxPartitionCount);
             for (i = 0; i < DriveLayout->PartitionCount; i++)
             {
                 FstubDbgPrintPartitionEx(DriveLayout->PartitionEntry, i);
@@ -566,7 +566,7 @@ FstubDbgPrintDriveLayoutEx(IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout)
 
             break;
         default:
-            DPRINT("Unsupported partition style: %ld\n", DriveLayout->PartitionStyle);
+            DPRINT("Unsupported partition style: %lu\n", DriveLayout->PartitionStyle);
     }
 }
 
@@ -578,29 +578,29 @@ FstubDbgPrintPartitionEx(IN PPARTITION_INFORMATION_EX PartitionEntry,
     CHAR Guid[38];
     PAGED_CODE();
 
-    DPRINT("Printing partition %ld\n", PartitionNumber);
+    DPRINT("Printing partition %lu\n", PartitionNumber);
 
     switch (PartitionEntry[PartitionNumber].PartitionStyle)
     {
         case PARTITION_STYLE_MBR:
             DPRINT("  StartingOffset: %I64x\n", PartitionEntry[PartitionNumber].StartingOffset.QuadPart);
             DPRINT("  PartitionLength: %I64x\n", PartitionEntry[PartitionNumber].PartitionLength.QuadPart);
-            DPRINT("  RewritePartition: %d\n", PartitionEntry[PartitionNumber].RewritePartition);
+            DPRINT("  RewritePartition: %u\n", PartitionEntry[PartitionNumber].RewritePartition);
             DPRINT("  PartitionType: %02x\n", PartitionEntry[PartitionNumber].Mbr.PartitionType);
-            DPRINT("  BootIndicator: %d\n", PartitionEntry[PartitionNumber].Mbr.BootIndicator);
-            DPRINT("  RecognizedPartition: %d\n", PartitionEntry[PartitionNumber].Mbr.RecognizedPartition);
-            DPRINT("  HiddenSectors: %ld\n", PartitionEntry[PartitionNumber].Mbr.HiddenSectors);
+            DPRINT("  BootIndicator: %u\n", PartitionEntry[PartitionNumber].Mbr.BootIndicator);
+            DPRINT("  RecognizedPartition: %u\n", PartitionEntry[PartitionNumber].Mbr.RecognizedPartition);
+            DPRINT("  HiddenSectors: %lu\n", PartitionEntry[PartitionNumber].Mbr.HiddenSectors);
 
             break;
         case PARTITION_STYLE_GPT:
             DPRINT("  StartingOffset: %I64x\n", PartitionEntry[PartitionNumber].StartingOffset.QuadPart);
             DPRINT("  PartitionLength: %I64x\n", PartitionEntry[PartitionNumber].PartitionLength.QuadPart);
-            DPRINT("  RewritePartition: %d\n", PartitionEntry[PartitionNumber].RewritePartition);
+            DPRINT("  RewritePartition: %u\n", PartitionEntry[PartitionNumber].RewritePartition);
             FstubDbgGuidToString(&(PartitionEntry[PartitionNumber].Gpt.PartitionType), Guid);
             DPRINT("  PartitionType: %s\n", Guid);
             FstubDbgGuidToString(&(PartitionEntry[PartitionNumber].Gpt.PartitionId), Guid);
             DPRINT("  PartitionId: %s\n", Guid);
-            DPRINT("  Attributes: %16x\n", PartitionEntry[PartitionNumber].Gpt.Attributes);
+            DPRINT("  Attributes: %I64x\n", PartitionEntry[PartitionNumber].Gpt.Attributes);
             DPRINT("  Name: %ws\n", PartitionEntry[PartitionNumber].Gpt.Name);
 
             break;
@@ -618,7 +618,7 @@ FstubDbgPrintSetPartitionEx(IN PSET_PARTITION_INFORMATION_EX PartitionEntry,
     PAGED_CODE();
 
     DPRINT("FSTUB: SET_PARTITION_INFORMATION_EX: %p\n", PartitionEntry);
-    DPRINT("Modifying partition %ld\n", PartitionNumber);
+    DPRINT("Modifying partition %lu\n", PartitionNumber);
     switch (PartitionEntry->PartitionStyle)
     {
         case PARTITION_STYLE_MBR:
@@ -630,7 +630,7 @@ FstubDbgPrintSetPartitionEx(IN PSET_PARTITION_INFORMATION_EX PartitionEntry,
             DPRINT("  PartitionType: %s\n", Guid);
             FstubDbgGuidToString(&(PartitionEntry->Gpt.PartitionId), Guid);
             DPRINT("  PartitionId: %s\n", Guid);
-            DPRINT("  Attributes: %16x\n", PartitionEntry->Gpt.Attributes);
+            DPRINT("  Attributes: %I64x\n", PartitionEntry->Gpt.Attributes);
             DPRINT("  Name: %ws\n", PartitionEntry->Gpt.Name);
 
             break;
@@ -2399,7 +2399,7 @@ IoWritePartitionTableEx(IN PDEVICE_OBJECT DeviceObject,
             break;
 
         default:
-            DPRINT("Unsupported partition style: %ld\n", DriveLayout->PartitionStyle);
+            DPRINT("Unsupported partition style: %lu\n", DriveLayout->PartitionStyle);
             Status = STATUS_NOT_SUPPORTED;
     }
 
index 4d89012..e7009c0 100644 (file)
@@ -725,7 +725,7 @@ IoGetDeviceInterfaces(IN CONST GUID *InterfaceClassGuid,
             }
             else if (bip->DataLength < 5 * sizeof(WCHAR))
             {
-                DPRINT("Registry string too short (length %lu, expected %lu at least)\n", bip->DataLength < 5 * sizeof(WCHAR));
+                DPRINT("Registry string too short (length %lu, expected %lu at least)\n", bip->DataLength, 5 * sizeof(WCHAR));
                 Status = STATUS_UNSUCCESSFUL;
                 goto cleanup;
             }
@@ -1245,7 +1245,7 @@ IoSetDeviceInterfaceState(IN PUNICODE_STRING SymbolicLinkName,
     if (SymbolicLinkName == NULL)
         return STATUS_INVALID_PARAMETER_1;
 
-    DPRINT("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable);
+    DPRINT("IoSetDeviceInterfaceState('%wZ', %u)\n", SymbolicLinkName, Enable);
 
     /* Symbolic link name is \??\ACPI#PNP0501#1#{GUID}\ReferenceString */
     /* Get GUID from SymbolicLinkName */
@@ -1261,7 +1261,7 @@ IoSetDeviceInterfaceState(IN PUNICODE_STRING SymbolicLinkName,
 
     SymLink.Buffer = SymbolicLinkName->Buffer;
     SymLink.MaximumLength = SymLink.Length = (USHORT)((ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)SymLink.Buffer);
-    DPRINT("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable);
+    DPRINT("IoSetDeviceInterfaceState('%wZ', %u)\n", SymbolicLinkName, Enable);
 
     Status = OpenRegistryHandlesFromSymbolicLink(SymbolicLinkName,
                                                  KEY_CREATE_SUB_KEY,
index c07d124..a221639 100644 (file)
@@ -1167,7 +1167,7 @@ IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers)
    LPWSTR Start;
    BOOLEAN SafeToUnload = TRUE;
 
-   DPRINT("IopUnloadDriver('%wZ', %d)\n", DriverServiceName, UnloadPnpDrivers);
+   DPRINT("IopUnloadDriver('%wZ', %u)\n", DriverServiceName, UnloadPnpDrivers);
 
    PAGED_CODE();
 
@@ -1608,7 +1608,7 @@ try_again:
         if (!DriverObject->MajorFunction[i])
         {
             /* Print a warning in the debug log */
-            DPRINT1("Driver <%wZ> set DriverObject->MajorFunction[%d] to NULL!\n",
+            DPRINT1("Driver <%wZ> set DriverObject->MajorFunction[%lu] to NULL!\n",
                     &DriverObject->DriverName, i);
 
             /* Fix it up */
index aad1b59..f1f56d0 100644 (file)
@@ -209,7 +209,7 @@ IopDeviceFsIoControl(IN HANDLE DeviceHandle,
     ACCESS_MASK DesiredAccess;
     KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
     ULONG BufferLength;
-    IOTRACE(IO_CTL_DEBUG, "Handle: %lx. CTL: %lx. Type: %lx \n",
+    IOTRACE(IO_CTL_DEBUG, "Handle: %p. CTL: %lx. Type: %lx \n",
             DeviceHandle, IoControlCode, IsDevIoCtl);
 
     /* Get the access type */
index c0617b2..d353a00 100644 (file)
@@ -175,7 +175,7 @@ IoReleaseRemoveLockEx(IN PIO_REMOVE_LOCK RemoveLock,
             {
                 DPRINT("Lock %#08lx (with tag %#08lx) was supposed to be held at max %I64d ticks but lasted longer\n",
                        Lock, TrackingBlock->Tag, Lock->Dbg.MaxLockedTicks);
-                DPRINT("Lock was acquired in file %s at line %d\n", TrackingBlock->File, TrackingBlock->Line);
+                DPRINT("Lock was acquired in file %s at line %lu\n", TrackingBlock->File, TrackingBlock->Line);
                 ASSERT(FALSE);
             }
 
@@ -270,7 +270,7 @@ IoReleaseRemoveLockAndWaitEx(IN PIO_REMOVE_LOCK RemoveLock,
         /* Tag should match */
         if (TrackingBlock->Tag != Tag)
         {
-            DPRINT("Last tracking block tag invalid! Expected: %x, having: %x\n", Tag, TrackingBlock->Tag);
+            DPRINT("Last tracking block tag invalid! Expected: %p, having: %p\n", Tag, TrackingBlock->Tag);
             ASSERT(TrackingBlock->Tag != Tag);
         }
 
index 3141e85..8b088f5 100644 (file)
@@ -827,7 +827,7 @@ NtPlugPlayControl(IN PLUGPLAY_CONTROL_CLASS PlugPlayControlClass,
                   IN OUT PVOID Buffer,
                   IN ULONG BufferLength)
 {
-    DPRINT("NtPlugPlayControl(%lu %p %lu) called\n",
+    DPRINT("NtPlugPlayControl(%d %p %lu) called\n",
            PlugPlayControlClass, Buffer, BufferLength);
 
     /* Function can only be called from user-mode */
index 44fa2ea..5f41772 100644 (file)
@@ -1365,7 +1365,7 @@ IopTraverseDeviceTree(PDEVICETREE_TRAVERSE_CONTEXT Context)
 
    DPRINT("Context 0x%p\n", Context);
 
-   DPRINT("IopTraverseDeviceTree(DeviceNode 0x%p  FirstDeviceNode 0x%p  Action %x  Context 0x%p)\n",
+   DPRINT("IopTraverseDeviceTree(DeviceNode 0x%p  FirstDeviceNode 0x%p  Action %p  Context 0x%p)\n",
       Context->DeviceNode, Context->FirstDeviceNode, Context->Action, Context->Context);
 
    /* Start from the specified device node */
index 93b4bda..c272b0a 100644 (file)
@@ -262,7 +262,7 @@ IopFixupResourceListWithRequirements(
             /* Check if we couldn't satsify a requirement or its alternates */
             if (AlternateRequired && !(IoDesc->Option & IO_RESOURCE_ALTERNATIVE))
             {
-                DPRINT1("Unable to satisfy preferred resource or alternates in list %d\n", i);
+                DPRINT1("Unable to satisfy preferred resource or alternates in list %lu\n", i);
 
                 /* Break out of this loop and try the next list */
                 break;
@@ -444,7 +444,7 @@ IopFixupResourceListWithRequirements(
                 if (!FoundResource && IoDesc->Option == 0)
                 {
                     /* Break out of this loop and try the next list */
-                    DPRINT1("Unable to satisfy required resource in list %d\n", i);
+                    DPRINT1("Unable to satisfy required resource in list %lu\n", i);
                     break;
                 }
                 else if (!FoundResource)
@@ -509,7 +509,7 @@ IopFixupResourceListWithRequirements(
         /* Check if we need an alternate with no resources left */
         if (AlternateRequired)
         {
-            DPRINT1("Unable to satisfy preferred resource or alternates in list %d\n", i);
+            DPRINT1("Unable to satisfy preferred resource or alternates in list %lu\n", i);
 
             /* Try the next alternate list */
             continue;
index cbe802a..5fd44e5 100644 (file)
@@ -271,7 +271,7 @@ tryagain:
     Status = LocateChildDevice(DeviceExtension, DevicePath, InstancePath, &Device);
     if (Status != STATUS_NO_SUCH_DEVICE || NextInstance > 9999)
     {
-        DPRINT1("NextInstance value is corrupt! (%d)\n", NextInstance);
+        DPRINT1("NextInstance value is corrupt! (%lu)\n", NextInstance);
         RtlDeleteRegistryValue(RTL_REGISTRY_HANDLE,
                                (PWSTR)DeviceKeyHandle,
                                L"NextInstance");
index cd4c017..3b8f1fa 100644 (file)
@@ -794,7 +794,7 @@ KiGetCacheInformation(VOID)
 
     /* Set the cache line */
     if (CacheLine > KeLargestCacheLine) KeLargestCacheLine = CacheLine;
-    DPRINT1("Prefetch Cache: %d bytes\tL2 Cache: %d bytes\tL2 Cache Line: %d bytes\tL2 Cache Associativity: %d\n",
+    DPRINT1("Prefetch Cache: %lu bytes\tL2 Cache: %lu bytes\tL2 Cache Line: %lu bytes\tL2 Cache Associativity: %lu\n",
             KePrefetchNTAGranularity,
             Pcr->SecondLevelCacheSize,
             KeLargestCacheLine,
index a9c2e00..eaacf4e 100644 (file)
@@ -1060,7 +1060,7 @@ DispatchToUser:
         }
 
         /* 3rd strike, kill the process */
-        DPRINT1("Kill %.16s, ExceptionCode: %lx, ExceptionAddress: %lx, BaseAddress: %lx\n",
+        DPRINT1("Kill %.16s, ExceptionCode: %lx, ExceptionAddress: %p, BaseAddress: %p\n",
                 PsGetCurrentProcess()->ImageFileName,
                 ExceptionRecord->ExceptionCode,
                 ExceptionRecord->ExceptionAddress,
index 01840f1..14298de 100644 (file)
@@ -77,8 +77,7 @@ KeSetBaseGdtSelector(ULONG Entry,
    KIRQL oldIrql;
    PUSHORT Gdt;
 
-   DPRINT("KeSetBaseGdtSelector(Entry %x, Base %x)\n",
-          Entry, Base);
+   DPRINT("KeSetBaseGdtSelector(Entry %x, Base %p)\n", Entry, Base);
 
    KeAcquireSpinLock(&GdtLock, &oldIrql);
 
index 50c2f6b..41b474a 100644 (file)
@@ -247,7 +247,7 @@ Ki386FreeIdentityMap(PLARGE_IDENTITY_MAP IdentityMap)
 {
     ULONG Page;
 
-    DPRINT("Freeing %d pages allocated for identity mapping\n", IdentityMap->PagesCount);
+    DPRINT("Freeing %lu pages allocated for identity mapping\n", IdentityMap->PagesCount);
 
     /* Free all allocated pages, if any */
     for (Page = 0; Page < IdentityMap->PagesCount; Page++)
index 76a4b98..46b925a 100644 (file)
@@ -978,7 +978,7 @@ KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame)
             }
             
             /* Check for privileged instructions */
-            DPRINT("Instruction (%d) at fault: %lx %lx %lx %lx\n",
+            DPRINT("Instruction (%lu) at fault: %lx %lx %lx %lx\n",
                     i,
                     Instructions[i],
                     Instructions[i + 1],
index 661a163..ec960fd 100644 (file)
@@ -68,7 +68,7 @@ KiInsertTimerTable(IN PKTIMER Timer,
     BOOLEAN Expired = FALSE;
     PLIST_ENTRY ListHead, NextEntry;
     PKTIMER CurrentTimer;
-    DPRINT("KiInsertTimerTable(): Timer %p, Hand: %d\n", Timer, Hand);
+    DPRINT("KiInsertTimerTable(): Timer %p, Hand: %lu\n", Timer, Hand);
 
     /* Check if the period is zero */
     if (!Timer->Period) Timer->Header.SignalState = FALSE;
index 1ef5763..5134757 100644 (file)
@@ -227,7 +227,7 @@ NtAcceptConnectPort(OUT PHANDLE PortHandle,
             /* Otherwise, quit */
             ObDereferenceObject(ServerPort);
             DPRINT1("Client section mapping failed: %lx\n", Status);
-            DPRINT1("View base, offset, size: %lx %lx %lx\n",
+            DPRINT1("View base, offset, size: %p %lx %p\n",
                     ServerPort->ClientSectionBase,
                     ConnectMessage->ClientView.ViewSize,
                     SectionOffset);
@@ -270,7 +270,7 @@ NtAcceptConnectPort(OUT PHANDLE PortHandle,
     /* Return the handle to user mode */
     *PortHandle = Handle;
     LPCTRACE(LPC_COMPLETE_DEBUG,
-             "Handle: %lx. Messages: %p/%p. Ports: %p/%p/%p\n",
+             "Handle: %p. Messages: %p/%p. Ports: %p/%p/%p\n",
              Handle,
              Message,
              ConnectMessage,
@@ -327,7 +327,7 @@ NtCompleteConnectPort(IN HANDLE PortHandle)
     KPROCESSOR_MODE PreviousMode = KeGetPreviousMode();
     PETHREAD Thread;
     PAGED_CODE();
-    LPCTRACE(LPC_COMPLETE_DEBUG, "Handle: %lx\n", PortHandle);
+    LPCTRACE(LPC_COMPLETE_DEBUG, "Handle: %p\n", PortHandle);
 
     /* Get the Port Object */
     Status = ObReferenceObjectByHandle(PortHandle,
index 3afc9a8..4877546 100644 (file)
@@ -481,7 +481,7 @@ NtSecureConnectPort(OUT PHANDLE PortHandle,
                 /* Return the handle */
                 *PortHandle = Handle;
                 LPCTRACE(LPC_CONNECT_DEBUG,
-                         "Handle: %lx. Length: %lx\n",
+                         "Handle: %p. Length: %lx\n",
                          Handle,
                          PortMessageLength);
 
index 8f6093e..b4fb885 100644 (file)
@@ -143,7 +143,7 @@ LpcpCreatePort(OUT PHANDLE PortHandle,
                             PortHandle);
 
     /* Return success or the error */
-    LPCTRACE(LPC_CREATE_DEBUG, "Port: %p. Handle: %lx\n", Port, *PortHandle);
+    LPCTRACE(LPC_CREATE_DEBUG, "Port: %p. Handle: %p\n", Port, *PortHandle);
     return Status;
 }
 
index 1d4e94c..aa3f5be 100644 (file)
@@ -24,7 +24,7 @@ NtListenPort(IN HANDLE PortHandle,
 {
     NTSTATUS Status;
     PAGED_CODE();
-    LPCTRACE(LPC_LISTEN_DEBUG, "Handle: %lx\n", PortHandle);
+    LPCTRACE(LPC_LISTEN_DEBUG, "Handle: %p\n", PortHandle);
 
     /* Wait forever for a connection request. */
     for (;;)
index 3c3334c..d5ccd7a 100644 (file)
@@ -152,7 +152,7 @@ NtReplyPort(IN HANDLE PortHandle,
 
     PAGED_CODE();
     LPCTRACE(LPC_REPLY_DEBUG,
-             "Handle: %lx. Message: %p.\n",
+             "Handle: %p. Message: %p.\n",
              PortHandle,
              ReplyMessage);
 
@@ -329,7 +329,7 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
 
     PAGED_CODE();
     LPCTRACE(LPC_REPLY_DEBUG,
-             "Handle: %lx. Messages: %p/%p. Context: %p\n",
+             "Handle: %p. Messages: %p/%p. Context: %p\n",
              PortHandle,
              ReplyMessage,
              ReceiveMessage,
@@ -670,7 +670,7 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
 Cleanup:
     /* All done, dereference the port and return the status */
     LPCTRACE(LPC_REPLY_DEBUG,
-             "Port: %p. Status: %p\n",
+             "Port: %p. Status: %d\n",
              Port,
              Status);
     if (ConnectionPort) ObDereferenceObject(ConnectionPort);
index 8bf0efa..9cd5fb4 100644 (file)
@@ -427,7 +427,7 @@ LpcRequestWaitReplyPort(IN PVOID PortObject,
 
     /* All done */
     LPCTRACE(LPC_SEND_DEBUG,
-             "Port: %p. Status: %p\n",
+             "Port: %p. Status: %d\n",
              Port,
              Status);
 
@@ -454,7 +454,7 @@ NtRequestPort(IN HANDLE PortHandle,
     ULONG MessageType;
     PAGED_CODE();
     LPCTRACE(LPC_SEND_DEBUG,
-             "Handle: %lx. Message: %p. Type: %lx\n",
+             "Handle: %p. Message: %p. Type: %lx\n",
              PortHandle,
              LpcRequest,
              LpcpGetMessageType(LpcRequest));
@@ -621,7 +621,7 @@ NtRequestPort(IN HANDLE PortHandle,
 
     /* All done with a failure*/
     LPCTRACE(LPC_SEND_DEBUG,
-             "Port: %p. Status: %p\n",
+             "Port: %p. Status: %d\n",
              Port,
              Status);
 
@@ -652,7 +652,7 @@ NtRequestWaitReplyPort(IN HANDLE PortHandle,
     ULONG MessageType;
     PAGED_CODE();
     LPCTRACE(LPC_SEND_DEBUG,
-             "Handle: %lx. Messages: %p/%p. Type: %lx\n",
+             "Handle: %p. Messages: %p/%p. Type: %lx\n",
              PortHandle,
              LpcRequest,
              LpcReply,
@@ -914,7 +914,7 @@ NtRequestWaitReplyPort(IN HANDLE PortHandle,
 
     /* All done */
     LPCTRACE(LPC_SEND_DEBUG,
-             "Port: %p. Status: %p\n",
+             "Port: %p. Status: %d\n",
              Port,
              Status);
     ObDereferenceObject(Port);
index 4bf0196..5a5f6a8 100644 (file)
@@ -1613,7 +1613,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType,
             //
             if (ExpPoolFlags & POOL_FLAG_DBGPRINT_ON_FAILURE)
             {
-                DPRINT1("EX: ExAllocatePool (%p, 0x%x) returning NULL\n",
+                DPRINT1("EX: ExAllocatePool (%lu, 0x%x) returning NULL\n",
                         NumberOfBytes,
                         OriginalType);
                 if (ExpPoolFlags & POOL_FLAG_CRASH_ON_FAILURE) DbgBreakPoint();
@@ -1937,7 +1937,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType,
         //
         if (ExpPoolFlags & POOL_FLAG_DBGPRINT_ON_FAILURE)
         {
-            DPRINT1("EX: ExAllocatePool (%p, 0x%x) returning NULL\n",
+            DPRINT1("EX: ExAllocatePool (%lu, 0x%x) returning NULL\n",
                     NumberOfBytes,
                     OriginalType);
             if (ExpPoolFlags & POOL_FLAG_CRASH_ON_FAILURE) DbgBreakPoint();
index 4dbb4bc..020fd38 100644 (file)
@@ -287,7 +287,7 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
                                   MmSizeOfNonPagedPoolInBytes);
     MmNonPagedPoolStart = (PVOID)PAGE_ALIGN(MmNonPagedPoolStart);
     NonPagedPoolExpansionVa = MmNonPagedPoolStart;
-    DPRINT("NP Pool has been tuned to: %d bytes and %d bytes\n",
+    DPRINT("NP Pool has been tuned to: %lu bytes and %lu bytes\n",
            MmSizeOfNonPagedPoolInBytes, MmMaximumNonPagedPoolInBytes);
 
     //
@@ -471,7 +471,7 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
     MmNumberOfSystemPtes = MiAddressToPte(MmNonPagedPoolExpansionStart) -
                            PointerPte;
     MmNumberOfSystemPtes--;
-    DPRINT("Final System PTE count: %d (%d bytes)\n",
+    DPRINT("Final System PTE count: %lu (%lu bytes)\n",
            MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE);
 
     //
index 441df34..38f811b 100644 (file)
@@ -2003,7 +2003,7 @@ MiDbgDumpMemoryDescriptors(VOID)
         TotalPages += Md->PageCount;
     }
 
-    DPRINT1("Total: %08lX (%d MB)\n", (ULONG)TotalPages, (ULONG)(TotalPages * PAGE_SIZE) / 1024 / 1024);
+    DPRINT1("Total: %08lX (%lu MB)\n", (ULONG)TotalPages, (ULONG)(TotalPages * PAGE_SIZE) / 1024 / 1024);
 }
 
 BOOLEAN
@@ -2183,7 +2183,7 @@ MmArmInitSystem(IN ULONG Phase,
             }
         }
 
-        DPRINT("System PTE count has been tuned to %d (%d bytes)\n",
+        DPRINT("System PTE count has been tuned to %lu (%lu bytes)\n",
                MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE);
 
         /* Check if no values are set for the heap limits */
index 3a5e948..f65d90c 100644 (file)
@@ -791,7 +791,7 @@ MiResolveTransitionFault(IN PVOID FaultingAddress,
     PMMPFN Pfn1;
     MMPTE TempPte;
     PMMPTE PointerToPteForProtoPage;
-    DPRINT1("Transition fault on 0x%p with PTE 0x%lx in process %s\n", FaultingAddress, PointerPte, CurrentProcess->ImageFileName);
+    DPRINT1("Transition fault on 0x%p with PTE 0x%p in process %s\n", FaultingAddress, PointerPte, CurrentProcess->ImageFileName);
 
     /* Windowss does this check */
     ASSERT(*InPageBlock == NULL);
index 8c6b203..45d8a6a 100644 (file)
@@ -212,7 +212,7 @@ MiUnlinkFreeOrZeroedPage(IN PMMPFN Entry)
     {
         /* FIXME: Should wake up the MPW and working set manager, if we had one */
 
-        DPRINT1("Running low on pages: %d remaining\n", MmAvailablePages);
+        DPRINT1("Running low on pages: %lu remaining\n", MmAvailablePages);
 
         /* Call RosMm and see if it can release any pages for us */
         MmRebalanceMemoryConsumers();
@@ -273,7 +273,7 @@ MiUnlinkPageFromList(IN PMMPFN Pfn)
         if (--MmAvailablePages < MmMinimumFreePages)
         {
             /* FIXME: Should wake up the MPW and working set manager, if we had one */
-            DPRINT1("Running low on pages: %d remaining\n", MmAvailablePages);
+            DPRINT1("Running low on pages: %lu remaining\n", MmAvailablePages);
 
             /* Call RosMm and see if it can release any pages for us */
             MmRebalanceMemoryConsumers();
@@ -459,7 +459,7 @@ MiRemovePageByColor(IN PFN_NUMBER PageIndex,
     {
         /* FIXME: Should wake up the MPW and working set manager, if we had one */
 
-        DPRINT1("Running low on pages: %d remaining\n", MmAvailablePages);
+        DPRINT1("Running low on pages: %lu remaining\n", MmAvailablePages);
 
         /* Call RosMm and see if it can release any pages for us */
         MmRebalanceMemoryConsumers();
@@ -1184,7 +1184,7 @@ MiAllocatePfn(IN PMMPTE PointerPte,
     /* Check if we're running low on pages */
     if (MmAvailablePages < 128)
     {
-        DPRINT1("Warning, running low on memory: %d pages left\n", MmAvailablePages);
+        DPRINT1("Warning, running low on memory: %lu pages left\n", MmAvailablePages);
 
         //MiEnsureAvailablePageOrWait(NULL, OldIrql);
 
index 31d07be..798b2f9 100644 (file)
@@ -482,7 +482,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType,
             // Get the page bit count
             //
             i = ((SizeInPages - 1) / PTE_COUNT) + 1;
-            DPRINT1("Paged pool expansion: %d %x\n", i, SizeInPages);
+            DPRINT1("Paged pool expansion: %lu %x\n", i, SizeInPages);
 
             //
             // Check if there is enougn paged pool expansion space left
index a260e0c..58c8a5e 100644 (file)
@@ -1576,7 +1576,7 @@ MiReleaseProcessReferenceToSessionDataPage(IN PMM_SESSION_SPACE SessionGlobal)
 
     /* Get the session ID */
     SessionId = SessionGlobal->SessionId;
-    DPRINT1("Last process in sessino %d going down!!!\n", SessionId);
+    DPRINT1("Last process in sessino %lu going down!!!\n", SessionId);
 
     /* Free the session page tables */
 #ifndef _M_AMD64
@@ -1986,7 +1986,7 @@ MiSessionCreateInternal(OUT PULONG SessionId)
     MmSessionSpace->PageTables[PointerPde - MiAddressToPde(MmSessionBase)] = *PointerPde;
 #endif
     InitializeListHead(&MmSessionSpace->ImageList);
-    DPRINT1("Session %d is ready to go: 0x%p 0x%p, %lx 0x%p\n",
+    DPRINT1("Session %lu is ready to go: 0x%p 0x%p, %lx 0x%p\n",
             *SessionId, MmSessionSpace, SessionGlobal, SessionPageDirIndex, PageTables);
 
     /* Initialize session pool */
index 2aa97a4..49e6055 100644 (file)
@@ -503,7 +503,7 @@ MiTestSpecialPool()
     {
         ByteSize = (100 * (i+1)) % (PAGE_SIZE - sizeof(POOL_HEADER));
         p1 = MmAllocateSpecialPool(ByteSize, 'TEST', PoolType, 0);
-        DPRINT1("p1 %p size %d\n", p1, ByteSize);
+        DPRINT1("p1 %p size %lu\n", p1, ByteSize);
         MmFreeSpecialPool(p1);
     }
 
@@ -512,7 +512,7 @@ MiTestSpecialPool()
     {
         ByteSize = (100 * (i+1)) % (PAGE_SIZE - sizeof(POOL_HEADER));
         p2[i] = MmAllocateSpecialPool(ByteSize, 'TEST', PoolType, 0);
-        DPRINT1("p2[%d] %p size %d\n", i, p1, ByteSize);
+        DPRINT1("p2[%lu] %p size %lu\n", i, p1, ByteSize);
     }
     for (i=0; i<100; i++)
     {
index b325e42..c8ca584 100644 (file)
@@ -172,7 +172,7 @@ MiTrimMemoryConsumer(ULONG Consumer, ULONG InitialTarget)
         /* Now swap the pages out */
         Status = MiMemoryConsumers[Consumer].Trim(Target, 0, &NrFreedPages);
 
-        DPRINT("Trimming consumer %d: Freed %d pages with a target of %d pages\n", Consumer, NrFreedPages, Target);
+        DPRINT("Trimming consumer %lu: Freed %lu pages with a target of %lu pages\n", Consumer, NrFreedPages, Target);
 
         if (!NT_SUCCESS(Status))
         {
index 0ff5297..de96119 100644 (file)
@@ -167,7 +167,7 @@ MiAllocatePagesForMdl(IN PHYSICAL_ADDRESS LowAddress,
     PPHYSICAL_PAGE Pfn1;
     INT LookForZeroedPages;
     ASSERT(KeGetCurrentIrql() <= APC_LEVEL);
-    DPRINT1("ARM3-DEBUG: Being called with %I64x %I64x %I64x %lx %d %d\n", LowAddress, HighAddress, SkipBytes, TotalBytes, CacheAttribute, MdlFlags);
+    DPRINT1("ARM3-DEBUG: Being called with %I64x %I64x %I64x %lx %d %lu\n", LowAddress, HighAddress, SkipBytes, TotalBytes, CacheAttribute, MdlFlags);
 
     //
     // Convert the low address into a PFN
index 52c5f57..6d63d24 100644 (file)
@@ -445,7 +445,7 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage,
     ULONG Pte;
     PULONG Pt;
 
-    DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n",
+    DPRINT("MmDeleteVirtualMapping(%p, %p, %u, %p, %p)\n",
            Process, Address, FreePage, WasDirty, Page);
 
     Pt = MmGetPageTableForProcess(Process, Address, FALSE);
@@ -792,7 +792,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process,
     ULONG oldPdeOffset, PdeOffset;
     PULONG Pt = NULL;
     ULONG Pte;
-    DPRINT("MmCreateVirtualMappingUnsafe(%x, %x, %x, %x (%x), %d)\n",
+    DPRINT("MmCreateVirtualMappingUnsafe(%p, %p, %lu, %p (%x), %lu)\n",
            Process, Address, flProtect, Pages, *Pages, PageCount);
 
     ASSERT(((ULONG_PTR)Address % PAGE_SIZE) == 0);
@@ -847,7 +847,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process,
         if (!(Attributes & PA_PRESENT) && Pages[i] != 0)
         {
             DPRINT1("Setting physical address but not allowing access at address "
-                    "0x%.8X with attributes %x/%x.\n",
+                    "0x%p with attributes %x/%x.\n",
                     Addr, Attributes, flProtect);
             KeBugCheck(MEMORY_MANAGEMENT);
         }
@@ -969,7 +969,7 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect)
     PULONG Pt;
     ULONG Pte;
 
-    DPRINT("MmSetPageProtect(Process %x  Address %x  flProtect %x)\n",
+    DPRINT("MmSetPageProtect(Process %p  Address %p  flProtect %x)\n",
            Process, Address, flProtect);
 
     Attributes = ProtectToPTE(flProtect);
@@ -1016,7 +1016,7 @@ MmGetPhysicalAddress(PVOID vaddr)
     PHYSICAL_ADDRESS p;
     ULONG Pte;
 
-    DPRINT("MmGetPhysicalAddress(vaddr %x)\n", vaddr);
+    DPRINT("MmGetPhysicalAddress(vaddr %p)\n", vaddr);
     Pte = MmGetPageEntryForProcess(NULL, vaddr);
     if (Pte != 0 && (Pte & PA_PRESENT))
     {
index aae43d6..5b67399 100644 (file)
@@ -1132,7 +1132,7 @@ MmDeleteProcessAddressSpace(PEPROCESS Process)
    PVOID Address;
    PMEMORY_AREA MemoryArea;
 
-   DPRINT("MmDeleteProcessAddressSpace(Process %x (%s))\n", Process,
+   DPRINT("MmDeleteProcessAddressSpace(Process %p (%s))\n", Process,
           Process->ImageFileName);
 
 #ifndef _M_AMD64
index ffbb65d..602d708 100644 (file)
@@ -32,7 +32,7 @@ MmpAccessFault(KPROCESSOR_MODE Mode,
 
    if (KeGetCurrentIrql() >= DISPATCH_LEVEL)
    {
-      DPRINT1("Page fault at high IRQL was %d\n", KeGetCurrentIrql());
+      DPRINT1("Page fault at high IRQL was %u\n", KeGetCurrentIrql());
       return(STATUS_UNSUCCESSFUL);
    }
 
@@ -119,7 +119,7 @@ MmNotPresentFault(KPROCESSOR_MODE Mode,
 
    if (KeGetCurrentIrql() >= DISPATCH_LEVEL)
    {
-      DPRINT1("Page fault at high IRQL was %d, address %x\n", KeGetCurrentIrql(), Address);
+      DPRINT1("Page fault at high IRQL was %u, address %x\n", KeGetCurrentIrql(), Address);
       return(STATUS_UNSUCCESSFUL);
    }
 
index b26e523..8ed9724 100644 (file)
@@ -647,7 +647,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName,
     * bytes) to the physical location of cluster 3042 then. */
    if (BytesPerAllocationUnit % PAGE_SIZE)
    {
-      DPRINT1("BytesPerAllocationUnit %d is not a multiple of PAGE_SIZE %d\n",
+      DPRINT1("BytesPerAllocationUnit %lu is not a multiple of PAGE_SIZE %d\n",
               BytesPerAllocationUnit, PAGE_SIZE);
       ZwClose(FileHandle);
       return STATUS_UNSUCCESSFUL;
@@ -784,7 +784,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName,
       ZwClose(FileHandle);
       return(STATUS_NO_MEMORY);
    }
-   DPRINT("ExtentCount: %d\n", ExtentCount);
+   DPRINT("ExtentCount: %lu\n", ExtentCount);
    Size = sizeof(RETRIEVAL_POINTERS_BUFFER) + ExtentCount * 2 * sizeof(LARGE_INTEGER);
    PagingFile->RetrievalPointers = ExAllocatePool(NonPagedPool, Size);
    if (PagingFile->RetrievalPointers == NULL)
index 9f37b1e..a076e75 100644 (file)
@@ -60,7 +60,7 @@
 
 #undef MmSetPageEntrySectionSegment
 #define MmSetPageEntrySectionSegment(S,O,E) do { \
-        DPRINT("SetPageEntrySectionSegment(old,%x,%x,%x)\n",(S),(O)->LowPart,E); \
+        DPRINT("SetPageEntrySectionSegment(old,%p,%x,%x)\n",(S),(O)->LowPart,E); \
         _MmSetPageEntrySectionSegment((S),(O),(E),__FILE__,__LINE__);   \
        } while (0)
 
@@ -805,7 +805,7 @@ MmFreeSectionSegments(PFILE_OBJECT FileObject)
       {
          if (SectionSegments[i].ReferenceCount != 0)
          {
-            DPRINT1("Image segment %d still referenced (was %d)\n", i,
+            DPRINT1("Image segment %lu still referenced (was %lu)\n", i,
                     SectionSegments[i].ReferenceCount);
             KeBugCheck(MEMORY_MANAGEMENT);
          }
@@ -1084,7 +1084,7 @@ MiReadPage(PMEMORY_AREA MemoryArea,
 
    ASSERT(Bcb);
 
-   DPRINT("%S %x\n", FileObject->FileName.Buffer, FileOffset);
+   DPRINT("%S %I64x\n", FileObject->FileName.Buffer, FileOffset);
 
    /*
     * If the file system is letting us go directly to the cache and the
@@ -1345,7 +1345,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       MmUnlockAddressSpace(AddressSpace);
       MiWaitForPageEvent(NULL, NULL);
       MmLockAddressSpace(AddressSpace);
-      DPRINT("Address 0x%.8X\n", Address);
+      DPRINT("Address 0x%p\n", Address);
       return(STATUS_MM_RESTART_OPERATION);
    }
 
@@ -1429,7 +1429,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
        * Finish the operation
        */
       MiSetPageEvent(Process, Address);
-      DPRINT("Address 0x%.8X\n", Address);
+      DPRINT("Address 0x%p\n", Address);
       return(STATUS_SUCCESS);
    }
 
@@ -1459,7 +1459,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
        * Cleanup and release locks
        */
       MiSetPageEvent(Process, Address);
-      DPRINT("Address 0x%.8X\n", Address);
+      DPRINT("Address 0x%p\n", Address);
       return(STATUS_SUCCESS);
    }
 
@@ -1517,7 +1517,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
           */
          MmLockAddressSpace(AddressSpace);
          MiSetPageEvent(Process, Address);
-         DPRINT("Address 0x%.8X\n", Address);
+         DPRINT("Address 0x%p\n", Address);
          return(Status);
       }
 
@@ -1548,7 +1548,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       MmInsertRmap(Page, Process, Address);
 
       MiSetPageEvent(Process, Address);
-      DPRINT("Address 0x%.8X\n", Address);
+      DPRINT("Address 0x%p\n", Address);
       return(STATUS_SUCCESS);
    }
    else if (IS_SWAP_FROM_SSE(Entry))
@@ -1619,7 +1619,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       }
       MmInsertRmap(Page, Process, Address);
       MiSetPageEvent(Process, Address);
-      DPRINT("Address 0x%.8X\n", Address);
+      DPRINT("Address 0x%p\n", Address);
       return(STATUS_SUCCESS);
    }
    else
@@ -1646,7 +1646,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       }
       MmInsertRmap(Page, Process, Address);
       MiSetPageEvent(Process, Address);
-      DPRINT("Address 0x%.8X\n", Address);
+      DPRINT("Address 0x%p\n", Address);
       return(STATUS_SUCCESS);
    }
 }
@@ -1669,14 +1669,14 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace,
    PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace);
    SWAPENTRY SwapEntry;
 
-   DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address);
+   DPRINT("MmAccessFaultSectionView(%p, %p, %p)\n", AddressSpace, MemoryArea, Address);
 
    /*
     * Check if the page has already been set readwrite
     */
    if (MmGetPageProtect(Process, Address) & PAGE_READWRITE)
    {
-      DPRINT("Address 0x%.8X\n", Address);
+      DPRINT("Address 0x%p\n", Address);
       return(STATUS_SUCCESS);
    }
 
@@ -1710,7 +1710,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace,
          (Region->Protect == PAGE_READWRITE ||
           Region->Protect == PAGE_EXECUTE_READWRITE)))
    {
-      DPRINT("Address 0x%.8X\n", Address);
+      DPRINT("Address 0x%p\n", Address);
       return(STATUS_ACCESS_VIOLATION);
    }
 
@@ -1743,7 +1743,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace,
         * Restart the operation
         */
        MmLockAddressSpace(AddressSpace);
-       DPRINT("Address 0x%.8X\n", Address);
+       DPRINT("Address 0x%p\n", Address);
        return(STATUS_MM_RESTART_OPERATION);
    }
 
@@ -1802,7 +1802,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace,
    MmUnlockSectionSegment(Segment);
 
    MiSetPageEvent(Process, Address);
-   DPRINT("Address 0x%.8X\n", Address);
+   DPRINT("Address 0x%p\n", Address);
    return(STATUS_SUCCESS);
 }
 
@@ -1917,8 +1917,8 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
     */
    if (Context.Section->AllocationAttributes & SEC_PHYSICALMEMORY)
    {
-      DPRINT1("Trying to page out from physical memory section address 0x%X "
-              "process %d\n", Address,
+      DPRINT1("Trying to page out from physical memory section address 0x%p "
+              "process %p\n", Address,
               Process ? Process->UniqueProcessId : 0);
        KeBugCheck(MEMORY_MANAGEMENT);
    }
@@ -1928,7 +1928,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
     */
    if (!MmIsPagePresent(Process, Address))
    {
-      DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n",
+      DPRINT1("Trying to page out not-present page at (%p,0x%p).\n",
               Process ? Process->UniqueProcessId : 0, Address);
        KeBugCheck(MEMORY_MANAGEMENT);
    }
@@ -1940,7 +1940,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
     */
    if (MmGetReferenceCountPage(Page) != 1)
    {
-       DPRINT("Cannot page out locked section page: 0x%p (RefCount: %d)\n",
+       DPRINT("Cannot page out locked section page: 0x%lu (RefCount: %lu)\n",
                Page, MmGetReferenceCountPage(Page));
        MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry);
        MmUnlockSectionSegment(Context.Segment);
@@ -2014,7 +2014,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
    {
       if (Context.Private)
       {
-         DPRINT1("Found a %s private page (address %x) in a pagefile segment.\n",
+         DPRINT1("Found a %s private page (address %p) in a pagefile segment.\n",
                  Context.WasDirty ? "dirty" : "clean", Address);
          KeBugCheckEx(MEMORY_MANAGEMENT, SwapEntry, (ULONG_PTR)Process, (ULONG_PTR)Address, 0);
       }
@@ -2033,7 +2033,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
    {
       if (Context.Private)
       {
-         DPRINT1("Found a %s private page (address %x) in a shared section segment.\n",
+         DPRINT1("Found a %s private page (address %p) in a shared section segment.\n",
                  Context.WasDirty ? "dirty" : "clean", Address);
          KeBugCheckEx(MEMORY_MANAGEMENT, Page, (ULONG_PTR)Process, (ULONG_PTR)Address, 0);
       }
@@ -2055,7 +2055,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
    {
       if (SwapEntry != 0)
       {
-         DPRINT1("Found a swapentry for a non private and direct mapped page (address %x)\n",
+         DPRINT1("Found a swapentry for a non private and direct mapped page (address %p)\n",
                  Address);
          KeBugCheckEx(MEMORY_MANAGEMENT, STATUS_UNSUCCESSFUL, SwapEntry, (ULONG_PTR)Process, (ULONG_PTR)Address);
       }
@@ -2078,7 +2078,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
    {
       if (SwapEntry != 0)
       {
-         DPRINT1("Found a swap entry for a non dirty, non private and not direct mapped page (address %x)\n",
+         DPRINT1("Found a swap entry for a non dirty, non private and not direct mapped page (address %p)\n",
                  Address);
          KeBugCheckEx(MEMORY_MANAGEMENT, SwapEntry, Page, (ULONG_PTR)Process, (ULONG_PTR)Address);
       }
@@ -2312,8 +2312,8 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace,
     */
    if (Section->AllocationAttributes & SEC_PHYSICALMEMORY)
    {
-      DPRINT1("Trying to write back page from physical memory mapped at %X "
-              "process %d\n", Address,
+      DPRINT1("Trying to write back page from physical memory mapped at %p "
+              "process %p\n", Address,
               Process ? Process->UniqueProcessId : 0);
       KeBugCheck(MEMORY_MANAGEMENT);
    }
@@ -2324,7 +2324,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace,
    Entry = MmGetPageEntrySectionSegment(Segment, &Offset);
    if (!MmIsPagePresent(Process, Address))
    {
-      DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n",
+      DPRINT1("Trying to page out not-present page at (%p,0x%p).\n",
               Process ? Process->UniqueProcessId : 0, Address);
       KeBugCheck(MEMORY_MANAGEMENT);
    }
@@ -2705,8 +2705,7 @@ MmpCloseSection(IN PEPROCESS Process OPTIONAL,
                 IN ULONG ProcessHandleCount,
                 IN ULONG SystemHandleCount)
 {
-   DPRINT("MmpCloseSection(OB %x, HC %d)\n",
-          Object, ProcessHandleCount);
+    DPRINT("MmpCloseSection(OB %p, HC %lu)\n", Object, ProcessHandleCount);
 }
 
 NTSTATUS
@@ -3937,7 +3936,7 @@ MmMapViewOfSegment(PMMSUPPORT AddressSpace,
                                BoundaryAddressMultiple);
    if (!NT_SUCCESS(Status))
    {
-      DPRINT1("Mapping between 0x%.8X and 0x%.8X failed (%X).\n",
+      DPRINT1("Mapping between 0x%p and 0x%p failed (%X).\n",
               (*BaseAddress), (char*)(*BaseAddress) + ViewSize, Status);
       return(Status);
    }
@@ -4123,7 +4122,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process,
    PROS_SECTION_OBJECT Section;
    PVOID ImageBaseAddress = 0;
 
-   DPRINT("Opening memory area Process %x BaseAddress %x\n",
+   DPRINT("Opening memory area Process %p BaseAddress %p\n",
           Process, BaseAddress);
 
    ASSERT(Process);
index a4a2a60..b2f1f14 100644 (file)
@@ -60,7 +60,7 @@ ObpInsertEntryDirectory(IN POBJECT_DIRECTORY Parent,
         (Parent != Context->Directory))
     {
         /* Invalid context */
-        DPRINT1("OB: ObpInsertEntryDirectory - invalid context %p %ld\n",
+        DPRINT1("OB: ObpInsertEntryDirectory - invalid context %p %u\n",
                 Context, Context->DirectoryLocked);
         ASSERT(FALSE);
         return FALSE;
index 3be8b7d..b6f091c 100644 (file)
@@ -683,7 +683,7 @@ ObpCloseHandleTableEntry(IN PHANDLE_TABLE HandleTable,
     Body = &ObjectHeader->Body;
     GrantedAccess = HandleEntry->GrantedAccess;
     OBTRACE(OB_HANDLE_DEBUG,
-            "%s - Closing handle: %lx for %p. HC PC %lx %lx\n",
+            "%s - Closing handle: %p for %p. HC PC %lx %lx\n",
             __FUNCTION__,
             Handle,
             Body,
@@ -753,7 +753,7 @@ ObpCloseHandleTableEntry(IN PHANDLE_TABLE HandleTable,
 
     /* Return to caller */
     OBTRACE(OB_HANDLE_DEBUG,
-            "%s - Closed handle: %lx for %p.\n",
+            "%s - Closed handle: %p for %p.\n",
             __FUNCTION__,
             Handle,
             Body);
@@ -1399,7 +1399,7 @@ ObpCreateUnnamedHandle(IN PVOID Object,
 
         /* Trace and return */
         OBTRACE(OB_HANDLE_DEBUG,
-                "%s - Returning Handle: %lx HC PC %lx %lx\n",
+                "%s - Returning Handle: %p HC PC %lx %lx\n",
                 __FUNCTION__,
                 Handle,
                 ObjectHeader->HandleCount,
@@ -1645,7 +1645,7 @@ ObpCreateHandle(IN OB_OPEN_REASON OpenReason,
 
         /* Trace and return */
         OBTRACE(OB_HANDLE_DEBUG,
-                "%s - Returning Handle: %lx HC PC %lx %lx\n",
+                "%s - Returning Handle: %p HC PC %lx %lx\n",
                 __FUNCTION__,
                 Handle,
                 ObjectHeader->HandleCount,
@@ -1708,7 +1708,7 @@ ObpCloseHandle(IN HANDLE Handle,
     PEPROCESS Process = PsGetCurrentProcess();
     PAGED_CODE();
     OBTRACE(OB_HANDLE_DEBUG,
-            "%s - Closing handle: %lx\n", __FUNCTION__, Handle);
+            "%s - Closing handle: %p\n", __FUNCTION__, Handle);
 
     if (AccessMode == KernelMode && Handle == (HANDLE)-1)
         return STATUS_INVALID_HANDLE;
@@ -1803,7 +1803,7 @@ ObpCloseHandle(IN HANDLE Handle,
 
     /* Return status */
     OBTRACE(OB_HANDLE_DEBUG,
-            "%s - Closed handle: %lx S: %lx\n",
+            "%s - Closed handle: %p S: %lx\n",
             __FUNCTION__, Handle, Status);
     return Status;
 }
@@ -2141,7 +2141,7 @@ ObDuplicateObject(IN PEPROCESS SourceProcess,
     ULONG AuditMask;
     PAGED_CODE();
     OBTRACE(OB_HANDLE_DEBUG,
-            "%s - Duplicating handle: %lx for %p into %p\n",
+            "%s - Duplicating handle: %p for %p into %p\n",
             __FUNCTION__,
             SourceHandle,
             SourceProcess,
@@ -2374,7 +2374,7 @@ ObDuplicateObject(IN PEPROCESS SourceProcess,
 
     /* Return status */
     OBTRACE(OB_HANDLE_DEBUG,
-            "%s - Duplicated handle: %lx for %p into %p. Source: %p HC PC %lx %lx\n",
+            "%s - Duplicated handle: %p for %p into %p. Source: %p HC PC %lx %lx\n",
             __FUNCTION__,
             NewHandle,
             SourceProcess,
@@ -2851,7 +2851,7 @@ ObInsertObject(IN PVOID Object,
     if (!(ObjectHeader->Flags & OB_FLAG_CREATE_INFO))
     {
         /* Display warning and break into debugger */
-        DPRINT1("OB: Attempting to insert existing object %08x\n", Object);
+        DPRINT1("OB: Attempting to insert existing object %p\n", Object);
         DbgBreakPoint();
 
         /* Allow debugger to continue */
@@ -3234,7 +3234,7 @@ NtDuplicateObject(IN HANDLE SourceProcessHandle,
     KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
     NTSTATUS Status;
     OBTRACE(OB_HANDLE_DEBUG,
-            "%s - Duplicating handle: %lx for %lx into %lx.\n",
+            "%s - Duplicating handle: %p for %p into %p.\n",
             __FUNCTION__,
             SourceHandle,
             SourceProcessHandle,
@@ -3324,7 +3324,7 @@ NtDuplicateObject(IN HANDLE SourceProcessHandle,
 
     /* Dereference the processes */
     OBTRACE(OB_HANDLE_DEBUG,
-            "%s - Duplicated handle: %lx into %lx S %lx\n",
+            "%s - Duplicated handle: %p into %p S %lx\n",
             __FUNCTION__,
             hTarget,
             TargetProcessHandle,
index aa7ff09..ce4c8c6 100644 (file)
@@ -285,7 +285,7 @@ ObpCreateSymbolicLinkName(IN POBJECT_SYMBOLIC_LINK SymbolicLink)
                 DriveType = DOSDEVICE_DRIVE_REMOTE;
                 break;
             default:
-                DPRINT1("Device Type %ld for %wZ is not known or unhandled\n",
+                DPRINT1("Device Type %lu for %wZ is not known or unhandled\n",
                         ((PDEVICE_OBJECT)Object)->DeviceType,
                         &SymbolicLink->LinkTarget);
                 DriveType = DOSDEVICE_DRIVE_UNKNOWN;
index e68be76..1111e31 100644 (file)
@@ -132,7 +132,7 @@ PopGracefulShutdown(IN PVOID Context)
         if ((Process != PsInitialSystemProcess) && (Process != PsIdleProcess))
         {
             /* Print it */
-            DPRINT1("%15s is still RUNNING (%lx)\n", Process->ImageFileName, Process->UniqueProcessId);
+            DPRINT1("%15s is still RUNNING (%p)\n", Process->ImageFileName, Process->UniqueProcessId);
         }
 
         /* Get the next process */
index 3ef3918..13cb5ef 100644 (file)
@@ -205,7 +205,7 @@ PopFlushVolumeWorker(IN PVOID Context)
             if (NT_SUCCESS(Status))
             {
                 /* Flush it and close it */
-                DPRINT1("Sending flush to: %lx\n", VolumeHandle);
+                DPRINT1("Sending flush to: %p\n", VolumeHandle);
                 ZwFlushBuffersFile(VolumeHandle, &IoStatusBlock);
                 ZwClose(VolumeHandle);
             }
index b174e20..88df584 100644 (file)
@@ -679,8 +679,8 @@ NtPowerInformation(IN POWER_INFORMATION_LEVEL PowerInformationLevel,
 
     PAGED_CODE();
 
-    DPRINT("NtPowerInformation(PowerInformationLevel 0x%x, InputBuffer 0x%x, "
-           "InputBufferLength 0x%x, OutputBuffer 0x%x, OutputBufferLength 0x%x)\n",
+    DPRINT("NtPowerInformation(PowerInformationLevel 0x%x, InputBuffer 0x%p, "
+           "InputBufferLength 0x%x, OutputBuffer 0x%p, OutputBufferLength 0x%x)\n",
            PowerInformationLevel,
            InputBuffer, InputBufferLength,
            OutputBuffer, OutputBufferLength);
@@ -914,7 +914,7 @@ NtSetSystemPowerState(IN POWER_ACTION SystemAction,
 #endif
 
         /* Flush all volumes and the registry */
-        DPRINT1("Flushing volumes, cache flushed %d pages\n", Dummy);
+        DPRINT1("Flushing volumes, cache flushed %lu pages\n", Dummy);
         PopFlushVolumes(PopAction.Shutdown);
 
         /* Set IRP for drivers */
index e075652..6da8ea2 100644 (file)
@@ -46,7 +46,7 @@ PspDumpThreads(BOOLEAN IncludeSystem)
                 nThreads++;
 
                 /* Print the Info */
-                DbgPrint("State %d Affinity %08x Priority %d PID.TID %d.%d Name %.8s Stack: \n",
+                DbgPrint("State %u Affinity %08x Priority %d PID.TID %d.%d Name %.8s Stack: \n",
                          Thread->Tcb.State,
                          Thread->Tcb.Affinity,
                          Thread->Tcb.Priority,
@@ -64,7 +64,7 @@ PspDumpThreads(BOOLEAN IncludeSystem)
                     PULONG Ebp = (PULONG)Esp[4];
 
                     /* Print EBP */
-                    DbgPrint("Ebp 0x%.8X\n", Ebp);
+                    DbgPrint("Ebp %p\n", Ebp);
 
                     /* Walk it */
                     while(Ebp != 0 && Ebp >= (PULONG)Thread->Tcb.StackLimit)
index da3f90e..ab0413e 100644 (file)
@@ -86,7 +86,7 @@ PspTerminateProcess(IN PEPROCESS Process,
     NTSTATUS Status = STATUS_NOTHING_TO_TERMINATE;
     PAGED_CODE();
     PSTRACE(PS_KILL_DEBUG,
-            "Process: %p ExitStatus: %p\n", Process, ExitStatus);
+            "Process: %p ExitStatus: %d\n", Process, ExitStatus);
     PSREFTRACE(Process);
 
     /* Check if this is a Critical Process */
@@ -461,7 +461,7 @@ PspExitThread(IN NTSTATUS ExitStatus)
     PKAPC Apc;
     PTOKEN PrimaryToken;
     PAGED_CODE();
-    PSTRACE(PS_KILL_DEBUG, "ExitStatus: %p\n", ExitStatus);
+    PSTRACE(PS_KILL_DEBUG, "ExitStatus: %d\n", ExitStatus);
 
     /* Get the Current Thread and Process */
     Thread = PsGetCurrentThread();
@@ -991,7 +991,7 @@ PspTerminateThreadByPointer(IN PETHREAD Thread,
     NTSTATUS Status = STATUS_SUCCESS;
     ULONG Flags;
     PAGED_CODE();
-    PSTRACE(PS_KILL_DEBUG, "Thread: %p ExitStatus: %p\n", Thread, ExitStatus);
+    PSTRACE(PS_KILL_DEBUG, "Thread: %p ExitStatus: %d\n", Thread, ExitStatus);
     PSREFTRACE(Thread);
 
     /* Check if this is a Critical Thread, and Bugcheck */
@@ -1076,7 +1076,7 @@ PspExitProcess(IN BOOLEAN LastThread,
     ULONG Actual;
     PAGED_CODE();
     PSTRACE(PS_KILL_DEBUG,
-            "LastThread: %p Process: %p\n", LastThread, Process);
+            "LastThread: %u Process: %p\n", LastThread, Process);
     PSREFTRACE(Process);
 
     /* Set Process Exit flag */
@@ -1165,7 +1165,7 @@ NtTerminateProcess(IN HANDLE ProcessHandle OPTIONAL,
     BOOLEAN KillByHandle;
     PAGED_CODE();
     PSTRACE(PS_KILL_DEBUG,
-            "ProcessHandle: %p ExitStatus: %p\n", ProcessHandle, ExitStatus);
+            "ProcessHandle: %p ExitStatus: %d\n", ProcessHandle, ExitStatus);
 
     /* Were we passed a process handle? */
     if (ProcessHandle)
@@ -1282,7 +1282,7 @@ NtTerminateThread(IN HANDLE ThreadHandle,
     NTSTATUS Status;
     PAGED_CODE();
     PSTRACE(PS_KILL_DEBUG,
-            "ThreadHandle: %p ExitStatus: %p\n", ThreadHandle, ExitStatus);
+            "ThreadHandle: %p ExitStatus: %d\n", ThreadHandle, ExitStatus);
 
     /* Handle the special NULL case */
     if (!ThreadHandle)
index 36fcbdb..699938f 100644 (file)
@@ -229,7 +229,7 @@ CHECK_PAGED_CODE_RTL(char *file, int line)
 {
   if(KeGetCurrentIrql() > APC_LEVEL)
   {
-    DbgPrint("%s:%i: Pagable code called at IRQL > APC_LEVEL (%d)\n", file, line, KeGetCurrentIrql());
+    DbgPrint("%s:%i: Pagable code called at IRQL > APC_LEVEL (%u)\n", file, line, KeGetCurrentIrql());
     ASSERT(FALSE);
   }
 }
index 6660338..f8f8c31 100644 (file)
@@ -1316,7 +1316,7 @@ SeAssignSecurity(PSECURITY_DESCRIPTOR _ParentDescriptor OPTIONAL,
     Length = sizeof(SECURITY_DESCRIPTOR_RELATIVE) +
         OwnerLength + GroupLength + DaclLength + SaclLength;
 
-    DPRINT("L: sizeof(SECURITY_DESCRIPTOR) %d OwnerLength %d GroupLength %d DaclLength %d SaclLength %d\n",
+    DPRINT("L: sizeof(SECURITY_DESCRIPTOR) %u OwnerLength %lu GroupLength %lu DaclLength %lu SaclLength %lu\n",
            sizeof(SECURITY_DESCRIPTOR),
            OwnerLength,
            GroupLength,
@@ -1357,11 +1357,11 @@ SeAssignSecurity(PSECURITY_DESCRIPTOR _ParentDescriptor OPTIONAL,
         RtlCopyMemory((PUCHAR)Descriptor + Current, Owner, OwnerLength);
         Descriptor->Owner = Current;
         Current += OwnerLength;
-        DPRINT("Owner of %x at %x\n", Descriptor, Descriptor->Owner);
+        DPRINT("Owner of %p at %x\n", Descriptor, Descriptor->Owner);
     }
     else
     {
-        DPRINT("Owner of %x is zero length\n", Descriptor);
+        DPRINT("Owner of %p is zero length\n", Descriptor);
     }
 
     if (GroupLength != 0)
@@ -1375,7 +1375,7 @@ SeAssignSecurity(PSECURITY_DESCRIPTOR _ParentDescriptor OPTIONAL,
 
     *NewDescriptor = Descriptor;
 
-    DPRINT("Descrptor %x\n", Descriptor);
+    DPRINT("Descrptor %p\n", Descriptor);
     ASSERT(RtlLengthSecurityDescriptor(Descriptor));
 
     return STATUS_SUCCESS;
index eec1d48..8d6e350 100644 (file)
@@ -623,7 +623,7 @@ SepCreateToken(OUT PHANDLE TokenHandle,
                             (PVOID*)&AccessToken);
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("ObCreateObject() failed (Status %lx)\n");
+        DPRINT1("ObCreateObject() failed (Status %lx)\n", Status);
         return Status;
     }
 
index 85649e2..5f81b64 100644 (file)
@@ -22,7 +22,7 @@ NTAPI
 IoWMIRegistrationControl(IN PDEVICE_OBJECT DeviceObject,
                          IN ULONG Action)
 {
-    DPRINT1("IoWMIRegistrationControl() called for DO %p, requesting %d action, returning success\n",
+    DPRINT1("IoWMIRegistrationControl() called for DO %p, requesting %lu action, returning success\n",
         DeviceObject, Action);
 
     return STATUS_SUCCESS;