fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug between reading header content and applying TUs

Browse Source
This commit is contained in:
Gliniak
2022-05-25 08:23:19 +02:00
parent d7d26dc1c4
commit 542e075699
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/xenia/kernel/xam/content_manager.cc
View File

@@ -108,7 +108,7 @@ std::vector<XCONTENT_AGGREGATE_DATA> ContentManager::ListContent(
XCONTENT_AGGREGATE_DATA content_data; XCONTENT_AGGREGATE_DATA content_data;
if (XSUCCEEDED( if (XSUCCEEDED(
ReadContentHeaderFile(xe::path_to_utf8(file_info.name) + ".header", ReadContentHeaderFile(xe::path_to_utf8(file_info.name) + ".header",
content_type, content_data))) { content_type, content_data, title_id))) {
result.emplace_back(std::move(content_data)); result.emplace_back(std::move(content_data));
} else { } else {
content_data.device_id = device_id; content_data.device_id = device_id;
@@ -170,10 +170,16 @@ X_RESULT ContentManager::WriteContentHeaderFile(
X_RESULT ContentManager::ReadContentHeaderFile(const std::string_view file_name, X_RESULT ContentManager::ReadContentHeaderFile(const std::string_view file_name,
XContentType content_type, XContentType content_type,
XCONTENT_AGGREGATE_DATA& data) { XCONTENT_AGGREGATE_DATA& data,
auto title_id = fmt::format("{:8X}", kernel_state_->title_id()); const uint32_t title_id) {
auto title_id_str = fmt::format("{:08X}", title_id);
if (title_id == -1) {
title_id_str = fmt::format("{:08X}", kernel_state_->title_id());
}
auto content_type_directory = fmt::format("{:08X}", content_type); auto content_type_directory = fmt::format("{:08X}", content_type);
auto header_file_path = root_path_ / title_id / kGameContentHeaderDirName / auto header_file_path = root_path_ / title_id_str /
kGameContentHeaderDirName /
content_type_directory / file_name; content_type_directory / file_name;
constexpr uint32_t header_size = sizeof(XCONTENT_AGGREGATE_DATA); constexpr uint32_t header_size = sizeof(XCONTENT_AGGREGATE_DATA);

3
src/xenia/kernel/xam/content_manager.h
View File

@@ -153,7 +153,8 @@ class ContentManager {
X_RESULT WriteContentHeaderFile(const XCONTENT_AGGREGATE_DATA* data_raw); X_RESULT WriteContentHeaderFile(const XCONTENT_AGGREGATE_DATA* data_raw);
X_RESULT ReadContentHeaderFile(const std::string_view file_name, X_RESULT ReadContentHeaderFile(const std::string_view file_name,
XContentType content_type, XContentType content_type,
XCONTENT_AGGREGATE_DATA& data); XCONTENT_AGGREGATE_DATA& data,
const uint32_t title_id = -1);
X_RESULT CreateContent(const std::string_view root_name, X_RESULT CreateContent(const std::string_view root_name,
const XCONTENT_AGGREGATE_DATA& data); const XCONTENT_AGGREGATE_DATA& data);
X_RESULT OpenContent(const std::string_view root_name, X_RESULT OpenContent(const std::string_view root_name,