Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-10-30 03:28:38 -05:00
Code Activity

sys, winfsp-tests: rename SerialNumber to VolumeSerialNumber

Browse Source
This commit is contained in:
Bill Zissimopoulos
2016-01-25 15:33:47 -08:00
parent 82d88e2af8
commit f19500568d
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inc/winfsp/fsctl.h
View File

@@ -113,7 +113,7 @@ typedef struct
UINT16 SectorSize; UINT16 SectorSize;
UINT16 SectorsPerAllocationUnit; UINT16 SectorsPerAllocationUnit;
UINT16 MaxComponentLength; /* maximum file name component length (bytes) */ UINT16 MaxComponentLength; /* maximum file name component length (bytes) */
UINT32 SerialNumber; /* volume serial number */ UINT32 VolumeSerialNumber;
/* I/O timeouts, capacity, etc. */ /* I/O timeouts, capacity, etc. */
UINT32 TransactTimeout; /* FSP_FSCTL_TRANSACT timeout (millis; 1 sec - 10 sec) */ UINT32 TransactTimeout; /* FSP_FSCTL_TRANSACT timeout (millis; 1 sec - 10 sec) */
UINT32 IrpTimeout; /* pending IRP timeout (millis; 1 min - 10 min) */ UINT32 IrpTimeout; /* pending IRP timeout (millis; 1 min - 10 min) */

2
src/sys/volinfo.c
View File

