From 8a099f3faa12736ceab9f275e3e88c8f1fa9b55d Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Tue, 26 Sep 2017 14:19:27 -0700 Subject: [PATCH] sys: PassQueryDirectoryFileName --- src/sys/dirctl.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/sys/dirctl.c b/src/sys/dirctl.c index 7272ba51..59e4d851 100644 --- a/src/sys/dirctl.c +++ b/src/sys/dirctl.c @@ -567,19 +567,11 @@ static NTSTATUS FspFsvolQueryDirectoryRetry( } /* create request */ - PassQueryDirectoryPattern = PatternIsFileName = FALSE; - if (FsvolDeviceExtension->VolumeParams.PassQueryDirectoryPattern && - FspFileDescDirectoryPatternMatchAll != FileDesc->DirectoryPattern.Buffer) - { - PassQueryDirectoryPattern = TRUE; - PatternIsFileName = !FsRtlDoesNameContainWildCards(&FileDesc->DirectoryPattern); - } - else if (FsvolDeviceExtension->VolumeParams.PassQueryDirectoryFileName && - !FsRtlDoesNameContainWildCards(&FileDesc->DirectoryPattern)) - { - PassQueryDirectoryPattern = TRUE; - PatternIsFileName = TRUE; - } + PatternIsFileName = FsvolDeviceExtension->VolumeParams.PassQueryDirectoryFileName && + !FsRtlDoesNameContainWildCards(&FileDesc->DirectoryPattern); + PassQueryDirectoryPattern = PatternIsFileName || + (FsvolDeviceExtension->VolumeParams.PassQueryDirectoryPattern && + FspFileDescDirectoryPatternMatchAll != FileDesc->DirectoryPattern.Buffer); Result = FspIopCreateRequestEx(Irp, 0, (PassQueryDirectoryPattern ? FileDesc->DirectoryPattern.Length + sizeof(WCHAR) : 0) + (FsvolDeviceExtension->VolumeParams.MaxComponentLength + 1) * sizeof(WCHAR),