Fixes the launch of some games on firmware versions 18 and above.

This commit is contained in:
Pavel Barabanov 2025-04-15 05:59:18 +03:00
parent 20e5a24241
commit 4eaf3604a0

View file

@ -61,28 +61,23 @@ std::unique_ptr<Process> CreateProcessImpl(std::unique_ptr<Loader::AppLoader>& o
std::unique_ptr<Process> CreateProcess(Core::System& system, u64 program_id, std::unique_ptr<Process> CreateProcess(Core::System& system, u64 program_id,
u8 minimum_key_generation, u8 maximum_key_generation) { u8 minimum_key_generation, u8 maximum_key_generation) {
// Attempt to load program NCA. FileSys::VirtualFile nca_raw = system.GetContentProviderUnion()
FileSys::VirtualFile nca_raw{}; .GetEntryRaw(program_id, FileSys::ContentRecordType::Program);
// Get the program NCA from storage.
auto& storage = system.GetContentProviderUnion();
nca_raw = storage.GetEntryRaw(program_id, FileSys::ContentRecordType::Program);
// Ensure we retrieved a program NCA.
if (!nca_raw) { if (!nca_raw) {
return nullptr; return nullptr;
} }
// Ensure we have a suitable version.
if (minimum_key_generation > 0) {
FileSys::NCA nca(nca_raw); FileSys::NCA nca(nca_raw);
if (nca.GetStatus() == Loader::ResultStatus::Success && if (nca.GetStatus() != Loader::ResultStatus::Success) {
(nca.GetKeyGeneration() < minimum_key_generation ||
nca.GetKeyGeneration() > maximum_key_generation)) {
LOG_WARNING(Service_LDR, "Skipping program {:016X} with generation {}", program_id,
nca.GetKeyGeneration());
return nullptr; return nullptr;
} }
u8 current_gen = nca.GetKeyGeneration();
if (minimum_key_generation > 0 && (current_gen < minimum_key_generation ||
current_gen > maximum_key_generation)) {
LOG_WARNING(Service_LDR, "Program {:016X} has unsupported generation {}. "
"Attempting to load anyway...", program_id, current_gen);
} }
std::unique_ptr<Loader::AppLoader> loader; std::unique_ptr<Loader::AppLoader> loader;