Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[service] unstub process winding (#2590)

unknownd19a7c3782d8
diff --git a/src/core/hle/service/am/applet.h b/src/core/hle/service/am/applet.h
index 6cc8cdf741..ad84f39dc7 100644
--- a/src/core/hle/service/am/applet.h
+++ b/src/core/hle/service/am/applet.h
@@ -8,6 +8,7 @@
#include <deque>
#include <mutex>
+#include <stack>
#include "common/math_util.h"
#include "core/hle/service/apm/apm_controller.h"
@@ -23,6 +24,7 @@
#include "core/hle/service/am/hid_registration.h"
#include "core/hle/service/am/lifecycle_manager.h"
#include "core/hle/service/am/process_holder.h"
+#include "core/hle/service/am/service/storage.h"
namespace Service::AM {
@@ -97,6 +99,9 @@ struct Applet {
std::deque<std::vector<u8>> preselected_user_launch_parameter{};
std::deque<std::vector<u8>> friend_invitation_storage_channel{};
+ // Context Stack
+ std::stack<SharedPointer<IStorage>> context_stack{};
+
// Caller applet
std::weak_ptr<Applet> caller_applet{};
std::shared_ptr<AppletDataBroker> caller_applet_broker{};
diff --git a/src/core/hle/service/am/service/process_winding_controller.cpp b/src/core/hle/service/am/service/process_winding_controller.cpp
index 10df830d70..30529de550 100644
--- a/src/core/hle/service/am/service/process_winding_controller.cpp
+++ b/src/core/hle/service/am/service/process_winding_controller.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
@@ -15,12 +18,12 @@ IProcessWindingController::IProcessWindingController(Core::System& system_,
static const FunctionInfo functions[] = {
{0, D<&IProcessWindingController::GetLaunchReason>, "GetLaunchReason"},
{11, D<&IProcessWindingController::OpenCallingLibraryApplet>, "OpenCallingLibraryApplet"},
- {21, nullptr, "PushContext"},
- {22, nullptr, "PopContext"},
- {23, nullptr, "CancelWindingReservation"},
- {30, nullptr, "WindAndDoReserved"},
- {40, nullptr, "ReserveToStartAndWaitAndUnwindThis"},
- {41, nullptr, "ReserveToStartAndWait"},
+ {21, D<&IProcessWindingController::PushContext>, "PushContext"},
+ {22, D<&IProcessWindingController::PopContext>, "PopContext"},
+ {23, D<&IProcessWindingController::CancelWindingReservation>, "CancelWindingReservation"},
+ {30, D<&IProcessWindingController::WindAndDoReserved>, "WindAndDoReserved"},
+ {40, D<&IProcessWindingController::ReserveToStartAndWaitAndUnwindThis>, "ReserveToStartAndWaitAndUnwindThis"},
+ {41, D<&IProcessWindingController::ReserveToStartAndWait>, "ReserveToStartAndWait"},
};
// clang-format on
@@ -51,4 +54,43 @@ Result IProcessWindingController::OpenCallingLibraryApplet(
R_SUCCEED();
}
+Result IProcessWindingController::PushContext(SharedPointer<IStorage> context) {
+ LOG_INFO(Service_AM, "called");
+ m_applet->context_stack.push(context);
+ R_SUCCEED();
+}
+
+Result IProcessWindingController::PopContext(Out<SharedPointer<IStorage>> out_context) {
+ LOG_INFO(Service_AM, "called");
+
+ if (m_applet->context_stack.empty()) {
+ LOG_ERROR(Service_AM, "Context stack is empty");
+ R_THROW(ResultUnknown);
+ }
+
+ *out_context = m_applet->context_stack.top();
+ m_applet->context_stack.pop();
+ R_SUCCEED();
+}
+
+Result IProcessWindingController::CancelWindingReservation() {
+ LOG_WARNING(Service_AM, "STUBBED");
+ R_SUCCEED();
+}
+
+Result IProcessWindingController::WindAndDoReserved() {
+ LOG_WARNING(Service_AM, "STUBBED");
+ R_SUCCEED();
+}
+
+Result IProcessWindingController::ReserveToStartAndWaitAndUnwindThis() {
+ LOG_WARNING(Service_AM, "STUBBED");
+ R_SUCCEED();
+}
+
+Result IProcessWindingController::ReserveToStartAndWait() {
+ LOG_WARNING(Service_AM, "STUBBED");
+ R_SUCCEED();
+}
+
} // namespace Service::AM
diff --git a/src/core/hle/service/am/service/process_winding_controller.h b/src/core/hle/service/am/service/process_winding_controller.h
index 4408af1f1d..0d53223033 100644
--- a/src/core/hle/service/am/service/process_winding_controller.h
+++ b/src/core/hle/service/am/service/process_winding_controller.h
@@ -1,8 +1,12 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
+#include "core/hle/service/am/service/storage.h"
#include "core/hle/service/am/am_types.h"
#include "core/hle/service/cmif_types.h"
#include "core/hle/service/service.h"
@@ -21,6 +25,12 @@ private:
Result GetLaunchReason(Out<AppletProcessLaunchReason> out_launch_reason);
Result OpenCallingLibraryApplet(
Out<SharedPointer<ILibraryAppletAccessor>> out_calling_library_applet);
+ Result PushContext(SharedPointer<IStorage> in_context);
+ Result PopContext(Out<SharedPointer<IStorage>> out_context);
+ Result CancelWindingReservation();
+ Result WindAndDoReserved();
+ Result ReserveToStartAndWaitAndUnwindThis();
+ Result ReserveToStartAndWait();
const std::shared_ptr<Applet> m_applet;
};
diff --git a/src/core/hle/service/am/service/self_controller.cpp b/src/core/hle/service/am/service/self_controller.cpp
index 1db02b88fd..1b58cbea27 100644
--- a/src/core/hle/service/am/service/self_controller.cpp
+++ b/src/core/hle/service/am/service/self_controller.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
@@ -67,6 +70,7 @@ ISelfController::ISelfController(Core::System& system_, std::shared_ptr<Applet>
{110, nullptr, "SetApplicationAlbumUserData"},
{120, D<&ISelfController::SaveCurrentScreenshot>, "SaveCurrentScreenshot"},
{130, D<&ISelfController::SetRecordVolumeMuted>, "SetRecordVolumeMuted"},
+ {230, D<&ISelfController::Unknown230>, "Unknown230"},
{1000, nullptr, "GetDebugStorageChannel"},
};
// clang-format on
@@ -404,4 +408,12 @@ Result ISelfController::SetRecordVolumeMuted(bool muted) {
R_SUCCEED();
}
+Result ISelfController::Unknown230(u32 in_val, Out<u16> out_val) {
+ LOG_WARNING(Service_AM, "(STUBBED) called, in_val={}", in_val);
+
+ *out_val = 0;
+
+ R_SUCCEED();
+}
+
} // namespace Service::AM
diff --git a/src/core/hle/service/am/service/self_controller.h b/src/core/hle/service/am/service/self_controller.h
index eca083cfe5..86cd9f1118 100644
--- a/src/core/hle/service/am/service/self_controller.h
+++ b/src/core/hle/service/am/service/self_controller.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
@@ -63,6 +66,7 @@ private:
Result SetAlbumImageTakenNotificationEnabled(bool enabled);
Result SaveCurrentScreenshot(Capture::AlbumReportOption album_report_option);
Result SetRecordVolumeMuted(bool muted);
+ Result Unknown230(u32 in_val, Out<u16> out_val);
Kernel::KProcess* const m_process;
const std::shared_ptr<Applet> m_applet;