From 32fc31fb13d4381dc4b2124df4f13cbcbde7fb8b Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Wed, 26 Sep 2018 22:15:05 -0400 Subject: [PATCH 1/5] patch_manager: Add DLC recognition to PatchManager --- src/core/file_sys/patch_manager.cpp | 26 ++++++++++++++++++++++++++ src/core/file_sys/patch_manager.h | 1 + 2 files changed, 27 insertions(+) diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index 4b3b5e665..5ac2b987e 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp @@ -18,6 +18,7 @@ namespace FileSys { constexpr u64 SINGLE_BYTE_MODULUS = 0x100; +constexpr u64 DLC_BASE_TITLE_ID_MASK = 0xFFFFFFFFFFFFE000; std::string FormatTitleVersion(u32 version, TitleVersionFormat format) { std::array bytes{}; @@ -35,6 +36,7 @@ std::string FormatTitleVersion(u32 version, TitleVersionFormat format) { constexpr std::array PATCH_TYPE_NAMES{ "Update", "LayeredFS", + "DLC", }; std::string FormatPatchTypeName(PatchType type) { @@ -139,6 +141,7 @@ std::map PatchManager::GetPatchVersionNames() const { std::map out; const auto installed = Service::FileSystem::GetUnionContents(); + // Update const auto update_tid = GetUpdateTitleID(title_id); PatchManager update{update_tid}; auto [nacp, discard_icon_file] = update.GetControlMetadata(); @@ -161,6 +164,29 @@ std::map PatchManager::GetPatchVersionNames() const { if (lfs_dir != nullptr && lfs_dir->GetSize() > 0) out.insert_or_assign(PatchType::LayeredFS, ""); + // DLC + const auto dlc_entries = installed->ListEntriesFilter(TitleType::AOC, ContentRecordType::Data); + std::vector dlc_match; + dlc_match.reserve(dlc_entries.size()); + std::copy_if(dlc_entries.begin(), dlc_entries.end(), std::back_inserter(dlc_match), + [this, &installed](const RegisteredCacheEntry& entry) { + return (entry.title_id & DLC_BASE_TITLE_ID_MASK) == title_id && + installed->GetEntry(entry)->GetStatus() == + Loader::ResultStatus::Success; + }); + if (!dlc_match.empty()) { + // Ensure sorted so DLC IDs show in order. + std::sort(dlc_match.begin(), dlc_match.end()); + + std::string list; + for (size_t i = 0; i < dlc_match.size() - 1; ++i) + list += fmt::format("{}, ", dlc_match[i].title_id & 0x7FF); + + list += fmt::format("{}", dlc_match.back().title_id & 0x7FF); + + out[PatchType::DLC] = list; + } + return out; } diff --git a/src/core/file_sys/patch_manager.h b/src/core/file_sys/patch_manager.h index 464f17515..3a2a9d212 100644 --- a/src/core/file_sys/patch_manager.h +++ b/src/core/file_sys/patch_manager.h @@ -27,6 +27,7 @@ std::string FormatTitleVersion(u32 version, enum class PatchType { Update, LayeredFS, + DLC, }; std::string FormatPatchTypeName(PatchType type); From aa0c82e40534f68ef6dd8d9d881a14ed298b19a0 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Wed, 26 Sep 2018 22:15:51 -0400 Subject: [PATCH 2/5] romfs_factory: Read from all locations with StorageId None Previous behavior was to assert. Seems to mirror expected game behavior. --- src/core/file_sys/romfs_factory.cpp | 51 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/src/core/file_sys/romfs_factory.cpp b/src/core/file_sys/romfs_factory.cpp index d027a8d59..4994c2532 100644 --- a/src/core/file_sys/romfs_factory.cpp +++ b/src/core/file_sys/romfs_factory.cpp @@ -39,36 +39,35 @@ ResultVal RomFSFactory::OpenCurrentProcess() { } ResultVal RomFSFactory::Open(u64 title_id, StorageId storage, ContentRecordType type) { + std::shared_ptr res; + switch (storage) { - case StorageId::NandSystem: { - const auto res = Service::FileSystem::GetSystemNANDContents()->GetEntry(title_id, type); - if (res == nullptr) { - // TODO(DarkLordZach): Find the right error code to use here - return ResultCode(-1); - } - const auto romfs = res->GetRomFS(); - if (romfs == nullptr) { - // TODO(DarkLordZach): Find the right error code to use here - return ResultCode(-1); - } - return MakeResult(romfs); - } - case StorageId::NandUser: { - const auto res = Service::FileSystem::GetUserNANDContents()->GetEntry(title_id, type); - if (res == nullptr) { - // TODO(DarkLordZach): Find the right error code to use here - return ResultCode(-1); - } - const auto romfs = res->GetRomFS(); - if (romfs == nullptr) { - // TODO(DarkLordZach): Find the right error code to use here - return ResultCode(-1); - } - return MakeResult(romfs); - } + case StorageId::None: + res = Service::FileSystem::GetUnionContents()->GetEntry(title_id, type); + break; + case StorageId::NandSystem: + res = Service::FileSystem::GetSystemNANDContents()->GetEntry(title_id, type); + break; + case StorageId::NandUser: + res = Service::FileSystem::GetUserNANDContents()->GetEntry(title_id, type); + break; + case StorageId::SdCard: + res = Service::FileSystem::GetSDMCContents()->GetEntry(title_id, type); + break; default: UNIMPLEMENTED_MSG("Unimplemented storage_id={:02X}", static_cast(storage)); } + + if (res == nullptr) { + // TODO(DarkLordZach): Find the right error code to use here + return ResultCode(-1); + } + const auto romfs = res->GetRomFS(); + if (romfs == nullptr) { + // TODO(DarkLordZach): Find the right error code to use here + return ResultCode(-1); + } + return MakeResult(romfs); } } // namespace FileSys From 62225ae050f0e3c0eee4eb691021cd4825efbed0 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Wed, 26 Sep 2018 22:17:09 -0400 Subject: [PATCH 3/5] aoc_u: Implement Count, List and Prepare AddOnContent Commands #2, #3, and #7 --- src/core/hle/service/aoc/aoc_u.cpp | 78 ++++++++++++++++++++++++++++-- src/core/hle/service/aoc/aoc_u.h | 3 ++ 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index d9eeac9ec..f7597f9bb 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp @@ -2,12 +2,27 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include "common/logging/log.h" +#include "core/file_sys/content_archive.h" +#include "core/file_sys/nca_metadata.h" +#include "core/file_sys/partition_filesystem.h" +#include "core/file_sys/registered_cache.h" #include "core/hle/ipc_helpers.h" +#include "core/hle/kernel/process.h" #include "core/hle/service/aoc/aoc_u.h" +#include "core/hle/service/filesystem/filesystem.h" +#include "core/loader/loader.h" namespace Service::AOC { +constexpr u64 DLC_BASE_TITLE_ID_MASK = 0xFFFFFFFFFFFFE000; +constexpr u64 DLC_BASE_TO_AOC_ID_MASK = 0x1000; + +bool CheckAOCTitleIDMatchesBase(u64 base, u64 aoc) { + return (aoc & DLC_BASE_TITLE_ID_MASK) == base; +} + AOC_U::AOC_U() : ServiceFramework("aoc:u") { static const FunctionInfo functions[] = { {0, nullptr, "CountAddOnContentByApplicationId"}, @@ -17,10 +32,25 @@ AOC_U::AOC_U() : ServiceFramework("aoc:u") { {4, nullptr, "GetAddOnContentBaseIdByApplicationId"}, {5, nullptr, "GetAddOnContentBaseId"}, {6, nullptr, "PrepareAddOnContentByApplicationId"}, - {7, nullptr, "PrepareAddOnContent"}, + {7, &AOC_U::PrepareAddOnContent, "PrepareAddOnContent"}, {8, nullptr, "GetAddOnContentListChangedEvent"}, }; RegisterHandlers(functions); + + // Accumulate AOC title ids + const auto rcu = FileSystem::GetUnionContents(); + const auto list = + rcu->ListEntriesFilter(FileSys::TitleType::AOC, FileSys::ContentRecordType::Data); + std::transform(list.begin(), list.end(), std::back_inserter(add_on_content), + [](const FileSys::RegisteredCacheEntry& rce) { return rce.title_id; }); + add_on_content.erase( + std::remove_if( + add_on_content.begin(), add_on_content.end(), + [&rcu](u64 tid) { + return rcu->GetEntry(tid, FileSys::ContentRecordType::Data)->GetStatus() != + Loader::ResultStatus::Success; + }), + add_on_content.end()); } AOC_U::~AOC_U() = default; @@ -28,15 +58,57 @@ AOC_U::~AOC_U() = default; void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 4}; rb.Push(RESULT_SUCCESS); - rb.Push(0); - LOG_WARNING(Service_AOC, "(STUBBED) called"); + + const auto current = Core::System::GetInstance().CurrentProcess()->program_id; + rb.Push(std::count_if(add_on_content.begin(), add_on_content.end(), [¤t](u64 tid) { + return (tid & DLC_BASE_TITLE_ID_MASK) == current; + })); } void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + + const auto offset = rp.PopRaw(); + auto count = rp.PopRaw(); + + const auto current = Core::System::GetInstance().CurrentProcess()->program_id; + + std::vector out; + for (size_t i = 0; i < add_on_content.size(); ++i) { + if ((add_on_content[i] & DLC_BASE_TITLE_ID_MASK) == current) + out.push_back(static_cast(add_on_content[i] & 0x7FF)); + } + + if (out.size() <= offset) { + IPC::ResponseBuilder rb{ctx, 2}; + // TODO(DarkLordZach): Find the correct error code. + rb.Push(ResultCode(-1)); + return; + } + + count = std::min(out.size() - offset, count); + out = std::vector(out.begin() + offset, out.begin() + offset + count); + + ctx.WriteBuffer(out); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); +} + IPC::ResponseBuilder rb{ctx, 4}; rb.Push(RESULT_SUCCESS); rb.Push(0); LOG_WARNING(Service_AOC, "(STUBBED) called"); + +void AOC_U::PrepareAddOnContent(Kernel::HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + + const auto aoc_id = rp.PopRaw(); + + LOG_WARNING(Service_AOC, "(STUBBED) called with aoc_id={:08X}", aoc_id); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); } void InstallInterfaces(SM::ServiceManager& service_manager) { diff --git a/src/core/hle/service/aoc/aoc_u.h b/src/core/hle/service/aoc/aoc_u.h index 29ce8f488..61e2ec75d 100644 --- a/src/core/hle/service/aoc/aoc_u.h +++ b/src/core/hle/service/aoc/aoc_u.h @@ -16,6 +16,9 @@ public: private: void CountAddOnContent(Kernel::HLERequestContext& ctx); void ListAddOnContent(Kernel::HLERequestContext& ctx); + void PrepareAddOnContent(Kernel::HLERequestContext& ctx); + + std::vector add_on_content; }; /// Registers all AOC services with the specified service manager. From 7d86a008e219f37cd6fd58175ed6e4a0739e6ea5 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Thu, 27 Sep 2018 08:59:50 -0400 Subject: [PATCH 4/5] aoc_u: Implement GetAddOnContentBaseId Command #5 --- src/core/file_sys/patch_manager.cpp | 5 +++-- src/core/hle/service/aoc/aoc_u.cpp | 7 ++++--- src/core/hle/service/aoc/aoc_u.h | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index 5ac2b987e..ceb462ec4 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp @@ -33,7 +33,7 @@ std::string FormatTitleVersion(u32 version, TitleVersionFormat format) { return fmt::format("v{}.{}.{}", bytes[3], bytes[2], bytes[1]); } -constexpr std::array PATCH_TYPE_NAMES{ +constexpr std::array PATCH_TYPE_NAMES{ "Update", "LayeredFS", "DLC", @@ -141,7 +141,7 @@ std::map PatchManager::GetPatchVersionNames() const { std::map out; const auto installed = Service::FileSystem::GetUnionContents(); - // Update + // Game Updates const auto update_tid = GetUpdateTitleID(title_id); PatchManager update{update_tid}; auto [nacp, discard_icon_file] = update.GetControlMetadata(); @@ -160,6 +160,7 @@ std::map PatchManager::GetPatchVersionNames() const { } } + // LayeredFS const auto lfs_dir = Service::FileSystem::GetModificationLoadRoot(title_id); if (lfs_dir != nullptr && lfs_dir->GetSize() > 0) out.insert_or_assign(PatchType::LayeredFS, ""); diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index f7597f9bb..745ee89bc 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp @@ -30,7 +30,7 @@ AOC_U::AOC_U() : ServiceFramework("aoc:u") { {2, &AOC_U::CountAddOnContent, "CountAddOnContent"}, {3, &AOC_U::ListAddOnContent, "ListAddOnContent"}, {4, nullptr, "GetAddOnContentBaseIdByApplicationId"}, - {5, nullptr, "GetAddOnContentBaseId"}, + {5, &AOC_U::GetAddOnContentBaseId, "GetAddOnContentBaseId"}, {6, nullptr, "PrepareAddOnContentByApplicationId"}, {7, &AOC_U::PrepareAddOnContent, "PrepareAddOnContent"}, {8, nullptr, "GetAddOnContentListChangedEvent"}, @@ -95,10 +95,11 @@ void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); } +void AOC_U::GetAddOnContentBaseId(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 4}; rb.Push(RESULT_SUCCESS); - rb.Push(0); - LOG_WARNING(Service_AOC, "(STUBBED) called"); + rb.Push(Core::System::GetInstance().CurrentProcess()->program_id | DLC_BASE_TO_AOC_ID_MASK); +} void AOC_U::PrepareAddOnContent(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; diff --git a/src/core/hle/service/aoc/aoc_u.h b/src/core/hle/service/aoc/aoc_u.h index 61e2ec75d..b3c7cab7a 100644 --- a/src/core/hle/service/aoc/aoc_u.h +++ b/src/core/hle/service/aoc/aoc_u.h @@ -16,6 +16,7 @@ public: private: void CountAddOnContent(Kernel::HLERequestContext& ctx); void ListAddOnContent(Kernel::HLERequestContext& ctx); + void GetAddOnContentBaseId(Kernel::HLERequestContext& ctx); void PrepareAddOnContent(Kernel::HLERequestContext& ctx); std::vector add_on_content; From f72046099ac1bce64017e6940daba6ee2ce8e9fb Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sun, 30 Sep 2018 21:07:17 -0400 Subject: [PATCH 5/5] aoc_u: Extract AccumulateAOCTitleIDs to separate function --- src/core/file_sys/patch_manager.cpp | 3 +- src/core/hle/service/aoc/aoc_u.cpp | 46 ++++++++++++++++------------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index ceb462ec4..57b7741f8 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include @@ -185,7 +186,7 @@ std::map PatchManager::GetPatchVersionNames() const { list += fmt::format("{}", dlc_match.back().title_id & 0x7FF); - out[PatchType::DLC] = list; + out.insert_or_assign(PatchType::DLC, std::move(list)); } return out; diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index 745ee89bc..cfc28fa0c 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp @@ -2,7 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include +#include #include "common/logging/log.h" #include "core/file_sys/content_archive.h" #include "core/file_sys/nca_metadata.h" @@ -19,25 +21,12 @@ namespace Service::AOC { constexpr u64 DLC_BASE_TITLE_ID_MASK = 0xFFFFFFFFFFFFE000; constexpr u64 DLC_BASE_TO_AOC_ID_MASK = 0x1000; -bool CheckAOCTitleIDMatchesBase(u64 base, u64 aoc) { +static bool CheckAOCTitleIDMatchesBase(u64 base, u64 aoc) { return (aoc & DLC_BASE_TITLE_ID_MASK) == base; } -AOC_U::AOC_U() : ServiceFramework("aoc:u") { - static const FunctionInfo functions[] = { - {0, nullptr, "CountAddOnContentByApplicationId"}, - {1, nullptr, "ListAddOnContentByApplicationId"}, - {2, &AOC_U::CountAddOnContent, "CountAddOnContent"}, - {3, &AOC_U::ListAddOnContent, "ListAddOnContent"}, - {4, nullptr, "GetAddOnContentBaseIdByApplicationId"}, - {5, &AOC_U::GetAddOnContentBaseId, "GetAddOnContentBaseId"}, - {6, nullptr, "PrepareAddOnContentByApplicationId"}, - {7, &AOC_U::PrepareAddOnContent, "PrepareAddOnContent"}, - {8, nullptr, "GetAddOnContentListChangedEvent"}, - }; - RegisterHandlers(functions); - - // Accumulate AOC title ids +static std::vector AccumulateAOCTitleIDs() { + std::vector add_on_content; const auto rcu = FileSystem::GetUnionContents(); const auto list = rcu->ListEntriesFilter(FileSys::TitleType::AOC, FileSys::ContentRecordType::Data); @@ -51,6 +40,22 @@ AOC_U::AOC_U() : ServiceFramework("aoc:u") { Loader::ResultStatus::Success; }), add_on_content.end()); + return add_on_content; +} + +AOC_U::AOC_U() : ServiceFramework("aoc:u"), add_on_content(AccumulateAOCTitleIDs()) { + static const FunctionInfo functions[] = { + {0, nullptr, "CountAddOnContentByApplicationId"}, + {1, nullptr, "ListAddOnContentByApplicationId"}, + {2, &AOC_U::CountAddOnContent, "CountAddOnContent"}, + {3, &AOC_U::ListAddOnContent, "ListAddOnContent"}, + {4, nullptr, "GetAddOnContentBaseIdByApplicationId"}, + {5, &AOC_U::GetAddOnContentBaseId, "GetAddOnContentBaseId"}, + {6, nullptr, "PrepareAddOnContentByApplicationId"}, + {7, &AOC_U::PrepareAddOnContent, "PrepareAddOnContent"}, + {8, nullptr, "GetAddOnContentListChangedEvent"}, + }; + RegisterHandlers(functions); } AOC_U::~AOC_U() = default; @@ -59,7 +64,7 @@ void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 4}; rb.Push(RESULT_SUCCESS); - const auto current = Core::System::GetInstance().CurrentProcess()->program_id; + const auto current = Core::System::GetInstance().CurrentProcess()->GetTitleID(); rb.Push(std::count_if(add_on_content.begin(), add_on_content.end(), [¤t](u64 tid) { return (tid & DLC_BASE_TITLE_ID_MASK) == current; })); @@ -71,7 +76,7 @@ void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { const auto offset = rp.PopRaw(); auto count = rp.PopRaw(); - const auto current = Core::System::GetInstance().CurrentProcess()->program_id; + const auto current = Core::System::GetInstance().CurrentProcess()->GetTitleID(); std::vector out; for (size_t i = 0; i < add_on_content.size(); ++i) { @@ -87,7 +92,8 @@ void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { } count = std::min(out.size() - offset, count); - out = std::vector(out.begin() + offset, out.begin() + offset + count); + std::rotate(out.begin(), out.begin() + offset, out.end()); + out.resize(count); ctx.WriteBuffer(out); @@ -98,7 +104,7 @@ void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { void AOC_U::GetAddOnContentBaseId(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 4}; rb.Push(RESULT_SUCCESS); - rb.Push(Core::System::GetInstance().CurrentProcess()->program_id | DLC_BASE_TO_AOC_ID_MASK); + rb.Push(Core::System::GetInstance().CurrentProcess()->GetTitleID() | DLC_BASE_TO_AOC_ID_MASK); } void AOC_U::PrepareAddOnContent(Kernel::HLERequestContext& ctx) {