sys: PassQueryDirectoryFileName

This commit is contained in:
Bill Zissimopoulos 2017-09-26 14:19:27 -07:00
parent 1ac172d2f8
commit 8a099f3faa

View File

@ -567,19 +567,11 @@ static NTSTATUS FspFsvolQueryDirectoryRetry(
} }
/* create request */ /* create request */
PassQueryDirectoryPattern = PatternIsFileName = FALSE; PatternIsFileName = FsvolDeviceExtension->VolumeParams.PassQueryDirectoryFileName &&
if (FsvolDeviceExtension->VolumeParams.PassQueryDirectoryPattern && !FsRtlDoesNameContainWildCards(&FileDesc->DirectoryPattern);
FspFileDescDirectoryPatternMatchAll != FileDesc->DirectoryPattern.Buffer) PassQueryDirectoryPattern = PatternIsFileName ||
{ (FsvolDeviceExtension->VolumeParams.PassQueryDirectoryPattern &&
PassQueryDirectoryPattern = TRUE; FspFileDescDirectoryPatternMatchAll != FileDesc->DirectoryPattern.Buffer);
PatternIsFileName = !FsRtlDoesNameContainWildCards(&FileDesc->DirectoryPattern);
}
else if (FsvolDeviceExtension->VolumeParams.PassQueryDirectoryFileName &&
!FsRtlDoesNameContainWildCards(&FileDesc->DirectoryPattern))
{
PassQueryDirectoryPattern = TRUE;
PatternIsFileName = TRUE;
}
Result = FspIopCreateRequestEx(Irp, 0, Result = FspIopCreateRequestEx(Irp, 0,
(PassQueryDirectoryPattern ? FileDesc->DirectoryPattern.Length + sizeof(WCHAR) : 0) + (PassQueryDirectoryPattern ? FileDesc->DirectoryPattern.Length + sizeof(WCHAR) : 0) +
(FsvolDeviceExtension->VolumeParams.MaxComponentLength + 1) * sizeof(WCHAR), (FsvolDeviceExtension->VolumeParams.MaxComponentLength + 1) * sizeof(WCHAR),