Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some format strings

Browse source 
svn path=/trunk/; revision=30637
This commit is contained in:
Christoph von Wittich 2007-11-21 17:08:21 +00:00
parent 2ebb95a057
commit e7df482753
8 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/drivers/filesystems/ntfs/blockdev.c
View file

@ -60,7 +60,7 @@ NtfsReadSectors(IN PDEVICE_OBJECT DeviceObject,
Offset.QuadPart = (LONGLONG)DiskSector * (LONGLONG)SectorSize; Offset.QuadPart = (LONGLONG)DiskSector * (LONGLONG)SectorSize;
BlockSize = SectorCount * 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); DeviceObject, DiskSector, Buffer);
DPRINT("Offset %I64x BlockSize %ld\n", DPRINT("Offset %I64x BlockSize %ld\n",
Offset.QuadPart, Offset.QuadPart,
@ -86,15 +86,15 @@ NtfsReadSectors(IN PDEVICE_OBJECT DeviceObject,
Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; 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); 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) if (Status == STATUS_PENDING)
{ {
DPRINT("Operation pending\n"); DPRINT("Operation pending\n");
KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL);
DPRINT("Getting IO Status... for %x\n", Irp); DPRINT("Getting IO Status... for %p\n", Irp);
Status = IoStatus.Status; Status = IoStatus.Status;
} }
@ -143,7 +143,7 @@ NtfsDeviceIoControl(IN PDEVICE_OBJECT DeviceObject,
Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; 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); Status = IoCallDriver(DeviceObject, Irp);
if (Status == STATUS_PENDING) if (Status == STATUS_PENDING)
{ {

4
reactos/drivers/filesystems/ntfs/close.c
View file

@ -47,13 +47,13 @@ NtfsCloseFile(PDEVICE_EXTENSION DeviceExt,
{ {
PCCB Ccb; PCCB Ccb;
DPRINT("NtfsCloseFile(DeviceExt %x, FileObject %x)\n", DPRINT("NtfsCloseFile(DeviceExt %p, FileObject %p)\n",
DeviceExt, DeviceExt,
FileObject); FileObject);
Ccb = (PCCB)(FileObject->FsContext2); Ccb = (PCCB)(FileObject->FsContext2);
DPRINT("Ccb %x\n", Ccb); DPRINT("Ccb %p\n", Ccb);
if (Ccb == NULL) if (Ccb == NULL)
{ {
return(STATUS_SUCCESS); return(STATUS_SUCCESS);

2
reactos/drivers/filesystems/ntfs/create.c
View file

@ -89,7 +89,7 @@ NtfsOpenFile(PDEVICE_EXTENSION DeviceExt,
NTSTATUS Status; NTSTATUS Status;
PWSTR AbsFileName = NULL; PWSTR AbsFileName = NULL;
DPRINT("NtfsOpenFile(%08lx, %08lx, %S)\n", DeviceExt, FileObject, FileName); DPRINT("NtfsOpenFile(%p, %p, %S)\n", DeviceExt, FileObject, FileName);
if (FileObject->RelatedFileObject) if (FileObject->RelatedFileObject)
{ {

2
reactos/drivers/filesystems/ntfs/dirctl.c
View file

@ -565,7 +565,7 @@ NtfsQueryDirectory(PDEVICE_OBJECT DeviceObject,
{ {
Buffer = Irp->UserBuffer; Buffer = Irp->UserBuffer;
} }
DPRINT("Buffer=%x tofind=%S\n", Buffer, Ccb->DirectorySearchPattern); DPRINT("Buffer=%p tofind=%S\n", Buffer, Ccb->DirectorySearchPattern);
#if 0 #if 0
TempFcb.ObjectName = TempFcb.PathName; TempFcb.ObjectName = TempFcb.PathName;
while (Status == STATUS_SUCCESS && BufferLength > 0) while (Status == STATUS_SUCCESS && BufferLength > 0)

8
reactos/drivers/filesystems/ntfs/fcb.c
View file

@ -127,7 +127,7 @@ NtfsGrabFCB(PDEVICE_EXTENSION Vcb,
{ {
KIRQL oldIrql; KIRQL oldIrql;
DPRINT("grabbing FCB at %x: %S, refCount:%d\n", DPRINT("grabbing FCB at %p: %S, refCount:%d\n",
Fcb, Fcb,
Fcb->PathName, Fcb->PathName,
Fcb->RefCount); Fcb->RefCount);
@ -144,7 +144,7 @@ NtfsReleaseFCB(PDEVICE_EXTENSION Vcb,
{ {
KIRQL oldIrql; KIRQL oldIrql;
DPRINT("releasing FCB at %x: %S, refCount:%d\n", DPRINT("releasing FCB at %p: %S, refCount:%d\n",
Fcb, Fcb,
Fcb->PathName, Fcb->PathName,
Fcb->RefCount); Fcb->RefCount);
@ -570,7 +570,7 @@ NtfsGetFCBForFile(PDEVICE_EXTENSION Vcb,
PFCB FCB; PFCB FCB;
PFCB parentFCB; PFCB parentFCB;
DPRINT("NtfsGetFCBForFile(%x, %x, %x, '%S')\n", DPRINT("NtfsGetFCBForFile(%p, %p, %p, '%S')\n",
Vcb, Vcb,
pParentFCB, pParentFCB,
pFCB, pFCB,
@ -612,7 +612,7 @@ NtfsGetFCBForFile(PDEVICE_EXTENSION Vcb,
} }
DPRINT("Parsing, currentElement:%S\n", currentElement); 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 */ /* Descend to next directory level */
if (parentFCB) if (parentFCB)

2
reactos/drivers/filesystems/ntfs/ntfs.c
View file

@ -76,7 +76,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
NtfsGlobalData->DeviceObject = DeviceObject; NtfsGlobalData->DeviceObject = DeviceObject;
/* Initialize driver data */ /* Initialize driver data */
DeviceObject->Flags = DO_DIRECT_IO; DeviceObject->Flags |= DO_DIRECT_IO;
DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsClose;
DriverObject->MajorFunction[IRP_MJ_CREATE] = NtfsCreate; DriverObject->MajorFunction[IRP_MJ_CREATE] = NtfsCreate;
DriverObject->MajorFunction[IRP_MJ_READ] = NtfsRead; DriverObject->MajorFunction[IRP_MJ_READ] = NtfsRead;

9
reactos/drivers/filesystems/ntfs/ntfs.h
View file

@ -337,12 +337,14 @@ NtfsDeviceIoControl(IN PDEVICE_OBJECT DeviceObject,
/* close.c */ /* close.c */
DRIVER_DISPATCH NtfsClose;
NTSTATUS STDCALL NTSTATUS STDCALL
NtfsClose(PDEVICE_OBJECT DeviceObject, NtfsClose(PDEVICE_OBJECT DeviceObject,
PIRP Irp); PIRP Irp);
/* create.c */ /* create.c */
DRIVER_DISPATCH NtfsCreate;
NTSTATUS STDCALL NTSTATUS STDCALL
NtfsCreate(PDEVICE_OBJECT DeviceObject, NtfsCreate(PDEVICE_OBJECT DeviceObject,
PIRP Irp); PIRP Irp);
@ -350,6 +352,7 @@ NtfsCreate(PDEVICE_OBJECT DeviceObject,
/* dirctl.c */ /* dirctl.c */
DRIVER_DISPATCH NtfsDirectoryControl;
NTSTATUS STDCALL NTSTATUS STDCALL
NtfsDirectoryControl(PDEVICE_OBJECT DeviceObject, NtfsDirectoryControl(PDEVICE_OBJECT DeviceObject,
PIRP Irp); PIRP Irp);
@ -408,6 +411,7 @@ NtfsGetFCBForFile(PDEVICE_EXTENSION Vcb,
/* finfo.c */ /* finfo.c */
DRIVER_DISPATCH NtfsQueryInformation;
NTSTATUS STDCALL NTSTATUS STDCALL
NtfsQueryInformation(PDEVICE_OBJECT DeviceObject, NtfsQueryInformation(PDEVICE_OBJECT DeviceObject,
PIRP Irp); PIRP Irp);
@ -415,6 +419,7 @@ NtfsQueryInformation(PDEVICE_OBJECT DeviceObject,
/* fsctl.c */ /* fsctl.c */
DRIVER_DISPATCH NtfsFileSystemControl;
NTSTATUS STDCALL NTSTATUS STDCALL
NtfsFileSystemControl(PDEVICE_OBJECT DeviceObject, NtfsFileSystemControl(PDEVICE_OBJECT DeviceObject,
PIRP Irp); PIRP Irp);
@ -501,10 +506,12 @@ CdfsFileFlagsToAttributes(PFCB Fcb,
/* rw.c */ /* rw.c */
DRIVER_DISPATCH NtfsRead;
NTSTATUS STDCALL NTSTATUS STDCALL
NtfsRead(PDEVICE_OBJECT DeviceObject, NtfsRead(PDEVICE_OBJECT DeviceObject,
PIRP Irp); PIRP Irp);
DRIVER_DISPATCH NtfsWrite;
NTSTATUS STDCALL NTSTATUS STDCALL
NtfsWrite(PDEVICE_OBJECT DeviceObject, NtfsWrite(PDEVICE_OBJECT DeviceObject,
PIRP Irp); PIRP Irp);
@ -512,10 +519,12 @@ NtfsWrite(PDEVICE_OBJECT DeviceObject,
/* volinfo.c */ /* volinfo.c */
DRIVER_DISPATCH NtfsQueryVolumeInformation;
NTSTATUS STDCALL NTSTATUS STDCALL
NtfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, NtfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject,
PIRP Irp); PIRP Irp);
DRIVER_DISPATCH NtfsSetVolumeInformation;
NTSTATUS STDCALL NTSTATUS STDCALL
NtfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject, NtfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject,
PIRP Irp); PIRP Irp);

2
reactos/drivers/filesystems/ntfs/volinfo.c
View file

@ -183,7 +183,7 @@ NtfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject,
SystemBuffer = Irp->AssociatedIrp.SystemBuffer; SystemBuffer = Irp->AssociatedIrp.SystemBuffer;
DPRINT("FsInformationClass %d\n", FsInformationClass); DPRINT("FsInformationClass %d\n", FsInformationClass);
DPRINT("SystemBuffer %x\n", SystemBuffer); DPRINT("SystemBuffer %p\n", SystemBuffer);
switch (FsInformationClass) switch (FsInformationClass)
{ {