Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2660 from bakugo/deltafragments

Browse source 
file_sys: Ignore DeltaFragment NCAs during installation
This commit is contained in:
Zach Hilman 2019-07-01 22:27:24 -05:00 committed by GitHub
commit 6be79bab37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/file_sys/nca_metadata.h
View file

@ -35,9 +35,9 @@ enum class ContentRecordType : u8 {
Program = 1, Program = 1,
Data = 2, Data = 2,
Control = 3, Control = 3,
Manual = 4, HtmlDocument = 4,
Legal = 5, LegalInformation = 5,
Patch = 6, DeltaFragment = 6,
}; };
struct ContentRecord { struct ContentRecord {

9
src/core/file_sys/registered_cache.cpp
View file

@ -99,7 +99,7 @@ ContentRecordType GetCRTypeFromNCAType(NCAContentType type) {
return ContentRecordType::Data; return ContentRecordType::Data;
case NCAContentType::Manual: case NCAContentType::Manual:
// TODO(DarkLordZach): Peek at NCA contents to differentiate Manual and Legal. // TODO(DarkLordZach): Peek at NCA contents to differentiate Manual and Legal.
return ContentRecordType::Manual; return ContentRecordType::HtmlDocument;
default: default:
UNREACHABLE_MSG("Invalid NCAContentType={:02X}", static_cast<u8>(type)); UNREACHABLE_MSG("Invalid NCAContentType={:02X}", static_cast<u8>(type));
} }
@ -397,8 +397,8 @@ InstallResult RegisteredCache::InstallEntry(const NSP& nsp, bool overwrite_if_ex
}); });
if (meta_iter == ncas.end()) { if (meta_iter == ncas.end()) {
LOG_ERROR(Loader, "The XCI you are attempting to install does not have a metadata NCA and " LOG_ERROR(Loader, "The file you are attempting to install does not have a metadata NCA and "
"is therefore malformed. Double check your encryption keys."); "is therefore malformed. Check your encryption keys.");
return InstallResult::ErrorMetaFailed; return InstallResult::ErrorMetaFailed;
} }
@ -415,6 +415,9 @@ InstallResult RegisteredCache::InstallEntry(const NSP& nsp, bool overwrite_if_ex
const auto cnmt_file = section0->GetFiles()[0]; const auto cnmt_file = section0->GetFiles()[0];
const CNMT cnmt(cnmt_file); const CNMT cnmt(cnmt_file);
for (const auto& record : cnmt.GetContentRecords()) { for (const auto& record : cnmt.GetContentRecords()) {
// Ignore DeltaFragments, they are not useful to us
if (record.type == ContentRecordType::DeltaFragment)
continue;
const auto nca = GetNCAFromNSPForID(nsp, record.nca_id); const auto nca = GetNCAFromNSPForID(nsp, record.nca_id);
if (nca == nullptr) if (nca == nullptr)
return InstallResult::ErrorCopyFailed; return InstallResult::ErrorCopyFailed;

3
src/core/file_sys/submission_package.cpp
View file

@ -248,10 +248,13 @@ void NSP::ReadNCAs(const std::vector<VirtualFile>& files) {
auto next_file = pfs->GetFile(fmt::format("{}.nca", id_string)); auto next_file = pfs->GetFile(fmt::format("{}.nca", id_string));
if (next_file == nullptr) { if (next_file == nullptr) {
if (rec.type != ContentRecordType::DeltaFragment) {
LOG_WARNING(Service_FS, LOG_WARNING(Service_FS,
"NCA with ID {}.nca is listed in content metadata, but cannot " "NCA with ID {}.nca is listed in content metadata, but cannot "
"be found in PFS. NSP appears to be corrupted.", "be found in PFS. NSP appears to be corrupted.",
id_string); id_string);
}
continue; continue;
} }

4
src/core/hle/service/am/applets/web_browser.cpp
View file

@ -459,10 +459,10 @@ void WebBrowser::InitializeOffline() {
case OfflineWebSource::OfflineHtmlPage: case OfflineWebSource::OfflineHtmlPage:
// While there is an AppID TLV field, in official SW this is always ignored. // While there is an AppID TLV field, in official SW this is always ignored.
title_id = 0; title_id = 0;
type = FileSys::ContentRecordType::Manual; type = FileSys::ContentRecordType::HtmlDocument;
break; break;
case OfflineWebSource::ApplicationLegalInformation: case OfflineWebSource::ApplicationLegalInformation:
type = FileSys::ContentRecordType::Legal; type = FileSys::ContentRecordType::LegalInformation;
break; break;
case OfflineWebSource::SystemDataPage: case OfflineWebSource::SystemDataPage:
type = FileSys::ContentRecordType::Data; type = FileSys::ContentRecordType::Data;

3
src/core/loader/nsp.cpp
View file

@ -168,7 +168,8 @@ ResultStatus AppLoader_NSP::ReadControlData(FileSys::NACP& nacp) {
} }
ResultStatus AppLoader_NSP::ReadManualRomFS(FileSys::VirtualFile& file) { ResultStatus AppLoader_NSP::ReadManualRomFS(FileSys::VirtualFile& file) {
const auto nca = nsp->GetNCA(nsp->GetProgramTitleID(), FileSys::ContentRecordType::Manual); const auto nca =
nsp->GetNCA(nsp->GetProgramTitleID(), FileSys::ContentRecordType::HtmlDocument);
if (nsp->GetStatus() != ResultStatus::Success || nca == nullptr) if (nsp->GetStatus() != ResultStatus::Success || nca == nullptr)
return ResultStatus::ErrorNoRomFS; return ResultStatus::ErrorNoRomFS;
file = nca->GetRomFS(); file = nca->GetRomFS();

2
src/core/loader/xci.cpp
View file

@ -134,7 +134,7 @@ ResultStatus AppLoader_XCI::ReadControlData(FileSys::NACP& control) {
ResultStatus AppLoader_XCI::ReadManualRomFS(FileSys::VirtualFile& file) { ResultStatus AppLoader_XCI::ReadManualRomFS(FileSys::VirtualFile& file) {
const auto nca = xci->GetSecurePartitionNSP()->GetNCA(xci->GetProgramTitleID(), const auto nca = xci->GetSecurePartitionNSP()->GetNCA(xci->GetProgramTitleID(),
FileSys::ContentRecordType::Manual); FileSys::ContentRecordType::HtmlDocument);
if (xci->GetStatus() != ResultStatus::Success || nca == nullptr) if (xci->GetStatus() != ResultStatus::Success || nca == nullptr)
return ResultStatus::ErrorXCIMissingPartition; return ResultStatus::ErrorXCIMissingPartition;
file = nca->GetRomFS(); file = nca->GetRomFS();