Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-22 16:33:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

tst: passthrough-cpp: minor improvements

Browse Source
This commit is contained in:
Bill Zissimopoulos 2017-03-29 14:40:37 -07:00
parent 96f6c28885
commit c9b5f25ffc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tst/passthrough-cpp/passthrough-cpp.cpp
View File

@ -104,7 +104,7 @@ struct PTFS_FILE_DESC
~PTFS_FILE_DESC() ~PTFS_FILE_DESC()
{ {
CloseHandle(Handle); CloseHandle(Handle);
FspFileSystemDeleteDirectoryBuffer(&DirBuffer); PTFS::DeleteDirectoryBuffer(&DirBuffer);
} }
HANDLE Handle; HANDLE Handle;
PVOID DirBuffer; PVOID DirBuffer;
@ -635,7 +635,7 @@ NTSTATUS PTFS::ReadDirectory(
NTSTATUS DirBufferResult; NTSTATUS DirBufferResult;
DirBufferResult = STATUS_SUCCESS; DirBufferResult = STATUS_SUCCESS;
if (FspFileSystemAcquireDirectoryBuffer(&FileDesc->DirBuffer, 0 == Marker, &DirBufferResult)) if (AcquireDirectoryBuffer(&FileDesc->DirBuffer, 0 == Marker, &DirBufferResult))
{ {
if (0 == Pattern) if (0 == Pattern)
Pattern = L"*"; Pattern = L"*";
@ -648,7 +648,7 @@ NTSTATUS PTFS::ReadDirectory(
DirBufferResult = STATUS_OBJECT_NAME_INVALID; DirBufferResult = STATUS_OBJECT_NAME_INVALID;
if (!NT_SUCCESS(DirBufferResult)) if (!NT_SUCCESS(DirBufferResult))
{ {
FspFileSystemReleaseDirectoryBuffer(&FileDesc->DirBuffer); ReleaseDirectoryBuffer(&FileDesc->DirBuffer);
return DirBufferResult; return DirBufferResult;
} }
@ -679,20 +679,20 @@ NTSTATUS PTFS::ReadDirectory(
DirInfo->FileInfo.HardLinks = 0; DirInfo->FileInfo.HardLinks = 0;
memcpy(DirInfo->FileNameBuf, FindData.cFileName, Length * sizeof(WCHAR)); memcpy(DirInfo->FileNameBuf, FindData.cFileName, Length * sizeof(WCHAR));
if (!FspFileSystemFillDirectoryBuffer(&FileDesc->DirBuffer, DirInfo, &DirBufferResult)) if (!FillDirectoryBuffer(&FileDesc->DirBuffer, DirInfo, &DirBufferResult))
break; break;
} while (FindNextFileW(FindHandle, &FindData)); } while (FindNextFileW(FindHandle, &FindData));
FindClose(FindHandle); FindClose(FindHandle);
} }
FspFileSystemReleaseDirectoryBuffer(&FileDesc->DirBuffer); ReleaseDirectoryBuffer(&FileDesc->DirBuffer);
} }
if (!NT_SUCCESS(DirBufferResult)) if (!NT_SUCCESS(DirBufferResult))
return DirBufferResult; return DirBufferResult;
FspFileSystemReadDirectoryBuffer(&FileDesc->DirBuffer, ReadDirectoryBuffer(&FileDesc->DirBuffer,
Marker, Buffer, BufferLength, PBytesTransferred); Marker, Buffer, BufferLength, PBytesTransferred);
return STATUS_SUCCESS; return STATUS_SUCCESS;