Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 53/72: [NTFS] - Add a few fixes and improvements, most from CR-123: -Add ATTR_RECORD_ALIGNMENT define to replace magic value of 8 when we need to adjust an attribute's beginning or length. -Don't use int's. -GetPackedByteCount() - Remove unused "bytes" variable.

by Trevor Thompson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ab24a5aaed797d556384… commit 5ab24a5aaed797d556384e81047e9f75cb903e49 Author: Trevor Thompson <tmt256(a)email.vccs.edu> AuthorDate: Wed Jul 5 16:29:16 2017 +0000 [NTFS] - Add a few fixes and improvements, most from CR-123: -Add ATTR_RECORD_ALIGNMENT define to replace magic value of 8 when we need to adjust an attribute's beginning or length. -Don't use int's. -GetPackedByteCount() - Remove unused "bytes" variable. svn path=/branches/GSoC_2016/NTFS/; revision=75288 --- drivers/filesystems/ntfs/attrib.c | 16 +++++++--------- drivers/filesystems/ntfs/btree.c | 14 +++++++------- drivers/filesystems/ntfs/create.c | 2 +- drivers/filesystems/ntfs/mft.c | 4 ++-- drivers/filesystems/ntfs/ntfs.h | 6 +++++- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/drivers/filesystems/ntfs/attrib.c b/drivers/filesystems/ntfs/attrib.c index 018c69b20f..7dcdabbea5 100644 --- a/drivers/filesystems/ntfs/attrib.c +++ b/drivers/filesystems/ntfs/attrib.c @@ -77,7 +77,7 @@ AddData(PFILE_RECORD_HEADER FileRecord, AttributeAddress->Type = AttributeData; AttributeAddress->Length = ResidentHeaderLength; - AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, 8); + AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, ATTR_RECORD_ALIGNMENT); AttributeAddress->Resident.ValueLength = 0; AttributeAddress->Resident.ValueOffset = ResidentHeaderLength; @@ -241,7 +241,7 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, AttributeAddress->Length = ResidentHeaderLength + FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + FilenameNoPath.Length; - AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, 8); + AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, ATTR_RECORD_ALIGNMENT); AttributeAddress->Resident.ValueLength = FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + FilenameNoPath.Length; AttributeAddress->Resident.ValueOffset = ResidentHeaderLength; @@ -363,7 +363,7 @@ AddRun(PNTFS_VCB Vcb, // calculate position of end markers NextAttributeOffset = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + RunBufferSize; - NextAttributeOffset = ALIGN_UP_BY(NextAttributeOffset, 8); + NextAttributeOffset = ALIGN_UP_BY(NextAttributeOffset, ATTR_RECORD_ALIGNMENT); // Update the length DestinationAttribute->Length = NextAttributeOffset - AttrOffset; @@ -437,7 +437,7 @@ AddStandardInformation(PFILE_RECORD_HEADER FileRecord, AttributeAddress->Type = AttributeStandardInformation; AttributeAddress->Length = sizeof(STANDARD_INFORMATION) + ResidentHeaderLength; - AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, 8); + AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, ATTR_RECORD_ALIGNMENT); AttributeAddress->Resident.ValueLength = sizeof(STANDARD_INFORMATION); AttributeAddress->Resident.ValueOffset = ResidentHeaderLength; AttributeAddress->Instance = FileRecord->NextAttributeNumber++; @@ -847,7 +847,8 @@ FreeClusters(PNTFS_VCB Vcb, if (NextAttribute->Type == AttributeEnd) { // update attribute length - AttrContext->Record.Length = ALIGN_UP_BY(AttrContext->Record.NonResident.MappingPairsOffset + RunBufferSize, 8); + AttrContext->Record.Length = ALIGN_UP_BY(AttrContext->Record.NonResident.MappingPairsOffset + RunBufferSize, + ATTR_RECORD_ALIGNMENT); DestinationAttribute->Length = AttrContext->Record.Length; // write end markers @@ -1459,7 +1460,6 @@ UCHAR GetPackedByteCount(LONGLONG NumberToPack, BOOLEAN IsSigned) { - int bytes = 0; if (!IsSigned) { if (NumberToPack >= 0x0100000000000000) @@ -1496,7 +1496,6 @@ GetPackedByteCount(LONGLONG NumberToPack, return 3; if (NumberToPack >= 0x0000000000000080) return 2; - return 1; } else { @@ -1515,9 +1514,8 @@ GetPackedByteCount(LONGLONG NumberToPack, return 3; if (NumberToPack <= 0xffffffffffffff80) return 2; - return 1; } - return bytes; + return 1; } NTSTATUS diff --git a/drivers/filesystems/ntfs/btree.c b/drivers/filesystems/ntfs/btree.c index f4641d005c..eff2b157ad 100644 --- a/drivers/filesystems/ntfs/btree.c +++ b/drivers/filesystems/ntfs/btree.c @@ -271,7 +271,7 @@ CreateIndexRootFromBTree(PDEVICE_EXTENSION DeviceExt, PINDEX_ROOT_ATTRIBUTE *IndexRoot, ULONG *Length) { - int i; + ULONG i; PB_TREE_KEY CurrentKey; PINDEX_ENTRY_ATTRIBUTE CurrentNodeEntry; PINDEX_ROOT_ATTRIBUTE NewIndexRoot = ExAllocatePoolWithTag(NonPagedPool, @@ -366,7 +366,7 @@ DestroyBTreeNode(PB_TREE_FILENAME_NODE Node) { PB_TREE_KEY NextKey; PB_TREE_KEY CurrentKey = Node->FirstKey; - int i; + ULONG i; for (i = 0; i < Node->KeyCount; i++) { NT_ASSERT(CurrentKey); @@ -400,9 +400,9 @@ DestroyBTree(PB_TREE Tree) } VOID -DumpBTreeKey(PB_TREE_KEY Key, int Number, int Depth) +DumpBTreeKey(PB_TREE_KEY Key, ULONG Number, ULONG Depth) { - int i; + ULONG i; for (i = 0; i < Depth; i++) DbgPrint(" "); DbgPrint(" Key #%d", Number); @@ -420,10 +420,10 @@ DumpBTreeKey(PB_TREE_KEY Key, int Number, int Depth) } VOID -DumpBTreeNode(PB_TREE_FILENAME_NODE Node, int Number, int Depth) +DumpBTreeNode(PB_TREE_FILENAME_NODE Node, ULONG Number, ULONG Depth) { PB_TREE_KEY CurrentKey; - int i; + ULONG i; for (i = 0; i < Depth; i++) DbgPrint(" "); DbgPrint("Node #%d, Depth %d\n", Number, Depth); @@ -488,7 +488,7 @@ NtfsInsertKey(ULONGLONG FileReference, ULONG EntrySize = ALIGN_UP_BY(AttributeSize + FIELD_OFFSET(INDEX_ENTRY_ATTRIBUTE, FileName), 8); PINDEX_ENTRY_ATTRIBUTE NewEntry; PB_TREE_KEY NewKey, CurrentKey, PreviousKey; - int i; + ULONG i; DPRINT1("NtfsInsertKey(0x%02I64, %p, %p, %s)\n", FileReference, diff --git a/drivers/filesystems/ntfs/create.c b/drivers/filesystems/ntfs/create.c index 3c8ba81f02..8274d97992 100644 --- a/drivers/filesystems/ntfs/create.c +++ b/drivers/filesystems/ntfs/create.c @@ -699,7 +699,7 @@ NtfsCreateFileRecord(PDEVICE_EXTENSION DeviceExt, // setup other file record fields FileRecord->SequenceNumber = 1; FileRecord->AttributeOffset = FileRecord->Ntfs.UsaOffset + (2 * FileRecord->Ntfs.UsaCount); - FileRecord->AttributeOffset = ALIGN_UP_BY(FileRecord->AttributeOffset, 8); + FileRecord->AttributeOffset = ALIGN_UP_BY(FileRecord->AttributeOffset, ATTR_RECORD_ALIGNMENT); FileRecord->Flags = FRH_IN_USE; FileRecord->BytesInUse = FileRecord->AttributeOffset + sizeof(ULONG) * 2; diff --git a/drivers/filesystems/ntfs/mft.c b/drivers/filesystems/ntfs/mft.c index 539b8f225c..87820e6457 100644 --- a/drivers/filesystems/ntfs/mft.c +++ b/drivers/filesystems/ntfs/mft.c @@ -373,7 +373,7 @@ InternalSetResidentAttributeLength(PNTFS_ATTR_CONTEXT AttrContext, // Ensure NextAttributeOffset is aligned to an 8-byte boundary if (NextAttributeOffset % 8 != 0) { - USHORT Padding = 8 - (NextAttributeOffset % 8); + USHORT Padding = ATTR_RECORD_ALIGNMENT - (NextAttributeOffset % ATTR_RECORD_ALIGNMENT); NextAttributeOffset += Padding; AttrContext->Record.Length += Padding; Destination->Length += Padding; @@ -731,7 +731,7 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, // update the end of the file record // calculate position of end markers (1 byte for empty data run) EndAttributeOffset = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + 1; - EndAttributeOffset = ALIGN_UP_BY(EndAttributeOffset, 8); + EndAttributeOffset = ALIGN_UP_BY(EndAttributeOffset, ATTR_RECORD_ALIGNMENT); // Update the length Destination->Length = EndAttributeOffset - AttrOffset; diff --git a/drivers/filesystems/ntfs/ntfs.h b/drivers/filesystems/ntfs/ntfs.h index eb4d6f3f9f..ddb876daf9 100644 --- a/drivers/filesystems/ntfs/ntfs.h +++ b/drivers/filesystems/ntfs/ntfs.h @@ -293,6 +293,10 @@ typedef struct }; } NTFS_ATTR_RECORD, *PNTFS_ATTR_RECORD; +// The beginning and length of an attribute record are always aligned to an 8-byte boundary, +// relative to the beginning of the file record. +#define ATTR_RECORD_ALIGNMENT 8 + typedef struct { ULONGLONG CreationTime; @@ -408,7 +412,7 @@ typedef struct _B_TREE_KEY // A key's sub-node precedes that key in the ordered list. typedef struct { - int KeyCount; + ULONG KeyCount; PB_TREE_KEY FirstKey; } B_TREE_FILENAME_NODE, *PB_TREE_FILENAME_NODE;

6 years, 9 months

[reactos] 52/72: [NTFS] - Add some fixes and improvements to mft.c from CR-123: FindAttribute() - Use * sizeof(WCHAR) in place bit-shifting wizardry. IncreaseMftSize() - Remove two useless casts. Return error code if WriteAttribute() fails. SetNonResidentAttributeDataLength() - Assert that AttrContext parameter describes a NonResident attribute. When migrating a resident attribute to non-resident, don't leak memory if FsRtlInitializeLargeMcb() throws an exception, and don't mark the attribute as

by Trevor Thompson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68a48b2758c64bf1e8f4b… commit 68a48b2758c64bf1e8f4b7885020567441d14879 Author: Trevor Thompson <tmt256(a)email.vccs.edu> AuthorDate: Wed Jul 5 05:09:51 2017 +0000 [NTFS] - Add some fixes and improvements to mft.c from CR-123: FindAttribute() - Use * sizeof(WCHAR) in place bit-shifting wizardry. IncreaseMftSize() - Remove two useless casts. Return error code if WriteAttribute() fails. SetNonResidentAttributeDataLength() - Assert that AttrContext parameter describes a NonResident attribute. When migrating a resident attribute to non-resident, don't leak memory if FsRtlInitializeLargeMcb() throws an exception, and don't mark the attribute as non-resident until after the Mcb is initialized. InternalSetResidentAttributeLength() and SetResidentAttributeLength() - Assert that AttrContext parameter describes a resident attribute. AddNewMftEntry() - Simplify math of backing up and restoring reserved bits by changing BitmapData to PUCHAR type. Don't attempt to modify a volume with more than 2^32 clusters. AddFixupArray() - Use ULONG in place of int. svn path=/branches/GSoC_2016/NTFS/; revision=75284 --- drivers/filesystems/ntfs/mft.c | 69 ++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/drivers/filesystems/ntfs/mft.c b/drivers/filesystems/ntfs/mft.c index f8aff9ccd2..539b8f225c 100644 --- a/drivers/filesystems/ntfs/mft.c +++ b/drivers/filesystems/ntfs/mft.c @@ -133,7 +133,7 @@ FindAttribute(PDEVICE_EXTENSION Vcb, AttrName = (PWCHAR)((PCHAR)Attribute + Attribute->NameOffset); DPRINT("%.*S, %.*S\n", Attribute->NameLength, AttrName, NameLength, Name); - if (RtlCompareMemory(AttrName, Name, NameLength << 1) == (NameLength << 1)) + if (RtlCompareMemory(AttrName, Name, NameLength * sizeof(WCHAR)) == (NameLength * sizeof(WCHAR))) { Found = TRUE; } @@ -268,7 +268,7 @@ IncreaseMftSize(PDEVICE_EXTENSION Vcb, BOOLEAN CanWait) } // Zero the bytes we'll be adding - RtlZeroMemory((PUCHAR)((ULONG_PTR)BitmapBuffer), NewBitmapSize); + RtlZeroMemory(BitmapBuffer, NewBitmapSize); // Read the bitmap attribute BytesRead = ReadAttribute(Vcb, @@ -337,6 +337,7 @@ IncreaseMftSize(PDEVICE_EXTENSION Vcb, BOOLEAN CanWait) ExFreePoolWithTag(BitmapBuffer, TAG_NTFS); ReleaseAttributeContext(BitmapContext); DPRINT1("ERROR: Couldn't write to bitmap attribute of $MFT!\n"); + return Status; } // Cleanup @@ -358,6 +359,8 @@ InternalSetResidentAttributeLength(PNTFS_ATTR_CONTEXT AttrContext, DPRINT("InternalSetResidentAttributeLength( %p, %p, %lu, %lu )\n", AttrContext, FileRecord, AttrOffset, DataSize); + ASSERT(!AttrContext->Record.IsNonResident); + // update ValueLength Field AttrContext->Record.Resident.ValueLength = Destination->Resident.ValueLength = DataSize; @@ -537,11 +540,7 @@ SetNonResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, PNTFS_ATTR_RECORD DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); ULONG ExistingClusters = AttrContext->Record.NonResident.AllocatedSize / BytesPerCluster; - if (!AttrContext->Record.IsNonResident) - { - DPRINT1("ERROR: SetNonResidentAttributeDataLength() called for resident attribute!\n"); - return STATUS_INVALID_PARAMETER; - } + ASSERT(AttrContext->Record.IsNonResident); // do we need to increase the allocation size? if (AttrContext->Record.NonResident.AllocatedSize < AllocationSize) @@ -671,11 +670,7 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, ULONG NextAttributeOffset = AttrOffset + AttrContext->Record.Length; PNTFS_ATTR_RECORD NextAttribute = (PNTFS_ATTR_RECORD)((PCHAR)FileRecord + NextAttributeOffset); - if (AttrContext->Record.IsNonResident) - { - DPRINT1("ERROR: SetResidentAttributeDataLength() called for non-resident attribute!\n"); - return STATUS_INVALID_PARAMETER; - } + ASSERT(!AttrContext->Record.IsNonResident); //NtfsDumpFileAttributes(Vcb, FileRecord); @@ -733,9 +728,6 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, // update the mapping pairs offset, which will be 0x40 + length in bytes of the name AttrContext->Record.NonResident.MappingPairsOffset = Destination->NonResident.MappingPairsOffset = 0x40 + (Destination->NameLength * 2); - // mark the attribute as non-resident - AttrContext->Record.IsNonResident = Destination->IsNonResident = 1; - // update the end of the file record // calculate position of end markers (1 byte for empty data run) EndAttributeOffset = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + 1; @@ -750,7 +742,22 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + EndAttributeOffset), FILE_RECORD_END); - // update file record on disk + // Initialize the MCB, potentially catch an exception + _SEH2_TRY + { + FsRtlInitializeLargeMcb(&AttrContext->DataRunsMCB, NonPagedPool); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Unable to create LargeMcb!\n"); + ExFreePoolWithTag(AttribData, TAG_NTFS); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } _SEH2_END; + + // Mark the attribute as non-resident (we wait until after we know the LargeMcb was initialized) + AttrContext->Record.IsNonResident = Destination->IsNonResident = 1; + + // Update file record on disk Status = UpdateFileRecord(Vcb, AttrContext->FileMFTIndex, FileRecord); if (!NT_SUCCESS(Status)) { @@ -760,13 +767,6 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, return Status; } - // Initialize the MCB, potentially catch an exception - _SEH2_TRY{ - FsRtlInitializeLargeMcb(&AttrContext->DataRunsMCB, NonPagedPool); - } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } _SEH2_END; - // Now we can treat the attribute as non-resident and enlarge it normally Status = SetNonResidentAttributeDataLength(Vcb, AttrContext, AttrOffset, FileRecord, DataSize); if (!NT_SUCCESS(Status)) @@ -1729,7 +1729,7 @@ AddNewMftEntry(PFILE_RECORD_HEADER FileRecord, RTL_BITMAP Bitmap; ULONGLONG BitmapDataSize; ULONGLONG AttrBytesRead; - PVOID BitmapData; + PUCHAR BitmapData; ULONG LengthWritten; PNTFS_ATTR_CONTEXT BitmapContext; LARGE_INTEGER BitmapBits; @@ -1765,17 +1765,20 @@ AddNewMftEntry(PFILE_RECORD_HEADER FileRecord, return STATUS_OBJECT_NAME_NOT_FOUND; } - // we need to backup the bits for records 0x10 - 0x17 and leave them unassigned if they aren't assigned - RtlCopyMemory(&SystemReservedBits, (PVOID)((ULONG_PTR)BitmapData + 2), 1); - RtlFillMemory((PVOID)((ULONG_PTR)BitmapData + 2), 1, (UCHAR)0xFF); + // We need to backup the bits for records 0x10 - 0x17 (3rd byte of bitmap) and mark these records + // as in-use so we don't assign files to those indices. They're reserved for the system (e.g. ChkDsk). + SystemReservedBits = BitmapData[2]; + BitmapData[2] = 0xff; // Calculate bit count BitmapBits.QuadPart = AttributeDataLength(&(DeviceExt->MFTContext->Record)) / DeviceExt->NtfsInfo.BytesPerFileRecord; if (BitmapBits.HighPart != 0) { - DPRINT1("\tFIXME: bitmap sizes beyond 32bits are not yet supported!\n"); - BitmapBits.LowPart = 0xFFFFFFFF; + DPRINT1("\tFIXME: bitmap sizes beyond 32bits are not yet supported! (Your NTFS volume is too large)\n"); + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return STATUS_NOT_IMPLEMENTED; } // convert buffer into bitmap @@ -1809,7 +1812,7 @@ AddNewMftEntry(PFILE_RECORD_HEADER FileRecord, // [BitmapData should have been updated via RtlFindClearBitsAndSet()] // Restore the system reserved bits - RtlCopyMemory((PVOID)((ULONG_PTR)BitmapData + 2), &SystemReservedBits, 1); + BitmapData[2] = SystemReservedBits; // write the bitmap back to the MFT's $Bitmap attribute Status = WriteAttribute(DeviceExt, BitmapContext, 0, BitmapData, BitmapDataSize, &LengthWritten); @@ -1845,9 +1848,9 @@ AddFixupArray(PDEVICE_EXTENSION Vcb, PNTFS_RECORD_HEADER Record) { USHORT *pShortToFixUp; - unsigned int ArrayEntryCount = Record->UsaCount - 1; - unsigned int Offset = Vcb->NtfsInfo.BytesPerSector - 2; - int i; + ULONG ArrayEntryCount = Record->UsaCount - 1; + ULONG Offset = Vcb->NtfsInfo.BytesPerSector - 2; + ULONG i; PFIXUP_ARRAY fixupArray = (PFIXUP_ARRAY)((UCHAR*)Record + Record->UsaOffset);

