yyc12345/libcmo21
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add more info display

Browse Source
This commit is contained in:
yyc12345 2023-08-29 10:42:13 +08:00
parent 0887cd6d86
commit 763c6e84f9
8 changed files with 150 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LibCmo/CK2/CKFile.hpp
View File

@ -126,7 +126,7 @@ namespace LibCmo::CK2 {
//CKINT PostPackSize; /**< When compressed chunk by chunk : size of Data after compression */ //CKINT PostPackSize; /**< When compressed chunk by chunk : size of Data after compression */
//CKINT PrePackSize; /**< When compressed chunk by chunk : size of Data before compression */ //CKINT PrePackSize; /**< When compressed chunk by chunk : size of Data before compression */
CK_FO_OPTIONS Options; /**< When loading an object it may be renamed , use to replace another object */ CK_FO_OPTIONS Options; /**< When loading an object it may be renamed , use to replace another object */
CKINT FileIndex; /**< Position of the object data inside uncompressed file buffer */ CKDWORD FileIndex; /**< Position of the object data inside uncompressed file buffer */
CKDWORD SaveFlags; /**< Flags used when this object was saved. */ CKDWORD SaveFlags; /**< Flags used when this object was saved. */
}; };

10
LibCmo/CK2/CKFileOthers.cpp
View File

@ -253,25 +253,26 @@ namespace LibCmo::CK2 {
#pragma region CKFileVisitor #pragma region CKFileVisitor
CKFileVisitor::CKFileVisitor(CKFileReader* reader) : CKFileVisitor::CKFileVisitor(CKFileReader* reader) :
m_IsReader(CKTRUE), m_Reader(reader), m_Writer(nullptr) { m_IsReader(CKTRUE), m_Reader(reader), m_Writer(nullptr), m_Ctx(reader->m_Ctx) {
if (reader == nullptr) LIBPANIC("Reader is nullptr."); if (reader == nullptr) LIBPANIC("Reader is nullptr.");
} }
CKFileVisitor::CKFileVisitor(CKFileWriter* writer) : CKFileVisitor::CKFileVisitor(CKFileWriter* writer) :
m_IsReader(false), m_Reader(nullptr), m_Writer(nullptr) { m_IsReader(false), m_Reader(nullptr), m_Writer(writer), m_Ctx(writer->m_Ctx) {
if (writer == nullptr) LIBPANIC("Writer is nullptr."); if (writer == nullptr) LIBPANIC("Writer is nullptr.");
} }
CKFileVisitor::CKFileVisitor(const CKFileVisitor& rhs) : CKFileVisitor::CKFileVisitor(const CKFileVisitor& rhs) :
m_IsReader(rhs.m_IsReader), m_Reader(rhs.m_Reader), m_Writer(rhs.m_Writer) {} m_IsReader(rhs.m_IsReader), m_Reader(rhs.m_Reader), m_Writer(rhs.m_Writer), m_Ctx(rhs.m_Ctx) {}
CKFileVisitor::CKFileVisitor(CKFileVisitor&& rhs) : CKFileVisitor::CKFileVisitor(CKFileVisitor&& rhs) :
m_IsReader(rhs.m_IsReader), m_Reader(rhs.m_Reader), m_Writer(rhs.m_Writer) {} m_IsReader(rhs.m_IsReader), m_Reader(rhs.m_Reader), m_Writer(rhs.m_Writer), m_Ctx(rhs.m_Ctx) {}
CKFileVisitor& CKFileVisitor::operator=(const CKFileVisitor& rhs) { CKFileVisitor& CKFileVisitor::operator=(const CKFileVisitor& rhs) {
this->m_IsReader = rhs.m_IsReader; this->m_IsReader = rhs.m_IsReader;
this->m_Reader = rhs.m_Reader; this->m_Reader = rhs.m_Reader;
this->m_Writer = rhs.m_Writer; this->m_Writer = rhs.m_Writer;
this->m_Ctx = rhs.m_Ctx;
return *this; return *this;
} }
@ -280,6 +281,7 @@ namespace LibCmo::CK2 {
this->m_IsReader = rhs.m_IsReader; this->m_IsReader = rhs.m_IsReader;
this->m_Reader = rhs.m_Reader; this->m_Reader = rhs.m_Reader;
this->m_Writer = rhs.m_Writer; this->m_Writer = rhs.m_Writer;
this->m_Ctx = rhs.m_Ctx;
return *this; return *this;
} }

