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/shared/addrtools.h | 64 --------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 libs/usvfs/src/shared/addrtools.h (limited to 'libs/usvfs/src/shared/addrtools.h') diff --git a/libs/usvfs/src/shared/addrtools.h b/libs/usvfs/src/shared/addrtools.h deleted file mode 100644 index b888ebf..0000000 --- a/libs/usvfs/src/shared/addrtools.h +++ /dev/null @@ -1,64 +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 "windows_sane.h" - -namespace usvfs::shared -{ - -#ifdef _M_AMD64 -typedef DWORD64 REGWORD; -#elif _M_IX86 -typedef DWORD REGWORD; -#endif - -inline LPVOID AddrAdd(LPVOID address, size_t offset) -{ - return reinterpret_cast(reinterpret_cast(address) + offset); -} - -inline std::ptrdiff_t AddrDiff(LPVOID lhs, LPVOID rhs) -{ - return reinterpret_cast(lhs) - reinterpret_cast(rhs); -} - -// implicitly cast pointer to void*, from there cast to target type. -// This is supposed to be safer than directly reinterpret-casting -template -inline T void_ptr_cast(void* ptr) -{ - return reinterpret_cast(ptr); -} - -template <> -inline int64_t void_ptr_cast(void* ptr) -{ - return reinterpret_cast(ptr); -} - -template <> -inline uint64_t void_ptr_cast(void* ptr) -{ - return reinterpret_cast(ptr); -} - -} // namespace usvfs::shared -- cgit v1.3.1