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.cpp | 77 --------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 libs/usvfs/src/shared/unicodestring.cpp (limited to 'libs/usvfs/src/shared/unicodestring.cpp') diff --git a/libs/usvfs/src/shared/unicodestring.cpp b/libs/usvfs/src/shared/unicodestring.cpp deleted file mode 100644 index f997e7f..0000000 --- a/libs/usvfs/src/shared/unicodestring.cpp +++ /dev/null @@ -1,77 +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 . -*/ -#include "unicodestring.h" -#include "logging.h" -#include "stringcast.h" -#include "stringutils.h" - -namespace usvfs -{ - -UnicodeString::UnicodeString(LPCWSTR string, size_t length) -{ - if (length == std::string::npos) { - length = wcslen(string); - } - m_Buffer.resize(length + 1); - memcpy(m_Buffer.data(), string, length * sizeof(wchar_t)); - update(); -} - -UnicodeString::UnicodeString(const std::wstring& string) -{ - m_Buffer.resize(string.length() + 1); - memcpy(m_Buffer.data(), string.data(), string.length() * sizeof(wchar_t)); - update(); -} - -UnicodeString& UnicodeString::operator=(const std::wstring& string) -{ - m_Buffer.resize(string.length() + 1); - memcpy(m_Buffer.data(), string.data(), string.length() * sizeof(wchar_t)); - update(); - return *this; -} - -UnicodeString& UnicodeString::appendPath(PUNICODE_STRING path) -{ - if (path != nullptr && path->Buffer && path->Length) { - auto appendAt = size(); - if (appendAt) { - m_Buffer.resize(m_Buffer.size() + path->Length / sizeof(WCHAR) + 1); - m_Buffer[appendAt++] = L'\\'; - } else - m_Buffer.resize(path->Length / sizeof(WCHAR) + 1); - memcpy(&m_Buffer[appendAt], path->Buffer, path->Length); - update(); - } - - return *this; -} - -void UnicodeString::update() -{ - m_Data.Length = static_cast(size() * sizeof(WCHAR)); - m_Data.MaximumLength = static_cast((m_Buffer.capacity() - 1) * sizeof(WCHAR)); - m_Data.Buffer = m_Buffer.data(); -} - -} // namespace usvfs -- cgit v1.3.1