From 2ebb95a05737d14c85bd41273bf104441da6fe1a Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Wed, 21 Nov 2007 16:50:07 +0000 Subject: [PATCH] fix some format strings svn path=/trunk/; revision=30636 --- reactos/drivers/filesystems/vfat/blockdev.c | 31 +++++++++++---------- reactos/drivers/filesystems/vfat/cleanup.c | 4 +-- reactos/drivers/filesystems/vfat/close.c | 4 +-- reactos/drivers/filesystems/vfat/create.c | 4 +-- reactos/drivers/filesystems/vfat/dir.c | 2 +- reactos/drivers/filesystems/vfat/fat.c | 4 +-- reactos/drivers/filesystems/vfat/finfo.c | 6 ++-- reactos/drivers/filesystems/vfat/flush.c | 4 +-- reactos/drivers/filesystems/vfat/fsctl.c | 20 ++++++------- reactos/drivers/filesystems/vfat/misc.c | 12 ++++---- reactos/drivers/filesystems/vfat/rw.c | 8 +++--- reactos/drivers/filesystems/vfat/shutdown.c | 2 +- reactos/drivers/filesystems/vfat/vfat.h | 2 ++ reactos/drivers/filesystems/vfat/volume.c | 8 +++--- 14 files changed, 57 insertions(+), 54 deletions(-) diff --git a/reactos/drivers/filesystems/vfat/blockdev.c b/reactos/drivers/filesystems/vfat/blockdev.c index 33f17481106..cada3d81421 100644 --- a/reactos/drivers/filesystems/vfat/blockdev.c +++ b/reactos/drivers/filesystems/vfat/blockdev.c @@ -14,6 +14,7 @@ /* FUNCTIONS ***************************************************************/ +static IO_COMPLETION_ROUTINE VfatReadWritePartialCompletion; static NTSTATUS NTAPI VfatReadWritePartialCompletion (IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -66,7 +67,7 @@ VfatReadDisk (IN PDEVICE_OBJECT pDeviceObject, KeInitializeEvent (&event, NotificationEvent, FALSE); - DPRINT ("VfatReadDisk(pDeviceObject %x, Offset %I64x, Length %d, Buffer %x)\n", + DPRINT ("VfatReadDisk(pDeviceObject %p, Offset %I64x, Length %d, Buffer %p)\n", pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); DPRINT ("Building synchronous FSD Request...\n"); @@ -89,26 +90,26 @@ VfatReadDisk (IN PDEVICE_OBJECT pDeviceObject, Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; } - DPRINT ("Calling IO Driver... with irp %x\n", Irp); + DPRINT ("Calling IO Driver... with irp %p\n", Irp); Status = IoCallDriver (pDeviceObject, Irp); - DPRINT ("Waiting for IO Operation for %x\n", Irp); + DPRINT ("Waiting for IO Operation for %p\n", Irp); if (Status == STATUS_PENDING) { DPRINT ("Operation pending\n"); KeWaitForSingleObject (&event, Suspended, KernelMode, FALSE, NULL); - DPRINT ("Getting IO Status... for %x\n", Irp); + DPRINT ("Getting IO Status... for %p\n", Irp); Status = IoStatus.Status; } if (!NT_SUCCESS (Status)) { DPRINT ("IO failed!!! VfatReadDisk : Error code: %x\n", Status); - DPRINT ("(pDeviceObject %x, Offset %I64x, Size %d, Buffer %x\n", + DPRINT ("(pDeviceObject %p, Offset %I64x, Size %d, Buffer %p\n", pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); return (Status); } - DPRINT ("Block request succeeded for %x\n", Irp); + DPRINT ("Block request succeeded for %p\n", Irp); return (STATUS_SUCCESS); } @@ -124,7 +125,7 @@ VfatReadDiskPartial (IN PVFAT_IRP_CONTEXT IrpContext, NTSTATUS Status; PVOID Buffer; - DPRINT ("VfatReadDiskPartial(IrpContext %x, ReadOffset %I64x, ReadLength %d, BufferOffset %x, Wait %d)\n", + DPRINT ("VfatReadDiskPartial(IrpContext %p, ReadOffset %I64x, ReadLength %d, BufferOffset %x, Wait %d)\n", IrpContext, ReadOffset->QuadPart, ReadLength, BufferOffset, Wait); DPRINT ("Building asynchronous FSD Request...\n"); @@ -178,7 +179,7 @@ VfatReadDiskPartial (IN PVFAT_IRP_CONTEXT IrpContext, InterlockedIncrement((PLONG)&IrpContext->RefCount); } - DPRINT ("Calling IO Driver... with irp %x\n", Irp); + DPRINT ("Calling IO Driver... with irp %p\n", Irp); Status = IoCallDriver (IrpContext->DeviceExt->StorageDevice, Irp); if (Wait && Status == STATUS_PENDING) @@ -204,7 +205,7 @@ VfatWriteDiskPartial (IN PVFAT_IRP_CONTEXT IrpContext, NTSTATUS Status; PVOID Buffer; - DPRINT ("VfatWriteDiskPartial(IrpContext %x, WriteOffset %I64x, WriteLength %d, BufferOffset %x, Wait %d)\n", + DPRINT ("VfatWriteDiskPartial(IrpContext %p, WriteOffset %I64x, WriteLength %d, BufferOffset %x, Wait %d)\n", IrpContext, WriteOffset->QuadPart, WriteLength, BufferOffset, Wait); Buffer = (PCHAR)MmGetMdlVirtualAddress(IrpContext->Irp->MdlAddress) + BufferOffset; @@ -283,9 +284,9 @@ VfatBlockDeviceIoControl (IN PDEVICE_OBJECT DeviceObject, IO_STATUS_BLOCK IoStatus; NTSTATUS Status; - DPRINT("VfatBlockDeviceIoControl(DeviceObject %x, CtlCode %x, " - "InputBuffer %x, InputBufferSize %x, OutputBuffer %x, " - "OutputBufferSize %x (%x)\n", DeviceObject, CtlCode, + DPRINT("VfatBlockDeviceIoControl(DeviceObject %p, CtlCode %x, " + "InputBuffer %p, InputBufferSize %x, OutputBuffer %p, " + "OutputBufferSize %p (%x)\n", DeviceObject, CtlCode, InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize, OutputBufferSize ? *OutputBufferSize : 0); @@ -313,15 +314,15 @@ VfatBlockDeviceIoControl (IN PDEVICE_OBJECT DeviceObject, Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; } - DPRINT ("Calling IO Driver... with irp %x\n", Irp); + DPRINT ("Calling IO Driver... with irp %p\n", Irp); Status = IoCallDriver(DeviceObject, Irp); - DPRINT ("Waiting for IO Operation for %x\n", Irp); + DPRINT ("Waiting for IO Operation for %p\n", Irp); if (Status == STATUS_PENDING) { DPRINT ("Operation pending\n"); KeWaitForSingleObject (&Event, Suspended, KernelMode, FALSE, NULL); - DPRINT ("Getting IO Status... for %x\n", Irp); + DPRINT ("Getting IO Status... for %p\n", Irp); Status = IoStatus.Status; } diff --git a/reactos/drivers/filesystems/vfat/cleanup.c b/reactos/drivers/filesystems/vfat/cleanup.c index 655f5c40391..4c9815c7426 100644 --- a/reactos/drivers/filesystems/vfat/cleanup.c +++ b/reactos/drivers/filesystems/vfat/cleanup.c @@ -22,7 +22,7 @@ VfatCleanupFile(PVFAT_IRP_CONTEXT IrpContext) PVFATFCB pFcb; PFILE_OBJECT FileObject = IrpContext->FileObject; - DPRINT("VfatCleanupFile(DeviceExt %x, FileObject %x)\n", + DPRINT("VfatCleanupFile(DeviceExt %p, FileObject %p)\n", IrpContext->DeviceExt, FileObject); /* FIXME: handle file/directory deletion here */ @@ -122,7 +122,7 @@ NTSTATUS VfatCleanup (PVFAT_IRP_CONTEXT IrpContext) { NTSTATUS Status; - DPRINT("VfatCleanup(DeviceObject %x, Irp %x)\n", IrpContext->DeviceObject, IrpContext->Irp); + DPRINT("VfatCleanup(DeviceObject %p, Irp %p)\n", IrpContext->DeviceObject, IrpContext->Irp); if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { diff --git a/reactos/drivers/filesystems/vfat/close.c b/reactos/drivers/filesystems/vfat/close.c index b7d2a18a547..61c4707a300 100644 --- a/reactos/drivers/filesystems/vfat/close.c +++ b/reactos/drivers/filesystems/vfat/close.c @@ -23,7 +23,7 @@ VfatCloseFile (PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject) PVFATCCB pCcb; NTSTATUS Status = STATUS_SUCCESS; - DPRINT ("VfatCloseFile(DeviceExt %x, FileObject %x)\n", + DPRINT ("VfatCloseFile(DeviceExt %p, FileObject %p)\n", DeviceExt, FileObject); /* FIXME : update entry in directory? */ @@ -76,7 +76,7 @@ NTSTATUS VfatClose (PVFAT_IRP_CONTEXT IrpContext) { NTSTATUS Status; - DPRINT ("VfatClose(DeviceObject %x, Irp %x)\n", IrpContext->DeviceObject, IrpContext->Irp); + DPRINT ("VfatClose(DeviceObject %p, Irp %p)\n", IrpContext->DeviceObject, IrpContext->Irp); if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { diff --git a/reactos/drivers/filesystems/vfat/create.c b/reactos/drivers/filesystems/vfat/create.c index 1e147ee3302..36b0d03e4ed 100644 --- a/reactos/drivers/filesystems/vfat/create.c +++ b/reactos/drivers/filesystems/vfat/create.c @@ -196,7 +196,7 @@ FindFile ( UNICODE_STRING FileToFindUpcase; BOOLEAN WildCard; - DPRINT ("FindFile(Parent %x, FileToFind '%wZ', DirIndex: %d)\n", + DPRINT ("FindFile(Parent %p, FileToFind '%wZ', DirIndex: %d)\n", Parent, FileToFindU, DirContext->DirIndex); DPRINT ("FindFile: Path %wZ)\n",&Parent->PathNameU); @@ -350,7 +350,7 @@ VfatOpenFile ( PVFATFCB Fcb; NTSTATUS Status; - DPRINT ("VfatOpenFile(%08lx, '%wZ', %08lx, %08lx)\n", DeviceExt, PathNameU, FileObject, ParentFcb); + DPRINT ("VfatOpenFile(%p, '%wZ', %p, %p)\n", DeviceExt, PathNameU, FileObject, ParentFcb); if (FileObject->RelatedFileObject) { diff --git a/reactos/drivers/filesystems/vfat/dir.c b/reactos/drivers/filesystems/vfat/dir.c index 34679fee37d..674ba56f4f3 100644 --- a/reactos/drivers/filesystems/vfat/dir.c +++ b/reactos/drivers/filesystems/vfat/dir.c @@ -389,7 +389,7 @@ static NTSTATUS DoQuery (PVFAT_IRP_CONTEXT IrpContext) DirContext.DirIndex = pCcb->Entry; } - DPRINT ("Buffer=%x tofind=%wZ\n", Buffer, &pCcb->SearchPattern); + DPRINT ("Buffer=%p tofind=%wZ\n", Buffer, &pCcb->SearchPattern); DirContext.LongNameU.Buffer = LongNameBuffer; DirContext.LongNameU.MaximumLength = sizeof(LongNameBuffer); diff --git a/reactos/drivers/filesystems/vfat/fat.c b/reactos/drivers/filesystems/vfat/fat.c index f7f8b457cf9..4f64508c4f8 100644 --- a/reactos/drivers/filesystems/vfat/fat.c +++ b/reactos/drivers/filesystems/vfat/fat.c @@ -626,7 +626,7 @@ GetNextCluster(PDEVICE_EXTENSION DeviceExt, { NTSTATUS Status; - DPRINT ("GetNextCluster(DeviceExt %x, CurrentCluster %x)\n", + DPRINT ("GetNextCluster(DeviceExt %p, CurrentCluster %x)\n", DeviceExt, CurrentCluster); if (CurrentCluster == 0) @@ -649,7 +649,7 @@ GetNextClusterExtend(PDEVICE_EXTENSION DeviceExt, { NTSTATUS Status; - DPRINT ("GetNextClusterExtend(DeviceExt %x, CurrentCluster %x)\n", + DPRINT ("GetNextClusterExtend(DeviceExt %p, CurrentCluster %x)\n", DeviceExt, CurrentCluster); ExAcquireResourceExclusiveLite(&DeviceExt->FatResource, TRUE); diff --git a/reactos/drivers/filesystems/vfat/finfo.c b/reactos/drivers/filesystems/vfat/finfo.c index 1626a597680..e4db4b7c0d0 100644 --- a/reactos/drivers/filesystems/vfat/finfo.c +++ b/reactos/drivers/filesystems/vfat/finfo.c @@ -104,7 +104,7 @@ VfatSetPositionInformation(PFILE_OBJECT FileObject, { DPRINT ("FsdSetPositionInformation()\n"); - DPRINT ("PositionInfo %x\n", PositionInfo); + DPRINT ("PositionInfo %p\n", PositionInfo); DPRINT ("Setting position %d\n", PositionInfo->CurrentByteOffset.u.LowPart); FileObject->CurrentByteOffset.QuadPart = @@ -868,7 +868,7 @@ NTSTATUS VfatSetInformation(PVFAT_IRP_CONTEXT IrpContext) /* PRECONDITION */ ASSERT(IrpContext); - DPRINT("VfatSetInformation(IrpContext %x)\n", IrpContext); + DPRINT("VfatSetInformation(IrpContext %p)\n", IrpContext); /* INITIALIZATION */ FileInformationClass = @@ -880,7 +880,7 @@ NTSTATUS VfatSetInformation(PVFAT_IRP_CONTEXT IrpContext) FileInformationClass >= FileMaximumInformation - 1 ? "????" : FileInformationClassNames[ FileInformationClass]); DPRINT("FileInformationClass %d\n", FileInformationClass); - DPRINT("SystemBuffer %x\n", SystemBuffer); + DPRINT("SystemBuffer %p\n", SystemBuffer); if (!(FCB->Flags & FCB_IS_PAGE_FILE)) { diff --git a/reactos/drivers/filesystems/vfat/flush.c b/reactos/drivers/filesystems/vfat/flush.c index ae6547bbacf..76a3c5d2cbc 100644 --- a/reactos/drivers/filesystems/vfat/flush.c +++ b/reactos/drivers/filesystems/vfat/flush.c @@ -18,7 +18,7 @@ static NTSTATUS VfatFlushFile(PDEVICE_EXTENSION DeviceExt, PVFATFCB Fcb) IO_STATUS_BLOCK IoStatus; NTSTATUS Status; - DPRINT("VfatFlushFile(DeviceExt %x, Fcb %x) for '%wZ'\n", DeviceExt, Fcb, &Fcb->PathNameU); + DPRINT("VfatFlushFile(DeviceExt %p, Fcb %p) for '%wZ'\n", DeviceExt, Fcb, &Fcb->PathNameU); CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, &IoStatus); if (IoStatus.Status == STATUS_INVALID_PARAMETER) @@ -43,7 +43,7 @@ NTSTATUS VfatFlushVolume(PDEVICE_EXTENSION DeviceExt, PVFATFCB VolumeFcb) PVFATFCB Fcb; NTSTATUS Status, ReturnStatus = STATUS_SUCCESS; - DPRINT("VfatFlushVolume(DeviceExt %x, FatFcb %x)\n", DeviceExt, VolumeFcb); + DPRINT("VfatFlushVolume(DeviceExt %p, FatFcb %p)\n", DeviceExt, VolumeFcb); ListEntry = DeviceExt->FcbListHead.Flink; while (ListEntry != &DeviceExt->FcbListHead) diff --git a/reactos/drivers/filesystems/vfat/fsctl.c b/reactos/drivers/filesystems/vfat/fsctl.c index 587c25dd18c..1684175646e 100644 --- a/reactos/drivers/filesystems/vfat/fsctl.c +++ b/reactos/drivers/filesystems/vfat/fsctl.c @@ -379,7 +379,7 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext) ULONG eocMark; FATINFO FatInfo; - DPRINT("VfatMount(IrpContext %x)\n", IrpContext); + DPRINT("VfatMount(IrpContext %p)\n", IrpContext); ASSERT(IrpContext); @@ -504,7 +504,7 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext) DeviceObject->StackSize = DeviceExt->StorageDevice->StackSize + 1; DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - DPRINT("FsDeviceObject %lx\n", DeviceObject); + DPRINT("FsDeviceObject %p\n", DeviceObject); DeviceExt->FATFileObject = IoCreateStreamFileObject(NULL, DeviceExt->StorageDevice); Fcb = vfatNewFCB(DeviceExt, &NameU); @@ -631,7 +631,7 @@ VfatVerify (PVFAT_IRP_CONTEXT IrpContext) BOOLEAN RecognizedFS; PDEVICE_EXTENSION DeviceExt = IrpContext->DeviceExt; - DPRINT("VfatVerify(IrpContext %x)\n", IrpContext); + DPRINT("VfatVerify(IrpContext %p)\n", IrpContext); DeviceToVerify = IrpContext->Stack->Parameters.VerifyVolume.DeviceObject; Status = VfatBlockDeviceIoControl(DeviceToVerify, @@ -677,7 +677,7 @@ VfatVerify (PVFAT_IRP_CONTEXT IrpContext) static NTSTATUS VfatGetVolumeBitmap(PVFAT_IRP_CONTEXT IrpContext) { - DPRINT("VfatGetVolumeBitmap (IrpContext %x)\n", IrpContext); + DPRINT("VfatGetVolumeBitmap (IrpContext %p)\n", IrpContext); return STATUS_INVALID_DEVICE_REQUEST; } @@ -698,7 +698,7 @@ VfatGetRetrievalPointers(PVFAT_IRP_CONTEXT IrpContext) ULONG LastCluster; NTSTATUS Status; - DPRINT("VfatGetRetrievalPointers(IrpContext %x)\n", IrpContext); + DPRINT("VfatGetRetrievalPointers(IrpContext %p)\n", IrpContext); DeviceExt = IrpContext->DeviceExt; FileObject = IrpContext->FileObject; @@ -779,7 +779,7 @@ ByeBye: static NTSTATUS VfatMoveFile(PVFAT_IRP_CONTEXT IrpContext) { - DPRINT("VfatMoveFile(IrpContext %x)\n", IrpContext); + DPRINT("VfatMoveFile(IrpContext %p)\n", IrpContext); return STATUS_INVALID_DEVICE_REQUEST; } @@ -792,7 +792,7 @@ VfatRosQueryLcnMapping(PVFAT_IRP_CONTEXT IrpContext) PROS_QUERY_LCN_MAPPING LcnQuery; PIO_STACK_LOCATION Stack; - DPRINT("VfatRosQueryLcnMapping(IrpContext %x)\n", IrpContext); + DPRINT("VfatRosQueryLcnMapping(IrpContext %p)\n", IrpContext); DeviceExt = IrpContext->DeviceExt; Stack = IrpContext->Stack; @@ -813,7 +813,7 @@ VfatIsVolumeDirty(PVFAT_IRP_CONTEXT IrpContext) { PULONG Flags; - DPRINT("VfatIsVolumeDirty(IrpContext %x)\n", IrpContext); + DPRINT("VfatIsVolumeDirty(IrpContext %p)\n", IrpContext); if (IrpContext->Stack->Parameters.FileSystemControl.OutputBufferLength != sizeof(ULONG)) return STATUS_INVALID_BUFFER_SIZE; @@ -839,7 +839,7 @@ VfatMarkVolumeDirty(PVFAT_IRP_CONTEXT IrpContext) PDEVICE_EXTENSION DeviceExt; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("VfatMarkVolumeDirty(IrpContext %x)\n", IrpContext); + DPRINT("VfatMarkVolumeDirty(IrpContext %p)\n", IrpContext); DeviceExt = IrpContext->DeviceExt; if (!(DeviceExt->VolumeFcb->Flags & VCB_IS_DIRTY)) @@ -866,7 +866,7 @@ NTSTATUS VfatFileSystemControl(PVFAT_IRP_CONTEXT IrpContext) NTSTATUS Status; - DPRINT("VfatFileSystemControl(IrpContext %x)\n", IrpContext); + DPRINT("VfatFileSystemControl(IrpContext %p)\n", IrpContext); ASSERT(IrpContext); ASSERT(IrpContext->Irp); diff --git a/reactos/drivers/filesystems/vfat/misc.c b/reactos/drivers/filesystems/vfat/misc.c index b1f61ae97c2..29db0d9b5af 100644 --- a/reactos/drivers/filesystems/vfat/misc.c +++ b/reactos/drivers/filesystems/vfat/misc.c @@ -58,7 +58,7 @@ static NTSTATUS VfatLockControl( PVFATFCB Fcb; NTSTATUS Status; - DPRINT("VfatLockControl(IrpContext %x)\n", IrpContext); + DPRINT("VfatLockControl(IrpContext %p)\n", IrpContext); ASSERT(IrpContext); @@ -94,7 +94,7 @@ Fail:; static NTSTATUS VfatDispatchRequest (IN PVFAT_IRP_CONTEXT IrpContext) { - DPRINT ("VfatDispatchRequest (IrpContext %x), is called for %s\n", IrpContext, + DPRINT ("VfatDispatchRequest (IrpContext %p), is called for %s\n", IrpContext, IrpContext->MajorFunction >= IRP_MJ_MAXIMUM_FUNCTION ? "????" : MajorFunctionNames[IrpContext->MajorFunction]); ASSERT(IrpContext); @@ -144,7 +144,7 @@ NTSTATUS NTAPI VfatBuildRequest ( PVFAT_IRP_CONTEXT IrpContext; KIRQL Irql; - DPRINT ("VfatBuildRequest (DeviceObject %x, Irp %x)\n", DeviceObject, Irp); + DPRINT ("VfatBuildRequest (DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(DeviceObject); ASSERT(Irp); @@ -188,7 +188,7 @@ PVFAT_IRP_CONTEXT VfatAllocateIrpContext(PDEVICE_OBJECT DeviceObject, PIRP Irp) PVFAT_IRP_CONTEXT IrpContext; /*PIO_STACK_LOCATION Stack;*/ UCHAR MajorFunction; - DPRINT ("VfatAllocateIrpContext(DeviceObject %x, Irp %x)\n", DeviceObject, Irp); + DPRINT ("VfatAllocateIrpContext(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(DeviceObject); ASSERT(Irp); @@ -227,7 +227,7 @@ PVFAT_IRP_CONTEXT VfatAllocateIrpContext(PDEVICE_OBJECT DeviceObject, PIRP Irp) static VOID NTAPI VfatDoRequest (PVOID IrpContext) { InterlockedDecrement(&QueueCount); - DPRINT ("VfatDoRequest (IrpContext %x), MajorFunction %x, %d\n", IrpContext, ((PVFAT_IRP_CONTEXT)IrpContext)->MajorFunction, QueueCount); + DPRINT ("VfatDoRequest (IrpContext %p), MajorFunction %x, %d\n", IrpContext, ((PVFAT_IRP_CONTEXT)IrpContext)->MajorFunction, QueueCount); FsRtlEnterFileSystem(); VfatDispatchRequest((PVFAT_IRP_CONTEXT)IrpContext); FsRtlExitFileSystem(); @@ -237,7 +237,7 @@ static VOID NTAPI VfatDoRequest (PVOID IrpContext) NTSTATUS VfatQueueRequest(PVFAT_IRP_CONTEXT IrpContext) { InterlockedIncrement(&QueueCount); - DPRINT ("VfatQueueRequest (IrpContext %x), %d\n", IrpContext, QueueCount); + DPRINT ("VfatQueueRequest (IrpContext %p), %d\n", IrpContext, QueueCount); ASSERT(IrpContext != NULL); ASSERT(IrpContext->Irp != NULL); diff --git a/reactos/drivers/filesystems/vfat/rw.c b/reactos/drivers/filesystems/vfat/rw.c index 54b2d2bbb96..0f806fe108b 100644 --- a/reactos/drivers/filesystems/vfat/rw.c +++ b/reactos/drivers/filesystems/vfat/rw.c @@ -139,7 +139,7 @@ VfatReadFileData (PVFAT_IRP_CONTEXT IrpContext, ASSERT(IrpContext->FileObject); ASSERT(IrpContext->FileObject->FsContext2 != NULL); - DPRINT("VfatReadFileData(DeviceExt %x, FileObject %x, " + DPRINT("VfatReadFileData(DeviceExt %p, FileObject %p, " "Length %d, ReadOffset 0x%I64x)\n", DeviceExt, IrpContext->FileObject, Length, ReadOffset.QuadPart); @@ -358,7 +358,7 @@ VfatWriteFileData(PVFAT_IRP_CONTEXT IrpContext, BytesPerCluster = DeviceExt->FatInfo.BytesPerCluster; BytesPerSector = DeviceExt->FatInfo.BytesPerSector; - DPRINT("VfatWriteFileData(DeviceExt %x, FileObject %x, " + DPRINT("VfatWriteFileData(DeviceExt %p, FileObject %p, " "Length %d, WriteOffset 0x%I64x), '%wZ'\n", DeviceExt, IrpContext->FileObject, Length, WriteOffset, &Fcb->PathNameU); @@ -547,7 +547,7 @@ VfatRead(PVFAT_IRP_CONTEXT IrpContext) ASSERT(IrpContext); - DPRINT("VfatRead(IrpContext %x)\n", IrpContext); + DPRINT("VfatRead(IrpContext %p)\n", IrpContext); ASSERT(IrpContext->DeviceObject); @@ -789,7 +789,7 @@ NTSTATUS VfatWrite (PVFAT_IRP_CONTEXT IrpContext) ASSERT(IrpContext); - DPRINT("VfatWrite(IrpContext %x)\n", IrpContext); + DPRINT("VfatWrite(IrpContext %p)\n", IrpContext); ASSERT(IrpContext->DeviceObject); diff --git a/reactos/drivers/filesystems/vfat/shutdown.c b/reactos/drivers/filesystems/vfat/shutdown.c index 1eb372be541..0c08dbd40bf 100644 --- a/reactos/drivers/filesystems/vfat/shutdown.c +++ b/reactos/drivers/filesystems/vfat/shutdown.c @@ -49,7 +49,7 @@ VfatShutdown(PDEVICE_OBJECT DeviceObject, PIRP Irp) PDEVICE_EXTENSION DeviceExt; ULONG eocMark; - DPRINT("VfatShutdown(DeviceObject %x, Irp %x)\n",DeviceObject, Irp); + DPRINT("VfatShutdown(DeviceObject %p, Irp %p)\n",DeviceObject, Irp); /* FIXME: block new mount requests */ diff --git a/reactos/drivers/filesystems/vfat/vfat.h b/reactos/drivers/filesystems/vfat/vfat.h index 52c9dd26784..40a69f8ceb8 100644 --- a/reactos/drivers/filesystems/vfat/vfat.h +++ b/reactos/drivers/filesystems/vfat/vfat.h @@ -463,6 +463,7 @@ typedef struct _VFAT_DIRENTRY_CONTEXT /* ------------------------------------------------------ shutdown.c */ +DRIVER_DISPATCH VfatShutdown; NTSTATUS NTAPI VfatShutdown (PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -762,6 +763,7 @@ PVFAT_IRP_CONTEXT VfatAllocateIrpContext(PDEVICE_OBJECT DeviceObject, VOID VfatFreeIrpContext(PVFAT_IRP_CONTEXT IrpContext); +DRIVER_DISPATCH VfatBuildRequest; NTSTATUS NTAPI VfatBuildRequest (PDEVICE_OBJECT DeviceObject, PIRP Irp); diff --git a/reactos/drivers/filesystems/vfat/volume.c b/reactos/drivers/filesystems/vfat/volume.c index 55bf079bc66..89f2f66b735 100644 --- a/reactos/drivers/filesystems/vfat/volume.c +++ b/reactos/drivers/filesystems/vfat/volume.c @@ -306,7 +306,7 @@ NTSTATUS VfatQueryVolumeInformation(PVFAT_IRP_CONTEXT IrpContext) /* PRECONDITION */ ASSERT(IrpContext); - DPRINT("VfatQueryVolumeInformation(IrpContext %x)\n", IrpContext); + DPRINT("VfatQueryVolumeInformation(IrpContext %p)\n", IrpContext); if (!ExAcquireResourceSharedLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) @@ -321,7 +321,7 @@ NTSTATUS VfatQueryVolumeInformation(PVFAT_IRP_CONTEXT IrpContext) DPRINT ("FsInformationClass %d\n", FsInformationClass); - DPRINT ("SystemBuffer %x\n", SystemBuffer); + DPRINT ("SystemBuffer %p\n", SystemBuffer); switch (FsInformationClass) { @@ -380,7 +380,7 @@ NTSTATUS VfatSetVolumeInformation(PVFAT_IRP_CONTEXT IrpContext) /* PRECONDITION */ ASSERT(IrpContext); - DPRINT ("VfatSetVolumeInformation(IrpContext %x)\n", IrpContext); + DPRINT ("VfatSetVolumeInformation(IrpContext %p)\n", IrpContext); if (!ExAcquireResourceExclusiveLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) @@ -394,7 +394,7 @@ NTSTATUS VfatSetVolumeInformation(PVFAT_IRP_CONTEXT IrpContext) DPRINT ("FsInformationClass %d\n", FsInformationClass); DPRINT ("BufferLength %d\n", BufferLength); - DPRINT ("SystemBuffer %x\n", SystemBuffer); + DPRINT ("SystemBuffer %p\n", SystemBuffer); switch(FsInformationClass) {