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

[Kernel] Move title_id field in XCONTENT_AGGREGATE_DATA struct

Browse Source 
XamAppEnumerateContentAggregate seems to store title_id at 0x140, so I've moved title_id to there, now AGGREGATE_DATA seems to match the size of the struct used by XamContentCreateInternal.

Also removed unneeded/useless checks inside XamAppEnumerateContentAggregate.
This commit is contained in:
emoose
2021-06-15 22:33:45 +01:00
committed by Rick Gibbed
parent 716d4c412a
commit 9503c9efaf
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,7 @@ struct XCONTENT_DATA {
static_assert_size(XCONTENT_DATA, 0x134);
struct XCONTENT_AGGREGATE_DATA : XCONTENT_DATA {
be<uint64_t> unk134; // some titles store XUID here?
be<uint32_t> title_id;
XCONTENT_AGGREGATE_DATA() = default;
@@ -102,6 +103,7 @@ struct XCONTENT_AGGREGATE_DATA : XCONTENT_DATA {
set_display_name(other.display_name());
set_file_name(other.file_name());
padding[0] = padding[1] = 0;
unk134 = 0;
title_id = kCurrentlyRunningTitleId;
}
@@ -113,7 +115,7 @@ struct XCONTENT_AGGREGATE_DATA : XCONTENT_DATA {
file_name() == other.file_name();
}
};
static_assert_size(XCONTENT_AGGREGATE_DATA, 0x138);
static_assert_size(XCONTENT_AGGREGATE_DATA, 0x148);
class ContentPackage {
public: