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/unicodestring.h | 110 ---------------------------------- 1 file changed, 110 deletions(-) delete mode 100644 libs/usvfs/src/shared/unicodestring.h (limited to 'libs/usvfs/src/shared/unicodestring.h') diff --git a/libs/usvfs/src/shared/unicodestring.h b/libs/usvfs/src/shared/unicodestring.h deleted file mode 100644 index 77071ad..0000000 --- a/libs/usvfs/src/shared/unicodestring.h +++ /dev/null @@ -1,110 +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 "ntdll_declarations.h" -#include "windows_sane.h" - -#include "formatters.h" - -namespace usvfs -{ - -/** - * @brief C++ wrapper for the windows UNICODE_STRING structure - */ -class UnicodeString -{ -public: - UnicodeString() : m_Buffer(1) { update(); } - - UnicodeString(const UnicodeString& other) : m_Buffer(other.m_Buffer) { update(); } - - UnicodeString(UnicodeString&& other) : m_Buffer(std::move(other.m_Buffer)) - { - update(); - } - - UnicodeString(const std::wstring& string); - UnicodeString(LPCWSTR string, size_t length = std::string::npos); - - UnicodeString& operator=(const std::wstring& string); - - UnicodeString& operator=(const UnicodeString& other) - { - m_Buffer = other.m_Buffer; - update(); - return *this; - } - - UnicodeString& operator=(UnicodeString&& other) - { - m_Buffer = std::move(other.m_Buffer); - update(); - return *this; - } - - /** - * @brief convert to a WinNt Api-style unicode string. This is only valid as long - * as the string isn't modified - */ - explicit operator PUNICODE_STRING() { return &m_Data; } - - /** - * @brief convert to a Win32 Api-style unicode string. This is only valid as long - * as the string isn't modified - */ - explicit operator LPCWSTR() const { return m_Data.Buffer; } - - /** - * @return length of the string in 16-bit words (not including zero termination) - */ - size_t size() const { return m_Buffer.size() - 1; } - - wchar_t operator[](size_t pos) const { return m_Buffer[pos]; } - - UnicodeString& appendPath(PUNICODE_STRING path); - -private: - friend struct ::std::formatter; - - void update(); - - UNICODE_STRING m_Data; - std::vector m_Buffer; -}; - -} // namespace usvfs - -template <> -struct std::formatter - : std::formatter -{ - template - FmtContext::iterator format(const usvfs::UnicodeString& v, FmtContext& ctx) const - { - if (v.size() == 0) { - return std::format_to(ctx.out(), ""); - } else { - return std::formatter::format(&v.m_Data, ctx); - } - } -}; -- cgit v1.3.1