From 333ff0ab17fcb35cb7661a56df899455c81d4b11 Mon Sep 17 00:00:00 2001 From: yyc12345 Date: Thu, 29 Jan 2026 21:03:09 +0800 Subject: [PATCH] fix: fix unvirt build issue --- Unvirt/CmdHelper.cpp | 2 +- Unvirt/Docstring.cpp | 2 +- Unvirt/Docstring.hpp | 8 ++++---- Unvirt/UnvirtContext.cpp | 38 +++++++++++++++++++------------------- Unvirt/Utils.cpp | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Unvirt/CmdHelper.cpp b/Unvirt/CmdHelper.cpp index 4ef70fc..988f427 100644 --- a/Unvirt/CmdHelper.cpp +++ b/Unvirt/CmdHelper.cpp @@ -8,7 +8,7 @@ namespace Unvirt::CmdHelper { static std::optional ParseLoadStage(const std::u8string_view &sv) { if (sv == u8"shallow") return LoadStage::Shallow; - else if (sv == u8"deel") return LoadStage::Deep; + else if (sv == u8"deep") return LoadStage::Deep; else return std::nullopt; } diff --git a/Unvirt/Docstring.cpp b/Unvirt/Docstring.cpp index 1e29ba6..79fab10 100644 --- a/Unvirt/Docstring.cpp +++ b/Unvirt/Docstring.cpp @@ -220,7 +220,7 @@ namespace Unvirt::Docstring { #pragma region Other Enums - namespace EnumDesc { + namespace Arrays { // clang-format off const GenericReflectionArray CK_FILE_WRITEMODE { { LibCmo::CK2::CK_FILE_WRITEMODE::CKFILE_UNCOMPRESSED, { u8"CKFILE_UNCOMPRESSED" } }, diff --git a/Unvirt/Docstring.hpp b/Unvirt/Docstring.hpp index ef63b76..6165a24 100644 --- a/Unvirt/Docstring.hpp +++ b/Unvirt/Docstring.hpp @@ -134,7 +134,7 @@ namespace Unvirt::Docstring { return strl; } } - yycc::string::op::printf(strl, u8"%s (0x%08" PRIXCKDWORD ")", INVALID_ENUM_NAME, static_cast(val)); + strl = yycc::string::op::printf(u8"%s (0x%08" PRIXCKDWORD ")", INVALID_ENUM_NAME, static_cast(val)); return strl; } @@ -145,7 +145,7 @@ namespace Unvirt::Docstring { for (auto& item : GetEnumReflectionArray()) { // if it have exacelt same entry, return directly if (item.first == val) { - yycc::string::op::printf(strl, u8"%s (0x%08" PRIXCKDWORD ")", item.second.mName, static_cast(item.first)); + strl = yycc::string::op::printf(u8"%s (0x%08" PRIXCKDWORD ")", item.second.mName, static_cast(item.first)); return strl; } @@ -162,14 +162,14 @@ namespace Unvirt::Docstring { } // add value self. - yycc::string::op::printf(cache, u8"%s (0x%08" PRIXCKDWORD ")", item.second.mName, static_cast(item.first)); + cache = yycc::string::op::printf(u8"%s (0x%08" PRIXCKDWORD ")", item.second.mName, static_cast(item.first)); strl += cache; } } // if nothing was gotten. set to undefined if (strl.size() == 0u) { - yycc::string::op::printf(strl, u8"%s (0x%08" PRIXCKDWORD ")", INVALID_ENUM_NAME, static_cast(val)); + strl = yycc::string::op::printf(u8"%s (0x%08" PRIXCKDWORD ")", INVALID_ENUM_NAME, static_cast(val)); } return strl; diff --git a/Unvirt/UnvirtContext.cpp b/Unvirt/UnvirtContext.cpp index 983fe5f..75d76e7 100644 --- a/Unvirt/UnvirtContext.cpp +++ b/Unvirt/UnvirtContext.cpp @@ -28,24 +28,24 @@ namespace Unvirt::Context { m_Ctx(nullptr), m_FileReader(nullptr), m_IsShallowRead(true) { // Set up commander with our callback. - m_Commander.SetLoadDelegate(std::bind(UnvirtContext::HandleLoad, this, ph::_1)); - m_Commander.SetUnloadDelegate(std::bind(UnvirtContext::HandleUnLoad, this, ph::_1)); - m_Commander.SetSaveDelegate(std::bind(UnvirtContext::HandleSave, this, ph::_1)); - m_Commander.SetInfoDelegate(std::bind(UnvirtContext::HandleInfo, this, ph::_1)); - m_Commander.SetLsDelegate(std::bind(UnvirtContext::HandleLs, this, ph::_1)); - m_Commander.SetDataDelegate(std::bind(UnvirtContext::HandleData, this, ph::_1)); - m_Commander.SetChunkDelegate(std::bind(UnvirtContext::HandleChunk, this, ph::_1)); - m_Commander.SetSearchDelegate(std::bind(UnvirtContext::HandleSearch, this, ph::_1)); - m_Commander.SetItemsDelegate(std::bind(UnvirtContext::HandleItems, this, ph::_1)); - m_Commander.SetStyleDelegate(std::bind(UnvirtContext::HandleStyle, this, ph::_1)); - m_Commander.SetEncodingDelegate(std::bind(UnvirtContext::HandleEncoding, this, ph::_1)); - m_Commander.SetTempDelegate(std::bind(UnvirtContext::HandleTemp, this, ph::_1)); - m_Commander.SetRscClearDelegate(std::bind(UnvirtContext::HandleRscClear, this, ph::_1)); - m_Commander.SetRscAddDelegate(std::bind(UnvirtContext::HandleRscAdd, this, ph::_1)); - m_Commander.SetTestDelegate(std::bind(UnvirtContext::HandleTest, this, ph::_1)); - m_Commander.SetVersionDelegate(std::bind(UnvirtContext::HandleVersion, this, ph::_1)); - m_Commander.SetHelpDelegate(std::bind(UnvirtContext::HandleHelp, this, ph::_1)); - m_Commander.SetExitDelegate(std::bind(UnvirtContext::HandleExit, this, ph::_1)); + m_Commander.SetLoadDelegate(std::bind(&UnvirtContext::HandleLoad, this, ph::_1)); + m_Commander.SetUnloadDelegate(std::bind(&UnvirtContext::HandleUnLoad, this, ph::_1)); + m_Commander.SetSaveDelegate(std::bind(&UnvirtContext::HandleSave, this, ph::_1)); + m_Commander.SetInfoDelegate(std::bind(&UnvirtContext::HandleInfo, this, ph::_1)); + m_Commander.SetLsDelegate(std::bind(&UnvirtContext::HandleLs, this, ph::_1)); + m_Commander.SetDataDelegate(std::bind(&UnvirtContext::HandleData, this, ph::_1)); + m_Commander.SetChunkDelegate(std::bind(&UnvirtContext::HandleChunk, this, ph::_1)); + m_Commander.SetSearchDelegate(std::bind(&UnvirtContext::HandleSearch, this, ph::_1)); + m_Commander.SetItemsDelegate(std::bind(&UnvirtContext::HandleItems, this, ph::_1)); + m_Commander.SetStyleDelegate(std::bind(&UnvirtContext::HandleStyle, this, ph::_1)); + m_Commander.SetEncodingDelegate(std::bind(&UnvirtContext::HandleEncoding, this, ph::_1)); + m_Commander.SetTempDelegate(std::bind(&UnvirtContext::HandleTemp, this, ph::_1)); + m_Commander.SetRscClearDelegate(std::bind(&UnvirtContext::HandleRscClear, this, ph::_1)); + m_Commander.SetRscAddDelegate(std::bind(&UnvirtContext::HandleRscAdd, this, ph::_1)); + m_Commander.SetTestDelegate(std::bind(&UnvirtContext::HandleTest, this, ph::_1)); + m_Commander.SetVersionDelegate(std::bind(&UnvirtContext::HandleVersion, this, ph::_1)); + m_Commander.SetHelpDelegate(std::bind(&UnvirtContext::HandleHelp, this, ph::_1)); + m_Commander.SetExitDelegate(std::bind(&UnvirtContext::HandleExit, this, ph::_1)); // initialize CK engine and create context LibCmo::CK2::CKERROR err = LibCmo::CK2::CKStartUp(); @@ -116,7 +116,7 @@ namespace Unvirt::Context { void UnvirtContext::Run() { // Enable terminal color feature #if defined(YYCC_OS_WINDOWS) - yycc::windows::console::colorful_console(); + auto suc = yycc::windows::console::colorful_console(); #endif // Show banner diff --git a/Unvirt/Utils.cpp b/Unvirt/Utils.cpp index d147a48..bb2b0ce 100644 --- a/Unvirt/Utils.cpp +++ b/Unvirt/Utils.cpp @@ -12,7 +12,7 @@ namespace Unvirt::Utils { bool PageBreaker::IsValidPage(size_t page) const { if (page == 0) return true; - else return page < this->GetMaxPage(); + else return page <= this->GetMaxPage(); } size_t PageBreaker::GetMaxPage() const {