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/hooks/ntdll.h | 57 ---------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 libs/usvfs/src/usvfs_dll/hooks/ntdll.h (limited to 'libs/usvfs/src/usvfs_dll/hooks/ntdll.h') diff --git a/libs/usvfs/src/usvfs_dll/hooks/ntdll.h b/libs/usvfs/src/usvfs_dll/hooks/ntdll.h deleted file mode 100644 index f3db4a6..0000000 --- a/libs/usvfs/src/usvfs_dll/hooks/ntdll.h +++ /dev/null @@ -1,57 +0,0 @@ -#pragma once - -#include -#include -#include - -namespace usvfs -{ - -DLLEXPORT NTSTATUS WINAPI -hook_NtQueryFullAttributesFile(POBJECT_ATTRIBUTES ObjectAttributes, - PFILE_NETWORK_OPEN_INFORMATION FileInformation); - -DLLEXPORT NTSTATUS WINAPI hook_NtQueryAttributesFile( - POBJECT_ATTRIBUTES ObjectAttributes, PFILE_BASIC_INFORMATION FileInformation); - -DLLEXPORT NTSTATUS WINAPI hook_NtQueryDirectoryFile( - HANDLE FileHandle, HANDLE Event, PIO_APC_ROUTINE ApcRoutine, PVOID ApcContext, - PIO_STATUS_BLOCK IoStatusBlock, PVOID FileInformation, ULONG Length, - FILE_INFORMATION_CLASS FileInformationClass, BOOLEAN ReturnSingleEntry, - PUNICODE_STRING FileName, BOOLEAN RestartScan); - -DLLEXPORT NTSTATUS WINAPI hook_NtQueryDirectoryFileEx( - HANDLE FileHandle, HANDLE Event, PIO_APC_ROUTINE ApcRoutine, PVOID ApcContext, - PIO_STATUS_BLOCK IoStatusBlock, PVOID FileInformation, ULONG Length, - FILE_INFORMATION_CLASS FileInformationClass, ULONG QueryFlags, - PUNICODE_STRING FileName); - -DLLEXPORT NTSTATUS WINAPI hook_NtQueryObject( - HANDLE Handle, OBJECT_INFORMATION_CLASS ObjectInformationClass, - PVOID ObjectInformation, ULONG ObjectInformationLength, PULONG ReturnLength); - -DLLEXPORT NTSTATUS WINAPI hook_NtQueryInformationFile( - HANDLE FileHandle, PIO_STATUS_BLOCK IoStatusBlock, PVOID FileInformation, - ULONG Length, FILE_INFORMATION_CLASS FileInformationClass); - -DLLEXPORT NTSTATUS WINAPI hook_NtQueryInformationByName( - POBJECT_ATTRIBUTES ObjectAttributes, PIO_STATUS_BLOCK IoStatusBlock, - PVOID FileInformation, ULONG Length, FILE_INFORMATION_CLASS FileInformationClass); - -DLLEXPORT NTSTATUS WINAPI hook_NtOpenFile(PHANDLE FileHandle, ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - PIO_STATUS_BLOCK IoStatusBlock, - ULONG ShareAccess, ULONG OpenOptions); - -DLLEXPORT NTSTATUS WINAPI hook_NtCreateFile( - PHANDLE FileHandle, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes, - PIO_STATUS_BLOCK IoStatusBlock, PLARGE_INTEGER AllocationSize, ULONG FileAttributes, - ULONG ShareAccess, ULONG CreateDisposition, ULONG CreateOptions, PVOID EaBuffer, - ULONG EaLength); - -DLLEXPORT NTSTATUS WINAPI hook_NtClose(HANDLE Handle); - -DLLEXPORT NTSTATUS WINAPI hook_NtTerminateProcess(HANDLE ProcessHandle, - NTSTATUS ExitStatus); - -} // namespace usvfs -- cgit v1.3.1