From f3d84c7b886bea8af8fbd23402579ed080be6bd1 Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Wed, 13 Jan 2016 15:16:46 -0800 Subject: [PATCH] rename *Path to *Name in multiple instances --- inc/winfsp/fsctl.h | 2 +- inc/winfsp/winfsp.h | 2 +- src/dll/fsctl.c | 8 ++++---- src/dll/loop.c | 2 +- tst/winfsp-tests/mount-test.c | 30 +++++++++++++++--------------- tst/winfsp-tests/timeout-test.c | 16 ++++++++-------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/inc/winfsp/fsctl.h b/inc/winfsp/fsctl.h index c8334a98..28a816fd 100644 --- a/inc/winfsp/fsctl.h +++ b/inc/winfsp/fsctl.h @@ -230,7 +230,7 @@ static inline FSP_FSCTL_TRANSACT_RSP *FspFsctlTransactConsumeResponse( #if !defined(WINFSP_SYS_INTERNAL) FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath, const FSP_FSCTL_VOLUME_PARAMS *VolumeParams, - PWCHAR VolumePathBuf, SIZE_T VolumePathSize, + PWCHAR VolumeNameBuf, SIZE_T VolumeNameSize, PHANDLE PVolumeHandle); FSP_API NTSTATUS FspFsctlTransact(HANDLE VolumeHandle, PVOID ResponseBuf, SIZE_T ResponseBufSize, diff --git a/inc/winfsp/winfsp.h b/inc/winfsp/winfsp.h index d4511635..de10e621 100644 --- a/inc/winfsp/winfsp.h +++ b/inc/winfsp/winfsp.h @@ -71,7 +71,7 @@ typedef struct _FSP_FILE_SYSTEM_INTERFACE typedef struct _FSP_FILE_SYSTEM { UINT16 Version; - WCHAR VolumePath[FSP_FSCTL_VOLUME_NAME_SIZEMAX / sizeof(WCHAR)]; + WCHAR VolumeName[FSP_FSCTL_VOLUME_NAME_SIZEMAX / sizeof(WCHAR)]; HANDLE VolumeHandle; PVOID UserContext; NTSTATUS DispatcherResult; diff --git a/src/dll/fsctl.c b/src/dll/fsctl.c index 8bc56ece..32d7a544 100644 --- a/src/dll/fsctl.c +++ b/src/dll/fsctl.c @@ -12,7 +12,7 @@ FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath, const FSP_FSCTL_VOLUME_PARAMS *VolumeParams, - PWCHAR VolumePathBuf, SIZE_T VolumePathSize, + PWCHAR VolumeNameBuf, SIZE_T VolumeNameSize, PHANDLE PVolumeHandle) { NTSTATUS Result; @@ -22,8 +22,8 @@ FSP_API NTSTATUS FspFsctlCreateVolume(PWSTR DevicePath, HANDLE VolumeHandle = INVALID_HANDLE_VALUE; DWORD Bytes; - if (sizeof(WCHAR) <= VolumePathSize) - VolumePathBuf[0] = L'\0'; + if (sizeof(WCHAR) <= VolumeNameSize) + VolumeNameBuf[0] = L'\0'; *PVolumeHandle = INVALID_HANDLE_VALUE; /* 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, 0, 0, - VolumePathBuf, (DWORD)VolumePathSize, + VolumeNameBuf, (DWORD)VolumeNameSize, &Bytes, 0)) { Result = FspNtStatusFromWin32(GetLastError()); diff --git a/src/dll/loop.c b/src/dll/loop.c index 131dd80c..c6353a78 100644 --- a/src/dll/loop.c +++ b/src/dll/loop.c @@ -33,7 +33,7 @@ FSP_API NTSTATUS FspFileSystemCreate(PWSTR DevicePath, memset(FileSystem, 0, sizeof *FileSystem); Result = FspFsctlCreateVolume(DevicePath, VolumeParams, - FileSystem->VolumePath, sizeof FileSystem->VolumePath, + FileSystem->VolumeName, sizeof FileSystem->VolumeName, &FileSystem->VolumeHandle); if (!NT_SUCCESS(Result)) { diff --git a/tst/winfsp-tests/mount-test.c b/tst/winfsp-tests/mount-test.c index ba927437..a3f25ab1 100644 --- a/tst/winfsp-tests/mount-test.c +++ b/tst/winfsp-tests/mount-test.c @@ -10,15 +10,15 @@ void mount_invalid_test(void) { NTSTATUS Result; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; - WCHAR VolumePath[MAX_PATH] = L"foo"; + WCHAR VolumeName[MAX_PATH] = L"foo"; HANDLE VolumeHandle; VolumeParams.SectorSize = 16384; VolumeParams.SerialNumber = 0x12345678; Result = FspFsctlCreateVolume(L"WinFsp.DoesNotExist", &VolumeParams, - VolumePath, sizeof VolumePath, &VolumeHandle); + VolumeName, sizeof VolumeName, &VolumeHandle); ASSERT(STATUS_NO_SUCH_DEVICE == Result); - ASSERT(L'\0' == VolumePath[0]); + ASSERT(L'\0' == VolumeName[0]); ASSERT(INVALID_HANDLE_VALUE == VolumeHandle); } @@ -50,16 +50,16 @@ void mount_create_volume_dotest(PWSTR DeviceName) NTSTATUS Result; BOOL Success; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; - WCHAR VolumePath[MAX_PATH]; + WCHAR VolumeName[MAX_PATH]; HANDLE VolumeHandle; VolumeParams.SectorSize = 16384; VolumeParams.SerialNumber = 0x12345678; wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, - VolumePath, sizeof VolumePath, &VolumeHandle); + VolumeName, sizeof VolumeName, &VolumeHandle); 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); Success = CloseHandle(VolumeHandle); @@ -92,7 +92,7 @@ void mount_volume_cancel_dotest(PWSTR DeviceName) NTSTATUS Result; BOOL Success; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; - WCHAR VolumePath[MAX_PATH]; + WCHAR VolumeName[MAX_PATH]; WCHAR FilePath[MAX_PATH]; HANDLE VolumeHandle; HANDLE Thread; @@ -102,12 +102,12 @@ void mount_volume_cancel_dotest(PWSTR DeviceName) VolumeParams.SerialNumber = 0x12345678; wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, - VolumePath, sizeof VolumePath, &VolumeHandle); + VolumeName, sizeof VolumeName, &VolumeHandle); 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); - 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); ASSERT(0 != Thread); @@ -149,7 +149,7 @@ void mount_volume_transact_dotest(PWSTR DeviceName, PWSTR Prefix) NTSTATUS Result; BOOL Success; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; - WCHAR VolumePath[MAX_PATH]; + WCHAR VolumeName[MAX_PATH]; WCHAR FilePath[MAX_PATH]; HANDLE VolumeHandle; HANDLE Thread; @@ -160,14 +160,14 @@ void mount_volume_transact_dotest(PWSTR DeviceName, PWSTR Prefix) VolumeParams.SerialNumber = 0x12345678; wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, - VolumePath, sizeof VolumePath, &VolumeHandle); + VolumeName, sizeof VolumeName, &VolumeHandle); 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); - 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", - 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); ASSERT(0 != Thread); diff --git a/tst/winfsp-tests/timeout-test.c b/tst/winfsp-tests/timeout-test.c index d0172b19..dadaa0fd 100644 --- a/tst/winfsp-tests/timeout-test.c +++ b/tst/winfsp-tests/timeout-test.c @@ -39,7 +39,7 @@ void timeout_pending_dotest(PWSTR DeviceName) NTSTATUS Result; BOOL Success; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; - WCHAR VolumePath[MAX_PATH]; + WCHAR VolumeName[MAX_PATH]; WCHAR FilePath[MAX_PATH]; HANDLE VolumeHandle; HANDLE Thread; @@ -50,12 +50,12 @@ void timeout_pending_dotest(PWSTR DeviceName) VolumeParams.SerialNumber = 0x12345678; wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, - VolumePath, sizeof VolumePath, &VolumeHandle); + VolumeName, sizeof VolumeName, &VolumeHandle); 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); - 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); ASSERT(0 != Thread); @@ -149,7 +149,7 @@ void timeout_transact_dotest(PWSTR DeviceName) NTSTATUS Result; BOOL Success; FSP_FSCTL_VOLUME_PARAMS VolumeParams = { 0 }; - WCHAR VolumePath[MAX_PATH]; + WCHAR VolumeName[MAX_PATH]; WCHAR FilePath[MAX_PATH]; HANDLE VolumeHandle; HANDLE Thread; @@ -160,9 +160,9 @@ void timeout_transact_dotest(PWSTR DeviceName) VolumeParams.SerialNumber = 0x12345678; wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, - VolumePath, sizeof VolumePath, &VolumeHandle); + VolumeName, sizeof VolumeName, &VolumeHandle); 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); @@ -181,7 +181,7 @@ void timeout_transact_dotest(PWSTR DeviceName) ASSERT(STATUS_SUCCESS == Result); 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); ASSERT(0 != Thread);