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: winfsp-tests: RejectIrpPriorToTransact0 test fixes

Browse Source
This commit is contained in:
Bill Zissimopoulos 2022-06-30 13:32:31 +01:00
parent 5483dcbd73
commit b4453c89cc
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tst/winfsp-tests/mount-test.c
View File

@ -215,6 +215,9 @@ void mount_volume_transact_dotest(PWSTR DeviceName, PWSTR Prefix)
ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumeName, 15)); ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumeName, 15));
ASSERT(INVALID_HANDLE_VALUE != VolumeHandle); ASSERT(INVALID_HANDLE_VALUE != VolumeHandle);
Result = FspFsctlTransact(VolumeHandle, 0, 0, 0, 0, FALSE);
ASSERT(NT_SUCCESS(Result));
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\file0", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\file0",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : VolumeName); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : VolumeName);
Thread = (HANDLE)_beginthreadex(0, 0, mount_volume_transact_dotest_thread, FilePath, 0, 0); Thread = (HANDLE)_beginthreadex(0, 0, mount_volume_transact_dotest_thread, FilePath, 0, 0);
@ -246,6 +249,8 @@ void mount_volume_transact_dotest(PWSTR DeviceName, PWSTR Prefix)
ASSERT(0 != Request->Hint); ASSERT(0 != Request->Hint);
ASSERT(FspFsctlTransactCreateKind == Request->Kind || ASSERT(FspFsctlTransactCreateKind == Request->Kind ||
FspFsctlTransactQueryVolumeInformationKind == Request->Kind); FspFsctlTransactQueryVolumeInformationKind == Request->Kind);
/* since we made RejectIrpPriorToTransact0 mandatory the assertions below do not hold */
#if 0
if (FspFsctlTransactCreateKind == Request->Kind) if (FspFsctlTransactCreateKind == Request->Kind)
{ {
ASSERT(FILE_CREATE == ((Request->Req.Create.CreateOptions >> 24) & 0xff)); ASSERT(FILE_CREATE == ((Request->Req.Create.CreateOptions >> 24) & 0xff));
@ -265,6 +270,7 @@ void mount_volume_transact_dotest(PWSTR DeviceName, PWSTR Prefix)
ASSERT((wcslen((PVOID)Request->Buffer) + 1) * sizeof(WCHAR) == Request->FileName.Size); ASSERT((wcslen((PVOID)Request->Buffer) + 1) * sizeof(WCHAR) == Request->FileName.Size);
ASSERT(0 == mywcscmp((PVOID)Request->Buffer, -1, L"\\file0", -1)); ASSERT(0 == mywcscmp((PVOID)Request->Buffer, -1, L"\\file0", -1));
} }
#endif
ASSERT(FspFsctlTransactCanProduceResponse(Response, ResponseBufEnd)); ASSERT(FspFsctlTransactCanProduceResponse(Response, ResponseBufEnd));
@ -294,7 +300,8 @@ void mount_volume_transact_dotest(PWSTR DeviceName, PWSTR Prefix)
GetExitCodeThread(Thread, &ExitCode); GetExitCodeThread(Thread, &ExitCode);
CloseHandle(Thread); CloseHandle(Thread);
ASSERT(ERROR_ACCESS_DENIED == ExitCode || ERROR_OPERATION_ABORTED == ExitCode); ASSERT(0 != ExitCode);
//ASSERT(ERROR_ACCESS_DENIED == ExitCode || ERROR_OPERATION_ABORTED == ExitCode);
} }
void mount_volume_transact_test(void) void mount_volume_transact_test(void)

5
tst/winfsp-tests/timeout-test.c
View File

@ -187,6 +187,8 @@ void timeout_transact_dotest(PWSTR DeviceName, PWSTR Prefix)
ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumeName, 15)); ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumeName, 15));
ASSERT(INVALID_HANDLE_VALUE != VolumeHandle); ASSERT(INVALID_HANDLE_VALUE != VolumeHandle);
Result = FspFsctlTransact(VolumeHandle, 0, 0, 0, 0, FALSE);
ASSERT(NT_SUCCESS(Result));
FSP_FSCTL_DECLSPEC_ALIGN UINT8 RequestBuf[FSP_FSCTL_TRANSACT_BATCH_BUFFER_SIZEMIN]; FSP_FSCTL_DECLSPEC_ALIGN UINT8 RequestBuf[FSP_FSCTL_TRANSACT_BATCH_BUFFER_SIZEMIN];
FSP_FSCTL_DECLSPEC_ALIGN UINT8 ResponseBuf[FSP_FSCTL_TRANSACT_RSP_SIZEMAX]; FSP_FSCTL_DECLSPEC_ALIGN UINT8 ResponseBuf[FSP_FSCTL_TRANSACT_RSP_SIZEMAX];
@ -223,6 +225,8 @@ void timeout_transact_dotest(PWSTR DeviceName, PWSTR Prefix)
ASSERT(0 != Request->Hint); ASSERT(0 != Request->Hint);
ASSERT(FspFsctlTransactCreateKind == Request->Kind || ASSERT(FspFsctlTransactCreateKind == Request->Kind ||
FspFsctlTransactQueryVolumeInformationKind == Request->Kind); FspFsctlTransactQueryVolumeInformationKind == Request->Kind);
/* since we made RejectIrpPriorToTransact0 mandatory the assertions below do not hold */
#if 0
if (FspFsctlTransactCreateKind == Request->Kind) if (FspFsctlTransactCreateKind == Request->Kind)
{ {
ASSERT(FILE_CREATE == ((Request->Req.Create.CreateOptions >> 24) & 0xff)); ASSERT(FILE_CREATE == ((Request->Req.Create.CreateOptions >> 24) & 0xff));
@ -239,6 +243,7 @@ void timeout_transact_dotest(PWSTR DeviceName, PWSTR Prefix)
ASSERT(!Request->Req.Create.OpenTargetDirectory); ASSERT(!Request->Req.Create.OpenTargetDirectory);
ASSERT(!Request->Req.Create.CaseSensitive); ASSERT(!Request->Req.Create.CaseSensitive);
} }
#endif
ResponseBufSize = 0; ResponseBufSize = 0;
RequestBufSize = sizeof RequestBuf; RequestBufSize = sizeof RequestBuf;