Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework system title handling with up-to-date title list and region detection support. (#6356)

Browse source
This commit is contained in:
Steveice10 2023-03-29 04:55:29 -07:00 • committed by GitHub
parent b5d6f645bd
commit 5346ca27b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 1292 additions and 806 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/core/loader/ncch.cpp
View file

@ -25,6 +25,7 @@
#include "core/loader/ncch.h"
#include "core/loader/smdh.h"
#include "core/memory.h"
#include "core/system_titles.h"
#include "network/network.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
@ -162,7 +163,10 @@ ResultStatus AppLoader_NCCH::LoadExec(std::shared_ptr<Kernel::Process>& process)
return ResultStatus::Error;
}
void AppLoader_NCCH::ParseRegionLockoutInfo() {
void AppLoader_NCCH::ParseRegionLockoutInfo(u64 program_id) {
auto cfg = Service::CFG::GetModule(Core::System::GetInstance());
ASSERT_MSG(cfg, "CFG Module missing!");
std::vector<u8> smdh_buffer;
if (ReadIcon(smdh_buffer) == ResultStatus::Success && smdh_buffer.size() >= sizeof(SMDH)) {
SMDH smdh;
@ -176,9 +180,12 @@ void AppLoader_NCCH::ParseRegionLockoutInfo() {
}
region_lockout >>= 1;
}
auto cfg = Service::CFG::GetModule(Core::System::GetInstance());
ASSERT_MSG(cfg, "CFG Module missing!");
cfg->SetPreferredRegionCodes(regions);
} else {
const auto region = Core::GetSystemTitleRegion(program_id);
if (region.has_value()) {
cfg->SetPreferredRegionCodes({region.value()});
}
}
}
@ -229,7 +236,7 @@ ResultStatus AppLoader_NCCH::Load(std::shared_ptr<Kernel::Process>& process) {
system.ArchiveManager().RegisterSelfNCCH(*this);
ParseRegionLockoutInfo();
ParseRegionLockoutInfo(ncch_program_id);
return ResultStatus::Success;
}