From bb3d41b416895ba946bc73bb0c0fcd6307b34ea8 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Wed, 2 Oct 2019 17:55:57 +1000 Subject: [PATCH] Finished updating lr to 9.0.0 --- .../ncm/source/impl/lr_redirection.cpp | 16 ++--- .../ncm/source/impl/lr_redirection.hpp | 2 +- .../ncm/source/impl/lr_registered_data.hpp | 12 ++-- .../lr_addoncontentlocationresolver.cpp | 2 +- .../ncm/source/lr_contentlocationresolver.cpp | 42 ++++++++++-- .../ncm/source/lr_contentlocationresolver.hpp | 50 +++++++++------ .../ncm/source/lr_ilocationresolver.cpp | 36 +++++++++-- .../ncm/source/lr_ilocationresolver.hpp | 64 +++++++++++++------ .../lr_redirectonlylocationresolver.cpp | 42 ++++++++++-- .../lr_redirectonlylocationresolver.hpp | 50 +++++++++------ .../source/lr_registeredlocationresolver.cpp | 22 +++---- .../source/lr_registeredlocationresolver.hpp | 10 +-- 12 files changed, 241 insertions(+), 107 deletions(-) diff --git a/stratosphere/ncm/source/impl/lr_redirection.cpp b/stratosphere/ncm/source/impl/lr_redirection.cpp index 59edfb5ff..c26b35a2a 100644 --- a/stratosphere/ncm/source/impl/lr_redirection.cpp +++ b/stratosphere/ncm/source/impl/lr_redirection.cpp @@ -23,19 +23,19 @@ namespace sts::lr::impl { NON_MOVEABLE(LocationRedirection); private: ncm::TitleId title_id; - ncm::TitleId application_id; + ncm::TitleId title_id_2; Path path; u32 flags; public: - LocationRedirection(ncm::TitleId title_id, ncm::TitleId application_id, const Path& path, u32 flags) : - title_id(title_id), application_id(application_id), path(path), flags(flags) { /* ... */ } + LocationRedirection(ncm::TitleId title_id, ncm::TitleId title_id_2, const Path& path, u32 flags) : + title_id(title_id), title_id_2(title_id_2), path(path), flags(flags) { /* ... */ } ncm::TitleId GetTitleId() const { return this->title_id; } - ncm::TitleId GetApplicationId() const { - return this->application_id; + ncm::TitleId GetTitleId2() const { + return this->title_id_2; } void GetPath(Path *out) const { @@ -69,9 +69,9 @@ namespace sts::lr::impl { this->SetRedirection(title_id, path, flags); } - void LocationRedirector::SetRedirection(ncm::TitleId title_id, ncm::TitleId application_id, const Path &path, u32 flags) { + void LocationRedirector::SetRedirection(ncm::TitleId title_id, ncm::TitleId title_id_2, const Path &path, u32 flags) { this->EraseRedirection(title_id); - this->redirection_list.push_back(*(new LocationRedirection(title_id, application_id, path, flags))); + this->redirection_list.push_back(*(new LocationRedirection(title_id, title_id_2, path, flags))); } void LocationRedirector::SetRedirectionFlags(ncm::TitleId title_id, u32 flags) { @@ -111,7 +111,7 @@ namespace sts::lr::impl { for (size_t i = 0; i < num_tids; i++) { ncm::TitleId tid = excluding_tids[i]; - if (it->GetApplicationId() == tid) { + if (it->GetTitleId2() == tid) { skip = true; break; } diff --git a/stratosphere/ncm/source/impl/lr_redirection.hpp b/stratosphere/ncm/source/impl/lr_redirection.hpp index 3cf142a1c..7b03585d3 100644 --- a/stratosphere/ncm/source/impl/lr_redirection.hpp +++ b/stratosphere/ncm/source/impl/lr_redirection.hpp @@ -37,7 +37,7 @@ namespace sts::lr::impl { bool FindRedirection(Path *out, ncm::TitleId title_id); void SetRedirection(ncm::TitleId title_id, const Path &path, u32 flags = RedirectionFlags_None); - void SetRedirection(ncm::TitleId title_id, ncm::TitleId application_id, const Path &path, u32 flags = RedirectionFlags_None); + void SetRedirection(ncm::TitleId title_id, ncm::TitleId title_id_2, const Path &path, u32 flags = RedirectionFlags_None); void SetRedirectionFlags(ncm::TitleId title_id, u32 flags); void EraseRedirection(ncm::TitleId title_id); void ClearRedirections(u32 flags = RedirectionFlags_None); diff --git a/stratosphere/ncm/source/impl/lr_registered_data.hpp b/stratosphere/ncm/source/impl/lr_registered_data.hpp index 91af52fba..fb80ae43d 100644 --- a/stratosphere/ncm/source/impl/lr_registered_data.hpp +++ b/stratosphere/ncm/source/impl/lr_registered_data.hpp @@ -27,7 +27,7 @@ namespace sts::lr::impl { private: struct Entry { Value value; - ncm::TitleId application_id; + ncm::TitleId title_id_2; Key key; bool is_valid; }; @@ -39,7 +39,7 @@ namespace sts::lr::impl { this->Clear(); } - bool Register(const Key &key, const Value &value, const ncm::TitleId application_id) { + bool Register(const Key &key, const Value &value, const ncm::TitleId title_id_2) { /* Try to find an existing value. */ for (size_t i = 0; i < this->GetSoftEntryLimit(); i++) { Entry& entry = this->entries[i]; @@ -54,7 +54,7 @@ namespace sts::lr::impl { if (!entry.is_valid) { entry.key = key; entry.value = value; - entry.application_id = application_id; + entry.title_id_2 = title_id_2; entry.is_valid = true; return true; } @@ -72,10 +72,10 @@ namespace sts::lr::impl { } } - void UnregisterApplication(ncm::TitleId application_id) { + void UnregisterTitleId2(ncm::TitleId title_id_2) { for (size_t i = 0; i < this->GetSoftEntryLimit(); i++) { Entry& entry = this->entries[i]; - if (entry.application_id == application_id) { + if (entry.title_id_2 == title_id_2) { entry.is_valid = false; } } @@ -107,7 +107,7 @@ namespace sts::lr::impl { for (size_t j = 0; j < num_tids; j++) { ncm::TitleId tid = tids[j]; - if (entry.application_id == tid) { + if (entry.title_id_2 == tid) { found = true; break; } diff --git a/stratosphere/ncm/source/lr_addoncontentlocationresolver.cpp b/stratosphere/ncm/source/lr_addoncontentlocationresolver.cpp index 5b7ec734c..2fbc39511 100644 --- a/stratosphere/ncm/source/lr_addoncontentlocationresolver.cpp +++ b/stratosphere/ncm/source/lr_addoncontentlocationresolver.cpp @@ -71,7 +71,7 @@ namespace sts::lr { } Result AddOnContentLocationResolverInterface::UnregisterApplicationAddOnContent(ncm::TitleId tid) { - this->registered_storages.UnregisterApplication(tid); + this->registered_storages.UnregisterTitleId2(tid); return ResultSuccess; } diff --git a/stratosphere/ncm/source/lr_contentlocationresolver.cpp b/stratosphere/ncm/source/lr_contentlocationresolver.cpp index b8a2bceb7..e4efe9429 100644 --- a/stratosphere/ncm/source/lr_contentlocationresolver.cpp +++ b/stratosphere/ncm/source/lr_contentlocationresolver.cpp @@ -73,16 +73,26 @@ namespace sts::lr { return ResultSuccess; } - Result ContentLocationResolverInterface::RedirectApplicationControlPath(InPointer path, ncm::TitleId tid) { + Result ContentLocationResolverInterface::RedirectApplicationControlPathDeprecated(InPointer path, ncm::TitleId tid) { this->app_control_redirector.SetRedirection(tid, *path.pointer, impl::RedirectionFlags_Application); return ResultSuccess; } - Result ContentLocationResolverInterface::RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid) { + Result ContentLocationResolverInterface::RedirectApplicationControlPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->app_control_redirector.SetRedirection(tid, title_id_2, *path.pointer, impl::RedirectionFlags_Application); + return ResultSuccess; + } + + Result ContentLocationResolverInterface::RedirectApplicationHtmlDocumentPathDeprecated(InPointer path, ncm::TitleId tid) { this->html_docs_redirector.SetRedirection(tid, *path.pointer, impl::RedirectionFlags_Application); return ResultSuccess; } + Result ContentLocationResolverInterface::RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->html_docs_redirector.SetRedirection(tid, title_id_2, *path.pointer, impl::RedirectionFlags_Application); + return ResultSuccess; + } + Result ContentLocationResolverInterface::ResolveApplicationLegalInformationPath(OutPointerWithServerSize out, ncm::TitleId tid) { if (this->GetRedirectedPath(out.pointer, &this->legal_info_redirector, tid)) { return ResultSuccess; @@ -91,11 +101,16 @@ namespace sts::lr { return ResultLrLegalInformationNotFound; } - Result ContentLocationResolverInterface::RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid) { + Result ContentLocationResolverInterface::RedirectApplicationLegalInformationPathDeprecated(InPointer path, ncm::TitleId tid) { this->legal_info_redirector.SetRedirection(tid, *path.pointer, impl::RedirectionFlags_Application); return ResultSuccess; } + Result ContentLocationResolverInterface::RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->legal_info_redirector.SetRedirection(tid, title_id_2, *path.pointer, impl::RedirectionFlags_Application); + return ResultSuccess; + } + Result ContentLocationResolverInterface::Refresh() { std::shared_ptr content_meta_database; std::shared_ptr content_storage; @@ -109,16 +124,26 @@ namespace sts::lr { return ResultSuccess; } - Result ContentLocationResolverInterface::RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid) { + Result ContentLocationResolverInterface::RedirectApplicationProgramPathDeprecated(InPointer path, ncm::TitleId tid) { this->program_redirector.SetRedirection(tid, *path.pointer, impl::RedirectionFlags_Application); return ResultSuccess; } - Result ContentLocationResolverInterface::ClearApplicationRedirection() { + Result ContentLocationResolverInterface::RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->program_redirector.SetRedirection(tid, title_id_2, *path.pointer, impl::RedirectionFlags_Application); + return ResultSuccess; + } + + Result ContentLocationResolverInterface::ClearApplicationRedirectionDeprecated() { this->ClearRedirections(impl::RedirectionFlags_Application); return ResultSuccess; } + Result ContentLocationResolverInterface::ClearApplicationRedirection(InBuffer excluding_tids) { + this->ClearRedirections(excluding_tids.buffer, excluding_tids.num_elements); + return ResultSuccess; + } + Result ContentLocationResolverInterface::EraseProgramRedirection(ncm::TitleId tid) { this->program_redirector.EraseRedirection(tid); return ResultSuccess; @@ -158,11 +183,16 @@ namespace sts::lr { return ResultSuccess; } - Result ContentLocationResolverInterface::RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid) { + Result ContentLocationResolverInterface::RedirectApplicationProgramPathForDebugDeprecated(InPointer path, ncm::TitleId tid) { this->debug_program_redirector.SetRedirection(tid, *path.pointer, impl::RedirectionFlags_Application); return ResultSuccess; } + Result ContentLocationResolverInterface::RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->debug_program_redirector.SetRedirection(tid, title_id_2, *path.pointer, impl::RedirectionFlags_Application); + return ResultSuccess; + } + Result ContentLocationResolverInterface::EraseProgramRedirectionForDebug(ncm::TitleId tid) { this->debug_program_redirector.EraseRedirection(tid); return ResultSuccess; diff --git a/stratosphere/ncm/source/lr_contentlocationresolver.hpp b/stratosphere/ncm/source/lr_contentlocationresolver.hpp index d7146fadd..d6b04784e 100644 --- a/stratosphere/ncm/source/lr_contentlocationresolver.hpp +++ b/stratosphere/ncm/source/lr_contentlocationresolver.hpp @@ -42,20 +42,26 @@ namespace sts::lr { virtual Result ResolveApplicationControlPath(OutPointerWithServerSize out, ncm::TitleId tid) override; virtual Result ResolveApplicationHtmlDocumentPath(OutPointerWithServerSize out, ncm::TitleId tid) override; virtual Result ResolveDataPath(OutPointerWithServerSize out, ncm::TitleId tid) override; - virtual Result RedirectApplicationControlPath(InPointer path, ncm::TitleId tid) override; - virtual Result RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationControlPathDeprecated(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationControlPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) override; + virtual Result RedirectApplicationHtmlDocumentPathDeprecated(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) override; virtual Result ResolveApplicationLegalInformationPath(OutPointerWithServerSize out, ncm::TitleId tid) override; - virtual Result RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationLegalInformationPathDeprecated(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) override; virtual Result Refresh() override; - virtual Result RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid) override; - virtual Result ClearApplicationRedirection() override; + virtual Result RedirectApplicationProgramPathDeprecated(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) override; + virtual Result ClearApplicationRedirectionDeprecated() override; + virtual Result ClearApplicationRedirection(InBuffer excluding_tids) override; virtual Result EraseProgramRedirection(ncm::TitleId tid) override; virtual Result EraseApplicationControlRedirection(ncm::TitleId tid) override; virtual Result EraseApplicationHtmlDocumentRedirection(ncm::TitleId tid) override; virtual Result EraseApplicationLegalInformationRedirection(ncm::TitleId tid) override; virtual Result ResolveProgramPathForDebug(OutPointerWithServerSize out, ncm::TitleId tid) override; virtual Result RedirectProgramPathForDebug(InPointer path, ncm::TitleId tid) override; - virtual Result RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationProgramPathForDebugDeprecated(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) override; virtual Result EraseProgramRedirectionForDebug(ncm::TitleId tid) override; public: DEFINE_SERVICE_DISPATCH_TABLE { @@ -64,21 +70,27 @@ namespace sts::lr { MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, ResolveApplicationControlPath), MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, ResolveApplicationHtmlDocumentPath), MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, ResolveDataPath), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationControlPath), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationHtmlDocumentPath), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationControlPathDeprecated, FirmwareVersion_100, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationControlPath, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationHtmlDocumentPathDeprecated, FirmwareVersion_100, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationHtmlDocumentPath, FirmwareVersion_900), MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, ResolveApplicationLegalInformationPath), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationLegalInformationPath), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationLegalInformationPathDeprecated, FirmwareVersion_100, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationLegalInformationPath, FirmwareVersion_900), MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, Refresh), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationProgramPath, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, ClearApplicationRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, EraseProgramRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, EraseApplicationControlRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, EraseApplicationHtmlDocumentRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, EraseApplicationLegalInformationRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, ResolveProgramPathForDebug, FirmwareVersion_700), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectProgramPathForDebug, FirmwareVersion_700), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationProgramPathForDebug, FirmwareVersion_700), - MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, EraseProgramRedirectionForDebug, FirmwareVersion_700), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationProgramPathDeprecated, FirmwareVersion_500, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationProgramPath, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, ClearApplicationRedirectionDeprecated, FirmwareVersion_500, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, ClearApplicationRedirection, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, EraseProgramRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, EraseApplicationControlRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, EraseApplicationHtmlDocumentRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, EraseApplicationLegalInformationRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, ResolveProgramPathForDebug, FirmwareVersion_700), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectProgramPathForDebug, FirmwareVersion_700), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationProgramPathForDebugDeprecated, FirmwareVersion_700, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, RedirectApplicationProgramPathForDebug, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(ContentLocationResolverInterface, EraseProgramRedirectionForDebug, FirmwareVersion_700), }; }; diff --git a/stratosphere/ncm/source/lr_ilocationresolver.cpp b/stratosphere/ncm/source/lr_ilocationresolver.cpp index 68b0e2d6a..96dbf073d 100644 --- a/stratosphere/ncm/source/lr_ilocationresolver.cpp +++ b/stratosphere/ncm/source/lr_ilocationresolver.cpp @@ -38,11 +38,19 @@ namespace sts::lr { std::abort(); } - Result ILocationResolver::RedirectApplicationControlPath(InPointer path, ncm::TitleId tid) { + Result ILocationResolver::RedirectApplicationControlPathDeprecated(InPointer path, ncm::TitleId tid) { std::abort(); } - Result ILocationResolver::RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid) { + Result ILocationResolver::RedirectApplicationControlPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + std::abort(); + } + + Result ILocationResolver::RedirectApplicationHtmlDocumentPathDeprecated(InPointer path, ncm::TitleId tid) { + std::abort(); + } + + Result ILocationResolver::RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { std::abort(); } @@ -50,7 +58,11 @@ namespace sts::lr { std::abort(); } - Result ILocationResolver::RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid) { + Result ILocationResolver::RedirectApplicationLegalInformationPathDeprecated(InPointer path, ncm::TitleId tid) { + std::abort(); + } + + Result ILocationResolver::RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { std::abort(); } @@ -58,11 +70,19 @@ namespace sts::lr { std::abort(); } - Result ILocationResolver::RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid) { + Result ILocationResolver::RedirectApplicationProgramPathDeprecated(InPointer path, ncm::TitleId tid) { std::abort(); } - Result ILocationResolver::ClearApplicationRedirection() { + Result ILocationResolver::RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + std::abort(); + } + + Result ILocationResolver::ClearApplicationRedirectionDeprecated() { + std::abort(); + } + + Result ILocationResolver::ClearApplicationRedirection(InBuffer excluding_tids) { std::abort(); } @@ -90,7 +110,11 @@ namespace sts::lr { std::abort(); } - Result ILocationResolver::RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid) { + Result ILocationResolver::RedirectApplicationProgramPathForDebugDeprecated(InPointer path, ncm::TitleId tid) { + std::abort(); + } + + Result ILocationResolver::RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { std::abort(); } diff --git a/stratosphere/ncm/source/lr_ilocationresolver.hpp b/stratosphere/ncm/source/lr_ilocationresolver.hpp index 5910b16b8..597f40bfe 100644 --- a/stratosphere/ncm/source/lr_ilocationresolver.hpp +++ b/stratosphere/ncm/source/lr_ilocationresolver.hpp @@ -30,12 +30,17 @@ namespace sts::lr { ResolveApplicationControlPath = 2, ResolveApplicationHtmlDocumentPath = 3, ResolveDataPath = 4, + RedirectApplicationControlPathDeprecated = 5, RedirectApplicationControlPath = 5, + RedirectApplicationHtmlDocumentPathDeprecated = 6, RedirectApplicationHtmlDocumentPath = 6, ResolveApplicationLegalInformationPath = 7, + RedirectApplicationLegalInformationPathDeprecated = 8, RedirectApplicationLegalInformationPath = 8, Refresh = 9, + RedirectApplicationProgramPathDeprecated = 10, RedirectApplicationProgramPath = 10, + ClearApplicationRedirectionDeprecated = 11, ClearApplicationRedirection = 11, EraseProgramRedirection = 12, EraseApplicationControlRedirection = 13, @@ -43,6 +48,7 @@ namespace sts::lr { EraseApplicationLegalInformationRedirection = 15, ResolveProgramPathForDebug = 16, RedirectProgramPathForDebug = 17, + RedirectApplicationProgramPathForDebugDeprecated = 18, RedirectApplicationProgramPathForDebug = 18, EraseProgramRedirectionForDebug = 19, }; @@ -64,26 +70,40 @@ namespace sts::lr { this->html_docs_redirector.ClearRedirections(flags); this->legal_info_redirector.ClearRedirections(flags); } + + void ClearRedirections(const ncm::TitleId* excluding_tids, size_t num_tids) { + this->program_redirector.ClearRedirections(excluding_tids, num_tids); + this->debug_program_redirector.ClearRedirections(excluding_tids, num_tids); + this->app_control_redirector.ClearRedirections(excluding_tids, num_tids); + this->html_docs_redirector.ClearRedirections(excluding_tids, num_tids); + this->legal_info_redirector.ClearRedirections(excluding_tids, num_tids); + } public: virtual Result ResolveProgramPath(OutPointerWithServerSize out, ncm::TitleId tid); virtual Result RedirectProgramPath(InPointer path, ncm::TitleId tid); virtual Result ResolveApplicationControlPath(OutPointerWithServerSize out, ncm::TitleId tid); virtual Result ResolveApplicationHtmlDocumentPath(OutPointerWithServerSize out, ncm::TitleId tid); virtual Result ResolveDataPath(OutPointerWithServerSize out, ncm::TitleId tid); - virtual Result RedirectApplicationControlPath(InPointer path, ncm::TitleId tid); - virtual Result RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid); + virtual Result RedirectApplicationControlPathDeprecated(InPointer path, ncm::TitleId tid); + virtual Result RedirectApplicationControlPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2); + virtual Result RedirectApplicationHtmlDocumentPathDeprecated(InPointer path, ncm::TitleId tid); + virtual Result RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2); virtual Result ResolveApplicationLegalInformationPath(OutPointerWithServerSize out, ncm::TitleId tid); - virtual Result RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid); + virtual Result RedirectApplicationLegalInformationPathDeprecated(InPointer path, ncm::TitleId tid); + virtual Result RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2); virtual Result Refresh(); - virtual Result RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid); - virtual Result ClearApplicationRedirection(); + virtual Result RedirectApplicationProgramPathDeprecated(InPointer path, ncm::TitleId tid); + virtual Result RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2); + virtual Result ClearApplicationRedirectionDeprecated(); + virtual Result ClearApplicationRedirection(InBuffer excluding_tids); virtual Result EraseProgramRedirection(ncm::TitleId tid); virtual Result EraseApplicationControlRedirection(ncm::TitleId tid); virtual Result EraseApplicationHtmlDocumentRedirection(ncm::TitleId tid); virtual Result EraseApplicationLegalInformationRedirection(ncm::TitleId tid); virtual Result ResolveProgramPathForDebug(OutPointerWithServerSize out, ncm::TitleId tid); virtual Result RedirectProgramPathForDebug(InPointer path, ncm::TitleId tid); - virtual Result RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid); + virtual Result RedirectApplicationProgramPathForDebugDeprecated(InPointer path, ncm::TitleId tid); + virtual Result RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2); virtual Result EraseProgramRedirectionForDebug(ncm::TitleId tid); public: DEFINE_SERVICE_DISPATCH_TABLE { @@ -92,21 +112,27 @@ namespace sts::lr { MAKE_SERVICE_COMMAND_META(ILocationResolver, ResolveApplicationControlPath), MAKE_SERVICE_COMMAND_META(ILocationResolver, ResolveApplicationHtmlDocumentPath), MAKE_SERVICE_COMMAND_META(ILocationResolver, ResolveDataPath), - MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationControlPath), - MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationHtmlDocumentPath), + MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationControlPathDeprecated, FirmwareVersion_100, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationControlPath, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationHtmlDocumentPathDeprecated, FirmwareVersion_100, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationHtmlDocumentPath, FirmwareVersion_900), MAKE_SERVICE_COMMAND_META(ILocationResolver, ResolveApplicationLegalInformationPath), - MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationLegalInformationPath), + MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationLegalInformationPathDeprecated, FirmwareVersion_100, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationLegalInformationPath, FirmwareVersion_900), MAKE_SERVICE_COMMAND_META(ILocationResolver, Refresh), - MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationProgramPath, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ILocationResolver, ClearApplicationRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ILocationResolver, EraseProgramRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ILocationResolver, EraseApplicationControlRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ILocationResolver, EraseApplicationHtmlDocumentRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ILocationResolver, EraseApplicationLegalInformationRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(ILocationResolver, ResolveProgramPathForDebug, FirmwareVersion_700), - MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectProgramPathForDebug, FirmwareVersion_700), - MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationProgramPathForDebug, FirmwareVersion_700), - MAKE_SERVICE_COMMAND_META(ILocationResolver, EraseProgramRedirectionForDebug, FirmwareVersion_700), + MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationProgramPathDeprecated, FirmwareVersion_500, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationProgramPath, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(ILocationResolver, ClearApplicationRedirectionDeprecated, FirmwareVersion_500, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ILocationResolver, ClearApplicationRedirection, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(ILocationResolver, EraseProgramRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(ILocationResolver, EraseApplicationControlRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(ILocationResolver, EraseApplicationHtmlDocumentRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(ILocationResolver, EraseApplicationLegalInformationRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(ILocationResolver, ResolveProgramPathForDebug, FirmwareVersion_700), + MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectProgramPathForDebug, FirmwareVersion_700), + MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationProgramPathForDebugDeprecated, FirmwareVersion_700, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(ILocationResolver, RedirectApplicationProgramPathForDebug, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(ILocationResolver, EraseProgramRedirectionForDebug, FirmwareVersion_700), }; }; diff --git a/stratosphere/ncm/source/lr_redirectonlylocationresolver.cpp b/stratosphere/ncm/source/lr_redirectonlylocationresolver.cpp index c8c61a80d..22bd99d68 100644 --- a/stratosphere/ncm/source/lr_redirectonlylocationresolver.cpp +++ b/stratosphere/ncm/source/lr_redirectonlylocationresolver.cpp @@ -60,16 +60,26 @@ namespace sts::lr { return ResultLrDataNotFound; } - Result RedirectOnlyLocationResolverInterface::RedirectApplicationControlPath(InPointer path, ncm::TitleId tid) { + Result RedirectOnlyLocationResolverInterface::RedirectApplicationControlPathDeprecated(InPointer path, ncm::TitleId tid) { this->app_control_redirector.SetRedirection(tid, *path.pointer, impl::RedirectionFlags_Application); return ResultSuccess; } - Result RedirectOnlyLocationResolverInterface::RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid) { + Result RedirectOnlyLocationResolverInterface::RedirectApplicationControlPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->app_control_redirector.SetRedirection(tid, title_id_2, *path.pointer, impl::RedirectionFlags_Application); + return ResultSuccess; + } + + Result RedirectOnlyLocationResolverInterface::RedirectApplicationHtmlDocumentPathDeprecated(InPointer path, ncm::TitleId tid) { this->html_docs_redirector.SetRedirection(tid, *path.pointer, impl::RedirectionFlags_Application); return ResultSuccess; } + Result RedirectOnlyLocationResolverInterface::RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->html_docs_redirector.SetRedirection(tid, title_id_2, *path.pointer, impl::RedirectionFlags_Application); + return ResultSuccess; + } + Result RedirectOnlyLocationResolverInterface::ResolveApplicationLegalInformationPath(OutPointerWithServerSize out, ncm::TitleId tid) { if (this->GetRedirectedPath(out.pointer, &this->legal_info_redirector, tid)) { return ResultSuccess; @@ -78,11 +88,16 @@ namespace sts::lr { return ResultLrLegalInformationNotFound; } - Result RedirectOnlyLocationResolverInterface::RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid) { + Result RedirectOnlyLocationResolverInterface::RedirectApplicationLegalInformationPathDeprecated(InPointer path, ncm::TitleId tid) { this->legal_info_redirector.SetRedirection(tid, *path.pointer, impl::RedirectionFlags_Application); return ResultSuccess; } + Result RedirectOnlyLocationResolverInterface::RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->legal_info_redirector.SetRedirection(tid, title_id_2, *path.pointer, impl::RedirectionFlags_Application); + return ResultSuccess; + } + Result RedirectOnlyLocationResolverInterface::Refresh() { this->program_redirector.ClearRedirections(); this->debug_program_redirector.ClearRedirections(); @@ -92,12 +107,17 @@ namespace sts::lr { return ResultSuccess; } - Result RedirectOnlyLocationResolverInterface::RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid) { + Result RedirectOnlyLocationResolverInterface::RedirectApplicationProgramPathDeprecated(InPointer path, ncm::TitleId tid) { this->program_redirector.SetRedirection(tid, *path.pointer, impl::RedirectionFlags_Application); return ResultSuccess; } - Result RedirectOnlyLocationResolverInterface::ClearApplicationRedirection() { + Result RedirectOnlyLocationResolverInterface::RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->program_redirector.SetRedirection(tid, title_id_2, *path.pointer, impl::RedirectionFlags_Application); + return ResultSuccess; + } + + Result RedirectOnlyLocationResolverInterface::ClearApplicationRedirectionDeprecated() { this->program_redirector.ClearRedirections(impl::RedirectionFlags_Application); this->debug_program_redirector.ClearRedirections(impl::RedirectionFlags_Application); this->app_control_redirector.ClearRedirections(impl::RedirectionFlags_Application); @@ -106,6 +126,11 @@ namespace sts::lr { return ResultSuccess; } + Result RedirectOnlyLocationResolverInterface::ClearApplicationRedirection(InBuffer excluding_tids) { + this->ClearRedirections(excluding_tids.buffer, excluding_tids.num_elements); + return ResultSuccess; + } + Result RedirectOnlyLocationResolverInterface::EraseProgramRedirection(ncm::TitleId tid) { this->program_redirector.EraseRedirection(tid); return ResultSuccess; @@ -145,11 +170,16 @@ namespace sts::lr { return ResultSuccess; } - Result RedirectOnlyLocationResolverInterface::RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid) { + Result RedirectOnlyLocationResolverInterface::RedirectApplicationProgramPathForDebugDeprecated(InPointer path, ncm::TitleId tid) { this->debug_program_redirector.SetRedirection(tid, *path.pointer, impl::RedirectionFlags_Application); return ResultSuccess; } + Result RedirectOnlyLocationResolverInterface::RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->debug_program_redirector.SetRedirection(tid, title_id_2, *path.pointer, impl::RedirectionFlags_Application); + return ResultSuccess; + } + Result RedirectOnlyLocationResolverInterface::EraseProgramRedirectionForDebug(ncm::TitleId tid) { this->debug_program_redirector.EraseRedirection(tid); return ResultSuccess; diff --git a/stratosphere/ncm/source/lr_redirectonlylocationresolver.hpp b/stratosphere/ncm/source/lr_redirectonlylocationresolver.hpp index 9346d5d67..a47719152 100644 --- a/stratosphere/ncm/source/lr_redirectonlylocationresolver.hpp +++ b/stratosphere/ncm/source/lr_redirectonlylocationresolver.hpp @@ -31,20 +31,26 @@ namespace sts::lr { virtual Result ResolveApplicationControlPath(OutPointerWithServerSize out, ncm::TitleId tid) override; virtual Result ResolveApplicationHtmlDocumentPath(OutPointerWithServerSize out, ncm::TitleId tid) override; virtual Result ResolveDataPath(OutPointerWithServerSize out, ncm::TitleId tid) override; - virtual Result RedirectApplicationControlPath(InPointer path, ncm::TitleId tid) override; - virtual Result RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationControlPathDeprecated(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationControlPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) override; + virtual Result RedirectApplicationHtmlDocumentPathDeprecated(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) override; virtual Result ResolveApplicationLegalInformationPath(OutPointerWithServerSize out, ncm::TitleId tid) override; - virtual Result RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationLegalInformationPathDeprecated(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationLegalInformationPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) override; virtual Result Refresh() override; - virtual Result RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid) override; - virtual Result ClearApplicationRedirection() override; + virtual Result RedirectApplicationProgramPathDeprecated(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) override; + virtual Result ClearApplicationRedirectionDeprecated() override; + virtual Result ClearApplicationRedirection(InBuffer excluding_tids) override; virtual Result EraseProgramRedirection(ncm::TitleId tid) override; virtual Result EraseApplicationControlRedirection(ncm::TitleId tid) override; virtual Result EraseApplicationHtmlDocumentRedirection(ncm::TitleId tid) override; virtual Result EraseApplicationLegalInformationRedirection(ncm::TitleId tid) override; virtual Result ResolveProgramPathForDebug(OutPointerWithServerSize out, ncm::TitleId tid) override; virtual Result RedirectProgramPathForDebug(InPointer path, ncm::TitleId tid) override; - virtual Result RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationProgramPathForDebugDeprecated(InPointer path, ncm::TitleId tid) override; + virtual Result RedirectApplicationProgramPathForDebug(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) override; virtual Result EraseProgramRedirectionForDebug(ncm::TitleId tid) override; public: DEFINE_SERVICE_DISPATCH_TABLE { @@ -53,21 +59,27 @@ namespace sts::lr { MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, ResolveApplicationControlPath), MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, ResolveApplicationHtmlDocumentPath), MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, ResolveDataPath), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationControlPath), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationHtmlDocumentPath), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationControlPathDeprecated, FirmwareVersion_100, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationControlPath, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationHtmlDocumentPathDeprecated, FirmwareVersion_100, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationHtmlDocumentPath, FirmwareVersion_900), MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, ResolveApplicationLegalInformationPath), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationLegalInformationPath), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationLegalInformationPathDeprecated, FirmwareVersion_100, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationLegalInformationPath, FirmwareVersion_900), MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, Refresh), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationProgramPath, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, ClearApplicationRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, EraseProgramRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, EraseApplicationControlRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, EraseApplicationHtmlDocumentRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, EraseApplicationLegalInformationRedirection, FirmwareVersion_500), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, ResolveProgramPathForDebug, FirmwareVersion_700), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectProgramPathForDebug, FirmwareVersion_700), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationProgramPathForDebug, FirmwareVersion_700), - MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, EraseProgramRedirectionForDebug, FirmwareVersion_700), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationProgramPathDeprecated, FirmwareVersion_500, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationProgramPath, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, ClearApplicationRedirectionDeprecated, FirmwareVersion_500, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, ClearApplicationRedirection, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, EraseProgramRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, EraseApplicationControlRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, EraseApplicationHtmlDocumentRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, EraseApplicationLegalInformationRedirection, FirmwareVersion_500), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, ResolveProgramPathForDebug, FirmwareVersion_700), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectProgramPathForDebug, FirmwareVersion_700), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationProgramPathForDebugDeprecated, FirmwareVersion_700, FirmwareVersion_810), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, RedirectApplicationProgramPathForDebug, FirmwareVersion_900), + MAKE_SERVICE_COMMAND_META(RedirectOnlyLocationResolverInterface, EraseProgramRedirectionForDebug, FirmwareVersion_700), }; }; diff --git a/stratosphere/ncm/source/lr_registeredlocationresolver.cpp b/stratosphere/ncm/source/lr_registeredlocationresolver.cpp index dac7e7b1a..f36c305bb 100644 --- a/stratosphere/ncm/source/lr_registeredlocationresolver.cpp +++ b/stratosphere/ncm/source/lr_registeredlocationresolver.cpp @@ -28,10 +28,10 @@ namespace sts::lr { this->program_redirector.ClearRedirections(); } - void RegisteredLocationResolverInterface::RegisterPath(const Path& path, impl::RegisteredLocations* locations, ncm::TitleId tid, ncm::TitleId application_id) { - if (!locations->Register(tid, path, application_id)) { + void RegisteredLocationResolverInterface::RegisterPath(const Path& path, impl::RegisteredLocations* locations, ncm::TitleId tid, ncm::TitleId title_id_2) { + if (!locations->Register(tid, path, title_id_2)) { locations->Clear(); - locations->Register(tid, path, application_id); + locations->Register(tid, path, title_id_2); } } @@ -75,8 +75,8 @@ namespace sts::lr { return ResultSuccess; } - Result RegisteredLocationResolverInterface::RegisterProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId application_id) { - this->RegisterPath(*path.pointer, &this->registered_program_locations, tid, application_id); + Result RegisteredLocationResolverInterface::RegisterProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->RegisterPath(*path.pointer, &this->registered_program_locations, tid, title_id_2); return ResultSuccess; } @@ -90,8 +90,8 @@ namespace sts::lr { return ResultSuccess; } - Result RegisteredLocationResolverInterface::RedirectProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId application_id) { - this->program_redirector.SetRedirection(tid, application_id, *path.pointer); + Result RegisteredLocationResolverInterface::RedirectProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->program_redirector.SetRedirection(tid, title_id_2, *path.pointer); return ResultSuccess; } @@ -108,8 +108,8 @@ namespace sts::lr { return ResultSuccess; } - Result RegisteredLocationResolverInterface::RegisterHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId application_id) { - this->RegisterPath(*path.pointer, &this->registered_html_docs_locations, tid, application_id); + Result RegisteredLocationResolverInterface::RegisterHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->RegisterPath(*path.pointer, &this->registered_html_docs_locations, tid, title_id_2); return ResultSuccess; } @@ -123,8 +123,8 @@ namespace sts::lr { return ResultSuccess; } - Result RegisteredLocationResolverInterface::RedirectHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId application_id) { - this->html_docs_redirector.SetRedirection(tid, application_id, *path.pointer); + Result RegisteredLocationResolverInterface::RedirectHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2) { + this->html_docs_redirector.SetRedirection(tid, title_id_2, *path.pointer); return ResultSuccess; } diff --git a/stratosphere/ncm/source/lr_registeredlocationresolver.hpp b/stratosphere/ncm/source/lr_registeredlocationresolver.hpp index dfc538303..18a05c9d3 100644 --- a/stratosphere/ncm/source/lr_registeredlocationresolver.hpp +++ b/stratosphere/ncm/source/lr_registeredlocationresolver.hpp @@ -50,7 +50,7 @@ namespace sts::lr { impl::RegisteredLocations registered_html_docs_locations; private: void ClearRedirections(u32 flags = impl::RedirectionFlags_None); - void RegisterPath(const Path& path, impl::RegisteredLocations* locations, ncm::TitleId tid, ncm::TitleId application_id); + void RegisterPath(const Path& path, impl::RegisteredLocations* locations, ncm::TitleId tid, ncm::TitleId title_id_2); bool ResolvePath(Path* out, impl::LocationRedirector* redirector, impl::RegisteredLocations* locations, ncm::TitleId tid); Result RefreshImpl(const ncm::TitleId* excluding_tids, size_t num_tids); public: @@ -59,16 +59,16 @@ namespace sts::lr { Result ResolveProgramPath(OutPointerWithServerSize out, ncm::TitleId tid); Result RegisterProgramPathDeprecated(InPointer path, ncm::TitleId tid); - Result RegisterProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId application_id); + Result RegisterProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2); Result UnregisterProgramPath(ncm::TitleId tid); Result RedirectProgramPathDeprecated(InPointer path, ncm::TitleId tid); - Result RedirectProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId application_id); + Result RedirectProgramPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2); Result ResolveHtmlDocumentPath(OutPointerWithServerSize out, ncm::TitleId tid); Result RegisterHtmlDocumentPathDeprecated(InPointer path, ncm::TitleId tid); - Result RegisterHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId application_id); + Result RegisterHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2); Result UnregisterHtmlDocumentPath(ncm::TitleId tid); Result RedirectHtmlDocumentPathDeprecated(InPointer path, ncm::TitleId tid); - Result RedirectHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId application_id); + Result RedirectHtmlDocumentPath(InPointer path, ncm::TitleId tid, ncm::TitleId title_id_2); Result Refresh(); Result RefreshExcluding(InBuffer tids); public: