Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTFS]

Browse source 
- Prepare (only prototype so far) NtfsFindMftRecord() for directory search & enumeration with WC.
- Modify CompareFileName() so that comparisons can be done with or without WC.
- Fix NtfsLookupFileAt() accordingly 

svn path=/trunk/; revision=64742
This commit is contained in:
Pierre Schweitzer 2014-10-14 18:41:38 +00:00
parent f4e263796c
commit f8c828f21c
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
reactos/drivers/filesystems/ntfs/mft.c
View file

@ -462,7 +462,8 @@ ReadLCN(PDEVICE_EXTENSION Vcb,
BOOLEAN BOOLEAN
CompareFileName(PUNICODE_STRING FileName, CompareFileName(PUNICODE_STRING FileName,
PINDEX_ENTRY_ATTRIBUTE IndexEntry) PINDEX_ENTRY_ATTRIBUTE IndexEntry,
BOOLEAN DirSearch)
{ {
UNICODE_STRING EntryName; UNICODE_STRING EntryName;
@ -470,12 +471,24 @@ CompareFileName(PUNICODE_STRING FileName,
EntryName.Length = EntryName.Length =
EntryName.MaximumLength = IndexEntry->FileName.NameLength; EntryName.MaximumLength = IndexEntry->FileName.NameLength;
return (RtlCompareUnicodeString(FileName, &EntryName, !!(IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == TRUE); if (DirSearch)
{
return FsRtlIsNameInExpression(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX), NULL);
}
else
{
return (RtlCompareUnicodeString(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == TRUE);
}
} }
NTSTATUS NTSTATUS
NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING FileName, ULONGLONG *OutMFTIndex) NtfsFindMftRecord(PDEVICE_EXTENSION Vcb,
ULONGLONG MFTIndex,
PUNICODE_STRING FileName,
ULONG FirstEntry,
BOOLEAN DirSearch,
ULONGLONG *OutMFTIndex)
{ {
PFILE_RECORD_HEADER MftRecord; PFILE_RECORD_HEADER MftRecord;
//ULONG Magic; //ULONG Magic;
@ -530,7 +543,7 @@ NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING Fil
while (IndexEntry < IndexEntryEnd && while (IndexEntry < IndexEntryEnd &&
!(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END))
{ {
if (CompareFileName(FileName, IndexEntry)) if (CompareFileName(FileName, IndexEntry, DirSearch))
{ {
*OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile;
ExFreePoolWithTag(IndexRecord, TAG_NTFS); ExFreePoolWithTag(IndexRecord, TAG_NTFS);
@ -613,7 +626,7 @@ NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING Fil
while (IndexEntry < IndexEntryEnd && while (IndexEntry < IndexEntryEnd &&
!(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END))
{ {
if (CompareFileName(FileName, IndexEntry)) if (CompareFileName(FileName, IndexEntry, DirSearch))
{ {
DPRINT("File found\n"); DPRINT("File found\n");
*OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile;
@ -663,7 +676,7 @@ NtfsLookupFileAt(PDEVICE_EXTENSION Vcb,
{ {
DPRINT1("Lookup: %wZ\n", &Current); DPRINT1("Lookup: %wZ\n", &Current);
Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &CurrentMFTIndex); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, 0, FALSE, &CurrentMFTIndex);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
return Status; return Status;