VERY experimental Nintendo Switch 2 emulator
C++
[file_sys] Properly fix the installation of new updates (#2651)
MaranBr2d8cb2d4570b
diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cppindex edd25644ac..4e3313f83c 100644--- a/src/core/file_sys/content_archive.cpp+++ b/src/core/file_sys/content_archive.cpp@@ -38,9 +38,6 @@ NCA::NCA(VirtualFile file_, const NCA* base_nca)reader = std::make_shared<NcaReader>();if (Result rc = reader->Initialize(file, GetCryptoConfiguration(), GetNcaCompressionConfiguration()); R_FAILED(rc)) {- if (rc != ResultInvalidNcaSignature) {- LOG_ERROR(Loader, "File reader errored out during header read: {:#x}", rc.GetInnerValue());- }status = Loader::ResultStatus::ErrorBadNCAHeader;return;}@@ -85,7 +82,6 @@ NCA::NCA(VirtualFile file_, const NCA* base_nca)for (s32 i = 0; i < fs_count; i++) {NcaFsHeaderReader header_reader;if (Result rc = fs.OpenStorage(&filesystems[i], &header_reader, i); R_FAILED(rc)) {- LOG_DEBUG(Loader, "File reader errored out during read of section {}: {:#x}", i, rc.GetInnerValue());status = Loader::ResultStatus::ErrorBadNCAHeader;return;}diff --git a/src/core/file_sys/fssystem/fs_types.h b/src/core/file_sys/fssystem/fs_types.hindex 43aeaf447b..f11b7f1dae 100644--- a/src/core/file_sys/fssystem/fs_types.h+++ b/src/core/file_sys/fssystem/fs_types.h@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-laterdiff --git a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cppindex 25036b02c1..d496d58cec 100644--- a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp+++ b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp@@ -1049,13 +1049,11 @@ Result NcaFileSystemDriver::CreatePatchMetaStorage(ASSERT(out_aes_ctr_ex_meta != nullptr);ASSERT(out_indirect_meta != nullptr);ASSERT(base_storage != nullptr);- //ASSERT(patch_info.HasAesCtrExTable());- //ASSERT(patch_info.HasIndirectTable());ASSERT(Common::IsAligned<s64>(patch_info.aes_ctr_ex_size, NcaHeader::XtsBlockSize));// Validate patch info extents.- R_UNLESS(patch_info.indirect_size > 0, ResultInvalidNcaPatchInfoIndirectSize);- R_UNLESS(patch_info.aes_ctr_ex_size >= 0, ResultInvalidNcaPatchInfoAesCtrExSize);+ R_UNLESS(patch_info.aes_ctr_ex_size >= 0 && patch_info.HasAesCtrExTable(), ResultInvalidNcaPatchInfoAesCtrExSize);+ R_UNLESS(patch_info.indirect_size > 0 && patch_info.HasIndirectTable(), ResultInvalidNcaPatchInfoIndirectSize);R_UNLESS(patch_info.indirect_size + patch_info.indirect_offset <= patch_info.aes_ctr_ex_offset,ResultInvalidNcaPatchInfoAesCtrExOffset);R_UNLESS(patch_info.aes_ctr_ex_offset + patch_info.aes_ctr_ex_size <=@@ -1333,10 +1331,30 @@ Result NcaFileSystemDriver::CreateIntegrityVerificationStorageImpl(R_UNLESS(last_layer_info_offset + layer_info.size <= layer_info_offset,ResultRomNcaInvalidIntegrityLayerInfoOffset);}- storage_info[level_hash_info.max_layers - 1]- = std::make_shared<OffsetVfsFile>(std::move(base_storage),- layer_info.size,- last_layer_info_offset);++ switch (level_hash_info.max_layers - 1) {+ case FileSys::HierarchicalIntegrityVerificationStorage::HierarchicalStorageInformation::MasterStorage:+ storage_info.SetMasterHashStorage(std::make_shared<OffsetVfsFile>(std::move(base_storage), layer_info.size, last_layer_info_offset));+ break;+ case FileSys::HierarchicalIntegrityVerificationStorage::HierarchicalStorageInformation::Layer1Storage:+ storage_info.SetLayer1HashStorage(std::make_shared<OffsetVfsFile>(std::move(base_storage), layer_info.size, last_layer_info_offset));+ break;+ case FileSys::HierarchicalIntegrityVerificationStorage::HierarchicalStorageInformation::Layer2Storage:+ storage_info.SetLayer2HashStorage(std::make_shared<OffsetVfsFile>(std::move(base_storage), layer_info.size, last_layer_info_offset));+ break;+ case FileSys::HierarchicalIntegrityVerificationStorage::HierarchicalStorageInformation::Layer3Storage:+ storage_info.SetLayer3HashStorage(std::make_shared<OffsetVfsFile>(std::move(base_storage), layer_info.size, last_layer_info_offset));+ break;+ case FileSys::HierarchicalIntegrityVerificationStorage::HierarchicalStorageInformation::Layer4Storage:+ storage_info.SetLayer4HashStorage(std::make_shared<OffsetVfsFile>(std::move(base_storage), layer_info.size, last_layer_info_offset));+ break;+ case FileSys::HierarchicalIntegrityVerificationStorage::HierarchicalStorageInformation::Layer5Storage:+ storage_info.SetLayer5HashStorage(std::make_shared<OffsetVfsFile>(std::move(base_storage), layer_info.size, last_layer_info_offset));+ break;+ case FileSys::HierarchicalIntegrityVerificationStorage::HierarchicalStorageInformation::DataStorage:+ storage_info.SetDataStorage(std::make_shared<OffsetVfsFile>(std::move(base_storage), layer_info.size, last_layer_info_offset));+ break;+ }// Make the integrity romfs storage.auto integrity_storage = std::make_shared<IntegrityRomFsStorage>();