24
LibCmo/CK2/CKStateChunk.cpp
View File

@ -110,6 +110,26 @@ namespace LibCmo::CK2 {
#pragma region Misc Funcs #pragma region Misc Funcs
const ChunkProfile CKStateChunk::GetStateChunkProfile() {
ChunkProfile profile;
profile.m_ClassId = this->m_ClassId;
profile.m_DataDwSize = this->m_DataDwSize;
profile.m_pData = this->m_pData;
profile.m_DataVersion = this->m_DataVersion;
profile.m_ChunkVersion = this->m_ChunkVersion;
profile.m_ObjectListSize = this->m_ObjectList.size();
profile.m_ChunkListSize = this->m_ChunkList.size();
profile.m_ManagerListSize = this->m_ManagerList.size();
profile.m_BindFile = this->m_BindFile;
profile.m_BindContext = this->m_BindContext;
return profile;
}
void CKStateChunk::Clear(void) { void CKStateChunk::Clear(void) {
this->m_ClassId = CK_CLASSID::CKCID_OBJECT; this->m_ClassId = CK_CLASSID::CKCID_OBJECT;
this->m_DataVersion = CK_STATECHUNK_DATAVERSION::CHUNK_DEV_2_1; this->m_DataVersion = CK_STATECHUNK_DATAVERSION::CHUNK_DEV_2_1;
@ -505,7 +525,7 @@ namespace LibCmo::CK2 {
return true; return true;
} }
XContainer::XArray<IdentifierProfile> CKStateChunk::GetIdentifierProfile() { const XContainer::XArray<IdentifierProfile> CKStateChunk::GetIdentifierProfile() {
XContainer::XArray<IdentifierProfile> collection; XContainer::XArray<IdentifierProfile> collection;
if (this->m_Parser.m_Status != CKStateChunkStatus::READ) return collection; if (this->m_Parser.m_Status != CKStateChunkStatus::READ) return collection;
@ -550,7 +570,7 @@ namespace LibCmo::CK2 {
return true; return true;
} else { } else {
// failed, report to context // failed, report to context
m_BindContext->OutputToConsoleEx("CKStateChunk read length error at %" PRIckDWORD ".", this->m_Parser.m_CurrentPos); m_BindContext->OutputToConsoleEx("CKStateChunk read length error at %" PRIuCKDWORD ".", this->m_Parser.m_CurrentPos);
return false; return false;
} }
} }

4
LibCmo/CK2/CKStateChunk.hpp
View File

@ -73,6 +73,8 @@ namespace LibCmo::CK2 {
#pragma region Misc Functions #pragma region Misc Functions
public: public:
const ChunkProfile GetStateChunkProfile();
//bool UnPack(CKDWORD DestSize); //bool UnPack(CKDWORD DestSize);
void Clear(void); void Clear(void);
CKDWORD GetDataSize(void); CKDWORD GetDataSize(void);
@ -112,7 +114,7 @@ namespace LibCmo::CK2 {
inline bool SeekIdentifierAndReturnSize(TEnum enum_v, CKDWORD* out_size) { inline bool SeekIdentifierAndReturnSize(TEnum enum_v, CKDWORD* out_size) {
return SeekIdentifierDwordAndReturnSize(static_cast<CKDWORD>(enum_v), out_size); return SeekIdentifierDwordAndReturnSize(static_cast<CKDWORD>(enum_v), out_size);
} }
XContainer::XArray<IdentifierProfile> GetIdentifierProfile(); const XContainer::XArray<IdentifierProfile> GetIdentifierProfile();
/* ========== Basic Data Read Functions ==========*/ /* ========== Basic Data Read Functions ==========*/

18
LibCmo/CK2/CKTypes.hpp
View File

@ -183,10 +183,20 @@ namespace LibCmo::CK2 {
using CKAttributeCategory = int32_t; using CKAttributeCategory = int32_t;
// type print style define // type print style define
#define PRIckBYTE PRIu8 #define PRIuCKID PRIu32
#define PRIckDWORD PRIu32 #define PRIiCKERROR PRIi32
#define PRIckWORD PRIu16 #define PRIiCLASSID PRIi32
#define PRIckINT PRIi32
#define PRIuCKBYTE PRIu8
#define PRIuCKDWORD PRIu32
#define PRIuCKWORD PRIu16
#define PRIxCKBYTE PRIx8
#define PRIxCKDWORD PRIx32
#define PRIxCKWORD PRIx16
#define PRIXCKBYTE PRIX8
#define PRIXCKDWORD PRIX32
#define PRIXCKWORD PRIX16
#define PRIiCKINT PRIi32
// ========== Class List ========== // ========== Class List ==========
// Objects and derivated classes // Objects and derivated classes

141
Unvirt/StructFormatter.cpp
View File

@ -8,12 +8,17 @@ namespace Unvirt::StructFormatter {
#pragma region Assist Functions #pragma region Assist Functions
static void PrintCKSTRING(const LibCmo::TypeHelper::MKString& name) { #define PRIuSIZET "zu"
LibCmo::CK2::CKSTRING ckname = name.c_str();
if (ckname == nullptr) { static void PrintCKSTRING(LibCmo::CK2::CKSTRING name) {
if (name == nullptr) {
fputs(UNVIRT_TERMCOL_LIGHT_MAGENTA(("<anonymous>")), stdout); fputs(UNVIRT_TERMCOL_LIGHT_MAGENTA(("<anonymous>")), stdout);
} else { } else {
fputs(ckname, stdout); if (name[0] == '\0') {
fputs(UNVIRT_TERMCOL_LIGHT_MAGENTA(("<blank>")), stdout);
} else {
fputs(name, stdout);
}
} }
} }
static void PrintPointer(const void* ptr) { static void PrintPointer(const void* ptr) {
@ -22,24 +27,21 @@ namespace Unvirt::StructFormatter {
} else { } else {
#if UINTPTR_MAX == UINT32_MAX #if UINTPTR_MAX == UINT32_MAX
// 32 bit. padding 8 zero // 32 bit. padding 8 zero
fprintf(stdout, "<0x%08" PRIXPTR ">", reinterpret_cast<uintptr_t>(ptr)); fprintf(stdout, "<0x%08" PRIxPTR ">", reinterpret_cast<uintptr_t>(ptr));
#else #else
// 64 bit. padding 16 zero // 64 bit. padding 16 zero
fprintf(stdout, "<0x%016" PRIXPTR ">", reinterpret_cast<uintptr_t>(ptr)); fprintf(stdout, "<0x%016" PRIxPTR ">", reinterpret_cast<uintptr_t>(ptr));
#endif #endif
} }
} }
static void PrintCKGUID(const LibCmo::CK2::CKGUID& guid) { static void PrintCKGUID(const LibCmo::CK2::CKGUID& guid) {
fprintf(stdout, "<0x%08" PRIx32 ", 0x%08" PRIx32 ">", guid.d1, guid.d2); fprintf(stdout, "<0x%08" PRIxCKDWORD ", 0x%08" PRIxCKDWORD ">", guid.d1, guid.d2);
} }
static void PrintIdentifier(const LibCmo::CK2::CKDWORD val) {
fprintf(stdout, "0x%08" PRIx32, val);
}
template<class _Ty> template<class _Ty>
static void GeneralPrintList( static void GeneralPrintList(
const std::vector<_Ty>& data, size_t page, size_t pageitems, const std::vector<_Ty>& data, size_t page, size_t pageitems,
std::function<void()> printHdrFct, std::function<void(size_t,const _Ty&)> printEntryFct) { std::function<void()> printHdrFct, std::function<void(size_t, const _Ty&)> printEntryFct) {
size_t fulllen = data.size(), size_t fulllen = data.size(),
startpos = page * pageitems, startpos = page * pageitems,
@ -53,7 +55,7 @@ namespace Unvirt::StructFormatter {
printEntryFct(counter, data[counter]); printEntryFct(counter, data[counter]);
} }
fprintf(stdout, "Page %zu of %zu\n", page + 1, fullpage + 1); fprintf(stdout, "Page %" PRIuSIZET " of %" PRIuSIZET "\n", page + 1, fullpage + 1);
} }
#pragma endregion #pragma endregion
@ -61,8 +63,8 @@ namespace Unvirt::StructFormatter {
void PrintCKFileInfo(const LibCmo::CK2::CKFileInfo& fileinfo) { void PrintCKFileInfo(const LibCmo::CK2::CKFileInfo& fileinfo) {
fputs(UNVIRT_TERMCOL_LIGHT_YELLOW(("CKFileInfo\n")), stdout); fputs(UNVIRT_TERMCOL_LIGHT_YELLOW(("CKFileInfo\n")), stdout);
fprintf(stdout, "FileVersion: %" PRIu32 "\n", fileinfo.FileVersion); fprintf(stdout, "FileVersion: %" PRIuCKDWORD "\n", fileinfo.FileVersion);
fprintf(stdout, "CKVersion: %02" PRIX32 "/%02" PRIX32 "/%04" PRIX32 "\n", fprintf(stdout, "CKVersion: %02" PRIxCKDWORD "/%02" PRIxCKDWORD "/%04" PRIxCKDWORD "\n",
(fileinfo.CKVersion >> 24) & 0xFF, (fileinfo.CKVersion >> 24) & 0xFF,
(fileinfo.CKVersion >> 16) & 0xFF, (fileinfo.CKVersion >> 16) & 0xFF,
(fileinfo.CKVersion >> 0) & 0xFFFF (fileinfo.CKVersion >> 0) & 0xFFFF
@ -74,59 +76,76 @@ namespace Unvirt::StructFormatter {
(fileinfo.ProductBuild >> 8) & 0xFF, (fileinfo.ProductBuild >> 8) & 0xFF,
(fileinfo.ProductBuild >> 0) & 0xFF, (fileinfo.ProductBuild >> 0) & 0xFF,
}; };
fprintf(stdout, "Product (Version / Build): %" PRIu32 " / %" PRIu32 ".%" PRIu32 ".%" PRIu32 ".%" PRIu32 "\n", fprintf(stdout, "Product (Version / Build): %" PRIuCKDWORD " / %" PRIuCKDWORD ".%" PRIuCKDWORD ".%" PRIuCKDWORD ".%" PRIuCKDWORD "\n",
fileinfo.ProductVersion, product_series[0], product_series[1], product_series[2], product_series[3] fileinfo.ProductVersion, product_series[0], product_series[1], product_series[2], product_series[3]
); );
fprintf(stdout, "Save Flags: %s\n", Unvirt::AccessibleValue::GetFlagEnumName( fprintf(stdout, "Save Flags: %s\n", AccessibleValue::GetFlagEnumName(
fileinfo.FileWriteMode, Unvirt::AccessibleValue::EnumDesc::CK_FILE_WRITEMODE fileinfo.FileWriteMode, AccessibleValue::EnumDesc::CK_FILE_WRITEMODE
).c_str()); ).c_str());
fprintf(stdout, "File Size: %s\n", Unvirt::AccessibleValue::GetReadableFileSize(fileinfo.FileSize).c_str()); fprintf(stdout, "File Size: %s\n", AccessibleValue::GetReadableFileSize(fileinfo.FileSize).c_str());
fprintf(stdout, "Crc: 0x%" PRIX32 "\n", fileinfo.Crc); fprintf(stdout, "Crc: 0x%" PRIxCKDWORD "\n", fileinfo.Crc);
fputc('\n', stdout); fputc('\n', stdout);
fputs("Hdr1 (Pack / UnPack): ", stdout); fputs("Hdr1 (Pack / UnPack): ", stdout);
fprintf(stdout, "%s / ", Unvirt::AccessibleValue::GetReadableFileSize(fileinfo.Hdr1PackSize).c_str()); fprintf(stdout, "%s / ", AccessibleValue::GetReadableFileSize(fileinfo.Hdr1PackSize).c_str());
fprintf(stdout, "%s\n", Unvirt::AccessibleValue::GetReadableFileSize(fileinfo.Hdr1UnPackSize).c_str()); fprintf(stdout, "%s\n", AccessibleValue::GetReadableFileSize(fileinfo.Hdr1UnPackSize).c_str());
fputs("Data (Pack / UnPack): ", stdout); fputs("Data (Pack / UnPack): ", stdout);
fprintf(stdout, "%s / ", Unvirt::AccessibleValue::GetReadableFileSize(fileinfo.DataPackSize).c_str()); fprintf(stdout, "%s / ", AccessibleValue::GetReadableFileSize(fileinfo.DataPackSize).c_str());
fprintf(stdout, "%s\n", Unvirt::AccessibleValue::GetReadableFileSize(fileinfo.DataUnPackSize).c_str()); fprintf(stdout, "%s\n", AccessibleValue::GetReadableFileSize(fileinfo.DataUnPackSize).c_str());
fputc('\n', stdout); fputc('\n', stdout);
fprintf(stdout, "Manager Count: %" PRIu32 "\nObject Count: %" PRIu32 "\nMax ID Saved: %" PRIu32 "\n", fprintf(stdout, "Manager Count: %" PRIuCKDWORD "\nObject Count: %" PRIuCKDWORD "\nMax ID Saved: %" PRIuCKDWORD "\n",
fileinfo.ManagerCount, fileinfo.ObjectCount, fileinfo.MaxIDSaved fileinfo.ManagerCount, fileinfo.ObjectCount, fileinfo.MaxIDSaved
); );
} }
void PrintObjectList(const LibCmo::XContainer::XArray<LibCmo::CK2::CKFileObject>& ls, size_t page, size_t pageitems) { void PrintObjectList(
const LibCmo::XContainer::XArray<LibCmo::CK2::CKFileObject>& ls,
const LibCmo::CK2::CKFileInfo& fileinfo,
size_t page, size_t pageitems) {
fputs(UNVIRT_TERMCOL_LIGHT_YELLOW(("CKFileObject\n")), stdout); fputs(UNVIRT_TERMCOL_LIGHT_YELLOW(("CKFileObject\n")), stdout);
GeneralPrintList<LibCmo::CK2::CKFileObject>(ls, page, pageitems, GeneralPrintList<LibCmo::CK2::CKFileObject>(ls, page, pageitems,
[]() -> void { []() -> void {
fputs("Index\tThis CK ID\tFile CK ID\tType\tCKObject\tCKStateChunk\tName\n", stdout); fputs("SaveFlags\tOptions\tCK ID\tFile CK ID\tFile Index\tPack Size\tIndex\tType\tCKObject\tCKStateChunk\tName\n", stdout);
}, },
[](size_t index, const LibCmo::CK2::CKFileObject& obj) -> void { [&fileinfo](size_t index, const LibCmo::CK2::CKFileObject& obj) -> void {
fprintf(stdout, "#%zu\t", index); fprintf(stdout, "0x%08" PRIxCKDWORD "\t", obj.SaveFlags);
fprintf(stdout, "%" PRIu32 "\t%" PRIu32 "\t", obj.CreatedObjectId, obj.ObjectId); fputs(AccessibleValue::GetEnumName(obj.Options, AccessibleValue::EnumDesc::CK_FO_OPTIONS).c_str(), stdout);
fprintf(stdout, "%s\t", Unvirt::AccessibleValue::GetClassIdName(obj.ObjectCid).c_str()); fputc('\t', stdout);
fprintf(stdout, "%" PRIuCKID "\t", obj.CreatedObjectId);
fprintf(stdout, "%" PRIuCKID "\t", obj.ObjectId);
fprintf(stdout, "0x%08" PRIxCKDWORD " (Rel: 0x%08" PRIxCKDWORD ")\t",
obj.FileIndex,
obj.FileIndex - sizeof(LibCmo::CK2::CKRawFileInfo) - fileinfo.Hdr1UnPackSize);
fprintf(stdout, "0x%08" PRIxCKDWORD "\t", obj.PackSize);
fprintf(stdout, "#%" PRIuSIZET "\t", index);
fputs(AccessibleValue::GetClassIdName(obj.ObjectCid).c_str(), stdout);
fputc('\t', stdout);
PrintPointer(obj.ObjPtr); PrintPointer(obj.ObjPtr);
fputc('\t', stdout); fputc('\t', stdout);
PrintPointer(obj.Data); PrintPointer(obj.Data);
fputc('\t', stdout); fputc('\t', stdout);
PrintCKSTRING(obj.Name); PrintCKSTRING(obj.Name.c_str());
fputc('\n', stdout); fputc('\n', stdout);
} }
); );
} }
void PrintManagerList(const LibCmo::XContainer::XArray<LibCmo::CK2::CKFileManagerData>& ls, size_t page, size_t pageitems) { void PrintManagerList(
const LibCmo::XContainer::XArray<LibCmo::CK2::CKFileManagerData>& ls,
size_t page, size_t pageitems) {
fputs(UNVIRT_TERMCOL_LIGHT_YELLOW(("CKFileManager\n")), stdout); fputs(UNVIRT_TERMCOL_LIGHT_YELLOW(("CKFileManager\n")), stdout);
GeneralPrintList<LibCmo::CK2::CKFileManagerData>(ls, page, pageitems, GeneralPrintList<LibCmo::CK2::CKFileManagerData>(ls, page, pageitems,
@ -136,13 +155,13 @@ namespace Unvirt::StructFormatter {
}, },
[](size_t index, const LibCmo::CK2::CKFileManagerData& mgr) -> void { [](size_t index, const LibCmo::CK2::CKFileManagerData& mgr) -> void {
// print body // print body
fprintf(stdout, "#%zu\t", index); fprintf(stdout, "#%" PRIuSIZET "\t", index);
PrintCKGUID(mgr.Manager); PrintCKGUID(mgr.Manager);
fputc('\t', stdout); fputc('\t', stdout);
PrintPointer(mgr.Data); PrintPointer(mgr.Data);
fputc('\n', stdout); fputc('\n', stdout);
} }
); );
} }
@ -156,21 +175,49 @@ namespace Unvirt::StructFormatter {
} }
void PrintCKStateChunk(const LibCmo::CK2::CKStateChunk* chunk) { void PrintCKStateChunk(const LibCmo::CK2::CKStateChunk* chunk) {
fputs(UNVIRT_TERMCOL_LIGHT_YELLOW(("CKStateChunk\n")), stdout); fputs(UNVIRT_TERMCOL_LIGHT_YELLOW(("CKStateChunk\n")), stdout);
// print header // hack const state chunk
fputs("Identifier\tData Pointer\tData Size\n", stdout);
// print body
LibCmo::CK2::CKStateChunk* operchunk = const_cast<LibCmo::CK2::CKStateChunk*>(chunk); LibCmo::CK2::CKStateChunk* operchunk = const_cast<LibCmo::CK2::CKStateChunk*>(chunk);
// write profile
const auto profile = operchunk->GetStateChunkProfile();
fputs("Type: ", stdout);
fputs(AccessibleValue::GetClassIdName(profile.m_ClassId).c_str(), stdout);
fputc('\n', stdout);
fprintf(stdout, "Version (Data / Chunk): %" PRIuCKDWORD " (%s) / %" PRIuCKDWORD " (%s)\n",
static_cast<LibCmo::CK2::CKDWORD>(profile.m_DataVersion), AccessibleValue::GetEnumName(profile.m_DataVersion, AccessibleValue::EnumDesc::CK_STATECHUNK_DATAVERSION).c_str(),
static_cast<LibCmo::CK2::CKDWORD>(profile.m_ChunkVersion), AccessibleValue::GetEnumName(profile.m_ChunkVersion, AccessibleValue::EnumDesc::CK_STATECHUNK_CHUNKVERSION).c_str());
fprintf(stdout, "List (Object / Chunk / Manager): %" PRIuCKDWORD " / %" PRIuCKDWORD " / %" PRIuCKDWORD "\n",
static_cast<LibCmo::CK2::CKDWORD>(profile.m_ObjectListSize),
static_cast<LibCmo::CK2::CKDWORD>(profile.m_ChunkListSize),
static_cast<LibCmo::CK2::CKDWORD>(profile.m_ManagerListSize));
fputs("Data: ", stdout);
PrintPointer(profile.m_pData);
fprintf(stdout, " (0x%" PRIxCKDWORD " DWORD)\n", profile.m_DataDwSize);
fputs("Bind CKFile: ", stdout);
PrintPointer(profile.m_BindFile);
fputc('\n', stdout);
fputs("Bind CKContext: ", stdout);
PrintPointer(profile.m_BindContext);
fputc('\n', stdout);
// write identifiers
operchunk->StartRead(); operchunk->StartRead();
auto collection = operchunk->GetIdentifierProfile(); const auto collection = operchunk->GetIdentifierProfile();
operchunk->StopRead(); operchunk->StopRead();
for (const auto& profile : collection) { fputs(UNVIRT_TERMCOL_LIGHT_YELLOW(("Identifiers\n")), stdout);
PrintIdentifier(profile.m_Identifier); fputs("Identifier\tData Pointer\tData Size\n", stdout);
for (const auto& ident : collection) {
fprintf(stdout, "0x%08" PRIxCKDWORD "\t", ident.m_AreaSize);
PrintPointer(ident.m_DataPtr);
fputc('\t', stdout); fputc('\t', stdout);
PrintPointer(profile.m_DataPtr); fprintf(stdout, "%" PRIuCKDWORD " (%" PRIuCKDWORD " DWORD + %" PRIuCKDWORD ")\n",
fputc('\t', stdout); ident.m_AreaSize, ident.m_AreaSize / sizeof(LibCmo::CK2::CKDWORD), ident.m_AreaSize % sizeof(LibCmo::CK2::CKDWORD));
fprintf(stdout, "%" PRIckDWORD "\n", profile.m_AreaSize);
} }
} }

11
Unvirt/StructFormatter.hpp
View File

@ -6,8 +6,15 @@
namespace Unvirt::StructFormatter { namespace Unvirt::StructFormatter {
void PrintCKFileInfo(const LibCmo::CK2::CKFileInfo& fileinfo); void PrintCKFileInfo(const LibCmo::CK2::CKFileInfo& fileinfo);
void PrintObjectList(const LibCmo::XContainer::XArray<LibCmo::CK2::CKFileObject>& ls, size_t page, size_t pageitems);
void PrintManagerList(const LibCmo::XContainer::XArray<LibCmo::CK2::CKFileManagerData>& ls, size_t page, size_t pageitems); void PrintObjectList(
const LibCmo::XContainer::XArray<LibCmo::CK2::CKFileObject>& ls,
const LibCmo::CK2::CKFileInfo& fileinfo,
size_t page, size_t pageitems);
void PrintManagerList(
const LibCmo::XContainer::XArray<LibCmo::CK2::CKFileManagerData>& ls,
size_t page, size_t pageitems);
void PrintCKObject(const LibCmo::CK2::ObjImpls::CKObject*); void PrintCKObject(const LibCmo::CK2::ObjImpls::CKObject*);
void PrintCKBaseManager(const LibCmo::CK2::MgrImpls::CKBaseManager*); void PrintCKBaseManager(const LibCmo::CK2::MgrImpls::CKBaseManager*);
void PrintCKStateChunk(const LibCmo::CK2::CKStateChunk*); void PrintCKStateChunk(const LibCmo::CK2::CKStateChunk*);

2
Unvirt/UnvirtContext.cpp
View File

@ -297,7 +297,7 @@ namespace Unvirt::Context {
PrintCommonError("Page out of range."); PrintCommonError("Page out of range.");
return; return;
} }
Unvirt::StructFormatter::PrintObjectList(m_FileReader->GetFileObjects(), page, this->m_PageLen); Unvirt::StructFormatter::PrintObjectList(m_FileReader->GetFileObjects(), m_FileReader->GetFileInfo(), page, this->m_PageLen);
break; break;
} }
case 1: case 1: