summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-08-16 22:57:00 +0200
committerZach Hilman <zachhilman@gmail.com>2018-08-23 17:52:44 +0200
commita9dc5a3c1058d22873a201c08bd6d095405789ae (patch)
treedaa6c23dcc4f3b3367eaf254689e427865b9e84e
parentMerge pull request #1157 from lioncash/vec (diff)
downloadyuzu-a9dc5a3c1058d22873a201c08bd6d095405789ae.tar
yuzu-a9dc5a3c1058d22873a201c08bd6d095405789ae.tar.gz
yuzu-a9dc5a3c1058d22873a201c08bd6d095405789ae.tar.bz2
yuzu-a9dc5a3c1058d22873a201c08bd6d095405789ae.tar.lz
yuzu-a9dc5a3c1058d22873a201c08bd6d095405789ae.tar.xz
yuzu-a9dc5a3c1058d22873a201c08bd6d095405789ae.tar.zst
yuzu-a9dc5a3c1058d22873a201c08bd6d095405789ae.zip
-rw-r--r--src/core/file_sys/card_image.cpp9
-rw-r--r--src/core/file_sys/card_image.h2
-rw-r--r--src/core/loader/xci.cpp11
3 files changed, 17 insertions, 5 deletions
diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cpp
index 1d7c7fb10..508f09e56 100644
--- a/src/core/file_sys/card_image.cpp
+++ b/src/core/file_sys/card_image.cpp
@@ -43,6 +43,8 @@ XCI::XCI(VirtualFile file_) : file(std::move(file_)), partitions(0x4) {
partitions[static_cast<size_t>(partition)] = std::make_shared<PartitionFilesystem>(raw);
}
+ program_nca_status = Loader::ResultStatus::ErrorXCIMissingProgramNCA;
+
auto result = AddNCAFromPartition(XCIPartition::Secure);
if (result != Loader::ResultStatus::Success) {
status = result;
@@ -76,6 +78,10 @@ Loader::ResultStatus XCI::GetStatus() const {
return status;
}
+Loader::ResultStatus XCI::GetProgramNCAStatus() const {
+ return program_nca_status;
+}
+
VirtualDir XCI::GetPartition(XCIPartition partition) const {
return partitions[static_cast<size_t>(partition)];
}
@@ -143,6 +149,9 @@ Loader::ResultStatus XCI::AddNCAFromPartition(XCIPartition part) {
if (file->GetExtension() != "nca")
continue;
auto nca = std::make_shared<NCA>(file);
+ if (nca->GetType() == NCAContentType::Program) {
+ program_nca_status = nca->GetStatus();
+ }
if (nca->GetStatus() == Loader::ResultStatus::Success) {
ncas.push_back(std::move(nca));
} else {
diff --git a/src/core/file_sys/card_image.h b/src/core/file_sys/card_image.h
index a03d5264e..54ab828d1 100644
--- a/src/core/file_sys/card_image.h
+++ b/src/core/file_sys/card_image.h
@@ -59,6 +59,7 @@ public:
explicit XCI(VirtualFile file);
Loader::ResultStatus GetStatus() const;
+ Loader::ResultStatus GetProgramNCAStatus() const;
u8 GetFormatVersion() const;
@@ -90,6 +91,7 @@ private:
GamecardHeader header{};
Loader::ResultStatus status;
+ Loader::ResultStatus program_nca_status;
std::vector<VirtualDir> partitions;
std::vector<std::shared_ptr<NCA>> ncas;
diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp
index 4c4979545..9dc4d1f35 100644
--- a/src/core/loader/xci.cpp
+++ b/src/core/loader/xci.cpp
@@ -61,11 +61,12 @@ ResultStatus AppLoader_XCI::Load(Kernel::SharedPtr<Kernel::Process>& process) {
if (xci->GetStatus() != ResultStatus::Success)
return xci->GetStatus();
- if (xci->GetNCAFileByType(FileSys::NCAContentType::Program) == nullptr) {
- if (!Core::Crypto::KeyManager::KeyFileExists(false))
- return ResultStatus::ErrorMissingProductionKeyFile;
- return ResultStatus::ErrorXCIMissingProgramNCA;
- }
+ if (xci->GetProgramNCAStatus() != ResultStatus::Success)
+ return xci->GetProgramNCAStatus();
+
+ const auto nca = xci->GetNCAFileByType(FileSys::NCAContentType::Program);
+ if (nca == nullptr && !Core::Crypto::KeyManager::KeyFileExists(false))
+ return ResultStatus::ErrorMissingProductionKeyFile;
auto result = nca_loader->Load(process);
if (result != ResultStatus::Success)