VERY experimental Nintendo Switch 2 emulator
C++
ns: rewrite IServiceGetterInterface
Liam81a1a3f7f17a
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex 43d377913a..1339cb1821 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -773,6 +773,8 @@ add_library(core STATIChle/service/ns/read_only_application_control_data_interface.hhle/service/ns/read_only_application_record_interface.cpphle/service/ns/read_only_application_record_interface.h+ hle/service/ns/service_getter_interface.cpp+ hle/service/ns/service_getter_interface.hhle/service/ns/system_update_control.cpphle/service/ns/system_update_control.hhle/service/ns/system_update_interface.cppdiff --git a/src/core/hle/service/am/service/application_functions.cpp b/src/core/hle/service/am/service/application_functions.cppindex a40789c01a..cb53b07e05 100644--- a/src/core/hle/service/am/service/application_functions.cpp+++ b/src/core/hle/service/am/service/application_functions.cpp@@ -17,7 +17,7 @@#include "core/hle/service/filesystem/save_data_controller.h"#include "core/hle/service/glue/glue_manager.h"#include "core/hle/service/ns/application_manager_interface.h"-#include "core/hle/service/ns/ns.h"+#include "core/hle/service/ns/service_getter_interface.h"#include "core/hle/service/sm/sm.h"namespace Service::AM {@@ -164,8 +164,10 @@ Result IApplicationFunctions::GetDesiredLanguage(Out<u64> out_language_code) {// Call IApplicationManagerInterface implementation.auto& service_manager = system.ServiceManager();- auto ns_am2 = service_manager.GetService<NS::NS>("ns:am2");- auto app_man = ns_am2->GetApplicationManagerInterface();+ auto ns_am2 = service_manager.GetService<NS::IServiceGetterInterface>("ns:am2");++ std::shared_ptr<NS::IApplicationManagerInterface> app_man;+ R_TRY(ns_am2->GetApplicationManagerInterface(&app_man));// Get desired application languageNS::ApplicationLanguage desired_language{};diff --git a/src/core/hle/service/am/service/library_applet_self_accessor.cpp b/src/core/hle/service/am/service/library_applet_self_accessor.cppindex 932e354e0a..963e674879 100644--- a/src/core/hle/service/am/service/library_applet_self_accessor.cpp+++ b/src/core/hle/service/am/service/library_applet_self_accessor.cpp@@ -15,7 +15,7 @@#include "core/hle/service/filesystem/filesystem.h"#include "core/hle/service/glue/glue_manager.h"#include "core/hle/service/ns/application_manager_interface.h"-#include "core/hle/service/ns/ns.h"+#include "core/hle/service/ns/service_getter_interface.h"#include "core/hle/service/sm/sm.h"namespace Service::AM {@@ -257,8 +257,10 @@ Result ILibraryAppletSelfAccessor::GetMainAppletApplicationDesiredLanguage(// Call IApplicationManagerInterface implementation.auto& service_manager = system.ServiceManager();- auto ns_am2 = service_manager.GetService<NS::NS>("ns:am2");- auto app_man = ns_am2->GetApplicationManagerInterface();+ auto ns_am2 = service_manager.GetService<NS::IServiceGetterInterface>("ns:am2");++ std::shared_ptr<NS::IApplicationManagerInterface> app_man;+ R_TRY(ns_am2->GetApplicationManagerInterface(&app_man));// Get desired application languageNS::ApplicationLanguage desired_language{};diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cppindex 9937e7bb7b..96fa221b0e 100644--- a/src/core/hle/service/ns/ns.cpp+++ b/src/core/hle/service/ns/ns.cpp@@ -1,101 +1,32 @@// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#include "common/logging/log.h"-#include "common/settings.h"-#include "core/arm/debug.h"-#include "core/core.h"-#include "core/file_sys/control_metadata.h"-#include "core/file_sys/patch_manager.h"-#include "core/file_sys/vfs/vfs.h"-#include "core/hle/service/filesystem/filesystem.h"-#include "core/hle/service/glue/glue_manager.h"-#include "core/hle/service/ipc_helpers.h"-#include "core/hle/service/ns/account_proxy_interface.h"-#include "core/hle/service/ns/application_manager_interface.h"-#include "core/hle/service/ns/application_version_interface.h"-#include "core/hle/service/ns/content_management_interface.h"#include "core/hle/service/ns/develop_interface.h"-#include "core/hle/service/ns/document_interface.h"-#include "core/hle/service/ns/download_task_interface.h"-#include "core/hle/service/ns/dynamic_rights_interface.h"-#include "core/hle/service/ns/ecommerce_interface.h"-#include "core/hle/service/ns/factory_reset_interface.h"-#include "core/hle/service/ns/language.h"#include "core/hle/service/ns/ns.h"-#include "core/hle/service/ns/ns_results.h"#include "core/hle/service/ns/pdm_qry.h"#include "core/hle/service/ns/platform_service_manager.h"-#include "core/hle/service/ns/read_only_application_control_data_interface.h"-#include "core/hle/service/ns/read_only_application_record_interface.h"-#include "core/hle/service/ns/system_update_control.h"+#include "core/hle/service/ns/service_getter_interface.h"#include "core/hle/service/ns/system_update_interface.h"#include "core/hle/service/ns/vulnerability_manager_interface.h"#include "core/hle/service/server_manager.h"-#include "core/hle/service/set/settings_server.h"namespace Service::NS {-NS::NS(const char* name, Core::System& system_) : ServiceFramework{system_, name} {- // clang-format off- static const FunctionInfo functions[] = {- {7988, &NS::PushInterface<IDynamicRightsInterface>, "GetDynamicRightsInterface"},- {7989, &NS::PushInterface<IReadOnlyApplicationControlDataInterface>, "GetReadOnlyApplicationControlDataInterface"},- {7991, &NS::PushInterface<IReadOnlyApplicationRecordInterface>, "GetReadOnlyApplicationRecordInterface"},- {7992, &NS::PushInterface<IECommerceInterface>, "GetECommerceInterface"},- {7993, &NS::PushInterface<IApplicationVersionInterface>, "GetApplicationVersionInterface"},- {7994, &NS::PushInterface<IFactoryResetInterface>, "GetFactoryResetInterface"},- {7995, &NS::PushInterface<IAccountProxyInterface>, "GetAccountProxyInterface"},- {7996, &NS::PushIApplicationManagerInterface, "GetApplicationManagerInterface"},- {7997, &NS::PushInterface<IDownloadTaskInterface>, "GetDownloadTaskInterface"},- {7998, &NS::PushInterface<IContentManagementInterface>, "GetContentManagementInterface"},- {7999, &NS::PushInterface<IDocumentInterface>, "GetDocumentInterface"},- };- // clang-format on-- RegisterHandlers(functions);-}--NS::~NS() = default;--std::shared_ptr<IApplicationManagerInterface> NS::GetApplicationManagerInterface() const {- return GetInterface<IApplicationManagerInterface>(system);-}--template <typename T, typename... Args>-void NS::PushInterface(HLERequestContext& ctx) {- LOG_DEBUG(Service_NS, "called");-- IPC::ResponseBuilder rb{ctx, 2, 0, 1};- rb.Push(ResultSuccess);- rb.PushIpcInterface<T>(system);-}--void NS::PushIApplicationManagerInterface(HLERequestContext& ctx) {- LOG_DEBUG(Service_NS, "called");-- IPC::ResponseBuilder rb{ctx, 2, 0, 1};- rb.Push(ResultSuccess);- rb.PushIpcInterface<IApplicationManagerInterface>(system);-}--template <typename T, typename... Args>-std::shared_ptr<T> NS::GetInterface(Args&&... args) const {- static_assert(std::is_base_of_v<SessionRequestHandler, T>,- "Not a base of ServiceFrameworkBase");-- return std::make_shared<T>(std::forward<Args>(args)...);-}-void LoopProcess(Core::System& system) {auto server_manager = std::make_unique<ServerManager>(system);- server_manager->RegisterNamedService("ns:am2", std::make_shared<NS>("ns:am2", system));- server_manager->RegisterNamedService("ns:ec", std::make_shared<NS>("ns:ec", system));- server_manager->RegisterNamedService("ns:rid", std::make_shared<NS>("ns:rid", system));- server_manager->RegisterNamedService("ns:rt", std::make_shared<NS>("ns:rt", system));- server_manager->RegisterNamedService("ns:web", std::make_shared<NS>("ns:web", system));- server_manager->RegisterNamedService("ns:ro", std::make_shared<NS>("ns:ro", system));+ server_manager->RegisterNamedService(+ "ns:am2", std::make_shared<IServiceGetterInterface>(system, "ns:am2"));+ server_manager->RegisterNamedService(+ "ns:ec", std::make_shared<IServiceGetterInterface>(system, "ns:ec"));+ server_manager->RegisterNamedService(+ "ns:rid", std::make_shared<IServiceGetterInterface>(system, "ns:rid"));+ server_manager->RegisterNamedService(+ "ns:rt", std::make_shared<IServiceGetterInterface>(system, "ns:rt"));+ server_manager->RegisterNamedService(+ "ns:web", std::make_shared<IServiceGetterInterface>(system, "ns:web"));+ server_manager->RegisterNamedService(+ "ns:ro", std::make_shared<IServiceGetterInterface>(system, "ns:ro"));server_manager->RegisterNamedService("ns:dev", std::make_shared<IDevelopInterface>(system));server_manager->RegisterNamedService("ns:su", std::make_shared<ISystemUpdateInterface>(system));diff --git a/src/core/hle/service/ns/ns.h b/src/core/hle/service/ns/ns.hindex ef5c575da0..f79b4ae3d6 100644--- a/src/core/hle/service/ns/ns.h+++ b/src/core/hle/service/ns/ns.h@@ -3,33 +3,12 @@#pragma once-#include "core/hle/service/service.h"-namespace Core {class System;}namespace Service::NS {-class IApplicationManagerInterface;--class NS final : public ServiceFramework<NS> {-public:- explicit NS(const char* name, Core::System& system_);- ~NS() override;-- std::shared_ptr<IApplicationManagerInterface> GetApplicationManagerInterface() const;--private:- template <typename T, typename... Args>- void PushInterface(HLERequestContext& ctx);-- void PushIApplicationManagerInterface(HLERequestContext& ctx);-- template <typename T, typename... Args>- std::shared_ptr<T> GetInterface(Args&&... args) const;-};-void LoopProcess(Core::System& system);} // namespace Service::NSdiff --git a/src/core/hle/service/ns/service_getter_interface.cpp b/src/core/hle/service/ns/service_getter_interface.cppnew file mode 100644index 0000000000..1a3dd7166c--- /dev/null+++ b/src/core/hle/service/ns/service_getter_interface.cpp@@ -0,0 +1,120 @@+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#include "core/hle/service/cmif_serialization.h"+#include "core/hle/service/ns/account_proxy_interface.h"+#include "core/hle/service/ns/application_manager_interface.h"+#include "core/hle/service/ns/application_version_interface.h"+#include "core/hle/service/ns/content_management_interface.h"+#include "core/hle/service/ns/document_interface.h"+#include "core/hle/service/ns/download_task_interface.h"+#include "core/hle/service/ns/dynamic_rights_interface.h"+#include "core/hle/service/ns/ecommerce_interface.h"+#include "core/hle/service/ns/factory_reset_interface.h"+#include "core/hle/service/ns/read_only_application_control_data_interface.h"+#include "core/hle/service/ns/read_only_application_record_interface.h"+#include "core/hle/service/ns/service_getter_interface.h"++namespace Service::NS {++IServiceGetterInterface::IServiceGetterInterface(Core::System& system_, const char* name)+ : ServiceFramework{system_, name} {+ // clang-format off+ static const FunctionInfo functions[] = {+ {7988, D<&IServiceGetterInterface::GetDynamicRightsInterface>, "GetDynamicRightsInterface"},+ {7989, D<&IServiceGetterInterface::GetReadOnlyApplicationControlDataInterface>, "GetReadOnlyApplicationControlDataInterface"},+ {7991, D<&IServiceGetterInterface::GetReadOnlyApplicationRecordInterface>, "GetReadOnlyApplicationRecordInterface"},+ {7992, D<&IServiceGetterInterface::GetECommerceInterface>, "GetECommerceInterface"},+ {7993, D<&IServiceGetterInterface::GetApplicationVersionInterface>, "GetApplicationVersionInterface"},+ {7994, D<&IServiceGetterInterface::GetFactoryResetInterface>, "GetFactoryResetInterface"},+ {7995, D<&IServiceGetterInterface::GetAccountProxyInterface>, "GetAccountProxyInterface"},+ {7996, D<&IServiceGetterInterface::GetApplicationManagerInterface>, "GetApplicationManagerInterface"},+ {7997, D<&IServiceGetterInterface::GetDownloadTaskInterface>, "GetDownloadTaskInterface"},+ {7998, D<&IServiceGetterInterface::GetContentManagementInterface>, "GetContentManagementInterface"},+ {7999, D<&IServiceGetterInterface::GetDocumentInterface>, "GetDocumentInterface"},+ };+ // clang-format on++ RegisterHandlers(functions);+}++IServiceGetterInterface::~IServiceGetterInterface() = default;++Result IServiceGetterInterface::GetDynamicRightsInterface(+ Out<SharedPointer<IDynamicRightsInterface>> out_interface) {+ LOG_DEBUG(Service_NS, "called");+ *out_interface = std::make_shared<IDynamicRightsInterface>(system);+ R_SUCCEED();+}++Result IServiceGetterInterface::GetReadOnlyApplicationControlDataInterface(+ Out<SharedPointer<IReadOnlyApplicationControlDataInterface>> out_interface) {+ LOG_DEBUG(Service_NS, "called");+ *out_interface = std::make_shared<IReadOnlyApplicationControlDataInterface>(system);+ R_SUCCEED();+}++Result IServiceGetterInterface::GetReadOnlyApplicationRecordInterface(+ Out<SharedPointer<IReadOnlyApplicationRecordInterface>> out_interface) {+ LOG_DEBUG(Service_NS, "called");+ *out_interface = std::make_shared<IReadOnlyApplicationRecordInterface>(system);+ R_SUCCEED();+}++Result IServiceGetterInterface::GetECommerceInterface(+ Out<SharedPointer<IECommerceInterface>> out_interface) {+ LOG_DEBUG(Service_NS, "called");+ *out_interface = std::make_shared<IECommerceInterface>(system);+ R_SUCCEED();+}++Result IServiceGetterInterface::GetApplicationVersionInterface(+ Out<SharedPointer<IApplicationVersionInterface>> out_interface) {+ LOG_DEBUG(Service_NS, "called");+ *out_interface = std::make_shared<IApplicationVersionInterface>(system);+ R_SUCCEED();+}++Result IServiceGetterInterface::GetFactoryResetInterface(+ Out<SharedPointer<IFactoryResetInterface>> out_interface) {+ LOG_DEBUG(Service_NS, "called");+ *out_interface = std::make_shared<IFactoryResetInterface>(system);+ R_SUCCEED();+}++Result IServiceGetterInterface::GetAccountProxyInterface(+ Out<SharedPointer<IAccountProxyInterface>> out_interface) {+ LOG_DEBUG(Service_NS, "called");+ *out_interface = std::make_shared<IAccountProxyInterface>(system);+ R_SUCCEED();+}++Result IServiceGetterInterface::GetApplicationManagerInterface(+ Out<SharedPointer<IApplicationManagerInterface>> out_interface) {+ LOG_DEBUG(Service_NS, "called");+ *out_interface = std::make_shared<IApplicationManagerInterface>(system);+ R_SUCCEED();+}++Result IServiceGetterInterface::GetDownloadTaskInterface(+ Out<SharedPointer<IDownloadTaskInterface>> out_interface) {+ LOG_DEBUG(Service_NS, "called");+ *out_interface = std::make_shared<IDownloadTaskInterface>(system);+ R_SUCCEED();+}++Result IServiceGetterInterface::GetContentManagementInterface(+ Out<SharedPointer<IContentManagementInterface>> out_interface) {+ LOG_DEBUG(Service_NS, "called");+ *out_interface = std::make_shared<IContentManagementInterface>(system);+ R_SUCCEED();+}++Result IServiceGetterInterface::GetDocumentInterface(+ Out<SharedPointer<IDocumentInterface>> out_interface) {+ LOG_DEBUG(Service_NS, "called");+ *out_interface = std::make_shared<IDocumentInterface>(system);+ R_SUCCEED();+}++} // namespace Service::NSdiff --git a/src/core/hle/service/ns/service_getter_interface.h b/src/core/hle/service/ns/service_getter_interface.hnew file mode 100644index 0000000000..bbc18d4445--- /dev/null+++ b/src/core/hle/service/ns/service_getter_interface.h@@ -0,0 +1,47 @@+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#pragma once++#include "core/hle/service/cmif_types.h"+#include "core/hle/service/service.h"++namespace Service::NS {++class IDynamicRightsInterface;+class IReadOnlyApplicationControlDataInterface;+class IReadOnlyApplicationRecordInterface;+class IECommerceInterface;+class IApplicationVersionInterface;+class IFactoryResetInterface;+class IAccountProxyInterface;+class IApplicationManagerInterface;+class IDownloadTaskInterface;+class IContentManagementInterface;+class IDocumentInterface;++class IServiceGetterInterface : public ServiceFramework<IServiceGetterInterface> {+public:+ explicit IServiceGetterInterface(Core::System& system_, const char* name);+ ~IServiceGetterInterface() override;++public:+ Result GetDynamicRightsInterface(Out<SharedPointer<IDynamicRightsInterface>> out_interface);+ Result GetReadOnlyApplicationControlDataInterface(+ Out<SharedPointer<IReadOnlyApplicationControlDataInterface>> out_interface);+ Result GetReadOnlyApplicationRecordInterface(+ Out<SharedPointer<IReadOnlyApplicationRecordInterface>> out_interface);+ Result GetECommerceInterface(Out<SharedPointer<IECommerceInterface>> out_interface);+ Result GetApplicationVersionInterface(+ Out<SharedPointer<IApplicationVersionInterface>> out_interface);+ Result GetFactoryResetInterface(Out<SharedPointer<IFactoryResetInterface>> out_interface);+ Result GetAccountProxyInterface(Out<SharedPointer<IAccountProxyInterface>> out_interface);+ Result GetApplicationManagerInterface(+ Out<SharedPointer<IApplicationManagerInterface>> out_interface);+ Result GetDownloadTaskInterface(Out<SharedPointer<IDownloadTaskInterface>> out_interface);+ Result GetContentManagementInterface(+ Out<SharedPointer<IContentManagementInterface>> out_interface);+ Result GetDocumentInterface(Out<SharedPointer<IDocumentInterface>> out_interface);+};++} // namespace Service::NS