Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-25 01:42:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: IRP_MJ_DIRECTORY_CONTROL: testing

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-03-29 00:02:11 -07:00
parent b0f4926b77
commit b5f37e2a40
2 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/sys/dirctl.c
View File

@ -7,7 +7,8 @@
#include <sys/driver.h> #include <sys/driver.h>
static NTSTATUS FspFsvolQueryDirectoryCopy( static NTSTATUS FspFsvolQueryDirectoryCopy(
PUNICODE_STRING DirectoryPattern, BOOLEAN CaseInsensitive, PUINT64 PDirectoryOffset, PUNICODE_STRING DirectoryPattern, BOOLEAN CaseInsensitive,
UINT64 DirectoryOffset, PUINT64 PDirectoryOffset,
FILE_INFORMATION_CLASS FileInformationClass, BOOLEAN ReturnSingleEntry, FILE_INFORMATION_CLASS FileInformationClass, BOOLEAN ReturnSingleEntry,
FSP_FSCTL_DIR_INFO **PDirInfo, ULONG DirInfoSize, FSP_FSCTL_DIR_INFO **PDirInfo, ULONG DirInfoSize,
PVOID DestBuf, PULONG PDestLen); PVOID DestBuf, PULONG PDestLen);
@ -65,7 +66,8 @@ enum
}; };
static NTSTATUS FspFsvolQueryDirectoryCopy( static NTSTATUS FspFsvolQueryDirectoryCopy(
PUNICODE_STRING DirectoryPattern, BOOLEAN CaseInsensitive, PUINT64 PDirectoryOffset, PUNICODE_STRING DirectoryPattern, BOOLEAN CaseInsensitive,
UINT64 DirectoryOffset, PUINT64 PDirectoryOffset,
FILE_INFORMATION_CLASS FileInformationClass, BOOLEAN ReturnSingleEntry, FILE_INFORMATION_CLASS FileInformationClass, BOOLEAN ReturnSingleEntry,
FSP_FSCTL_DIR_INFO **PDirInfo, ULONG DirInfoSize, FSP_FSCTL_DIR_INFO **PDirInfo, ULONG DirInfoSize,
PVOID DestBuf, PULONG PDestLen) PVOID DestBuf, PULONG PDestLen)
@ -98,7 +100,6 @@ static NTSTATUS FspFsvolQueryDirectoryCopy(
PAGED_CODE(); PAGED_CODE();
BOOLEAN MatchAll = FspFileDescDirectoryPatternMatchAll == DirectoryPattern->Buffer; BOOLEAN MatchAll = FspFileDescDirectoryPatternMatchAll == DirectoryPattern->Buffer;
UINT64 DirectoryOffset = *PDirectoryOffset;
BOOLEAN DirectoryOffsetFound = FALSE; BOOLEAN DirectoryOffsetFound = FALSE;
FSP_FSCTL_DIR_INFO *DirInfo = *PDirInfo; FSP_FSCTL_DIR_INFO *DirInfo = *PDirInfo;
PUINT8 DirInfoEnd = (PUINT8)DirInfo + DirInfoSize; PUINT8 DirInfoEnd = (PUINT8)DirInfo + DirInfoSize;
@ -144,8 +145,11 @@ static NTSTATUS FspFsvolQueryDirectoryCopy(
DirInfoSize = DirInfo->Size; DirInfoSize = DirInfo->Size;
if (sizeof(FSP_FSCTL_DIR_INFO) > DirInfoSize) if (sizeof(FSP_FSCTL_DIR_INFO) > DirInfoSize)
return 0 != *PDestLen ? STATUS_SUCCESS : {
(0 == DirectoryOffset ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES); if (0 == *PDestLen)
return STATUS_NO_MORE_FILES;
break;
}
if (0 != DirectoryOffset && !DirectoryOffsetFound) if (0 != DirectoryOffset && !DirectoryOffsetFound)
{ {
@ -162,13 +166,12 @@ static NTSTATUS FspFsvolQueryDirectoryCopy(
if ((PUINT8)DestBuf + if ((PUINT8)DestBuf +
FSP_FSCTL_ALIGN_UP(BaseInfoLen + FileName.Length, sizeof(LONGLONG)) > DestBufEnd) FSP_FSCTL_ALIGN_UP(BaseInfoLen + FileName.Length, sizeof(LONGLONG)) > DestBufEnd)
{ {
if (DestBufBgn != DestBuf) if (0 == *PDestLen)
break;
else
{ {
*PDestLen = BaseInfoLen + FileName.Length; *PDestLen = BaseInfoLen + FileName.Length;
return STATUS_BUFFER_OVERFLOW; return STATUS_BUFFER_OVERFLOW;
} }
break;
} }
if (0 != PrevDestBuf) if (0 != PrevDestBuf)
@ -239,6 +242,7 @@ static NTSTATUS FspFsvolQueryDirectoryCopy(
*PDirInfo = DirInfo; *PDirInfo = DirInfo;
return STATUS_SUCCESS; return STATUS_SUCCESS;
#undef FILL_INFO #undef FILL_INFO
#undef FILL_INFO_BASE #undef FILL_INFO_BASE
} }
@ -265,15 +269,15 @@ static NTSTATUS FspFsvolQueryDirectoryCopyCache(
FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(FsvolDeviceObject); FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(FsvolDeviceObject);
BOOLEAN CaseInsensitive = 0 == FsvolDeviceExtension->VolumeParams.CaseSensitiveSearch; BOOLEAN CaseInsensitive = 0 == FsvolDeviceExtension->VolumeParams.CaseSensitiveSearch;
PUNICODE_STRING DirectoryPattern = &FileDesc->DirectoryPattern; PUNICODE_STRING DirectoryPattern = &FileDesc->DirectoryPattern;
UINT64 DirectoryOffset = 0 == FileDesc->DirInfoCacheHint ? UINT64 DirectoryOffset = FileDesc->DirectoryOffset;
FileDesc->DirectoryOffset : 0;
PUINT8 DirInfoBgn = (PUINT8)DirInfo; PUINT8 DirInfoBgn = (PUINT8)DirInfo;
PUINT8 DirInfoEnd = (PUINT8)DirInfo + DirInfoSize; PUINT8 DirInfoEnd = (PUINT8)DirInfo + DirInfoSize;
DirInfo = (PVOID)(DirInfoBgn + FileDesc->DirInfoCacheHint); DirInfo = (PVOID)(DirInfoBgn + FileDesc->DirInfoCacheHint);
DirInfoSize = (ULONG)(DirInfoEnd - (PUINT8)DirInfo); DirInfoSize = (ULONG)(DirInfoEnd - (PUINT8)DirInfo);
Result = FspFsvolQueryDirectoryCopy(DirectoryPattern, CaseInsensitive, &DirectoryOffset, Result = FspFsvolQueryDirectoryCopy(DirectoryPattern, CaseInsensitive,
0 != FileDesc->DirInfoCacheHint ? 0 : DirectoryOffset, &DirectoryOffset,
FileInformationClass, ReturnSingleEntry, FileInformationClass, ReturnSingleEntry,
&DirInfo, DirInfoSize, &DirInfo, DirInfoSize,
DestBuf, PDestLen); DestBuf, PDestLen);
@ -283,6 +287,8 @@ static NTSTATUS FspFsvolQueryDirectoryCopyCache(
FileDesc->DirectoryOffset = DirectoryOffset; FileDesc->DirectoryOffset = DirectoryOffset;
FileDesc->DirInfoCacheHint = (ULONG)((PUINT8)DirInfo - DirInfoBgn); FileDesc->DirInfoCacheHint = (ULONG)((PUINT8)DirInfo - DirInfoBgn);
} }
else if (STATUS_NO_MORE_FILES == Result && 0 == FileDesc->DirectoryOffset)
Result = STATUS_NO_SUCH_FILE;
return Result; return Result;
} }
@ -303,7 +309,7 @@ static NTSTATUS FspFsvolQueryDirectoryCopyInPlace(
FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(FsvolDeviceObject); FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(FsvolDeviceObject);
BOOLEAN CaseInsensitive = 0 == FsvolDeviceExtension->VolumeParams.CaseSensitiveSearch; BOOLEAN CaseInsensitive = 0 == FsvolDeviceExtension->VolumeParams.CaseSensitiveSearch;
PUNICODE_STRING DirectoryPattern = &FileDesc->DirectoryPattern; PUNICODE_STRING DirectoryPattern = &FileDesc->DirectoryPattern;
UINT64 DirectoryOffset = 0; UINT64 DirectoryOffset = FileDesc->DirectoryOffset;
ASSERT(DirInfo == DestBuf); ASSERT(DirInfo == DestBuf);
static_assert( static_assert(
@ -311,13 +317,16 @@ static NTSTATUS FspFsvolQueryDirectoryCopyInPlace(
FIELD_OFFSET(FILE_ID_BOTH_DIR_INFORMATION, FileName), FIELD_OFFSET(FILE_ID_BOTH_DIR_INFORMATION, FileName),
"FSP_FSCTL_DIR_INFO must be bigger than FILE_ID_BOTH_DIR_INFORMATION"); "FSP_FSCTL_DIR_INFO must be bigger than FILE_ID_BOTH_DIR_INFORMATION");
Result = FspFsvolQueryDirectoryCopy(DirectoryPattern, CaseInsensitive, &DirectoryOffset, Result = FspFsvolQueryDirectoryCopy(DirectoryPattern, CaseInsensitive,
0, &DirectoryOffset,
FileInformationClass, ReturnSingleEntry, FileInformationClass, ReturnSingleEntry,
&DirInfo, DirInfoSize, &DirInfo, DirInfoSize,
DestBuf, PDestLen); DestBuf, PDestLen);
if (NT_SUCCESS(Result)) if (NT_SUCCESS(Result))
FileDesc->DirectoryOffset = DirectoryOffset; FileDesc->DirectoryOffset = DirectoryOffset;
else if (STATUS_NO_MORE_FILES == Result && 0 == FileDesc->DirectoryOffset)
Result = STATUS_NO_SUCH_FILE;
return Result; return Result;
} }
@ -444,6 +453,8 @@ static NTSTATUS FspFsvolQueryDirectory(
FSP_FILE_NODE *FileNode = FileObject->FsContext; FSP_FILE_NODE *FileNode = FileObject->FsContext;
FILE_INFORMATION_CLASS FileInformationClass = IrpSp->Parameters.QueryDirectory.FileInformationClass; FILE_INFORMATION_CLASS FileInformationClass = IrpSp->Parameters.QueryDirectory.FileInformationClass;
PUNICODE_STRING FileName = IrpSp->Parameters.QueryDirectory.FileName; PUNICODE_STRING FileName = IrpSp->Parameters.QueryDirectory.FileName;
ULONG Length = IrpSp->Parameters.QueryDirectory.Length;
ULONG BaseInfoLen;
/* only directory files can be queried */ /* only directory files can be queried */
if (!FileNode->IsDirectory) if (!FileNode->IsDirectory)
@ -457,15 +468,28 @@ static NTSTATUS FspFsvolQueryDirectory(
switch (FileInformationClass) switch (FileInformationClass)
{ {
case FileDirectoryInformation: case FileDirectoryInformation:
BaseInfoLen = FIELD_OFFSET(FILE_DIRECTORY_INFORMATION, FileName);
break;
case FileFullDirectoryInformation: case FileFullDirectoryInformation:
BaseInfoLen = FIELD_OFFSET(FILE_FULL_DIR_INFORMATION, FileName);
break;
case FileIdFullDirectoryInformation: case FileIdFullDirectoryInformation:
BaseInfoLen = FIELD_OFFSET(FILE_ID_FULL_DIR_INFORMATION, FileName);
break;
case FileNamesInformation: case FileNamesInformation:
BaseInfoLen = FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName);
break;
case FileBothDirectoryInformation: case FileBothDirectoryInformation:
BaseInfoLen = FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName);
break;
case FileIdBothDirectoryInformation: case FileIdBothDirectoryInformation:
BaseInfoLen = FIELD_OFFSET(FILE_ID_BOTH_DIR_INFORMATION, FileName);
break; break;
default: default:
return STATUS_INVALID_INFO_CLASS; return STATUS_INVALID_INFO_CLASS;
} }
if (BaseInfoLen >= Length)
return STATUS_BUFFER_TOO_SMALL;
Result = FspFsvolQueryDirectoryRetry(FsvolDeviceObject, Irp, IrpSp, IoIsOperationSynchronous(Irp)); Result = FspFsvolQueryDirectoryRetry(FsvolDeviceObject, Irp, IrpSp, IoIsOperationSynchronous(Irp));

18
tst/winfsp-tests/memfs.cpp
View File

@ -754,19 +754,23 @@ static NTSTATUS ReadDirectory(FSP_FILE_SYSTEM *FileSystem,
if (0 == ParentNode) if (0 == ParentNode)
return Result; return Result;
if (0 == Offset)
if (!AddDirInfo(FileNode, L".", Buffer, Length, PBytesTransferred))
return STATUS_SUCCESS;
if (0 == Offset || FileNode->FileInfo.IndexNumber == Offset)
if (!AddDirInfo(ParentNode, L"..", Buffer, Length, PBytesTransferred))
return STATUS_SUCCESS;
Context.Buffer = Buffer; Context.Buffer = Buffer;
Context.Offset = Offset; Context.Offset = Offset;
Context.Length = Length; Context.Length = Length;
Context.PBytesTransferred = PBytesTransferred; Context.PBytesTransferred = PBytesTransferred;
Context.OffsetFound = FALSE; Context.OffsetFound = FALSE;
if (0 == Offset)
if (!AddDirInfo(FileNode, L".", Buffer, Length, PBytesTransferred))
return STATUS_SUCCESS;
if (0 == Offset || FileNode->FileInfo.IndexNumber == Offset)
{
Context.OffsetFound = FileNode->FileInfo.IndexNumber == Context.Offset;
if (!AddDirInfo(ParentNode, L"..", Buffer, Length, PBytesTransferred))
return STATUS_SUCCESS;
}
if (MemfsFileNodeEnumerateChildren(Memfs->FileNodeMap, FileNode, ReadDirectoryEnumFn, &Context)) if (MemfsFileNodeEnumerateChildren(Memfs->FileNodeMap, FileNode, ReadDirectoryEnumFn, &Context))
FspFileSystemAddDirInfo(0, Buffer, Length, PBytesTransferred); FspFileSystemAddDirInfo(0, Buffer, Length, PBytesTransferred);