6 years, 9 months

[reactos] 51/72: [NTFS] - Add some fixes and improvements to finfo.c from CR-123: NtfsSetEndOfFile() - Make fileNameAttribute and filename variables uppercase. Don't leak FileRecord if we can't truncate the file. Don't leak memory if there's no FileName attribute.

by Trevor Thompson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34696e49fc9b6ebcde32d… commit 34696e49fc9b6ebcde32d9e6792ac4bae48fd184 Author: Trevor Thompson <tmt256(a)email.vccs.edu> AuthorDate: Wed Jul 5 03:11:13 2017 +0000 [NTFS] - Add some fixes and improvements to finfo.c from CR-123: NtfsSetEndOfFile() - Make fileNameAttribute and filename variables uppercase. Don't leak FileRecord if we can't truncate the file. Don't leak memory if there's no FileName attribute. svn path=/branches/GSoC_2016/NTFS/; revision=75283 --- drivers/filesystems/ntfs/finfo.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/filesystems/ntfs/finfo.c b/drivers/filesystems/ntfs/finfo.c index ed1515c8d6..323b85cf45 100644 --- a/drivers/filesystems/ntfs/finfo.c +++ b/drivers/filesystems/ntfs/finfo.c @@ -449,9 +449,9 @@ NtfsSetEndOfFile(PNTFS_FCB Fcb, ULONG AttributeOffset; NTSTATUS Status = STATUS_SUCCESS; ULONGLONG AllocationSize; - PFILENAME_ATTRIBUTE fileNameAttribute; + PFILENAME_ATTRIBUTE FileNameAttribute; ULONGLONG ParentMFTId; - UNICODE_STRING filename; + UNICODE_STRING FileName; // Allocate non-paged memory for the file record @@ -485,6 +485,7 @@ NtfsSetEndOfFile(PNTFS_FCB Fcb, NewFileSize)) { DPRINT1("Couldn't decrease file size!\n"); + ExFreePoolWithTag(FileRecord, TAG_NTFS); return STATUS_USER_MAPPED_FILE; } } @@ -535,24 +536,26 @@ NtfsSetEndOfFile(PNTFS_FCB Fcb, // now we need to update this file's size in every directory index entry that references it // TODO: expand to work with every filename / hardlink stored in the file record. - fileNameAttribute = GetBestFileNameFromRecord(Fcb->Vcb, FileRecord); - if (fileNameAttribute == NULL) + FileNameAttribute = GetBestFileNameFromRecord(Fcb->Vcb, FileRecord); + if (FileNameAttribute == NULL) { DPRINT1("Unable to find FileName attribute associated with file!\n"); + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); return STATUS_INVALID_PARAMETER; } - ParentMFTId = fileNameAttribute->DirectoryFileReferenceNumber & NTFS_MFT_MASK; + ParentMFTId = FileNameAttribute->DirectoryFileReferenceNumber & NTFS_MFT_MASK; - filename.Buffer = fileNameAttribute->Name; - filename.Length = fileNameAttribute->NameLength * sizeof(WCHAR); - filename.MaximumLength = filename.Length; + FileName.Buffer = FileNameAttribute->Name; + FileName.Length = FileNameAttribute->NameLength * sizeof(WCHAR); + FileName.MaximumLength = FileName.Length; AllocationSize = ROUND_UP(NewFileSize->QuadPart, Fcb->Vcb->NtfsInfo.BytesPerCluster); Status = UpdateFileNameRecord(Fcb->Vcb, ParentMFTId, - &filename, + &FileName, FALSE, NewFileSize->QuadPart, AllocationSize,

6 years, 9 months

[reactos] 50/72: [NTFS] - Add some fixes and improvements to create.c, dirctl.c and fcb.c from CR-123: -NtfsOpenFile() - Replace an ExFreePool() with ExFreePoolWithTag(). -NtfsCreateFile() - Fix broken cast with BooleanFlagOn() macro. -NtfsAddFilenameToDirectory() - Remove an extra cast. Return an error if we fail to allocate I30IndexRoot. -NtfsGetNextPathElement(), NtfsWSubString(), NtfsGetFCBForFile() - Use PCWSTR in place of const PWCHAR or PWCHAR where it makes sense.

by Trevor Thompson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=39a06fae0dcc928341e10… commit 39a06fae0dcc928341e104ccbac7cacc5d7b4298 Author: Trevor Thompson <tmt256(a)email.vccs.edu> AuthorDate: Tue Jul 4 22:34:17 2017 +0000 [NTFS] - Add some fixes and improvements to create.c, dirctl.c and fcb.c from CR-123: -NtfsOpenFile() - Replace an ExFreePool() with ExFreePoolWithTag(). -NtfsCreateFile() - Fix broken cast with BooleanFlagOn() macro. -NtfsAddFilenameToDirectory() - Remove an extra cast. Return an error if we fail to allocate I30IndexRoot. -NtfsGetNextPathElement(), NtfsWSubString(), NtfsGetFCBForFile() - Use PCWSTR in place of const PWCHAR or PWCHAR where it makes sense. svn path=/branches/GSoC_2016/NTFS/; revision=75281 --- drivers/filesystems/ntfs/create.c | 4 ++-- drivers/filesystems/ntfs/dirctl.c | 3 ++- drivers/filesystems/ntfs/fcb.c | 10 +++++----- drivers/filesystems/ntfs/ntfs.h | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/filesystems/ntfs/create.c b/drivers/filesystems/ntfs/create.c index 4da9470a6b..3c8ba81f02 100644 --- a/drivers/filesystems/ntfs/create.c +++ b/drivers/filesystems/ntfs/create.c @@ -304,7 +304,7 @@ NtfsOpenFile(PDEVICE_EXTENSION DeviceExt, DPRINT("Could not make a new FCB, status: %x\n", Status); if (AbsFileName) - ExFreePool(AbsFileName); + ExFreePoolWithTag(AbsFileName, TAG_NTFS); return Status; } @@ -572,7 +572,7 @@ NtfsCreateFile(PDEVICE_OBJECT DeviceObject, // Create the file record on disk Status = NtfsCreateFileRecord(DeviceExt, FileObject, - (Stack->Flags & SL_CASE_SENSITIVE), + BooleanFlagOn(Stack->Flags, SL_CASE_SENSITIVE), BooleanFlagOn(IrpContext->Flags,IRPCONTEXT_CANWAIT)); if (!NT_SUCCESS(Status)) { diff --git a/drivers/filesystems/ntfs/dirctl.c b/drivers/filesystems/ntfs/dirctl.c index c3bcdb43cb..c41688ea2b 100644 --- a/drivers/filesystems/ntfs/dirctl.c +++ b/drivers/filesystems/ntfs/dirctl.c @@ -138,12 +138,13 @@ NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, // Allocate memory for the index root data I30IndexRootLength = AttributeDataLength(&IndexRootContext->Record); - I30IndexRoot = (PINDEX_ROOT_ATTRIBUTE)ExAllocatePoolWithTag(NonPagedPool, I30IndexRootLength, TAG_NTFS); + I30IndexRoot = ExAllocatePoolWithTag(NonPagedPool, I30IndexRootLength, TAG_NTFS); if (!I30IndexRoot) { DPRINT1("ERROR: Couldn't allocate memory for index root attribute!\n"); ReleaseAttributeContext(IndexRootContext); ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; } // Read the Index Root diff --git a/drivers/filesystems/ntfs/fcb.c b/drivers/filesystems/ntfs/fcb.c index 851234c4fe..5497b8001d 100644 --- a/drivers/filesystems/ntfs/fcb.c +++ b/drivers/filesystems/ntfs/fcb.c @@ -35,8 +35,8 @@ /* FUNCTIONS ****************************************************************/ static -PWCHAR -NtfsGetNextPathElement(PWCHAR FileName) +PCWSTR +NtfsGetNextPathElement(PCWSTR FileName) { if (*FileName == L'\0') { @@ -55,7 +55,7 @@ NtfsGetNextPathElement(PWCHAR FileName) static VOID NtfsWSubString(PWCHAR pTarget, - const PWCHAR pSource, + PCWSTR pSource, size_t pLength) { wcsncpy(pTarget, pSource, pLength); @@ -593,13 +593,13 @@ NTSTATUS NtfsGetFCBForFile(PNTFS_VCB Vcb, PNTFS_FCB *pParentFCB, PNTFS_FCB *pFCB, - const PWSTR pFileName, + PCWSTR pFileName, BOOLEAN CaseSensitive) { NTSTATUS Status; WCHAR pathName [MAX_PATH]; WCHAR elementName [MAX_PATH]; - PWCHAR currentElement; + PCWSTR currentElement; PNTFS_FCB FCB; PNTFS_FCB parentFCB; diff --git a/drivers/filesystems/ntfs/ntfs.h b/drivers/filesystems/ntfs/ntfs.h index 3e01f469a4..eb4d6f3f9f 100644 --- a/drivers/filesystems/ntfs/ntfs.h +++ b/drivers/filesystems/ntfs/ntfs.h @@ -840,7 +840,7 @@ NTSTATUS NtfsGetFCBForFile(PNTFS_VCB Vcb, PNTFS_FCB *pParentFCB, PNTFS_FCB *pFCB, - const PWSTR pFileName, + PCWSTR pFileName, BOOLEAN CaseSensitive); NTSTATUS

6 years, 9 months

[reactos] 49/72: [NTFS] - Add some fixes and improvements to btree.c from CR-123: -CompareTreeKeys() - Assert that the first key isn't the dummy key. -CreateIndexRootFromBTree() - Assert that CurrentKey->IndexEntry->Length isn't 0. -DumpBTreeKey() - Use sizeof(WCHAR) in place of magic 2. -NtfsInsertKey() - Check for allocation failure of NewKey.

by Trevor Thompson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e9acb7ddae095b06d573… commit 7e9acb7ddae095b06d573d4d5bb19a93624c739a Author: Trevor Thompson <tmt256(a)email.vccs.edu> AuthorDate: Tue Jul 4 21:47:43 2017 +0000 [NTFS] - Add some fixes and improvements to btree.c from CR-123: -CompareTreeKeys() - Assert that the first key isn't the dummy key. -CreateIndexRootFromBTree() - Assert that CurrentKey->IndexEntry->Length isn't 0. -DumpBTreeKey() - Use sizeof(WCHAR) in place of magic 2. -NtfsInsertKey() - Check for allocation failure of NewKey. svn path=/branches/GSoC_2016/NTFS/; revision=75280 --- drivers/filesystems/ntfs/btree.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/filesystems/ntfs/btree.c b/drivers/filesystems/ntfs/btree.c index d23871d3ff..f4641d005c 100644 --- a/drivers/filesystems/ntfs/btree.c +++ b/drivers/filesystems/ntfs/btree.c @@ -62,6 +62,8 @@ CompareTreeKeys(PB_TREE_KEY Key1, PB_TREE_KEY Key2, BOOLEAN CaseSensitive) UNICODE_STRING Key1Name, Key2Name; LONG Comparison; + ASSERT(!(Key1->IndexEntry->Flags & NTFS_INDEX_ENTRY_END)); + // If Key2 is the "dummy key", key 1 will always come first if (Key2->NextKey == NULL) return -1; @@ -322,11 +324,10 @@ CreateIndexRootFromBTree(PDEVICE_EXTENSION DeviceExt, return STATUS_NOT_IMPLEMENTED; } + ASSERT(CurrentKey->IndexEntry->Length != 0); + // Copy the index entry - if (CurrentKey->IndexEntry->Length > 0) - RtlCopyMemory(CurrentNodeEntry, CurrentKey->IndexEntry, CurrentKey->IndexEntry->Length); - else - DPRINT1("DRIVER ERROR: CurrentKey->IndexEntry->Length <= 0 !\n"); + RtlCopyMemory(CurrentNodeEntry, CurrentKey->IndexEntry, CurrentKey->IndexEntry->Length); DPRINT1("Index Node Entry Stream Length: %u\nIndex Node Entry Length: %u\n", CurrentNodeEntry->KeyLength, @@ -409,7 +410,7 @@ DumpBTreeKey(PB_TREE_KEY Key, int Number, int Depth) if (!(Key->IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { UNICODE_STRING FileName; - FileName.Length = Key->IndexEntry->FileName.NameLength * 2; + FileName.Length = Key->IndexEntry->FileName.NameLength * sizeof(WCHAR); FileName.MaximumLength = FileName.Length; FileName.Buffer = Key->IndexEntry->FileName.Name; DbgPrint(" '%wZ'\n", &FileName); @@ -514,6 +515,12 @@ NtfsInsertKey(ULONGLONG FileReference, // Setup the New Key NewKey = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_KEY), TAG_NTFS); + if (!NewKey) + { + DPRINT1("ERROR: Failed to allocate memory for new key!\n"); + ExFreePoolWithTag(NewEntry, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } NewKey->IndexEntry = NewEntry; NewKey->NextKey = NULL;

6 years, 9 months

[reactos] 48/72: [NTFS] - Add some fixes and improvements to attribute.c from CR-123: -AddFileName() - Don't use dedicated buffer for FileNameNoPath, just point into FileObject->FileName's buffer. Don't use RtlCopyUnicodeString(), just update pointers. -AddRun() - Fix an SEH2_YIELD with missing return statement. -FreeClusters() - Use ULONG_MAX in place of 0xffffffff. -NtfsDumpIndexRootAttribute() - Use consistent UpperCase naming convention. Use BooleanFlagOn() macro where appropriate. Replace m

by Trevor Thompson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5cc846555486cd27c68d… commit e5cc846555486cd27c68d51ad1c68417b9c6b771 Author: Trevor Thompson <tmt256(a)email.vccs.edu> AuthorDate: Tue Jul 4 21:40:02 2017 +0000 [NTFS] - Add some fixes and improvements to attribute.c from CR-123: -AddFileName() - Don't use dedicated buffer for FileNameNoPath, just point into FileObject->FileName's buffer. Don't use RtlCopyUnicodeString(), just update pointers. -AddRun() - Fix an SEH2_YIELD with missing return statement. -FreeClusters() - Use ULONG_MAX in place of 0xffffffff. -NtfsDumpIndexRootAttribute() - Use consistent UpperCase naming convention. Use BooleanFlagOn() macro where appropriate. Replace magic 8 with sizeof(ULONGLONG). -GetFileNameAttributeLength() - Add documentation. svn path=/branches/GSoC_2016/NTFS/; revision=75279 --- drivers/filesystems/ntfs/attrib.c | 66 ++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/drivers/filesystems/ntfs/attrib.c b/drivers/filesystems/ntfs/attrib.c index 4fece45c6c..018c69b20f 100644 --- a/drivers/filesystems/ntfs/attrib.c +++ b/drivers/filesystems/ntfs/attrib.c @@ -29,6 +29,7 @@ /* INCLUDES *****************************************************************/ #include "ntfs.h" +#include <ntintsafe.h> #define NDEBUG #include <debug.h> @@ -147,7 +148,6 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, UNICODE_STRING Current, Remaining, FilenameNoPath; NTSTATUS Status = STATUS_SUCCESS; ULONG FirstEntry; - WCHAR Buffer[MAX_PATH]; if (AttributeAddress->Type != AttributeEnd) { @@ -172,7 +172,8 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, // we need to extract the filename from the path DPRINT1("Pathname: %wZ\n", &FileObject->FileName); - RtlInitEmptyUnicodeString(&FilenameNoPath, Buffer, MAX_PATH); + FilenameNoPath.Buffer = FileObject->FileName.Buffer; + FilenameNoPath.MaximumLength = FilenameNoPath.Length = FileObject->FileName.Length; FsRtlDissectName(FileObject->FileName, &Current, &Remaining); @@ -180,8 +181,11 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, { DPRINT1("Current: %wZ\n", &Current); - if(Remaining.Length != 0) - RtlCopyUnicodeString(&FilenameNoPath, &Remaining); + if (Remaining.Length != 0) + { + FilenameNoPath.Buffer = Remaining.Buffer; + FilenameNoPath.Length = FilenameNoPath.MaximumLength = Remaining.Length; + } FirstEntry = 0; Status = NtfsFindMftRecord(DeviceExt, @@ -196,8 +200,11 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, if (Remaining.Length == 0 ) { - if(Current.Length != 0) - RtlCopyUnicodeString(&FilenameNoPath, &Current); + if (Current.Length != 0) + { + FilenameNoPath.Buffer = Current.Buffer; + FilenameNoPath.Length = FilenameNoPath.MaximumLength = Current.Length; + } break; } @@ -317,9 +324,13 @@ AddRun(PNTFS_VCB Vcb, { ExRaiseStatus(STATUS_UNSUCCESSFUL); } - } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(_SEH2_GetExceptionCode()); - } _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Failed to add LargeMcb Entry!\n"); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); if (!RunBuffer) @@ -756,7 +767,7 @@ FreeClusters(PNTFS_VCB Vcb, } BitmapDataSize = AttributeDataLength(&DataContext->Record); - BitmapDataSize = min(BitmapDataSize, 0xffffffff); + BitmapDataSize = min(BitmapDataSize, ULONG_MAX); ASSERT((BitmapDataSize * 8) >= Vcb->NtfsInfo.ClusterCount); BitmapData = ExAllocatePoolWithTag(NonPagedPool, ROUND_UP(BitmapDataSize, Vcb->NtfsInfo.BytesPerSector), TAG_NTFS); if (BitmapData == NULL) @@ -1144,8 +1155,8 @@ VOID NtfsDumpIndexRootAttribute(PNTFS_ATTR_RECORD Attribute) { PINDEX_ROOT_ATTRIBUTE IndexRootAttr; - ULONG currentOffset; - ULONG currentNode; + ULONG CurrentOffset; + ULONG CurrentNode; IndexRootAttr = (PINDEX_ROOT_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); @@ -1168,18 +1179,18 @@ NtfsDumpIndexRootAttribute(PNTFS_ATTR_RECORD Attribute) IndexRootAttr->Header.FirstEntryOffset, IndexRootAttr->Header.TotalSizeOfEntries, IndexRootAttr->Header.AllocatedSize); - currentOffset = IndexRootAttr->Header.FirstEntryOffset; - currentNode = 0; + CurrentOffset = IndexRootAttr->Header.FirstEntryOffset; + CurrentNode = 0; // print details of every node in the index - while (currentOffset < IndexRootAttr->Header.TotalSizeOfEntries) + while (CurrentOffset < IndexRootAttr->Header.TotalSizeOfEntries) { - PINDEX_ENTRY_ATTRIBUTE currentIndexExtry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexRootAttr + 0x10 + currentOffset); - DbgPrint(" Index Node Entry %lu", currentNode++); - if (currentIndexExtry->Flags & NTFS_INDEX_ENTRY_NODE) + PINDEX_ENTRY_ATTRIBUTE currentIndexExtry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexRootAttr + 0x10 + CurrentOffset); + DbgPrint(" Index Node Entry %lu", CurrentNode++); + if (BooleanFlagOn(currentIndexExtry->Flags, NTFS_INDEX_ENTRY_NODE)) DbgPrint(" (Branch)"); else DbgPrint(" (Leaf)"); - if((currentIndexExtry->Flags & NTFS_INDEX_ENTRY_END)) + if (BooleanFlagOn(currentIndexExtry->Flags, NTFS_INDEX_ENTRY_END)) { DbgPrint(" (Dummy Key)"); } @@ -1203,11 +1214,11 @@ NtfsDumpIndexRootAttribute(PNTFS_ATTR_RECORD Attribute) if (currentIndexExtry->Flags & NTFS_INDEX_ENTRY_NODE) { // Print the VCN of the sub-node - PULONGLONG SubNodeVCN = (PULONGLONG)((ULONG_PTR)currentIndexExtry + currentIndexExtry->Length - 8); + PULONGLONG SubNodeVCN = (PULONGLONG)((ULONG_PTR)currentIndexExtry + currentIndexExtry->Length - sizeof(ULONGLONG)); DbgPrint(" VCN of sub-node: 0x%llx\n", *SubNodeVCN); } - currentOffset += currentIndexExtry->Length; + CurrentOffset += currentIndexExtry->Length; ASSERT(currentIndexExtry->Length); } @@ -1567,6 +1578,19 @@ GetStandardInformationFromRecord(PDEVICE_EXTENSION Vcb, return NULL; } +/** +* @name GetFileNameAttributeLength +* @implemented +* +* Returns the size of a given FILENAME_ATTRIBUTE, in bytes. +* +* @param FileNameAttribute +* Pointer to a FILENAME_ATTRIBUTE to determine the size of. +* +* @remarks +* The length of a FILENAME_ATTRIBUTE is variable and is dependent on the length of the file name stored at the end. +* This function operates on the FILENAME_ATTRIBUTE proper, so don't try to pass it a PNTFS_ATTR_RECORD. +*/ ULONG GetFileNameAttributeLength(PFILENAME_ATTRIBUTE FileNameAttribute) { ULONG Length = FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + (FileNameAttribute->NameLength * sizeof(WCHAR));

6 years, 9 months

[reactos] 47/72: [NTFS] - Fix UpdateFileNameRecord() when the file being updated resides in $INDEX_ROOT. Also, don't attempt to read beyond size of index root attribute, and check return value after reading.

by Trevor Thompson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5b7f90f237d6d21249c2… commit f5b7f90f237d6d21249c203753d9c8c1e65ab84f Author: Trevor Thompson <tmt256(a)email.vccs.edu> AuthorDate: Tue Jul 4 21:16:46 2017 +0000 [NTFS] - Fix UpdateFileNameRecord() when the file being updated resides in $INDEX_ROOT. Also, don't attempt to read beyond size of index root attribute, and check return value after reading. svn path=/branches/GSoC_2016/NTFS/; revision=75278 --- drivers/filesystems/ntfs/mft.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/ntfs/mft.c b/drivers/filesystems/ntfs/mft.c index 6ffe8d53ad..f8aff9ccd2 100644 --- a/drivers/filesystems/ntfs/mft.c +++ b/drivers/filesystems/ntfs/mft.c @@ -1418,7 +1418,15 @@ UpdateFileNameRecord(PDEVICE_EXTENSION Vcb, return STATUS_INSUFFICIENT_RESOURCES; } - ReadAttribute(Vcb, IndexRootCtx, 0, IndexRecord, Vcb->NtfsInfo.BytesPerIndexRecord); + Status = ReadAttribute(Vcb, IndexRootCtx, 0, IndexRecord, AttributeDataLength(&IndexRootCtx->Record)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to read Index Root!\n"); + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + ReleaseAttributeContext(IndexRootCtx); + ExFreePoolWithTag(MftRecord, TAG_NTFS); + } + IndexRoot = (PINDEX_ROOT_ATTRIBUTE)IndexRecord; IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)&IndexRoot->Header + IndexRoot->Header.FirstEntryOffset); // Index root is always resident. @@ -1440,6 +1448,18 @@ UpdateFileNameRecord(PDEVICE_EXTENSION Vcb, NewAllocationSize, CaseSensitive); + if (Status == STATUS_PENDING) + { + // we need to write the index root attribute back to disk + ULONG LengthWritten; + Status = WriteAttribute(Vcb, IndexRootCtx, 0, IndexRecord, AttributeDataLength(&IndexRootCtx->Record), &LengthWritten); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't update Index Root!\n"); + } + + } + ReleaseAttributeContext(IndexRootCtx); ExFreePoolWithTag(IndexRecord, TAG_NTFS); ExFreePoolWithTag(MftRecord, TAG_NTFS);

6 years, 9 months

[reactos] 46/72: [NTFS] - Fix AddFileName() when the file path is two or more directories deep.

by Trevor Thompson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=612facc28fb9e0bc15cb7… commit 612facc28fb9e0bc15cb759abda871b8f7478477 Author: Trevor Thompson <tmt256(a)email.vccs.edu> AuthorDate: Tue Jul 4 20:47:06 2017 +0000 [NTFS] - Fix AddFileName() when the file path is two or more directories deep. svn path=/branches/GSoC_2016/NTFS/; revision=75277 --- drivers/filesystems/ntfs/attrib.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/filesystems/ntfs/attrib.c b/drivers/filesystems/ntfs/attrib.c index 239e1c0400..4fece45c6c 100644 --- a/drivers/filesystems/ntfs/attrib.c +++ b/drivers/filesystems/ntfs/attrib.c @@ -146,7 +146,7 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, ULONGLONG CurrentMFTIndex = NTFS_FILE_ROOT; UNICODE_STRING Current, Remaining, FilenameNoPath; NTSTATUS Status = STATUS_SUCCESS; - ULONG FirstEntry = 0; + ULONG FirstEntry; WCHAR Buffer[MAX_PATH]; if (AttributeAddress->Type != AttributeEnd) @@ -183,6 +183,7 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, if(Remaining.Length != 0) RtlCopyUnicodeString(&FilenameNoPath, &Remaining); + FirstEntry = 0; Status = NtfsFindMftRecord(DeviceExt, CurrentMFTIndex, &Current, @@ -200,7 +201,7 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, break; } - FsRtlDissectName(Current, &Current, &Remaining); + FsRtlDissectName(Remaining, &Current, &Remaining); } DPRINT1("MFT Index of parent: %I64u\n", CurrentMFTIndex);

6 years, 9 months

[reactos] 45/72: [NTFS] - Fix gcc build. Fix CompareTreeKeys(): Don't consider Key1 a possible dummy key. Don't assume filenames are the same length.

by Trevor Thompson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16204ed3a703aded3eda9… commit 16204ed3a703aded3eda9f8aaa9835570c893894 Author: Trevor Thompson <tmt256(a)email.vccs.edu> AuthorDate: Thu Jun 29 02:36:00 2017 +0000 [NTFS] - Fix gcc build. Fix CompareTreeKeys(): Don't consider Key1 a possible dummy key. Don't assume filenames are the same length. svn path=/branches/GSoC_2016/NTFS/; revision=75228 --- drivers/filesystems/ntfs/btree.c | 71 ++++++++++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 17 deletions(-) diff --git a/drivers/filesystems/ntfs/btree.c b/drivers/filesystems/ntfs/btree.c index 604c02c290..d23871d3ff 100644 --- a/drivers/filesystems/ntfs/btree.c +++ b/drivers/filesystems/ntfs/btree.c @@ -54,21 +54,18 @@ * > 0 if key1 is greater than key2 * * @remarks -* Any other key is always less than the final (dummy) key in a node. +* Any other key is always less than the final (dummy) key in a node. Key1 must not be the dummy node. */ LONG CompareTreeKeys(PB_TREE_KEY Key1, PB_TREE_KEY Key2, BOOLEAN CaseSensitive) { UNICODE_STRING Key1Name, Key2Name; + LONG Comparison; // If Key2 is the "dummy key", key 1 will always come first if (Key2->NextKey == NULL) return -1; - // If Key1 is the "dummy key", key 2 will always come first - if (Key1->NextKey == NULL) - return 1; - Key1Name.Buffer = Key1->IndexEntry->FileName.Name; Key1Name.Length = Key1Name.MaximumLength = Key1->IndexEntry->FileName.NameLength * sizeof(WCHAR); @@ -77,7 +74,38 @@ CompareTreeKeys(PB_TREE_KEY Key1, PB_TREE_KEY Key2, BOOLEAN CaseSensitive) Key2Name.Length = Key2Name.MaximumLength = Key2->IndexEntry->FileName.NameLength * sizeof(WCHAR); - return RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); + // Are the two keys the same length? + if(Key1Name.Length == Key2Name.Length) + return RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); + + // Is Key1 shorter? + if (Key1Name.Length < Key2Name.Length) + { + // Truncate KeyName2 to be the same length as KeyName1 + Key2Name.Length = Key1Name.Length; + + // Compare the names of the same length + Comparison = RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); + + // If the truncated files are the same length, the shorter one comes first + if (Comparison == 0) + return -1; + } + else + { + // Key2 is shorter + // Truncate KeyName1 to be the same length as KeyName2 + Key1Name.Length = Key2Name.Length; + + // Compare the names of the same length + Comparison = RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); + + // If the truncated files are the same length, the shorter one comes first + if (Comparison == 0) + return 1; + } + + return Comparison; } /** @@ -241,6 +269,8 @@ CreateIndexRootFromBTree(PDEVICE_EXTENSION DeviceExt, PINDEX_ROOT_ATTRIBUTE *IndexRoot, ULONG *Length) { + int i; + PB_TREE_KEY CurrentKey; PINDEX_ENTRY_ATTRIBUTE CurrentNodeEntry; PINDEX_ROOT_ATTRIBUTE NewIndexRoot = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, @@ -274,11 +304,11 @@ CreateIndexRootFromBTree(PDEVICE_EXTENSION DeviceExt, NewIndexRoot->Header.TotalSizeOfEntries = NewIndexRoot->Header.FirstEntryOffset; // Setup each Node Entry - PB_TREE_KEY CurrentKey = Tree->RootNode->FirstKey; + CurrentKey = Tree->RootNode->FirstKey; CurrentNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)NewIndexRoot + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) + NewIndexRoot->Header.FirstEntryOffset); - for (int i = 0; i < Tree->RootNode->KeyCount; i++) + for (i = 0; i < Tree->RootNode->KeyCount; i++) { // Would adding the current entry to the index increase the index size beyond the limit we've set? ULONG IndexSize = FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) @@ -335,7 +365,8 @@ DestroyBTreeNode(PB_TREE_FILENAME_NODE Node) { PB_TREE_KEY NextKey; PB_TREE_KEY CurrentKey = Node->FirstKey; - for (int i = 0; i < Node->KeyCount; i++) + int i; + for (i = 0; i < Node->KeyCount; i++) { NT_ASSERT(CurrentKey); NextKey = CurrentKey->NextKey; @@ -370,7 +401,8 @@ DestroyBTree(PB_TREE Tree) VOID DumpBTreeKey(PB_TREE_KEY Key, int Number, int Depth) { - for (int i = 0; i < Depth; i++) + int i; + for (i = 0; i < Depth; i++) DbgPrint(" "); DbgPrint(" Key #%d", Number); @@ -386,14 +418,17 @@ DumpBTreeKey(PB_TREE_KEY Key, int Number, int Depth) DbgPrint(" (Dummy Key)\n"); } +VOID DumpBTreeNode(PB_TREE_FILENAME_NODE Node, int Number, int Depth) { - for (int i = 0; i < Depth; i++) + PB_TREE_KEY CurrentKey; + int i; + for (i = 0; i < Depth; i++) DbgPrint(" "); DbgPrint("Node #%d, Depth %d\n", Number, Depth); - PB_TREE_KEY CurrentKey = Node->FirstKey; - for (int i = 0; i < Node->KeyCount; i++) + CurrentKey = Node->FirstKey; + for (i = 0; i < Node->KeyCount; i++) { DumpBTreeKey(CurrentKey, i, Depth); CurrentKey = CurrentKey->NextKey; @@ -451,6 +486,8 @@ NtfsInsertKey(ULONGLONG FileReference, ULONG AttributeSize = GetFileNameAttributeLength(FileNameAttribute); ULONG EntrySize = ALIGN_UP_BY(AttributeSize + FIELD_OFFSET(INDEX_ENTRY_ATTRIBUTE, FileName), 8); PINDEX_ENTRY_ATTRIBUTE NewEntry; + PB_TREE_KEY NewKey, CurrentKey, PreviousKey; + int i; DPRINT1("NtfsInsertKey(0x%02I64, %p, %p, %s)\n", FileReference, @@ -476,14 +513,14 @@ NtfsInsertKey(ULONGLONG FileReference, RtlCopyMemory(&NewEntry->FileName, FileNameAttribute, AttributeSize); // Setup the New Key - PB_TREE_KEY NewKey = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_KEY), TAG_NTFS); + NewKey = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_KEY), TAG_NTFS); NewKey->IndexEntry = NewEntry; NewKey->NextKey = NULL; // Find where to insert the key - PB_TREE_KEY CurrentKey = Node->FirstKey; - PB_TREE_KEY PreviousKey = NULL; - for (int i = 0; i < Node->KeyCount; i++) + CurrentKey = Node->FirstKey; + PreviousKey = NULL; + for (i = 0; i < Node->KeyCount; i++) { // Should the New Key go before the current key? LONG Comparison = CompareTreeKeys(NewKey, CurrentKey, CaseSensitive);

6 years, 9 months

[reactos] 44/72: [NTFS] - Fix a couple of issues spotted by Thomas: Maintain alphabetical ordering of CMakeLists.txt, fix casts to BOOLEAN with BooleanFlagOn macro.

by Trevor Thompson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dc4938549ef2315a2f30… commit 2dc4938549ef2315a2f301eb452e9b9ad6f14835 Author: Trevor Thompson <tmt256(a)email.vccs.edu> AuthorDate: Wed Jun 28 18:22:42 2017 +0000 [NTFS] - Fix a couple of issues spotted by Thomas: Maintain alphabetical ordering of CMakeLists.txt, fix casts to BOOLEAN with BooleanFlagOn macro. svn path=/branches/GSoC_2016/NTFS/; revision=75224 --- drivers/filesystems/ntfs/CMakeLists.txt | 2 +- drivers/filesystems/ntfs/create.c | 2 +- drivers/filesystems/ntfs/dirctl.c | 2 +- drivers/filesystems/ntfs/finfo.c | 2 +- drivers/filesystems/ntfs/rw.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/filesystems/ntfs/CMakeLists.txt b/drivers/filesystems/ntfs/CMakeLists.txt index b9c72a72e7..0b1af78947 100644 --- a/drivers/filesystems/ntfs/CMakeLists.txt +++ b/drivers/filesystems/ntfs/CMakeLists.txt @@ -1,8 +1,8 @@ list(APPEND SOURCE attrib.c - btree.c blockdev.c + btree.c cleanup.c close.c create.c diff --git a/drivers/filesystems/ntfs/create.c b/drivers/filesystems/ntfs/create.c index 586da89b36..4da9470a6b 100644 --- a/drivers/filesystems/ntfs/create.c +++ b/drivers/filesystems/ntfs/create.c @@ -419,7 +419,7 @@ NtfsCreateFile(PDEVICE_OBJECT DeviceObject, Status = NtfsOpenFile(DeviceExt, FileObject, ((RequestedOptions & FILE_OPEN_BY_FILE_ID) ? FullPath.Buffer : FileObject->FileName.Buffer), - (Stack->Flags & SL_CASE_SENSITIVE), + BooleanFlagOn(Stack->Flags, SL_CASE_SENSITIVE), &Fcb); if (RequestedOptions & FILE_OPEN_BY_FILE_ID) diff --git a/drivers/filesystems/ntfs/dirctl.c b/drivers/filesystems/ntfs/dirctl.c index ba7231dc80..c3bcdb43cb 100644 --- a/drivers/filesystems/ntfs/dirctl.c +++ b/drivers/filesystems/ntfs/dirctl.c @@ -621,7 +621,7 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) &FileRecord, &MFTRecord, Fcb->MFTIndex, - (Stack->Flags & SL_CASE_SENSITIVE)); + BooleanFlagOn(Stack->Flags, SL_CASE_SENSITIVE)); if (NT_SUCCESS(Status)) { diff --git a/drivers/filesystems/ntfs/finfo.c b/drivers/filesystems/ntfs/finfo.c index 1cb7dbc0fe..ed1515c8d6 100644 --- a/drivers/filesystems/ntfs/finfo.c +++ b/drivers/filesystems/ntfs/finfo.c @@ -635,7 +635,7 @@ NtfsSetInformation(PNTFS_IRP_CONTEXT IrpContext) FileObject, DeviceExt, Irp->Flags, - (Stack->Flags & SL_CASE_SENSITIVE), + BooleanFlagOn(Stack->Flags, SL_CASE_SENSITIVE), &EndOfFileInfo->EndOfFile); break; diff --git a/drivers/filesystems/ntfs/rw.c b/drivers/filesystems/ntfs/rw.c index 215269a25c..7ef808f8c2 100644 --- a/drivers/filesystems/ntfs/rw.c +++ b/drivers/filesystems/ntfs/rw.c @@ -686,7 +686,7 @@ NtfsWrite(PNTFS_IRP_CONTEXT IrpContext) Length, ByteOffset.LowPart, Irp->Flags, - (IrpContext->Stack->Flags & SL_CASE_SENSITIVE), + BooleanFlagOn(IrpContext->Stack->Flags, SL_CASE_SENSITIVE), &ReturnedWriteLength); IrpContext->Irp->IoStatus.Status = Status;

6 years, 9 months

← Newer
1
...
20
21
22
23
24
25
26
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2017