From: Victor Perevertkin Date: Sat, 15 Jun 2019 16:24:27 +0000 (+0300) Subject: [NTFS] Do not print debug message for every function call by default X-Git-Tag: 0.4.14-dev~776 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=155243494059037a5cccd3b1c57f0b77ca897c95 [NTFS] Do not print debug message for every function call by default --- diff --git a/drivers/filesystems/ntfs/btree.c b/drivers/filesystems/ntfs/btree.c index a702e25b335..2e772dd03c1 100644 --- a/drivers/filesystems/ntfs/btree.c +++ b/drivers/filesystems/ntfs/btree.c @@ -694,7 +694,7 @@ CreateBTreeFromIndex(PDEVICE_EXTENSION Vcb, PNTFS_ATTR_CONTEXT IndexAllocationContext = NULL; NTSTATUS Status; - DPRINT1("CreateBTreeFromIndex(%p, %p)\n", IndexRoot, NewTree); + DPRINT("CreateBTreeFromIndex(%p, %p)\n", IndexRoot, NewTree); if (!Tree || !RootNode || !CurrentKey) { @@ -920,7 +920,7 @@ CreateIndexRootFromBTree(PDEVICE_EXTENSION DeviceExt, DeviceExt->NtfsInfo.BytesPerFileRecord, TAG_NTFS); - DPRINT1("CreateIndexRootFromBTree(%p, %p, 0x%lx, %p, %p)\n", DeviceExt, Tree, MaxIndexSize, IndexRoot, Length); + DPRINT("CreateIndexRootFromBTree(%p, %p, 0x%lx, %p, %p)\n", DeviceExt, Tree, MaxIndexSize, IndexRoot, Length); #ifndef NDEBUG DumpBTree(Tree); @@ -1091,7 +1091,7 @@ DemoteBTreeRoot(PB_TREE Tree) PB_TREE_FILENAME_NODE NewSubNode, NewIndexRoot; PB_TREE_KEY DummyKey; - DPRINT1("Collapsing Index Root into sub-node.\n"); + DPRINT("Collapsing Index Root into sub-node.\n"); #ifndef NDEBUG DumpBTree(Tree); @@ -1192,7 +1192,7 @@ UpdateIndexAllocation(PDEVICE_EXTENSION DeviceExt, ULONG i; ULONG IndexAllocationOffset; - DPRINT1("UpdateIndexAllocation() called.\n"); + DPRINT("UpdateIndexAllocation() called.\n"); Status = FindAttribute(DeviceExt, FileRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationContext, &IndexAllocationOffset); if (NT_SUCCESS(Status)) @@ -1708,16 +1708,16 @@ NtfsInsertKey(PB_TREE Tree, *MedianKey = NULL; *NewRightHandSibling = NULL; - DPRINT1("NtfsInsertKey(%p, 0x%I64x, %p, %p, %s, %lu, %lu, %p, %p)\n", - Tree, - FileReference, - FileNameAttribute, - Node, - CaseSensitive ? "TRUE" : "FALSE", - MaxIndexRootSize, - IndexRecordSize, - MedianKey, - NewRightHandSibling); + DPRINT("NtfsInsertKey(%p, 0x%I64x, %p, %p, %s, %lu, %lu, %p, %p)\n", + Tree, + FileReference, + FileNameAttribute, + Node, + CaseSensitive ? "TRUE" : "FALSE", + MaxIndexRootSize, + IndexRecordSize, + MedianKey, + NewRightHandSibling); // Create the key for the filename attribute NewKey = CreateBTreeKeyFromFilename(FileReference, FileNameAttribute); @@ -1893,7 +1893,7 @@ SplitBTreeNode(PB_TREE Tree, ULONG SizeSum; ULONG i; - DPRINT1("SplitBTreeNode(%p, %p, %p, %p, %s) called\n", + DPRINT("SplitBTreeNode(%p, %p, %p, %p, %s) called\n", Tree, Node, MedianKey, diff --git a/drivers/filesystems/ntfs/create.c b/drivers/filesystems/ntfs/create.c index 0ce5771ae3c..f5b5d518ee2 100644 --- a/drivers/filesystems/ntfs/create.c +++ b/drivers/filesystems/ntfs/create.c @@ -111,7 +111,7 @@ NtfsMoonWalkID(PDEVICE_EXTENSION DeviceExt, WCHAR FullPath[MAX_PATH]; ULONG WritePosition = MAX_PATH - 1; - DPRINT1("NtfsMoonWalkID(%p, %I64x, %p)\n", DeviceExt, Id, OutPath); + DPRINT("NtfsMoonWalkID(%p, %I64x, %p)\n", DeviceExt, Id, OutPath); RtlZeroMemory(FullPath, sizeof(FullPath)); MftRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); @@ -181,7 +181,7 @@ NtfsOpenFileById(PDEVICE_EXTENSION DeviceExt, PNTFS_FCB FCB; PFILE_RECORD_HEADER MftRecord; - DPRINT1("NtfsOpenFileById(%p, %p, %I64x, %p)\n", DeviceExt, FileObject, MftId, FoundFCB); + DPRINT("NtfsOpenFileById(%p, %p, %I64x, %p)\n", DeviceExt, FileObject, MftId, FoundFCB); ASSERT(MftId < NTFS_FILE_FIRST_USER_FILE); if (MftId > 0xb) /* No entries are used yet beyond this */ @@ -250,7 +250,7 @@ NtfsOpenFile(PDEVICE_EXTENSION DeviceExt, NTSTATUS Status; PWSTR AbsFileName = NULL; - DPRINT1("NtfsOpenFile(%p, %p, %S, %s, %p)\n", + DPRINT("NtfsOpenFile(%p, %p, %S, %s, %p)\n", DeviceExt, FileObject, FileName, @@ -339,7 +339,7 @@ NtfsCreateFile(PDEVICE_OBJECT DeviceObject, UNICODE_STRING FullPath; PIRP Irp = IrpContext->Irp; - DPRINT1("NtfsCreateFile(%p, %p) called\n", DeviceObject, IrpContext); + DPRINT("NtfsCreateFile(%p, %p) called\n", DeviceObject, IrpContext); DeviceExt = DeviceObject->DeviceExtension; ASSERT(DeviceExt); @@ -695,7 +695,7 @@ NtfsCreateDirectory(PDEVICE_EXTENSION DeviceExt, ULONG MaxIndexRootSize; ULONG RootLength; - DPRINT1("NtfsCreateFileRecord(%p, %p, %s, %s)\n", + DPRINT("NtfsCreateFileRecord(%p, %p, %s, %s)\n", DeviceExt, FileObject, CaseSensitive ? "TRUE" : "FALSE", @@ -820,7 +820,7 @@ NtfsCreateEmptyFileRecord(PDEVICE_EXTENSION DeviceExt) PFILE_RECORD_HEADER FileRecord; PNTFS_ATTR_RECORD NextAttribute; - DPRINT1("NtfsCreateEmptyFileRecord(%p)\n", DeviceExt); + DPRINT("NtfsCreateEmptyFileRecord(%p)\n", DeviceExt); // allocate memory for file record FileRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); @@ -895,7 +895,7 @@ NtfsCreateFileRecord(PDEVICE_EXTENSION DeviceExt, ULONGLONG ParentMftIndex; ULONGLONG FileMftIndex; - DPRINT1("NtfsCreateFileRecord(%p, %p, %s, %s)\n", + DPRINT("NtfsCreateFileRecord(%p, %p, %s, %s)\n", DeviceExt, FileObject, CaseSensitive ? "TRUE" : "FALSE", diff --git a/drivers/filesystems/ntfs/dirctl.c b/drivers/filesystems/ntfs/dirctl.c index 4ad76fa3825..7ceb2638a44 100644 --- a/drivers/filesystems/ntfs/dirctl.c +++ b/drivers/filesystems/ntfs/dirctl.c @@ -378,7 +378,7 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) UNICODE_STRING Pattern; ULONG Written; - DPRINT1("NtfsQueryDirectory() called\n"); + DPRINT("NtfsQueryDirectory() called\n"); ASSERT(IrpContext); Irp = IrpContext->Irp; @@ -591,7 +591,7 @@ NtfsDirectoryControl(PNTFS_IRP_CONTEXT IrpContext) { NTSTATUS Status = STATUS_UNSUCCESSFUL; - DPRINT1("NtfsDirectoryControl() called\n"); + DPRINT("NtfsDirectoryControl() called\n"); switch (IrpContext->MinorFunction) { diff --git a/drivers/filesystems/ntfs/fcb.c b/drivers/filesystems/ntfs/fcb.c index 8a4f4605460..955b84a676e 100644 --- a/drivers/filesystems/ntfs/fcb.c +++ b/drivers/filesystems/ntfs/fcb.c @@ -389,7 +389,7 @@ NtfsMakeFCBFromDirEntry(PNTFS_VCB Vcb, PNTFS_FCB rcFCB; ULONGLONG Size, AllocatedSize; - DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p, %p)\n", Vcb, DirectoryFCB, Name, Stream, Record, fileFCB); + DPRINT("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p, %p)\n", Vcb, DirectoryFCB, Name, Stream, Record, fileFCB); FileName = GetBestFileNameFromRecord(Vcb, Record); if (!FileName) @@ -516,12 +516,12 @@ NtfsDirFindFile(PNTFS_VCB Vcb, PNTFS_ATTR_CONTEXT DataContext; USHORT Length = 0; - DPRINT1("NtfsDirFindFile(%p, %p, %S, %s, %p)\n", - Vcb, - DirectoryFcb, - FileToFind, - CaseSensitive ? "TRUE" : "FALSE", - FoundFCB); + DPRINT("NtfsDirFindFile(%p, %p, %S, %s, %p)\n", + Vcb, + DirectoryFcb, + FileToFind, + CaseSensitive ? "TRUE" : "FALSE", + FoundFCB); *FoundFCB = NULL; RtlInitUnicodeString(&File, FileToFind); diff --git a/drivers/filesystems/ntfs/finfo.c b/drivers/filesystems/ntfs/finfo.c index 9a1b44b3882..d7a55cbad39 100644 --- a/drivers/filesystems/ntfs/finfo.c +++ b/drivers/filesystems/ntfs/finfo.c @@ -46,7 +46,7 @@ NtfsGetStandardInformation(PNTFS_FCB Fcb, { UNREFERENCED_PARAMETER(DeviceObject); - DPRINT1("NtfsGetStandardInformation(%p, %p, %p, %p)\n", Fcb, DeviceObject, StandardInfo, BufferLength); + DPRINT("NtfsGetStandardInformation(%p, %p, %p, %p)\n", Fcb, DeviceObject, StandardInfo, BufferLength); if (*BufferLength < sizeof(FILE_STANDARD_INFORMATION)) return STATUS_BUFFER_TOO_SMALL; @@ -102,7 +102,7 @@ NtfsGetBasicInformation(PFILE_OBJECT FileObject, { PFILENAME_ATTRIBUTE FileName = &Fcb->Entry; - DPRINT1("NtfsGetBasicInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, BasicInfo, BufferLength); + DPRINT("NtfsGetBasicInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, BasicInfo, BufferLength); if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) return STATUS_BUFFER_TOO_SMALL; @@ -136,7 +136,7 @@ NtfsGetNameInformation(PFILE_OBJECT FileObject, UNREFERENCED_PARAMETER(FileObject); UNREFERENCED_PARAMETER(DeviceObject); - DPRINT1("NtfsGetNameInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, NameInfo, BufferLength); + DPRINT("NtfsGetNameInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, NameInfo, BufferLength); ASSERT(NameInfo != NULL); ASSERT(Fcb != NULL); @@ -200,7 +200,7 @@ NtfsGetNetworkOpenInformation(PNTFS_FCB Fcb, { PFILENAME_ATTRIBUTE FileName = &Fcb->Entry; - DPRINT1("NtfsGetNetworkOpenInformation(%p, %p, %p, %p)\n", Fcb, DeviceExt, NetworkInfo, BufferLength); + DPRINT("NtfsGetNetworkOpenInformation(%p, %p, %p, %p)\n", Fcb, DeviceExt, NetworkInfo, BufferLength); if (*BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) return STATUS_BUFFER_TOO_SMALL; @@ -727,7 +727,7 @@ NtfsSetInformation(PNTFS_IRP_CONTEXT IrpContext) PDEVICE_OBJECT DeviceObject; NTSTATUS Status = STATUS_NOT_IMPLEMENTED; - DPRINT1("NtfsSetInformation(%p)\n", IrpContext); + DPRINT("NtfsSetInformation(%p)\n", IrpContext); Irp = IrpContext->Irp; Stack = IrpContext->Stack; diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c index c85f1bfb9f6..a8c2a425619 100644 --- a/drivers/filesystems/ntfs/fsctl.c +++ b/drivers/filesystems/ntfs/fsctl.c @@ -50,7 +50,7 @@ NtfsHasFileSystem(PDEVICE_OBJECT DeviceToMount) PBOOT_SECTOR BootSector; NTSTATUS Status; - DPRINT1("NtfsHasFileSystem() called\n"); + DPRINT("NtfsHasFileSystem() called\n"); Size = sizeof(DISK_GEOMETRY); Status = NtfsDeviceIoControl(DeviceToMount, @@ -425,7 +425,7 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject, NTSTATUS Status; BOOLEAN Lookaside = FALSE; - DPRINT1("NtfsMountVolume() called\n"); + DPRINT("NtfsMountVolume() called\n"); if (DeviceObject != NtfsGlobalData->DeviceObject) { @@ -737,7 +737,7 @@ GetVolumeBitmap(PDEVICE_EXTENSION DeviceExt, ULONGLONG ToCopy; BOOLEAN Overflow = FALSE; - DPRINT1("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); + DPRINT("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); Stack = IoGetCurrentIrpStackLocation(Irp); @@ -904,7 +904,7 @@ NtfsUserFsRequest(PDEVICE_OBJECT DeviceObject, PIO_STACK_LOCATION Stack; PDEVICE_EXTENSION DeviceExt; - DPRINT1("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp); + DPRINT("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp); Stack = IoGetCurrentIrpStackLocation(Irp); DeviceExt = DeviceObject->DeviceExtension; @@ -966,7 +966,7 @@ NtfsFileSystemControl(PNTFS_IRP_CONTEXT IrpContext) PIRP Irp; PDEVICE_OBJECT DeviceObject; - DPRINT1("NtfsFileSystemControl() called\n"); + DPRINT("NtfsFileSystemControl() called\n"); DeviceObject = IrpContext->DeviceObject; Irp = IrpContext->Irp; diff --git a/drivers/filesystems/ntfs/rw.c b/drivers/filesystems/ntfs/rw.c index fc3a62c7ccf..1d18b0648c6 100644 --- a/drivers/filesystems/ntfs/rw.c +++ b/drivers/filesystems/ntfs/rw.c @@ -60,7 +60,7 @@ NtfsReadFile(PDEVICE_EXTENSION DeviceExt, PCHAR ReadBuffer = (PCHAR)Buffer; ULONGLONG StreamSize; - DPRINT1("NtfsReadFile(%p, %p, %p, %lu, %lu, %lx, %p)\n", DeviceExt, FileObject, Buffer, Length, ReadOffset, IrpFlags, LengthRead); + DPRINT("NtfsReadFile(%p, %p, %p, %lu, %lu, %lx, %p)\n", DeviceExt, FileObject, Buffer, Length, ReadOffset, IrpFlags, LengthRead); *LengthRead = 0; diff --git a/drivers/filesystems/ntfs/volinfo.c b/drivers/filesystems/ntfs/volinfo.c index 565a6012bca..3e6123f8205 100644 --- a/drivers/filesystems/ntfs/volinfo.c +++ b/drivers/filesystems/ntfs/volinfo.c @@ -45,7 +45,7 @@ NtfsGetFreeClusters(PDEVICE_EXTENSION DeviceExt) ULONG Read = 0; RTL_BITMAP Bitmap; - DPRINT1("NtfsGetFreeClusters(%p)\n", DeviceExt); + DPRINT("NtfsGetFreeClusters(%p)\n", DeviceExt); BitmapRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); if (BitmapRecord == NULL) @@ -118,7 +118,7 @@ NtfsAllocateClusters(PDEVICE_EXTENSION DeviceExt, ULONG AssignedRun; ULONG LengthWritten; - DPRINT1("NtfsAllocateClusters(%p, %lu, %lu, %p, %p)\n", DeviceExt, FirstDesiredCluster, DesiredClusters, FirstAssignedCluster, AssignedClusters); + DPRINT("NtfsAllocateClusters(%p, %lu, %lu, %p, %p)\n", DeviceExt, FirstDesiredCluster, DesiredClusters, FirstAssignedCluster, AssignedClusters); BitmapRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); if (BitmapRecord == NULL) @@ -151,9 +151,9 @@ NtfsAllocateClusters(PDEVICE_EXTENSION DeviceExt, return STATUS_INSUFFICIENT_RESOURCES; } - DPRINT1("Total clusters: %I64x\n", DeviceExt->NtfsInfo.ClusterCount); - DPRINT1("Total clusters in bitmap: %I64x\n", BitmapDataSize * 8); - DPRINT1("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - DeviceExt->NtfsInfo.ClusterCount) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); + DPRINT("Total clusters: %I64x\n", DeviceExt->NtfsInfo.ClusterCount); + DPRINT("Total clusters in bitmap: %I64x\n", BitmapDataSize * 8); + DPRINT("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - DeviceExt->NtfsInfo.ClusterCount) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); ReadAttribute(DeviceExt, DataContext, 0, (PCHAR)BitmapData, (ULONG)BitmapDataSize);