Merge pull request #2576 from DarkLordZach/nsp-fix-1
nsp: Fix various errors with loading and processing of extracted NSPs
This commit is contained in:
commit
25383b9ff2
|
@ -14,6 +14,7 @@
|
||||||
#include "core/file_sys/content_archive.h"
|
#include "core/file_sys/content_archive.h"
|
||||||
#include "core/file_sys/nca_metadata.h"
|
#include "core/file_sys/nca_metadata.h"
|
||||||
#include "core/file_sys/partition_filesystem.h"
|
#include "core/file_sys/partition_filesystem.h"
|
||||||
|
#include "core/file_sys/program_metadata.h"
|
||||||
#include "core/file_sys/submission_package.h"
|
#include "core/file_sys/submission_package.h"
|
||||||
#include "core/loader/loader.h"
|
#include "core/loader/loader.h"
|
||||||
|
|
||||||
|
@ -78,6 +79,10 @@ Loader::ResultStatus NSP::GetStatus() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
Loader::ResultStatus NSP::GetProgramStatus(u64 title_id) const {
|
Loader::ResultStatus NSP::GetProgramStatus(u64 title_id) const {
|
||||||
|
if (IsExtractedType() && GetExeFS() != nullptr && FileSys::IsDirectoryExeFS(GetExeFS())) {
|
||||||
|
return Loader::ResultStatus::Success;
|
||||||
|
}
|
||||||
|
|
||||||
const auto iter = program_status.find(title_id);
|
const auto iter = program_status.find(title_id);
|
||||||
if (iter == program_status.end())
|
if (iter == program_status.end())
|
||||||
return Loader::ResultStatus::ErrorNSPMissingProgramNCA;
|
return Loader::ResultStatus::ErrorNSPMissingProgramNCA;
|
||||||
|
@ -85,12 +90,29 @@ Loader::ResultStatus NSP::GetProgramStatus(u64 title_id) const {
|
||||||
}
|
}
|
||||||
|
|
||||||
u64 NSP::GetFirstTitleID() const {
|
u64 NSP::GetFirstTitleID() const {
|
||||||
|
if (IsExtractedType()) {
|
||||||
|
return GetProgramTitleID();
|
||||||
|
}
|
||||||
|
|
||||||
if (program_status.empty())
|
if (program_status.empty())
|
||||||
return 0;
|
return 0;
|
||||||
return program_status.begin()->first;
|
return program_status.begin()->first;
|
||||||
}
|
}
|
||||||
|
|
||||||
u64 NSP::GetProgramTitleID() const {
|
u64 NSP::GetProgramTitleID() const {
|
||||||
|
if (IsExtractedType()) {
|
||||||
|
if (GetExeFS() == nullptr || !IsDirectoryExeFS(GetExeFS())) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
ProgramMetadata meta;
|
||||||
|
if (meta.Load(GetExeFS()->GetFile("main.npdm")) == Loader::ResultStatus::Success) {
|
||||||
|
return meta.GetTitleID();
|
||||||
|
} else {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const auto out = GetFirstTitleID();
|
const auto out = GetFirstTitleID();
|
||||||
if ((out & 0x800) == 0)
|
if ((out & 0x800) == 0)
|
||||||
return out;
|
return out;
|
||||||
|
@ -102,6 +124,10 @@ u64 NSP::GetProgramTitleID() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<u64> NSP::GetTitleIDs() const {
|
std::vector<u64> NSP::GetTitleIDs() const {
|
||||||
|
if (IsExtractedType()) {
|
||||||
|
return {GetProgramTitleID()};
|
||||||
|
}
|
||||||
|
|
||||||
std::vector<u64> out;
|
std::vector<u64> out;
|
||||||
out.reserve(ncas.size());
|
out.reserve(ncas.size());
|
||||||
for (const auto& kv : ncas)
|
for (const auto& kv : ncas)
|
||||||
|
|
|
@ -26,20 +26,18 @@ AppLoader_NSP::AppLoader_NSP(FileSys::VirtualFile file)
|
||||||
|
|
||||||
if (nsp->GetStatus() != ResultStatus::Success)
|
if (nsp->GetStatus() != ResultStatus::Success)
|
||||||
return;
|
return;
|
||||||
if (nsp->IsExtractedType())
|
|
||||||
return;
|
|
||||||
|
|
||||||
const auto control_nca =
|
|
||||||
nsp->GetNCA(nsp->GetProgramTitleID(), FileSys::ContentRecordType::Control);
|
|
||||||
if (control_nca == nullptr || control_nca->GetStatus() != ResultStatus::Success)
|
|
||||||
return;
|
|
||||||
|
|
||||||
std::tie(nacp_file, icon_file) =
|
|
||||||
FileSys::PatchManager(nsp->GetProgramTitleID()).ParseControlNCA(*control_nca);
|
|
||||||
|
|
||||||
if (nsp->IsExtractedType()) {
|
if (nsp->IsExtractedType()) {
|
||||||
secondary_loader = std::make_unique<AppLoader_DeconstructedRomDirectory>(nsp->GetExeFS());
|
secondary_loader = std::make_unique<AppLoader_DeconstructedRomDirectory>(nsp->GetExeFS());
|
||||||
} else {
|
} else {
|
||||||
|
const auto control_nca =
|
||||||
|
nsp->GetNCA(nsp->GetProgramTitleID(), FileSys::ContentRecordType::Control);
|
||||||
|
if (control_nca == nullptr || control_nca->GetStatus() != ResultStatus::Success)
|
||||||
|
return;
|
||||||
|
|
||||||
|
std::tie(nacp_file, icon_file) =
|
||||||
|
FileSys::PatchManager(nsp->GetProgramTitleID()).ParseControlNCA(*control_nca);
|
||||||
|
|
||||||
if (title_id == 0)
|
if (title_id == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -56,11 +54,11 @@ FileType AppLoader_NSP::IdentifyType(const FileSys::VirtualFile& file) {
|
||||||
if (nsp.GetStatus() == ResultStatus::Success) {
|
if (nsp.GetStatus() == ResultStatus::Success) {
|
||||||
// Extracted Type case
|
// Extracted Type case
|
||||||
if (nsp.IsExtractedType() && nsp.GetExeFS() != nullptr &&
|
if (nsp.IsExtractedType() && nsp.GetExeFS() != nullptr &&
|
||||||
FileSys::IsDirectoryExeFS(nsp.GetExeFS()) && nsp.GetRomFS() != nullptr) {
|
FileSys::IsDirectoryExeFS(nsp.GetExeFS())) {
|
||||||
return FileType::NSP;
|
return FileType::NSP;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Non-Ectracted Type case
|
// Non-Extracted Type case
|
||||||
if (!nsp.IsExtractedType() &&
|
if (!nsp.IsExtractedType() &&
|
||||||
nsp.GetNCA(nsp.GetFirstTitleID(), FileSys::ContentRecordType::Program) != nullptr &&
|
nsp.GetNCA(nsp.GetFirstTitleID(), FileSys::ContentRecordType::Program) != nullptr &&
|
||||||
AppLoader_NCA::IdentifyType(nsp.GetNCAFile(
|
AppLoader_NCA::IdentifyType(nsp.GetNCAFile(
|
||||||
|
@ -77,7 +75,7 @@ AppLoader_NSP::LoadResult AppLoader_NSP::Load(Kernel::Process& process) {
|
||||||
return {ResultStatus::ErrorAlreadyLoaded, {}};
|
return {ResultStatus::ErrorAlreadyLoaded, {}};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (title_id == 0) {
|
if (!nsp->IsExtractedType() && title_id == 0) {
|
||||||
return {ResultStatus::ErrorNSPMissingProgramNCA, {}};
|
return {ResultStatus::ErrorNSPMissingProgramNCA, {}};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -91,7 +89,8 @@ AppLoader_NSP::LoadResult AppLoader_NSP::Load(Kernel::Process& process) {
|
||||||
return {nsp_program_status, {}};
|
return {nsp_program_status, {}};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nsp->GetNCA(title_id, FileSys::ContentRecordType::Program) == nullptr) {
|
if (!nsp->IsExtractedType() &&
|
||||||
|
nsp->GetNCA(title_id, FileSys::ContentRecordType::Program) == nullptr) {
|
||||||
if (!Core::Crypto::KeyManager::KeyFileExists(false)) {
|
if (!Core::Crypto::KeyManager::KeyFileExists(false)) {
|
||||||
return {ResultStatus::ErrorMissingProductionKeyFile, {}};
|
return {ResultStatus::ErrorMissingProductionKeyFile, {}};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue