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/test/thooklib_test/test_hooks.cpp | 38 ---------------------------- 1 file changed, 38 deletions(-) delete mode 100644 libs/usvfs/test/thooklib_test/test_hooks.cpp (limited to 'libs/usvfs/test/thooklib_test/test_hooks.cpp') diff --git a/libs/usvfs/test/thooklib_test/test_hooks.cpp b/libs/usvfs/test/thooklib_test/test_hooks.cpp deleted file mode 100644 index edde2c8..0000000 --- a/libs/usvfs/test/thooklib_test/test_hooks.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#include -#include - -HANDLE WINAPI THCreateFileA_1(LPCSTR lpFileName, DWORD dwDesiredAccess, - DWORD dwShareMode, - LPSECURITY_ATTRIBUTES lpSecurityAttributes, - DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, - HANDLE hTemplateFile) -{ - if (strcmp(lpFileName, INVALID_FILENAME.c_str()) == 0) { - return MARKERHANDLE; - } else { - HANDLE res = - ::CreateFileA(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, - dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile); - return res; - } -} - -HANDLE WINAPI THCreateFileW_1(LPCWSTR lpFileName, DWORD dwDesiredAccess, - DWORD dwShareMode, - LPSECURITY_ATTRIBUTES lpSecurityAttributes, - DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, - HANDLE hTemplateFile) -{ - if (wcscmp(lpFileName, INVALID_FILENAME.w_str()) == 0) { - EXPECT_EQ(0x42, dwDesiredAccess); - EXPECT_EQ(0x43, dwShareMode); - EXPECT_EQ(0x44, (int)lpSecurityAttributes); - EXPECT_EQ(0x45, dwCreationDisposition); - EXPECT_EQ(0x46, dwFlagsAndAttributes); - EXPECT_EQ(0x47, (int)hTemplateFile); - return MARKERHANDLE; - } else { - return ::CreateFileW(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, - dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile); - } -} -- cgit v1.3.1