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

rename *Path to *Name in multiple instances

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-01-13 15:16:46 -08:00
parent 830d2fde71
commit f3d84c7b88
6 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/winfsp/fsctl.h
View File

@ -230,7 +230,7 @@ static inline FSP_FSCTL_TRANSACT_RSP *FspFsctlTransactConsumeResponse(
#if !defined(WINFSP_SYS_INTERNAL) #if !defined(WINFSP_SYS_INTERNAL)
FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath, FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath,
const FSP_FSCTL_VOLUME_PARAMS *VolumeParams, const FSP_FSCTL_VOLUME_PARAMS *VolumeParams,
PWCHAR VolumePathBuf, SIZE_T VolumePathSize, PWCHAR VolumeNameBuf, SIZE_T VolumeNameSize,
PHANDLE PVolumeHandle); PHANDLE PVolumeHandle);
FSP_API NTSTATUS FspFsctlTransact(HANDLE VolumeHandle, FSP_API NTSTATUS FspFsctlTransact(HANDLE VolumeHandle,
PVOID ResponseBuf, SIZE_T ResponseBufSize, PVOID ResponseBuf, SIZE_T ResponseBufSize,

2
inc/winfsp/winfsp.h
View File

@ -71,7 +71,7 @@ typedef struct _FSP_FILE_SYSTEM_INTERFACE
typedef struct _FSP_FILE_SYSTEM typedef struct _FSP_FILE_SYSTEM
{ {
UINT16 Version; UINT16 Version;
WCHAR VolumePath[FSP_FSCTL_VOLUME_NAME_SIZEMAX / sizeof(WCHAR)]; WCHAR VolumeName[FSP_FSCTL_VOLUME_NAME_SIZEMAX / sizeof(WCHAR)];
HANDLE VolumeHandle; HANDLE VolumeHandle;
PVOID UserContext; PVOID UserContext;
NTSTATUS DispatcherResult; NTSTATUS DispatcherResult;

8
src/dll/fsctl.c
View File

@ -12,7 +12,7 @@
FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath, FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath,
const FSP_FSCTL_VOLUME_PARAMS *VolumeParams, const FSP_FSCTL_VOLUME_PARAMS *VolumeParams,
PWCHAR VolumePathBuf, SIZE_T VolumePathSize, PWCHAR VolumeNameBuf, SIZE_T VolumeNameSize,
PHANDLE PVolumeHandle) PHANDLE PVolumeHandle)
{ {
NTSTATUS Result; NTSTATUS Result;
@ -22,8 +22,8 @@ FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath,
HANDLE VolumeHandle = INVALID_HANDLE_VALUE; HANDLE VolumeHandle = INVALID_HANDLE_VALUE;
DWORD Bytes; DWORD Bytes;
if (sizeof(WCHAR) <= VolumePathSize) if (sizeof(WCHAR) <= VolumeNameSize)
VolumePathBuf[0] = L'\0'; VolumeNameBuf[0] = L'\0';
*PVolumeHandle = INVALID_HANDLE_VALUE; *PVolumeHandle = INVALID_HANDLE_VALUE;
/* check lengths; everything (including encoded volume params) must fit within MAX_PATH */ /* check lengths; everything (including encoded volume params) must fit within MAX_PATH */
@ -64,7 +64,7 @@ FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath,
if (!DeviceIoControl(VolumeHandle, FSP_FSCTL_VOLUME_NAME, if (!DeviceIoControl(VolumeHandle, FSP_FSCTL_VOLUME_NAME,
0, 0, 0, 0,
VolumePathBuf, (DWORD)VolumePathSize, VolumeNameBuf, (DWORD)VolumeNameSize,
&Bytes, 0)) &Bytes, 0))
{ {
Result = FspNtStatusFromWin32(GetLastError()); Result = FspNtStatusFromWin32(GetLastError());

2
src/dll/loop.c
View File

@ -33,7 +33,7 @@ FSP_API NTSTATUS FspFileSystemCreate(PWSTR DevicePath,
memset(FileSystem, 0, sizeof *FileSystem); memset(FileSystem, 0, sizeof *FileSystem);
Result = FspFsctlCreateVolume(DevicePath, VolumeParams, Result = FspFsctlCreateVolume(DevicePath, VolumeParams,
FileSystem->VolumePath, sizeof FileSystem->VolumePath, FileSystem->VolumeName, sizeof FileSystem->VolumeName,
&FileSystem->VolumeHandle); &FileSystem->VolumeHandle);
if (!NT_SUCCESS(Result)) if (!NT_SUCCESS(Result))
{ {

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

@ -10,15 +10,15 @@ void mount_invalid_test(void)
{ {
NTSTATUS Result; NTSTATUS Result;
FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 };
WCHAR VolumePath[MAX_PATH] = L"foo"; WCHAR VolumeName[MAX_PATH] = L"foo";
HANDLE VolumeHandle; HANDLE VolumeHandle;
VolumeParams.SectorSize = 16384; VolumeParams.SectorSize = 16384;
VolumeParams.SerialNumber = 0x12345678; VolumeParams.SerialNumber = 0x12345678;
Result = FspFsctlCreateVolume(L"WinFsp.DoesNotExist", &VolumeParams, Result = FspFsctlCreateVolume(L"WinFsp.DoesNotExist", &VolumeParams,
VolumePath, sizeof VolumePath, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);
ASSERT(STATUS_NO_SUCH_DEVICE == Result); ASSERT(STATUS_NO_SUCH_DEVICE == Result);
ASSERT(L'\0' == VolumePath[0]); ASSERT(L'\0' == VolumeName[0]);
ASSERT(INVALID_HANDLE_VALUE == VolumeHandle); ASSERT(INVALID_HANDLE_VALUE == VolumeHandle);
} }
@ -50,16 +50,16 @@ void mount_create_volume_dotest(PWSTR DeviceName)
NTSTATUS Result; NTSTATUS Result;
BOOL Success; BOOL Success;
FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 };
WCHAR VolumePath[MAX_PATH]; WCHAR VolumeName[MAX_PATH];
HANDLE VolumeHandle; HANDLE VolumeHandle;
VolumeParams.SectorSize = 16384; VolumeParams.SectorSize = 16384;
VolumeParams.SerialNumber = 0x12345678; VolumeParams.SerialNumber = 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,
VolumePath, sizeof VolumePath, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);
ASSERT(STATUS_SUCCESS == Result); ASSERT(STATUS_SUCCESS == Result);
ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumePath, 15)); ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumeName, 15));
ASSERT(INVALID_HANDLE_VALUE != VolumeHandle); ASSERT(INVALID_HANDLE_VALUE != VolumeHandle);
Success = CloseHandle(VolumeHandle); Success = CloseHandle(VolumeHandle);
@ -92,7 +92,7 @@ void mount_volume_cancel_dotest(PWSTR DeviceName)
NTSTATUS Result; NTSTATUS Result;
BOOL Success; BOOL Success;
FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 };
WCHAR VolumePath[MAX_PATH]; WCHAR VolumeName[MAX_PATH];
WCHAR FilePath[MAX_PATH]; WCHAR FilePath[MAX_PATH];
HANDLE VolumeHandle; HANDLE VolumeHandle;
HANDLE Thread; HANDLE Thread;
@ -102,12 +102,12 @@ void mount_volume_cancel_dotest(PWSTR DeviceName)
VolumeParams.SerialNumber = 0x12345678; VolumeParams.SerialNumber = 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,
VolumePath, sizeof VolumePath, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);
ASSERT(STATUS_SUCCESS == Result); ASSERT(STATUS_SUCCESS == Result);
ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumePath, 15)); ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumeName, 15));
ASSERT(INVALID_HANDLE_VALUE != VolumeHandle); ASSERT(INVALID_HANDLE_VALUE != VolumeHandle);
StringCbPrintfW(FilePath, sizeof FilePath, L"\\\\?\\GLOBALROOT%s\\file0", VolumePath); StringCbPrintfW(FilePath, sizeof FilePath, L"\\\\?\\GLOBALROOT%s\\file0", VolumeName);
Thread = (HANDLE)_beginthreadex(0, 0, mount_volume_cancel_dotest_thread, FilePath, 0, 0); Thread = (HANDLE)_beginthreadex(0, 0, mount_volume_cancel_dotest_thread, FilePath, 0, 0);
ASSERT(0 != Thread); ASSERT(0 != Thread);
@ -149,7 +149,7 @@ void mount_volume_transact_dotest(PWSTR DeviceName, PWSTR Prefix)
NTSTATUS Result; NTSTATUS Result;
BOOL Success; BOOL Success;
FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 };
WCHAR VolumePath[MAX_PATH]; WCHAR VolumeName[MAX_PATH];
WCHAR FilePath[MAX_PATH]; WCHAR FilePath[MAX_PATH];
HANDLE VolumeHandle; HANDLE VolumeHandle;
HANDLE Thread; HANDLE Thread;
@ -160,14 +160,14 @@ void mount_volume_transact_dotest(PWSTR DeviceName, PWSTR Prefix)
VolumeParams.SerialNumber = 0x12345678; VolumeParams.SerialNumber = 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,
VolumePath, sizeof VolumePath, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);
ASSERT(STATUS_SUCCESS == Result); ASSERT(STATUS_SUCCESS == Result);
ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumePath, 15)); ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumeName, 15));
ASSERT(INVALID_HANDLE_VALUE != VolumeHandle); ASSERT(INVALID_HANDLE_VALUE != VolumeHandle);
StringCbPrintfW(FilePath, sizeof FilePath, L"\\\\?\\GLOBALROOT%s\\file0", VolumePath); StringCbPrintfW(FilePath, sizeof FilePath, L"\\\\?\\GLOBALROOT%s\\file0", VolumeName);
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\file0", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\file0",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : VolumePath); 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);
ASSERT(0 != Thread); ASSERT(0 != Thread);

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

@ -39,7 +39,7 @@ void timeout_pending_dotest(PWSTR DeviceName)
NTSTATUS Result; NTSTATUS Result;
BOOL Success; BOOL Success;
FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 };
WCHAR VolumePath[MAX_PATH]; WCHAR VolumeName[MAX_PATH];
WCHAR FilePath[MAX_PATH]; WCHAR FilePath[MAX_PATH];
HANDLE VolumeHandle; HANDLE VolumeHandle;
HANDLE Thread; HANDLE Thread;
@ -50,12 +50,12 @@ void timeout_pending_dotest(PWSTR DeviceName)
VolumeParams.SerialNumber = 0x12345678; VolumeParams.SerialNumber = 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,
VolumePath, sizeof VolumePath, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);
ASSERT(STATUS_SUCCESS == Result); ASSERT(STATUS_SUCCESS == Result);
ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumePath, 15)); ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumeName, 15));
ASSERT(INVALID_HANDLE_VALUE != VolumeHandle); ASSERT(INVALID_HANDLE_VALUE != VolumeHandle);
StringCbPrintfW(FilePath, sizeof FilePath, L"\\\\?\\GLOBALROOT%s\\file0", VolumePath); StringCbPrintfW(FilePath, sizeof FilePath, L"\\\\?\\GLOBALROOT%s\\file0", VolumeName);
Thread = (HANDLE)_beginthreadex(0, 0, timeout_pending_dotest_thread, FilePath, 0, 0); Thread = (HANDLE)_beginthreadex(0, 0, timeout_pending_dotest_thread, FilePath, 0, 0);
ASSERT(0 != Thread); ASSERT(0 != Thread);
@ -149,7 +149,7 @@ void timeout_transact_dotest(PWSTR DeviceName)
NTSTATUS Result; NTSTATUS Result;
BOOL Success; BOOL Success;
FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 };
WCHAR VolumePath[MAX_PATH]; WCHAR VolumeName[MAX_PATH];
WCHAR FilePath[MAX_PATH]; WCHAR FilePath[MAX_PATH];
HANDLE VolumeHandle; HANDLE VolumeHandle;
HANDLE Thread; HANDLE Thread;
@ -160,9 +160,9 @@ void timeout_transact_dotest(PWSTR DeviceName)
VolumeParams.SerialNumber = 0x12345678; VolumeParams.SerialNumber = 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,
VolumePath, sizeof VolumePath, &VolumeHandle); VolumeName, sizeof VolumeName, &VolumeHandle);
ASSERT(STATUS_SUCCESS == Result); ASSERT(STATUS_SUCCESS == Result);
ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumePath, 15)); ASSERT(0 == wcsncmp(L"\\Device\\Volume{", VolumeName, 15));
ASSERT(INVALID_HANDLE_VALUE != VolumeHandle); ASSERT(INVALID_HANDLE_VALUE != VolumeHandle);
@ -181,7 +181,7 @@ void timeout_transact_dotest(PWSTR DeviceName)
ASSERT(STATUS_SUCCESS == Result); ASSERT(STATUS_SUCCESS == Result);
ASSERT(0 == RequestBufSize); ASSERT(0 == RequestBufSize);
StringCbPrintfW(FilePath, sizeof FilePath, L"\\\\?\\GLOBALROOT%s\\file0", VolumePath); StringCbPrintfW(FilePath, sizeof FilePath, L"\\\\?\\GLOBALROOT%s\\file0", VolumeName);
Thread = (HANDLE)_beginthreadex(0, 0, timeout_transact_dotest_thread, FilePath, 0, 0); Thread = (HANDLE)_beginthreadex(0, 0, timeout_transact_dotest_thread, FilePath, 0, 0);
ASSERT(0 != Thread); ASSERT(0 != Thread);