diff options
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/patch_manager.cpp | 9 | ||||
| -rw-r--r-- | src/core/file_sys/patch_manager.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index ccb38ba03..78dbadee3 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp | |||
| @@ -156,7 +156,7 @@ std::vector<VirtualFile> PatchManager::CollectPatches(const std::vector<VirtualD | |||
| 156 | return out; | 156 | return out; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | std::vector<u8> PatchManager::PatchNSO(const std::vector<u8>& nso) const { | 159 | std::vector<u8> PatchManager::PatchNSO(const std::vector<u8>& nso, const std::string& name) const { |
| 160 | if (nso.size() < sizeof(Loader::NSOHeader)) { | 160 | if (nso.size() < sizeof(Loader::NSOHeader)) { |
| 161 | return nso; | 161 | return nso; |
| 162 | } | 162 | } |
| @@ -172,18 +172,19 @@ std::vector<u8> PatchManager::PatchNSO(const std::vector<u8>& nso) const { | |||
| 172 | const auto build_id = build_id_raw.substr(0, build_id_raw.find_last_not_of('0') + 1); | 172 | const auto build_id = build_id_raw.substr(0, build_id_raw.find_last_not_of('0') + 1); |
| 173 | 173 | ||
| 174 | if (Settings::values.dump_nso) { | 174 | if (Settings::values.dump_nso) { |
| 175 | LOG_INFO(Loader, "Dumping NSO for build_id={}, title_id={:016X}", build_id, title_id); | 175 | LOG_INFO(Loader, "Dumping NSO for name={}, build_id={}, title_id={:016X}", name, build_id, |
| 176 | title_id); | ||
| 176 | const auto dump_dir = Service::FileSystem::GetModificationDumpRoot(title_id); | 177 | const auto dump_dir = Service::FileSystem::GetModificationDumpRoot(title_id); |
| 177 | if (dump_dir != nullptr) { | 178 | if (dump_dir != nullptr) { |
| 178 | const auto nso_dir = GetOrCreateDirectoryRelative(dump_dir, "/nso"); | 179 | const auto nso_dir = GetOrCreateDirectoryRelative(dump_dir, "/nso"); |
| 179 | const auto file = nso_dir->CreateFile(fmt::format("{}.nso", build_id)); | 180 | const auto file = nso_dir->CreateFile(fmt::format("{}-{}.nso", name, build_id)); |
| 180 | 181 | ||
| 181 | file->Resize(nso.size()); | 182 | file->Resize(nso.size()); |
| 182 | file->WriteBytes(nso); | 183 | file->WriteBytes(nso); |
| 183 | } | 184 | } |
| 184 | } | 185 | } |
| 185 | 186 | ||
| 186 | LOG_INFO(Loader, "Patching NSO for build_id={}", build_id); | 187 | LOG_INFO(Loader, "Patching NSO for name={}, build_id={}", name, build_id); |
| 187 | 188 | ||
| 188 | const auto load_dir = Service::FileSystem::GetModificationLoadRoot(title_id); | 189 | const auto load_dir = Service::FileSystem::GetModificationLoadRoot(title_id); |
| 189 | auto patch_dirs = load_dir->GetSubdirectories(); | 190 | auto patch_dirs = load_dir->GetSubdirectories(); |
diff --git a/src/core/file_sys/patch_manager.h b/src/core/file_sys/patch_manager.h index de2672c76..769f8c6f0 100644 --- a/src/core/file_sys/patch_manager.h +++ b/src/core/file_sys/patch_manager.h | |||
| @@ -44,7 +44,7 @@ public: | |||
| 44 | // Currently tracked NSO patches: | 44 | // Currently tracked NSO patches: |
| 45 | // - IPS | 45 | // - IPS |
| 46 | // - IPSwitch | 46 | // - IPSwitch |
| 47 | std::vector<u8> PatchNSO(const std::vector<u8>& nso) const; | 47 | std::vector<u8> PatchNSO(const std::vector<u8>& nso, const std::string& name) const; |
| 48 | 48 | ||
| 49 | // Checks to see if PatchNSO() will have any effect given the NSO's build ID. | 49 | // Checks to see if PatchNSO() will have any effect given the NSO's build ID. |
| 50 | // Used to prevent expensive copies in NSO loader. | 50 | // Used to prevent expensive copies in NSO loader. |