citroneo/emulator
0
0
Fork 0
mirror of https://github.com/citron-neo/emulator.git synced 2026-07-05 15:21:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(aoc): apply GetBaseTitleID to PrepareAddOnContent program ID

Browse Source 
GetApplicationProcessProgramID() can return the +0x800 update
title ID rather than the base ID, causing GetAOCBaseTitleID and
GetAOCTitleIDsForBase to produce wrong results. Apply
GetBaseTitleID() first, matching CountAddOnContent and
ListAddOnContent.

Demote log to DEBUG; add raw_program_id, accumulated/matched
counts for diagnostics.
This commit is contained in:
cheezwiz7899
2026-07-01 09:37:37 +10:00
parent 1d90167960
commit 121b472393
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/hle/service/aoc/addon_content_manager.cpp
+8 -6
View File
@@ -252,7 +252,8 @@ Result IAddOnContentManager::GetAddOnContentBaseId(Out<u64> out_title_id,
}
Result IAddOnContentManager::PrepareAddOnContent(s32 addon_index, ClientProcessId process_id) {
const auto program_id = system.GetApplicationProcessProgramID();
const auto raw_program_id = system.GetApplicationProcessProgramID();
const auto program_id = FileSys::GetBaseTitleID(raw_program_id);
const auto aoc_base_id = FileSys::GetAOCBaseTitleID(program_id);
const auto matching_aocs = GetAOCTitleIDsForBase(add_on_content, program_id);
u64 physical_title_id = 0;
@@ -260,11 +261,12 @@ Result IAddOnContentManager::PrepareAddOnContent(s32 addon_index, ClientProcessI
physical_title_id = matching_aocs[static_cast<std::size_t>(addon_index) - 1];
}
LOG_WARNING(Service_AOC,
"PrepareAddOnContent: program_id={:016X}, aoc_base={:016X}, "
"addon_index={}, physical_title_id={:016X}, process_id={}",
program_id, aoc_base_id, addon_index, physical_title_id,
process_id.pid);
LOG_DEBUG(Service_AOC,
"PrepareAddOnContent: raw_program_id={:016X}, base_id={:016X}, "
"aoc_base={:016X}, accumulated={}, matched={}, addon_index={}, "
"physical_title_id={:016X}, process_id={}",
raw_program_id, program_id, aoc_base_id, add_on_content.size(),
matching_aocs.size(), addon_index, physical_title_id, process_id.pid);
R_SUCCEED();
}