yyc12345/libcmo21
1
0
Fork 0
Code Activity

fix: fix unvirt build issue

Browse Source
This commit is contained in:
yyc12345
2026-01-29 21:03:09 +08:00
parent 6f10f96f97
commit 333ff0ab17
5 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Unvirt/CmdHelper.cpp
View File

@@ -8,7 +8,7 @@ namespace Unvirt::CmdHelper {
static std::optional<LoadStage> ParseLoadStage(const std::u8string_view &sv) { static std::optional<LoadStage> ParseLoadStage(const std::u8string_view &sv) {
if (sv == u8"shallow") return LoadStage::Shallow; 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; else return std::nullopt;
} }

2
Unvirt/Docstring.cpp
View File

@@ -220,7 +220,7 @@ namespace Unvirt::Docstring {
#pragma region Other Enums #pragma region Other Enums
namespace EnumDesc { namespace Arrays {
// clang-format off // clang-format off
const GenericReflectionArray<LibCmo::CK2::CK_FILE_WRITEMODE> CK_FILE_WRITEMODE { const GenericReflectionArray<LibCmo::CK2::CK_FILE_WRITEMODE> CK_FILE_WRITEMODE {
{ LibCmo::CK2::CK_FILE_WRITEMODE::CKFILE_UNCOMPRESSED, { u8"CKFILE_UNCOMPRESSED" } }, { LibCmo::CK2::CK_FILE_WRITEMODE::CKFILE_UNCOMPRESSED, { u8"CKFILE_UNCOMPRESSED" } },

8
Unvirt/Docstring.hpp
View File

@@ -134,7 +134,7 @@ namespace Unvirt::Docstring {
return strl; return strl;
} }
} }
yycc::string::op::printf(strl, u8"%s (0x%08" PRIXCKDWORD ")", INVALID_ENUM_NAME, static_cast<LibCmo::CKDWORD>(val)); strl = yycc::string::op::printf(u8"%s (0x%08" PRIXCKDWORD ")", INVALID_ENUM_NAME, static_cast<LibCmo::CKDWORD>(val));
return strl; return strl;
} }
@@ -145,7 +145,7 @@ namespace Unvirt::Docstring {
for (auto& item : GetEnumReflectionArray<T>()) { for (auto& item : GetEnumReflectionArray<T>()) {
// if it have exacelt same entry, return directly // if it have exacelt same entry, return directly
if (item.first == val) { if (item.first == val) {
yycc::string::op::printf(strl, u8"%s (0x%08" PRIXCKDWORD ")", item.second.mName, static_cast<LibCmo::CKDWORD>(item.first)); strl = yycc::string::op::printf(u8"%s (0x%08" PRIXCKDWORD ")", item.second.mName, static_cast<LibCmo::CKDWORD>(item.first));
return strl; return strl;
} }
@@ -162,14 +162,14 @@ namespace Unvirt::Docstring {
} }
// add value self. // add value self.
yycc::string::op::printf(cache, u8"%s (0x%08" PRIXCKDWORD ")", item.second.mName, static_cast<LibCmo::CKDWORD>(item.first)); cache = yycc::string::op::printf(u8"%s (0x%08" PRIXCKDWORD ")", item.second.mName, static_cast<LibCmo::CKDWORD>(item.first));
strl += cache; strl += cache;
} }
} }
// if nothing was gotten. set to undefined // if nothing was gotten. set to undefined
if (strl.size() == 0u) { if (strl.size() == 0u) {
yycc::string::op::printf(strl, u8"%s (0x%08" PRIXCKDWORD ")", INVALID_ENUM_NAME, static_cast<LibCmo::CKDWORD>(val)); strl = yycc::string::op::printf(u8"%s (0x%08" PRIXCKDWORD ")", INVALID_ENUM_NAME, static_cast<LibCmo::CKDWORD>(val));
} }
return strl; return strl;

38
Unvirt/UnvirtContext.cpp
View File

@@ -28,24 +28,24 @@ namespace Unvirt::Context {
m_Ctx(nullptr), m_FileReader(nullptr), m_IsShallowRead(true) { m_Ctx(nullptr), m_FileReader(nullptr), m_IsShallowRead(true) {
// Set up commander with our callback. // Set up commander with our callback.
m_Commander.SetLoadDelegate(std::bind(UnvirtContext::HandleLoad, 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.SetUnloadDelegate(std::bind(&UnvirtContext::HandleUnLoad, this, ph::_1));
m_Commander.SetSaveDelegate(std::bind(UnvirtContext::HandleSave, 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.SetInfoDelegate(std::bind(&UnvirtContext::HandleInfo, this, ph::_1));
m_Commander.SetLsDelegate(std::bind(UnvirtContext::HandleLs, 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.SetDataDelegate(std::bind(&UnvirtContext::HandleData, this, ph::_1));
m_Commander.SetChunkDelegate(std::bind(UnvirtContext::HandleChunk, 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.SetSearchDelegate(std::bind(&UnvirtContext::HandleSearch, this, ph::_1));
m_Commander.SetItemsDelegate(std::bind(UnvirtContext::HandleItems, 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.SetStyleDelegate(std::bind(&UnvirtContext::HandleStyle, this, ph::_1));
m_Commander.SetEncodingDelegate(std::bind(UnvirtContext::HandleEncoding, 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.SetTempDelegate(std::bind(&UnvirtContext::HandleTemp, this, ph::_1));
m_Commander.SetRscClearDelegate(std::bind(UnvirtContext::HandleRscClear, 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.SetRscAddDelegate(std::bind(&UnvirtContext::HandleRscAdd, this, ph::_1));
m_Commander.SetTestDelegate(std::bind(UnvirtContext::HandleTest, 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.SetVersionDelegate(std::bind(&UnvirtContext::HandleVersion, this, ph::_1));
m_Commander.SetHelpDelegate(std::bind(UnvirtContext::HandleHelp, 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.SetExitDelegate(std::bind(&UnvirtContext::HandleExit, this, ph::_1));
// initialize CK engine and create context // initialize CK engine and create context
LibCmo::CK2::CKERROR err = LibCmo::CK2::CKStartUp(); LibCmo::CK2::CKERROR err = LibCmo::CK2::CKStartUp();
@@ -116,7 +116,7 @@ namespace Unvirt::Context {
void UnvirtContext::Run() { void UnvirtContext::Run() {
// Enable terminal color feature // Enable terminal color feature
#if defined(YYCC_OS_WINDOWS) #if defined(YYCC_OS_WINDOWS)
yycc::windows::console::colorful_console(); auto suc = yycc::windows::console::colorful_console();
#endif #endif
// Show banner // Show banner

2
Unvirt/Utils.cpp
View File

@@ -12,7 +12,7 @@ namespace Unvirt::Utils {
bool PageBreaker::IsValidPage(size_t page) const { bool PageBreaker::IsValidPage(size_t page) const {
if (page == 0) return true; if (page == 0) return true;
else return page < this->GetMaxPage(); else return page <= this->GetMaxPage();
} }
size_t PageBreaker::GetMaxPage() const { size_t PageBreaker::GetMaxPage() const {