citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

core/file_sys: Allow exefs mods to be read from mods path 

The original path (file_name.exefsdir) is still supported, but alternatively users can choose to put exefs patches in the same place as LayeredFS files (`load/mods/<Title ID>/exefs`).
This commit is contained in:
zhupengfei 2020-02-07 13:50:29 +08:00
parent 8a570bf00c
commit 91e5a39a08
No known key found for this signature in database
GPG Key ID: DD129E108BD09378
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -513,7 +513,13 @@ Loader::ResultStatus NCCHContainer::ApplyCodePatch(std::vector<u8>& code) const
std::string path; std::string path;
bool (*patch_fn)(const std::vector<u8>& patch, std::vector<u8>& code); bool (*patch_fn)(const std::vector<u8>& patch, std::vector<u8>& code);
}; };
const std::array<PatchLocation, 2> patch_paths{{
const auto mods_path =
fmt::format("{}mods/{:016X}/", FileUtil::GetUserPath(FileUtil::UserPath::LoadDir),
ncch_header.program_id);
const std::array<PatchLocation, 4> patch_paths{{
{mods_path + "exefs/code.ips", Patch::ApplyIpsPatch},
{mods_path + "exefs/code.bps", Patch::ApplyBpsPatch},
{filepath + ".exefsdir/code.ips", Patch::ApplyIpsPatch}, {filepath + ".exefsdir/code.ips", Patch::ApplyIpsPatch},
{filepath + ".exefsdir/code.bps", Patch::ApplyBpsPatch}, {filepath + ".exefsdir/code.bps", Patch::ApplyBpsPatch},
}}; }};
@ -552,17 +558,26 @@ Loader::ResultStatus NCCHContainer::LoadOverrideExeFSSection(const char* name,
else else
return Loader::ResultStatus::Error; return Loader::ResultStatus::Error;
std::string section_override = filepath + ".exefsdir/" + override_name; const auto mods_path =
FileUtil::IOFile section_file(section_override, "rb"); fmt::format("{}mods/{:016X}/", FileUtil::GetUserPath(FileUtil::UserPath::LoadDir),
ncch_header.program_id);
std::array<std::string, 2> override_paths{{
mods_path + "exefs/" + override_name,
filepath + ".exefsdir/" + override_name,
}};
if (section_file.IsOpen()) { for (const auto& path : override_paths) {
auto section_size = section_file.GetSize(); FileUtil::IOFile section_file(path, "rb");
buffer.resize(section_size);
section_file.Seek(0, SEEK_SET); if (section_file.IsOpen()) {
if (section_file.ReadBytes(&buffer[0], section_size) == section_size) { auto section_size = section_file.GetSize();
LOG_WARNING(Service_FS, "File {} overriding built-in ExeFS file", section_override); buffer.resize(section_size);
return Loader::ResultStatus::Success;
section_file.Seek(0, SEEK_SET);
if (section_file.ReadBytes(&buffer[0], section_size) == section_size) {
LOG_WARNING(Service_FS, "File {} overriding built-in ExeFS file", path);
return Loader::ResultStatus::Success;
}
} }
} }
return Loader::ResultStatus::ErrorNotUsed; return Loader::ResultStatus::ErrorNotUsed;