midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3249 from Subv/logo

Browse Source 
NCCH: Load the "logo" file from the specified offset if it's present instead of the ExeFS.
This commit is contained in:
Sebastian Valle 2017-12-14 18:30:19 -05:00 committed by GitHub
commit 542f14d3c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/file_sys/ncch_container.cpp
View File

@ -252,6 +252,26 @@ Loader::ResultStatus NCCHContainer::LoadSectionExeFS(const char* name, std::vect
if (result == Loader::ResultStatus::Success || !has_exefs) if (result == Loader::ResultStatus::Success || !has_exefs)
return result; return result;
// As of firmware 5.0.0-11 the logo is stored between the access descriptor and the plain region
// instead of the ExeFS.
if (std::strcmp(name, "logo") == 0) {
if (ncch_header.logo_region_offset && ncch_header.logo_region_size) {
size_t logo_offset = ncch_header.logo_region_offset * kBlockSize;
size_t logo_size = ncch_header.logo_region_size * kBlockSize;
buffer.resize(logo_size);
file.Seek(ncch_offset + logo_offset, SEEK_SET);
if (file.ReadBytes(buffer.data(), logo_size) != logo_size) {
LOG_ERROR(Service_FS, "Could not read NCCH logo");
return Loader::ResultStatus::Error;
}
return Loader::ResultStatus::Success;
} else {
LOG_INFO(Service_FS, "Attempting to load logo from the ExeFS");
}
}
// If we don't have any separate files, we'll need a full ExeFS // If we don't have any separate files, we'll need a full ExeFS
if (!exefs_file.IsOpen()) if (!exefs_file.IsOpen())
return Loader::ResultStatus::Error; return Loader::ResultStatus::Error;