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

tst: passthrough, passthrough-fuse: WinFspLoad: eliminate RRF_SUBKEY_WOW6432KEY

Browse Source
This commit is contained in:
Bill Zissimopoulos 2017-01-31 15:27:15 -08:00
parent b7a06c7046
commit 06f6c192ed
3 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/WinFsp-Tutorial.asciidoc
View File

@ -85,19 +85,24 @@ static NTSTATUS WinFspLoad(VOID)
#endif #endif
#define FSP_DLLPATH "bin\\" FSP_DLLNAME #define FSP_DLLPATH "bin\\" FSP_DLLNAME
WCHAR PathBuf[MAX_PATH - (sizeof L"" FSP_DLLPATH / sizeof(WCHAR) - 1)]; WCHAR PathBuf[MAX_PATH];
DWORD Size; DWORD Size;
HKEY RegKey;
LONG Result; LONG Result;
HMODULE Module; HMODULE Module;
Module = LoadLibraryW(L"" FSP_DLLNAME); Module = LoadLibraryW(L"" FSP_DLLNAME);
if (0 == Module) if (0 == Module)
{ {
Size = sizeof PathBuf; Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\WinFsp",
Result = RegGetValueW( 0, KEY_READ | KEY_WOW64_32KEY, &RegKey);
HKEY_LOCAL_MACHINE, L"Software\\WinFsp", L"InstallDir", if (ERROR_SUCCESS == Result)
RRF_RT_REG_SZ | 0x00020000/*RRF_SUBKEY_WOW6432KEY*/, {
0, PathBuf, &Size); Size = sizeof PathBuf - sizeof L"" FSP_DLLPATH + sizeof(WCHAR);
Result = RegGetValueW(RegKey, 0, L"InstallDir",
RRF_RT_REG_SZ, 0, PathBuf, &Size);
RegCloseKey(RegKey);
}
if (ERROR_SUCCESS != Result) if (ERROR_SUCCESS != Result)
return STATUS_OBJECT_NAME_NOT_FOUND; return STATUS_OBJECT_NAME_NOT_FOUND;

25
tst/passthrough-fuse/winposix.c
View File

@ -523,7 +523,7 @@ static int maperror(int winerrno)
} }
} }
NTSTATUS WinFspLoad(VOID) static NTSTATUS WinFspLoad(VOID)
{ {
#if defined(_WIN64) #if defined(_WIN64)
#define FSP_DLLNAME "winfsp-x64.dll" #define FSP_DLLNAME "winfsp-x64.dll"
@ -532,29 +532,34 @@ NTSTATUS WinFspLoad(VOID)
#endif #endif
#define FSP_DLLPATH "bin\\" FSP_DLLNAME #define FSP_DLLPATH "bin\\" FSP_DLLNAME
WCHAR PathBuf[MAX_PATH - (sizeof L"" FSP_DLLPATH / sizeof(WCHAR) - 1)]; WCHAR PathBuf[MAX_PATH];
DWORD Size; DWORD Size;
HKEY RegKey;
LONG Result; LONG Result;
HMODULE Module; HMODULE Module;
Module = LoadLibraryW(L"" FSP_DLLNAME); Module = LoadLibraryW(L"" FSP_DLLNAME);
if (0 == Module) if (0 == Module)
{ {
Size = sizeof PathBuf; Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\WinFsp",
Result = RegGetValueW( 0, KEY_READ | KEY_WOW64_32KEY, &RegKey);
HKEY_LOCAL_MACHINE, L"Software\\WinFsp", L"InstallDir", if (ERROR_SUCCESS == Result)
RRF_RT_REG_SZ | 0x00020000/*RRF_SUBKEY_WOW6432KEY*/, {
0, PathBuf, &Size); Size = sizeof PathBuf - sizeof L"" FSP_DLLPATH + sizeof(WCHAR);
Result = RegGetValueW(RegKey, 0, L"InstallDir",
RRF_RT_REG_SZ, 0, PathBuf, &Size);
RegCloseKey(RegKey);
}
if (ERROR_SUCCESS != Result) if (ERROR_SUCCESS != Result)
return 0xC0000034L/*STATUS_OBJECT_NAME_NOT_FOUND*/; return STATUS_OBJECT_NAME_NOT_FOUND;
RtlCopyMemory(PathBuf + (Size / sizeof(WCHAR) - 1), L"" FSP_DLLPATH, sizeof L"" FSP_DLLPATH); RtlCopyMemory(PathBuf + (Size / sizeof(WCHAR) - 1), L"" FSP_DLLPATH, sizeof L"" FSP_DLLPATH);
Module = LoadLibraryW(PathBuf); Module = LoadLibraryW(PathBuf);
if (0 == Module) if (0 == Module)
return 0xC0000135L/*STATUS_DLL_NOT_FOUND*/; return STATUS_DLL_NOT_FOUND;
} }
return 0/*STATUS_SUCCESS*/; return STATUS_SUCCESS;
#undef FSP_DLLNAME #undef FSP_DLLNAME
#undef FSP_DLLPATH #undef FSP_DLLPATH

17
tst/passthrough/passthrough.c
View File

@ -925,19 +925,24 @@ static NTSTATUS WinFspLoad(VOID)
#endif #endif
#define FSP_DLLPATH "bin\\" FSP_DLLNAME #define FSP_DLLPATH "bin\\" FSP_DLLNAME
WCHAR PathBuf[MAX_PATH - (sizeof L"" FSP_DLLPATH / sizeof(WCHAR) - 1)]; WCHAR PathBuf[MAX_PATH];
DWORD Size; DWORD Size;
HKEY RegKey;
LONG Result; LONG Result;
HMODULE Module; HMODULE Module;
Module = LoadLibraryW(L"" FSP_DLLNAME); Module = LoadLibraryW(L"" FSP_DLLNAME);
if (0 == Module) if (0 == Module)
{ {
Size = sizeof PathBuf; Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\WinFsp",
Result = RegGetValueW( 0, KEY_READ | KEY_WOW64_32KEY, &RegKey);
HKEY_LOCAL_MACHINE, L"Software\\WinFsp", L"InstallDir", if (ERROR_SUCCESS == Result)
RRF_RT_REG_SZ | 0x00020000/*RRF_SUBKEY_WOW6432KEY*/, {
0, PathBuf, &Size); Size = sizeof PathBuf - sizeof L"" FSP_DLLPATH + sizeof(WCHAR);
Result = RegGetValueW(RegKey, 0, L"InstallDir",
RRF_RT_REG_SZ, 0, PathBuf, &Size);
RegCloseKey(RegKey);
}
if (ERROR_SUCCESS != Result) if (ERROR_SUCCESS != Result)
return STATUS_OBJECT_NAME_NOT_FOUND; return STATUS_OBJECT_NAME_NOT_FOUND;