Author: cwittich Date: Wed Nov 21 20:08:21 2007 New Revision: 30637
URL: http://svn.reactos.org/svn/reactos?rev=30637&view=rev Log: fix some format strings
Modified: trunk/reactos/drivers/filesystems/ntfs/blockdev.c trunk/reactos/drivers/filesystems/ntfs/close.c trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/volinfo.c
Modified: trunk/reactos/drivers/filesystems/ntfs/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/bl... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/blockdev.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/blockdev.c Wed Nov 21 20:08:21 2007 @@ -60,7 +60,7 @@ Offset.QuadPart = (LONGLONG)DiskSector * (LONGLONG)SectorSize; BlockSize = SectorCount * SectorSize;
- DPRINT("NtfsReadSectors(DeviceObject %x, DiskSector %d, Buffer %x)\n", + DPRINT("NtfsReadSectors(DeviceObject %p, DiskSector %d, Buffer %p)\n", DeviceObject, DiskSector, Buffer); DPRINT("Offset %I64x BlockSize %ld\n", Offset.QuadPart, @@ -86,15 +86,15 @@ 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; }
@@ -143,7 +143,7 @@ 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); if (Status == STATUS_PENDING) {
Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/cl... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/close.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/close.c Wed Nov 21 20:08:21 2007 @@ -47,13 +47,13 @@ { PCCB Ccb;
- DPRINT("NtfsCloseFile(DeviceExt %x, FileObject %x)\n", + DPRINT("NtfsCloseFile(DeviceExt %p, FileObject %p)\n", DeviceExt, FileObject);
Ccb = (PCCB)(FileObject->FsContext2);
- DPRINT("Ccb %x\n", Ccb); + DPRINT("Ccb %p\n", Ccb); if (Ccb == NULL) { return(STATUS_SUCCESS);
Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/cr... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c Wed Nov 21 20:08:21 2007 @@ -89,7 +89,7 @@ NTSTATUS Status; PWSTR AbsFileName = NULL;
- DPRINT("NtfsOpenFile(%08lx, %08lx, %S)\n", DeviceExt, FileObject, FileName); + DPRINT("NtfsOpenFile(%p, %p, %S)\n", DeviceExt, FileObject, FileName);
if (FileObject->RelatedFileObject) {
Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/di... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c Wed Nov 21 20:08:21 2007 @@ -565,7 +565,7 @@ { Buffer = Irp->UserBuffer; } - DPRINT("Buffer=%x tofind=%S\n", Buffer, Ccb->DirectorySearchPattern); + DPRINT("Buffer=%p tofind=%S\n", Buffer, Ccb->DirectorySearchPattern); #if 0 TempFcb.ObjectName = TempFcb.PathName; while (Status == STATUS_SUCCESS && BufferLength > 0)
Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/fc... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c Wed Nov 21 20:08:21 2007 @@ -127,7 +127,7 @@ { KIRQL oldIrql;
- DPRINT("grabbing FCB at %x: %S, refCount:%d\n", + DPRINT("grabbing FCB at %p: %S, refCount:%d\n", Fcb, Fcb->PathName, Fcb->RefCount); @@ -144,7 +144,7 @@ { KIRQL oldIrql;
- DPRINT("releasing FCB at %x: %S, refCount:%d\n", + DPRINT("releasing FCB at %p: %S, refCount:%d\n", Fcb, Fcb->PathName, Fcb->RefCount); @@ -570,7 +570,7 @@ PFCB FCB; PFCB parentFCB;
- DPRINT("NtfsGetFCBForFile(%x, %x, %x, '%S')\n", + DPRINT("NtfsGetFCBForFile(%p, %p, %p, '%S')\n", Vcb, pParentFCB, pFCB, @@ -612,7 +612,7 @@ }
DPRINT("Parsing, currentElement:%S\n", currentElement); - DPRINT(" parentFCB:%x FCB:%x\n", parentFCB, FCB); + DPRINT(" parentFCB:%p FCB:%p\n", parentFCB, FCB);
/* Descend to next directory level */ if (parentFCB)
Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/nt... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c Wed Nov 21 20:08:21 2007 @@ -76,7 +76,7 @@ NtfsGlobalData->DeviceObject = DeviceObject;
/* Initialize driver data */ - DeviceObject->Flags = DO_DIRECT_IO; + DeviceObject->Flags |= DO_DIRECT_IO; DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsClose; DriverObject->MajorFunction[IRP_MJ_CREATE] = NtfsCreate; DriverObject->MajorFunction[IRP_MJ_READ] = NtfsRead;
Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/nt... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Wed Nov 21 20:08:21 2007 @@ -337,12 +337,14 @@
/* close.c */
+DRIVER_DISPATCH NtfsClose; NTSTATUS STDCALL NtfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp);
/* create.c */
+DRIVER_DISPATCH NtfsCreate; NTSTATUS STDCALL NtfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -350,6 +352,7 @@
/* dirctl.c */
+DRIVER_DISPATCH NtfsDirectoryControl; NTSTATUS STDCALL NtfsDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -408,6 +411,7 @@
/* finfo.c */
+DRIVER_DISPATCH NtfsQueryInformation; NTSTATUS STDCALL NtfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -415,6 +419,7 @@
/* fsctl.c */
+DRIVER_DISPATCH NtfsFileSystemControl; NTSTATUS STDCALL NtfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -501,10 +506,12 @@
/* rw.c */
+DRIVER_DISPATCH NtfsRead; NTSTATUS STDCALL NtfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+DRIVER_DISPATCH NtfsWrite; NTSTATUS STDCALL NtfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -512,10 +519,12 @@
/* volinfo.c */
+DRIVER_DISPATCH NtfsQueryVolumeInformation; NTSTATUS STDCALL NtfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+DRIVER_DISPATCH NtfsSetVolumeInformation; NTSTATUS STDCALL NtfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp);
Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/vo... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c Wed Nov 21 20:08:21 2007 @@ -183,7 +183,7 @@ SystemBuffer = Irp->AssociatedIrp.SystemBuffer;
DPRINT("FsInformationClass %d\n", FsInformationClass); - DPRINT("SystemBuffer %x\n", SystemBuffer); + DPRINT("SystemBuffer %p\n", SystemBuffer);
switch (FsInformationClass) {
-
cwittich＠svn.reactos.org