@@ -177,7 +177,7 @@ static NTSTATUS FspFsvolQueryFsVolumeInformation(
ULONG CopyLength; ULONG CopyLength;
Info->VolumeCreationTime.QuadPart = VolumeInfo->VolumeCreationTime; Info->VolumeCreationTime.QuadPart = VolumeInfo->VolumeCreationTime;
Info->VolumeSerialNumber = FsvolDeviceExtension->VolumeParams.SerialNumber; Info->VolumeSerialNumber = FsvolDeviceExtension->VolumeParams.VolumeSerialNumber;
Info->VolumeLabelLength = VolumeInfo->VolumeLabelLength; Info->VolumeLabelLength = VolumeInfo->VolumeLabelLength;
Info->SupportsObjects = FALSE; Info->SupportsObjects = FALSE;

2
src/sys/volume.c
View File

@@ -397,7 +397,7 @@ NTSTATUS FspVolumeMount(
IoAcquireVpbSpinLock(&Irql); IoAcquireVpbSpinLock(&Irql);
Vpb->ReferenceCount++; Vpb->ReferenceCount++;
Vpb->DeviceObject = FsvolDeviceObject; Vpb->DeviceObject = FsvolDeviceObject;
Vpb->SerialNumber = FsvolDeviceExtension->VolumeParams.SerialNumber; Vpb->SerialNumber = FsvolDeviceExtension->VolumeParams.VolumeSerialNumber;
IoReleaseVpbSpinLock(Irql); IoReleaseVpbSpinLock(Irql);
/* done with mounting; release the DeleteResource */ /* done with mounting; release the DeleteResource */

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

@@ -455,7 +455,7 @@ NTSTATUS MemfsCreate(ULONG Flags, ULONG FileInfoTimeout,
memset(&VolumeParams, 0, sizeof VolumeParams); memset(&VolumeParams, 0, sizeof VolumeParams);
VolumeParams.SectorSize = MEMFS_SECTOR_SIZE; VolumeParams.SectorSize = MEMFS_SECTOR_SIZE;
VolumeParams.SectorsPerAllocationUnit = MEMFS_SECTORS_PER_ALLOCATION_UNIT; VolumeParams.SectorsPerAllocationUnit = MEMFS_SECTORS_PER_ALLOCATION_UNIT;
VolumeParams.SerialNumber = (UINT32)(MemfsGetSystemTime() / (10000 * 1000)); VolumeParams.VolumeSerialNumber = (UINT32)(MemfsGetSystemTime() / (10000 * 1000));
VolumeParams.FileInfoTimeout = FileInfoTimeout; VolumeParams.FileInfoTimeout = FileInfoTimeout;
VolumeParams.CaseSensitiveSearch = 1; VolumeParams.CaseSensitiveSearch = 1;
VolumeParams.CasePreservedNames = 1; VolumeParams.CasePreservedNames = 1;

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

@@ -14,7 +14,7 @@ void mount_invalid_test(void)
HANDLE VolumeHandle; HANDLE VolumeHandle;
VolumeParams.SectorSize = 16384; VolumeParams.SectorSize = 16384;
VolumeParams.SerialNumber = 0x12345678; VolumeParams.VolumeSerialNumber = 0x12345678;
Result = FspFsctlCreateVolume(L"WinFsp.DoesNotExist", &VolumeParams, Result = FspFsctlCreateVolume(L"WinFsp.DoesNotExist", &VolumeParams,
VolumeName, sizeof VolumeName, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);
ASSERT(STATUS_NO_SUCH_DEVICE == Result); ASSERT(STATUS_NO_SUCH_DEVICE == Result);
@@ -54,7 +54,7 @@ void mount_create_volume_dotest(PWSTR DeviceName)
HANDLE VolumeHandle; HANDLE VolumeHandle;
VolumeParams.SectorSize = 16384; VolumeParams.SectorSize = 16384;
VolumeParams.SerialNumber = 0x12345678; VolumeParams.VolumeSerialNumber = 0x12345678;
wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share");
Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, Result = FspFsctlCreateVolume(DeviceName, &VolumeParams,
VolumeName, sizeof VolumeName, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);
@@ -99,7 +99,7 @@ void mount_volume_cancel_dotest(PWSTR DeviceName, PWSTR Prefix)
DWORD ExitCode; DWORD ExitCode;
VolumeParams.SectorSize = 16384; VolumeParams.SectorSize = 16384;
VolumeParams.SerialNumber = 0x12345678; VolumeParams.VolumeSerialNumber = 0x12345678;
wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share");
Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, Result = FspFsctlCreateVolume(DeviceName, &VolumeParams,
VolumeName, sizeof VolumeName, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);
@@ -158,7 +158,7 @@ void mount_volume_transact_dotest(PWSTR DeviceName, PWSTR Prefix)
VolumeParams.TransactTimeout = 10000; /* allow for longer transact timeout to handle MUP redir */ VolumeParams.TransactTimeout = 10000; /* allow for longer transact timeout to handle MUP redir */
VolumeParams.SectorSize = 16384; VolumeParams.SectorSize = 16384;
VolumeParams.SerialNumber = 0x12345678; VolumeParams.VolumeSerialNumber = 0x12345678;
wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share");
Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, Result = FspFsctlCreateVolume(DeviceName, &VolumeParams,
VolumeName, sizeof VolumeName, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);

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

@@ -48,7 +48,7 @@ void timeout_pending_dotest(PWSTR DeviceName, PWSTR Prefix)
VolumeParams.TransactTimeout = 10000; /* allow for longer transact timeout to handle MUP redir */ VolumeParams.TransactTimeout = 10000; /* allow for longer transact timeout to handle MUP redir */
VolumeParams.IrpTimeout = FspFsctlIrpTimeoutDebug; VolumeParams.IrpTimeout = FspFsctlIrpTimeoutDebug;
VolumeParams.SectorSize = 16384; VolumeParams.SectorSize = 16384;
VolumeParams.SerialNumber = 0x12345678; VolumeParams.VolumeSerialNumber = 0x12345678;
wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share");
Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, Result = FspFsctlCreateVolume(DeviceName, &VolumeParams,
VolumeName, sizeof VolumeName, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);
@@ -159,7 +159,7 @@ void timeout_transact_dotest(PWSTR DeviceName, PWSTR Prefix)
VolumeParams.TransactTimeout = 0 != Prefix ? 1000 : 5000; VolumeParams.TransactTimeout = 0 != Prefix ? 1000 : 5000;
VolumeParams.SectorSize = 16384; VolumeParams.SectorSize = 16384;
VolumeParams.SerialNumber = 0x12345678; VolumeParams.VolumeSerialNumber = 0x12345678;
wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share");
Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, Result = FspFsctlCreateVolume(DeviceName, &VolumeParams,
VolumeName, sizeof VolumeName, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);