VERY experimental Nintendo Switch 2 emulator
C++
service: am: Stub to exit applet cleanly
german773ff84838ab51
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cppindex 7c705651a6..e9bd04842d 100644--- a/src/core/hle/service/am/am.cpp+++ b/src/core/hle/service/am/am.cpp@@ -191,7 +191,7 @@ IDisplayController::IDisplayController(Core::System& system_){5, nullptr, "GetLastForegroundCaptureImageEx"},{6, nullptr, "GetLastApplicationCaptureImageEx"},{7, nullptr, "GetCallerAppletCaptureImageEx"},- {8, nullptr, "TakeScreenShotOfOwnLayer"},+ {8, &IDisplayController::TakeScreenShotOfOwnLayer, "TakeScreenShotOfOwnLayer"},{9, nullptr, "CopyBetweenCaptureBuffers"},{10, nullptr, "AcquireLastApplicationCaptureBuffer"},{11, nullptr, "ReleaseLastApplicationCaptureBuffer"},@@ -219,6 +219,13 @@ IDisplayController::IDisplayController(Core::System& system_)IDisplayController::~IDisplayController() = default;+void IDisplayController::TakeScreenShotOfOwnLayer(HLERequestContext& ctx) {+ LOG_WARNING(Service_AM, "(STUBBED) called");++ IPC::ResponseBuilder rb{ctx, 2};+ rb.Push(ResultSuccess);+}+IDebugFunctions::IDebugFunctions(Core::System& system_): ServiceFramework{system_, "IDebugFunctions"} {// clang-format off@@ -1340,12 +1347,12 @@ ILibraryAppletSelfAccessor::ILibraryAppletSelfAccessor(Core::System& system_)// clang-format offstatic const FunctionInfo functions[] = {{0, &ILibraryAppletSelfAccessor::PopInData, "PopInData"},- {1, nullptr, "PushOutData"},+ {1, &ILibraryAppletSelfAccessor::PushOutData, "PushOutData"},{2, nullptr, "PopInteractiveInData"},{3, nullptr, "PushInteractiveOutData"},{5, nullptr, "GetPopInDataEvent"},{6, nullptr, "GetPopInteractiveInDataEvent"},- {10, nullptr, "ExitProcessAndReturn"},+ {10, &ILibraryAppletSelfAccessor::ExitProcessAndReturn, "ExitProcessAndReturn"},{11, &ILibraryAppletSelfAccessor::GetLibraryAppletInfo, "GetLibraryAppletInfo"},{12, nullptr, "GetMainAppletIdentityInfo"},{13, nullptr, "CanUseApplicationCore"},@@ -1399,6 +1406,22 @@ void ILibraryAppletSelfAccessor::PopInData(HLERequestContext& ctx) {rb.PushIpcInterface<IStorage>(system, std::move(data));}+void ILibraryAppletSelfAccessor::PushOutData(HLERequestContext& ctx) {+ LOG_WARNING(Service_AM, "(STUBBED) called");++ IPC::ResponseBuilder rb{ctx, 2};+ rb.Push(ResultSuccess);+}++void ILibraryAppletSelfAccessor::ExitProcessAndReturn(HLERequestContext& ctx) {+ LOG_WARNING(Service_AM, "(STUBBED) called");++ system.Exit();++ IPC::ResponseBuilder rb{ctx, 2};+ rb.Push(ResultSuccess);+}+void ILibraryAppletSelfAccessor::GetLibraryAppletInfo(HLERequestContext& ctx) {struct LibraryAppletInfo {Applets::AppletId applet_id;diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.hindex 3d5eae44eb..5b97eb5e35 100644--- a/src/core/hle/service/am/am.h+++ b/src/core/hle/service/am/am.h@@ -120,6 +120,9 @@ class IDisplayController final : public ServiceFramework<IDisplayController> {public:explicit IDisplayController(Core::System& system_);~IDisplayController() override;++private:+ void TakeScreenShotOfOwnLayer(HLERequestContext& ctx);};class IDebugFunctions final : public ServiceFramework<IDebugFunctions> {@@ -303,7 +306,9 @@ public:private:void PopInData(HLERequestContext& ctx);+ void PushOutData(HLERequestContext& ctx);void GetLibraryAppletInfo(HLERequestContext& ctx);+ void ExitProcessAndReturn(HLERequestContext& ctx);void GetCallerAppletIdentityInfo(HLERequestContext& ctx);void PushInShowMiiEditData();