summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/file_sys/card_image.cpp4
-rw-r--r--src/core/file_sys/submission_package.cpp169
-rw-r--r--src/core/file_sys/submission_package.h5
-rw-r--r--src/core/hle/service/filesystem/fsp_srv.cpp2
-rw-r--r--src/core/hle/service/lbl/lbl.cpp38
5 files changed, 125 insertions, 93 deletions
diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cpp
index edfc1bbd4..8f5142a07 100644
--- a/src/core/file_sys/card_image.cpp
+++ b/src/core/file_sys/card_image.cpp
@@ -20,7 +20,9 @@ namespace FileSys {
constexpr std::array<const char*, 0x4> partition_names = {"update", "normal", "secure", "logo"};
-XCI::XCI(VirtualFile file_) : file(std::move(file_)), partitions(0x4) {
+XCI::XCI(VirtualFile file_)
+ : file(std::move(file_)), program_nca_status{Loader::ResultStatus::ErrorXCIMissingProgramNCA},
+ partitions(0x4) {
if (file->ReadObject(&header) != sizeof(GamecardHeader)) {
status = Loader::ResultStatus::ErrorBadXCIHeader;
return;
diff --git a/src/core/file_sys/submission_package.cpp b/src/core/file_sys/submission_package.cpp
index 11264878d..09bf077cd 100644
--- a/src/core/file_sys/submission_package.cpp
+++ b/src/core/file_sys/submission_package.cpp
@@ -18,6 +18,39 @@
#include "core/loader/loader.h"
namespace FileSys {
+namespace {
+void SetTicketKeys(const std::vector<VirtualFile>& files) {
+ Core::Crypto::KeyManager keys;
+
+ for (const auto& ticket_file : files) {
+ if (ticket_file == nullptr) {
+ continue;
+ }
+
+ if (ticket_file->GetExtension() != "tik") {
+ continue;
+ }
+
+ if (ticket_file->GetSize() <
+ Core::Crypto::TICKET_FILE_TITLEKEY_OFFSET + sizeof(Core::Crypto::Key128)) {
+ continue;
+ }
+
+ Core::Crypto::Key128 key{};
+ ticket_file->Read(key.data(), key.size(), Core::Crypto::TICKET_FILE_TITLEKEY_OFFSET);
+
+ // We get the name without the extension in order to create the rights ID.
+ std::string name_only(ticket_file->GetName());
+ name_only.erase(name_only.size() - 4);
+
+ const auto rights_id_raw = Common::HexStringToArray<16>(name_only);
+ u128 rights_id;
+ std::memcpy(rights_id.data(), rights_id_raw.data(), sizeof(u128));
+ keys.SetKey(Core::Crypto::S128KeyType::Titlekey, key, rights_id[1], rights_id[0]);
+ }
+}
+} // Anonymous namespace
+
NSP::NSP(VirtualFile file_)
: file(std::move(file_)), status{Loader::ResultStatus::Success},
pfs(std::make_shared<PartitionFilesystem>(file)) {
@@ -26,83 +59,16 @@ NSP::NSP(VirtualFile file_)
return;
}
+ const auto files = pfs->GetFiles();
+
if (IsDirectoryExeFS(pfs)) {
extracted = true;
- exefs = pfs;
-
- const auto& files = pfs->GetFiles();
- const auto romfs_iter =
- std::find_if(files.begin(), files.end(), [](const FileSys::VirtualFile& file) {
- return file->GetName().find(".romfs") != std::string::npos;
- });
- if (romfs_iter != files.end())
- romfs = *romfs_iter;
+ InitializeExeFSAndRomFS(files);
return;
}
- extracted = false;
- const auto files = pfs->GetFiles();
-
- Core::Crypto::KeyManager keys;
- for (const auto& ticket_file : files) {
- if (ticket_file->GetExtension() == "tik") {
- if (ticket_file == nullptr ||
- ticket_file->GetSize() <
- Core::Crypto::TICKET_FILE_TITLEKEY_OFFSET + sizeof(Core::Crypto::Key128)) {
- continue;
- }
-
- Core::Crypto::Key128 key{};
- ticket_file->Read(key.data(), key.size(), Core::Crypto::TICKET_FILE_TITLEKEY_OFFSET);
- std::string_view name_only(ticket_file->GetName());
- name_only.remove_suffix(4);
- const auto rights_id_raw = Common::HexStringToArray<16>(name_only);
- u128 rights_id;
- std::memcpy(rights_id.data(), rights_id_raw.data(), sizeof(u128));
- keys.SetKey(Core::Crypto::S128KeyType::Titlekey, key, rights_id[1], rights_id[0]);
- }
- }
-
- for (const auto& outer_file : files) {
- if (outer_file->GetName().substr(outer_file->GetName().size() - 9) == ".cnmt.nca") {
- const auto nca = std::make_shared<NCA>(outer_file);
- if (nca->GetStatus() != Loader::ResultStatus::Success) {
- program_status[nca->GetTitleId()] = nca->GetStatus();
- continue;
- }
-
- const auto section0 = nca->GetSubdirectories()[0];
-
- for (const auto& inner_file : section0->GetFiles()) {
- if (inner_file->GetExtension() != "cnmt")
- continue;
-
- const CNMT cnmt(inner_file);
- auto& ncas_title = ncas[cnmt.GetTitleID()];
-
- ncas_title[ContentRecordType::Meta] = nca;
- for (const auto& rec : cnmt.GetContentRecords()) {
- const auto id_string = Common::HexArrayToString(rec.nca_id, false);
- const auto next_file = pfs->GetFile(fmt::format("{}.nca", id_string));
- if (next_file == nullptr) {
- LOG_WARNING(Service_FS,
- "NCA with ID {}.nca is listed in content metadata, but cannot "
- "be found in PFS. NSP appears to be corrupted.",
- id_string);
- continue;
- }
-
- auto next_nca = std::make_shared<NCA>(next_file);
- if (next_nca->GetType() == NCAContentType::Program)
- program_status[cnmt.GetTitleID()] = next_nca->GetStatus();
- if (next_nca->GetStatus() == Loader::ResultStatus::Success)
- ncas_title[rec.type] = std::move(next_nca);
- }
-
- break;
- }
- }
- }
+ SetTicketKeys(files);
+ ReadNCAs(files);
}
NSP::~NSP() = default;
@@ -242,4 +208,63 @@ VirtualDir NSP::GetParentDirectory() const {
bool NSP::ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) {
return false;
}
+
+void NSP::InitializeExeFSAndRomFS(const std::vector<VirtualFile>& files) {
+ exefs = pfs;
+
+ const auto romfs_iter = std::find_if(files.begin(), files.end(), [](const VirtualFile& file) {
+ return file->GetName().rfind(".romfs") != std::string::npos;
+ });
+
+ if (romfs_iter == files.end()) {
+ return;
+ }
+
+ romfs = *romfs_iter;
+}
+
+void NSP::ReadNCAs(const std::vector<VirtualFile>& files) {
+ for (const auto& outer_file : files) {
+ if (outer_file->GetName().substr(outer_file->GetName().size() - 9) != ".cnmt.nca") {
+ continue;
+ }
+
+ const auto nca = std::make_shared<NCA>(outer_file);
+ if (nca->GetStatus() != Loader::ResultStatus::Success) {
+ program_status[nca->GetTitleId()] = nca->GetStatus();
+ continue;
+ }
+
+ const auto section0 = nca->GetSubdirectories()[0];
+
+ for (const auto& inner_file : section0->GetFiles()) {
+ if (inner_file->GetExtension() != "cnmt")
+ continue;
+
+ const CNMT cnmt(inner_file);
+ auto& ncas_title = ncas[cnmt.GetTitleID()];
+
+ ncas_title[ContentRecordType::Meta] = nca;
+ for (const auto& rec : cnmt.GetContentRecords()) {
+ const auto id_string = Common::HexArrayToString(rec.nca_id, false);
+ const auto next_file = pfs->GetFile(fmt::format("{}.nca", id_string));
+ if (next_file == nullptr) {
+ LOG_WARNING(Service_FS,
+ "NCA with ID {}.nca is listed in content metadata, but cannot "
+ "be found in PFS. NSP appears to be corrupted.",
+ id_string);
+ continue;
+ }
+
+ auto next_nca = std::make_shared<NCA>(next_file);
+ if (next_nca->GetType() == NCAContentType::Program)
+ program_status[cnmt.GetTitleID()] = next_nca->GetStatus();
+ if (next_nca->GetStatus() == Loader::ResultStatus::Success)
+ ncas_title[rec.type] = std::move(next_nca);
+ }
+
+ break;
+ }
+ }
+}
} // namespace FileSys
diff --git a/src/core/file_sys/submission_package.h b/src/core/file_sys/submission_package.h
index e85a2b76e..da3dc5e9f 100644
--- a/src/core/file_sys/submission_package.h
+++ b/src/core/file_sys/submission_package.h
@@ -59,9 +59,12 @@ protected:
bool ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) override;
private:
+ void InitializeExeFSAndRomFS(const std::vector<VirtualFile>& files);
+ void ReadNCAs(const std::vector<VirtualFile>& files);
+
VirtualFile file;
- bool extracted;
+ bool extracted = false;
Loader::ResultStatus status;
std::map<u64, Loader::ResultStatus> program_status;
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp
index cabaf5a55..d5dced429 100644
--- a/src/core/hle/service/filesystem/fsp_srv.cpp
+++ b/src/core/hle/service/filesystem/fsp_srv.cpp
@@ -468,6 +468,7 @@ FSP_SRV::FSP_SRV() : ServiceFramework("fsp-srv") {
{80, nullptr, "OpenSaveDataMetaFile"},
{81, nullptr, "OpenSaveDataTransferManager"},
{82, nullptr, "OpenSaveDataTransferManagerVersion2"},
+ {83, nullptr, "OpenSaveDataTransferProhibiterForCloudBackUp"},
{100, nullptr, "OpenImageDirectoryFileSystem"},
{110, nullptr, "OpenContentStorageFileSystem"},
{200, &FSP_SRV::OpenDataStorageByCurrentProcess, "OpenDataStorageByCurrentProcess"},
@@ -495,6 +496,7 @@ FSP_SRV::FSP_SRV() : ServiceFramework("fsp-srv") {
{613, nullptr, "VerifySaveDataFileSystemBySaveDataSpaceId"},
{614, nullptr, "CorruptSaveDataFileSystemBySaveDataSpaceId"},
{615, nullptr, "QuerySaveDataInternalStorageTotalSize"},
+ {616, nullptr, "GetSaveDataCommitId"},
{620, nullptr, "SetSdCardEncryptionSeed"},
{630, nullptr, "SetSdCardAccessibility"},
{631, nullptr, "IsSdCardAccessible"},
diff --git a/src/core/hle/service/lbl/lbl.cpp b/src/core/hle/service/lbl/lbl.cpp
index 8fc8b1057..7321584e1 100644
--- a/src/core/hle/service/lbl/lbl.cpp
+++ b/src/core/hle/service/lbl/lbl.cpp
@@ -21,29 +21,29 @@ public:
{0, nullptr, "Unknown1"},
{1, nullptr, "Unknown2"},
{2, nullptr, "Unknown3"},
- {3, nullptr, "Unknown4"},
- {4, nullptr, "Unknown5"},
- {5, nullptr, "Unknown6"},
+ {3, nullptr, "GetCurrentBacklightLevel"},
+ {4, nullptr, "Unknown4"},
+ {5, nullptr, "GetAlsComputedBacklightLevel"},
{6, nullptr, "TurnOffBacklight"},
{7, nullptr, "TurnOnBacklight"},
{8, nullptr, "GetBacklightStatus"},
- {9, nullptr, "Unknown7"},
- {10, nullptr, "Unknown8"},
- {11, nullptr, "Unknown9"},
- {12, nullptr, "Unknown10"},
- {13, nullptr, "Unknown11"},
- {14, nullptr, "Unknown12"},
- {15, nullptr, "Unknown13"},
+ {9, nullptr, "Unknown5"},
+ {10, nullptr, "Unknown6"},
+ {11, nullptr, "Unknown7"},
+ {12, nullptr, "Unknown8"},
+ {13, nullptr, "Unknown9"},
+ {14, nullptr, "Unknown10"},
+ {15, nullptr, "GetAutoBrightnessSetting"},
{16, nullptr, "ReadRawLightSensor"},
- {17, nullptr, "Unknown14"},
- {18, nullptr, "Unknown15"},
- {19, nullptr, "Unknown16"},
- {20, nullptr, "Unknown17"},
- {21, nullptr, "Unknown18"},
- {22, nullptr, "Unknown19"},
- {23, nullptr, "Unknown20"},
- {24, nullptr, "Unknown21"},
- {25, nullptr, "Unknown22"},
+ {17, nullptr, "Unknown11"},
+ {18, nullptr, "Unknown12"},
+ {19, nullptr, "Unknown13"},
+ {20, nullptr, "Unknown14"},
+ {21, nullptr, "Unknown15"},
+ {22, nullptr, "Unknown16"},
+ {23, nullptr, "Unknown17"},
+ {24, nullptr, "Unknown18"},
+ {25, nullptr, "Unknown19"},
{26, &LBL::EnableVrMode, "EnableVrMode"},
{27, &LBL::DisableVrMode, "DisableVrMode"},
{28, &LBL::GetVrMode, "GetVrMode"},
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 01:43:51 +0100