VERY experimental Nintendo Switch 2 emulator
C++
am: rewrite IApplicationCreator
Liam871b238b7a8b
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex db27e0f3ec..8fd99a5e9a 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -423,8 +423,6 @@ add_library(core STATIChle/service/am/applet_manager.hhle/service/am/applet_message_queue.cpphle/service/am/applet_message_queue.h- hle/service/am/application_creator.cpp- hle/service/am/application_creator.hhle/service/am/hid_registration.cpphle/service/am/hid_registration.hhle/service/am/idle.cpp@@ -443,6 +441,8 @@ add_library(core STATIChle/service/am/service/applet_common_functions.hhle/service/am/service/application_accessor.cpphle/service/am/service/application_accessor.h+ hle/service/am/service/application_creator.cpp+ hle/service/am/service/application_creator.hhle/service/am/service/application_functions.cpphle/service/am/service/application_functions.hhle/service/am/service/application_proxy_service.cppdiff --git a/src/core/hle/service/am/application_creator.cpp b/src/core/hle/service/am/service/application_creator.cppsimilarity index 50%rename from src/core/hle/service/am/application_creator.cpprename to src/core/hle/service/am/service/application_creator.cppindex 79ea045a35..568bb01223 100644--- a/src/core/hle/service/am/application_creator.cpp+++ b/src/core/hle/service/am/service/application_creator.cpp@@ -1,8 +1,12 @@// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#include "core/hle/service/am/application_creator.h"-#include "core/hle/service/ipc_helpers.h"+#include "core/hle/service/am/am_types.h"+#include "core/hle/service/am/applet.h"+#include "core/hle/service/am/applet_manager.h"+#include "core/hle/service/am/service/application_accessor.h"+#include "core/hle/service/am/service/application_creator.h"+#include "core/hle/service/cmif_serialization.h"namespace Service::AM {@@ -10,7 +14,7 @@ IApplicationCreator::IApplicationCreator(Core::System& system_): ServiceFramework{system_, "IApplicationCreator"} {// clang-format offstatic const FunctionInfo functions[] = {- {0, nullptr, "CreateApplication"},+ {0, D<&IApplicationCreator::CreateApplication>, "CreateApplication"},{1, nullptr, "PopLaunchRequestedApplication"},{10, nullptr, "CreateSystemApplication"},{100, nullptr, "PopFloatingApplicationForDevelopment"},@@ -22,4 +26,10 @@ IApplicationCreator::IApplicationCreator(Core::System& system_)IApplicationCreator::~IApplicationCreator() = default;+Result IApplicationCreator::CreateApplication(+ Out<SharedPointer<IApplicationAccessor>> out_application_accessor, u64 application_id) {+ LOG_ERROR(Service_NS, "called, application_id={:x}", application_id);+ R_THROW(ResultUnknown);+}+} // namespace Service::AMdiff --git a/src/core/hle/service/am/application_creator.h b/src/core/hle/service/am/service/application_creator.hsimilarity index 68%rename from src/core/hle/service/am/application_creator.hrename to src/core/hle/service/am/service/application_creator.hindex 375a3c4763..9f939ebf6d 100644--- a/src/core/hle/service/am/application_creator.h+++ b/src/core/hle/service/am/service/application_creator.h@@ -3,14 +3,21 @@#pragma once+#include "core/hle/service/cmif_types.h"#include "core/hle/service/service.h"namespace Service::AM {+class IApplicationAccessor;+struct Applet;+class IApplicationCreator final : public ServiceFramework<IApplicationCreator> {public:explicit IApplicationCreator(Core::System& system_);~IApplicationCreator() override;++private:+ Result CreateApplication(Out<SharedPointer<IApplicationAccessor>>, u64 application_id);};} // namespace Service::AMdiff --git a/src/core/hle/service/am/service/system_applet_proxy.cpp b/src/core/hle/service/am/service/system_applet_proxy.cppindex a3e8017995..5ec509d2e0 100644--- a/src/core/hle/service/am/service/system_applet_proxy.cpp+++ b/src/core/hle/service/am/service/system_applet_proxy.cpp@@ -1,8 +1,8 @@// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#include "core/hle/service/am/application_creator.h"#include "core/hle/service/am/service/applet_common_functions.h"+#include "core/hle/service/am/service/application_creator.h"#include "core/hle/service/am/service/audio_controller.h"#include "core/hle/service/am/service/common_state_getter.h"#include "core/hle/service/am/service/debug_functions.h"@@ -104,8 +104,9 @@ Result ISystemAppletProxy::GetLibraryAppletCreator(Result ISystemAppletProxy::GetApplicationCreator(Out<SharedPointer<IApplicationCreator>> out_application_creator) {- LOG_ERROR(Service_AM, "called");- R_THROW(ResultUnknown);+ LOG_DEBUG(Service_AM, "called");+ *out_application_creator = std::make_shared<IApplicationCreator>(system);+ R_SUCCEED();}Result ISystemAppletProxy::GetAppletCommonFunctions(