Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-07-03 09:22:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pvt-sxs

Browse Source
This commit is contained in:
Bill Zissimopoulos
2022-09-01 14:42:27 +01:00
parent adeed2b79d deee7edded
commit 0b3ce52958
9 changed files with 121 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dll/eventlog.c
View File

@ -100,9 +100,11 @@ NTSTATUS FspEventLogRegister(VOID)
WCHAR Path[MAX_PATH];
DWORD RegResult, DwordValue;
HKEY RegKey;
NTSTATUS Result;
if (0 == GetModuleFileNameW(DllInstance, Path, MAX_PATH))
return FspNtStatusFromWin32(GetLastError());
Result = FspGetModuleFileName(DllInstance, Path, MAX_PATH, L"" MyEventLogRegisterPath);
if (!NT_SUCCESS(Result))
return Result;
RegResult = RegCreateKeyExW(
HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\" FSP_EVENTLOG_NAME,

13
src/dll/fsctl.c
View File

@ -730,8 +730,9 @@ NTSTATUS FspFsctlRegister(VOID)
FspSxsAppendSuffix(DriverName, sizeof DriverName, L"" FSP_FSCTL_DRIVER_NAME);
if (0 == GetModuleFileNameW(DllInstance, DriverPath, MAX_PATH))
return FspNtStatusFromWin32(GetLastError());
Result = FspGetModuleFileName(DllInstance, DriverPath, MAX_PATH, L"" MyFsctlRegisterPath);
if (!NT_SUCCESS(Result))
return Result;
Size = lstrlenW(DriverPath);
if (4 < Size &&
@ -745,6 +746,14 @@ NTSTATUS FspFsctlRegister(VOID)
DriverPath[Size - 2] = L'y';
DriverPath[Size - 1] = L's';
}
else if (4 < Size &&
(L'.' == DriverPath[Size - 4]) &&
(L'S' == DriverPath[Size - 3] || L's' == DriverPath[Size - 3]) &&
(L'Y' == DriverPath[Size - 2] || L'y' == DriverPath[Size - 2]) &&
(L'S' == DriverPath[Size - 1] || L's' == DriverPath[Size - 1]) &&
(L'\0' == DriverPath[Size]))
{
}
else
/* should not happen! */
return STATUS_NO_SUCH_DEVICE;

5
src/dll/library.h
View File

@ -94,6 +94,11 @@ ULONG FspLdapGetTrustPosixOffset(PVOID Ldap, PWSTR Context, PWSTR Domain, PWSTR
PWSTR FspDiagIdent(VOID);
NTSTATUS FspGetModuleVersion(PWSTR ModuleFileName, PUINT32 PVersion);
NTSTATUS FspGetModuleFileName(
HMODULE Module,
PWSTR FileName,
ULONG Size,
PWSTR RelativePath);
#define FspFileSystemDirectoryBufferEntryInvalid ((ULONG)-1)
VOID FspFileSystemPeekInDirectoryBuffer(PVOID *PDirBuffer,

32
src/dll/np.c
View File

@ -1152,15 +1152,34 @@ DWORD APIENTRY NPCloseEnum(HANDLE hEnum)
NTSTATUS FspNpRegister(VOID)
{
extern HINSTANCE DllInstance;
WCHAR ProviderPath[MAX_PATH];
WCHAR DllPath[MAX_PATH], ProviderPath[MAX_PATH];
PWSTR VersionInfoPath;
BOOLEAN HasPercent;
WCHAR RegBuffer[1024];
PWSTR P, Part;
DWORD RegResult, RegType, RegBufferSize, RegBufferOffset;
HKEY RegKey;
BOOLEAN FoundProvider;
NTSTATUS Result;
if (0 == GetModuleFileNameW(DllInstance, ProviderPath, MAX_PATH))
return FspNtStatusFromWin32(GetLastError());
VersionInfoPath = ProviderPath;
HasPercent = FALSE;
for (P = L"" MyNpRegisterPath; *P; P++)
if ('%' == *P)
{
HasPercent = TRUE;
break;
}
if (HasPercent)
{
VersionInfoPath = DllPath;
if (0 == GetModuleFileNameW(DllInstance, DllPath, MAX_PATH))
return FspNtStatusFromWin32(GetLastError());
}
Result = FspGetModuleFileName(DllInstance, ProviderPath, MAX_PATH, L"" MyNpRegisterPath);
if (!NT_SUCCESS(Result))
return Result;
RegResult = RegCreateKeyExW(
HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\" FSP_NP_NAME,
@ -1187,12 +1206,12 @@ NTSTATUS FspNpRegister(VOID)
DWORD Size;
PWSTR Description;
Size = GetFileVersionInfoSizeW(ProviderPath, &Size/*dummy*/);
Size = GetFileVersionInfoSizeW(VersionInfoPath, &Size/*dummy*/);
if (0 < Size)
{
VersionInfo = MemAlloc(Size);
if (0 != VersionInfo &&
GetFileVersionInfoW(ProviderPath, 0, Size, VersionInfo) &&
GetFileVersionInfoW(VersionInfoPath, 0, Size, VersionInfo) &&
VerQueryValueW(VersionInfo, L"\\StringFileInfo\\040904b0\\FileDescription",
&Description, &Size))
{
@ -1208,7 +1227,8 @@ NTSTATUS FspNpRegister(VOID)
goto close_and_exit;
RegResult = RegSetValueExW(RegKey,
L"ProviderPath", 0, REG_SZ, (PVOID)ProviderPath, (lstrlenW(ProviderPath) + 1) * sizeof(WCHAR));
L"ProviderPath", 0, HasPercent ? REG_EXPAND_SZ : REG_SZ,
(PVOID)ProviderPath, (lstrlenW(ProviderPath) + 1) * sizeof(WCHAR));
if (ERROR_SUCCESS != RegResult)
goto close_and_exit;

31
src/dll/util.c
View File

@ -21,6 +21,7 @@
#include <dll/library.h>
#include <aclapi.h>
#include <shlwapi.h>
static INIT_ONCE FspDiagIdentInitOnce = INIT_ONCE_STATIC_INIT;
static WCHAR FspDiagIdentBuf[20] = L"UNKNOWN";
@ -248,3 +249,33 @@ NTSTATUS FspGetModuleVersion(PWSTR ModuleFileName, PUINT32 PVersion)
return STATUS_SUCCESS;
}
NTSTATUS FspGetModuleFileName(
HMODULE Module,
PWSTR FileName,
ULONG Size,
PWSTR RelativePath)
{
if (MAX_PATH > Size)
return STATUS_BUFFER_TOO_SMALL;
if (0 != RelativePath &&
L'\0' != RelativePath[0] &&
(L'.' != RelativePath[0] || L'\0' != RelativePath[1]))
{
WCHAR Temp[MAX_PATH];
if (0 == GetModuleFileNameW(Module, Temp, MAX_PATH))
return FspNtStatusFromWin32(GetLastError());
if (0 == PathCombineW(FileName, Temp, RelativePath))
return STATUS_UNSUCCESSFUL;
}
else
{
if (0 == GetModuleFileNameW(Module, FileName, MAX_PATH))
return FspNtStatusFromWin32(GetLastError());
}
return STATUS_SUCCESS;
}