From bf7a57fc55493247a624ecfd65e4d73964e7d8d2 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Sun, 12 Apr 2026 02:40:16 -0500 Subject: Remove vendored usvfs and Windows-only usvfs code paths The Linux port uses its own in-process FUSE VFS (FuseConnector), so usvfs was dead weight: libs/usvfs/ was never built, usvfsconnector.cpp was explicitly REMOVE_ITEM'd from the source list, and every call site was already guarded by #ifdef _WIN32 with a working Linux branch (the Windows build is also broken on this branch, since FUSE3 is a hard find_package dependency). - Drop libs/usvfs/ and src/src/usvfsconnector.{cpp,h} - Collapse #ifdef _WIN32 / usvfs include branches in organizercore, mainwindow, settings, util, spawn - Remove getUsvfsVersionString() and the "usvfs: ..." log field - Remove vfs32/64DLLName APPPARAMs (nothing reads them) - Relabel About dialog "usvfs:" row to "VFS: FUSE 3" --- libs/usvfs/src/usvfs_dll/hookmanager.h | 81 ---------------------------------- 1 file changed, 81 deletions(-) delete mode 100644 libs/usvfs/src/usvfs_dll/hookmanager.h (limited to 'libs/usvfs/src/usvfs_dll/hookmanager.h') diff --git a/libs/usvfs/src/usvfs_dll/hookmanager.h b/libs/usvfs/src/usvfs_dll/hookmanager.h deleted file mode 100644 index 636a29c..0000000 --- a/libs/usvfs/src/usvfs_dll/hookmanager.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -Userspace Virtual Filesystem - -Copyright (C) 2015 Sebastian Herbord. All rights reserved. - -This file is part of usvfs. - -usvfs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -usvfs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with usvfs. If not, see . -*/ -#pragma once - -#include "hookcontext.h" -#include -#include - -namespace usvfs -{ - -class HookManager -{ -public: - HookManager(const usvfsParameters& params, HMODULE module); - ~HookManager(); - - HookManager(const HookManager& reference) = delete; - - HookManager& operator=(const HookManager& reference) = delete; - - static HookManager& instance(); - - HookContext* context() { return &m_Context; } - - /// - /// \brief retrieve address of the detour of a function - /// \param functionName name of the function to look up - /// \return function address that can be used to directly execute the original code - /// - LPVOID detour(const char* functionName); - - /// - /// \brief remove the hook on the specified function. - /// \param functionName name of the function to unhook - /// \note This function is only exposed to allow a workaround for ExitProcess and may - /// be - /// removed if a better solution is found there. If you have another legit use - /// case, please let me know! - /// - void removeHook(const std::string& functionName); - -private: - void logStubInt(LPVOID address); - static void logStub(LPVOID address); - - void installHook(HMODULE module1, HMODULE module2, const std::string& functionName, - LPVOID hook, LPVOID* fillFuncAddr); - void installStub(HMODULE module1, HMODULE module2, const std::string& functionName); - void initHooks(); - void removeHooks(); - -private: - static HookManager* s_Instance; - - std::map m_Hooks; - - std::map m_Stubs; - - HookContext m_Context; -}; - -} // namespace usvfs -- cgit v1.3.1