1 files changed, 21 insertions, 108 deletions
diff --git a/src/core/hle/service/am/applet_oe.cpp b/src/core/hle/service/am/applet_oe.cpp
index d6c565d85..56bafd162 100644
--- a/src/core/hle/service/am/applet_oe.cpp
+++ b/src/core/hle/service/am/applet_oe.cpp
@@ -1,129 +1,42 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "common/logging/log.h"
 #include "core/hle/service/am/am.h"
+#include "core/hle/service/am/applet_manager.h"
 #include "core/hle/service/am/applet_oe.h"
+#include "core/hle/service/am/application_proxy.h"
 #include "core/hle/service/ipc_helpers.h"
-#include "core/hle/service/nvnflinger/nvnflinger.h"
 
 namespace Service::AM {
 
-class IApplicationProxy final : public ServiceFramework<IApplicationProxy> {
-public:
-    explicit IApplicationProxy(Nvnflinger::Nvnflinger& nvnflinger_,
-                               std::shared_ptr<AppletMessageQueue> msg_queue_,
-                               Core::System& system_)
-        : ServiceFramework{system_, "IApplicationProxy"},
-          nvnflinger{nvnflinger_}, msg_queue{std::move(msg_queue_)} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, &IApplicationProxy::GetCommonStateGetter, "GetCommonStateGetter"},
-            {1, &IApplicationProxy::GetSelfController, "GetSelfController"},
-            {2, &IApplicationProxy::GetWindowController, "GetWindowController"},
-            {3, &IApplicationProxy::GetAudioController, "GetAudioController"},
-            {4, &IApplicationProxy::GetDisplayController, "GetDisplayController"},
-            {10, nullptr, "GetProcessWindingController"},
-            {11, &IApplicationProxy::GetLibraryAppletCreator, "GetLibraryAppletCreator"},
-            {20, &IApplicationProxy::GetApplicationFunctions, "GetApplicationFunctions"},
-            {1000, &IApplicationProxy::GetDebugFunctions, "GetDebugFunctions"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-
-private:
-    void GetAudioController(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<IAudioController>(system);
-    }
-
-    void GetDisplayController(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<IDisplayController>(system);
-    }
-
-    void GetDebugFunctions(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<IDebugFunctions>(system);
-    }
-
-    void GetWindowController(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<IWindowController>(system);
-    }
-
-    void GetSelfController(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
-
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<ISelfController>(system, nvnflinger);
-    }
-
-    void GetCommonStateGetter(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
+AppletOE::AppletOE(Nvnflinger::Nvnflinger& nvnflinger_, Core::System& system_)
+    : ServiceFramework{system_, "appletOE"}, nvnflinger{nvnflinger_} {
+    static const FunctionInfo functions[] = {
+        {0, &AppletOE::OpenApplicationProxy, "OpenApplicationProxy"},
+    };
+    RegisterHandlers(functions);
+}
 
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<ICommonStateGetter>(system, msg_queue);
-    }
+AppletOE::~AppletOE() = default;
 
-    void GetLibraryAppletCreator(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
+void AppletOE::OpenApplicationProxy(HLERequestContext& ctx) {
+    LOG_DEBUG(Service_AM, "called");
 
+    if (const auto applet = GetAppletFromContext(ctx)) {
         IPC::ResponseBuilder rb{ctx, 2, 0, 1};
         rb.Push(ResultSuccess);
-        rb.PushIpcInterface<ILibraryAppletCreator>(system);
-    }
-
-    void GetApplicationFunctions(HLERequestContext& ctx) {
-        LOG_DEBUG(Service_AM, "called");
+        rb.PushIpcInterface<IApplicationProxy>(nvnflinger, applet, system);
+    } else {
+        UNIMPLEMENTED();
 
-        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-        rb.Push(ResultSuccess);
-        rb.PushIpcInterface<IApplicationFunctions>(system);
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultUnknown);
     }
-
-    Nvnflinger::Nvnflinger& nvnflinger;
-    std::shared_ptr<AppletMessageQueue> msg_queue;
-};
-
-void AppletOE::OpenApplicationProxy(HLERequestContext& ctx) {
-    LOG_DEBUG(Service_AM, "called");
-
-    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-    rb.Push(ResultSuccess);
-    rb.PushIpcInterface<IApplicationProxy>(nvnflinger, msg_queue, system);
-}
-
-AppletOE::AppletOE(Nvnflinger::Nvnflinger& nvnflinger_,
-                   std::shared_ptr<AppletMessageQueue> msg_queue_, Core::System& system_)
-    : ServiceFramework{system_, "appletOE"}, nvnflinger{nvnflinger_}, msg_queue{
-                                                                          std::move(msg_queue_)} {
-    static const FunctionInfo functions[] = {
-        {0, &AppletOE::OpenApplicationProxy, "OpenApplicationProxy"},
-    };
-    RegisterHandlers(functions);
 }
 
-AppletOE::~AppletOE() = default;
-
-const std::shared_ptr<AppletMessageQueue>& AppletOE::GetMessageQueue() const {
-    return msg_queue;
+std::shared_ptr<Applet> AppletOE::GetAppletFromContext(HLERequestContext& ctx) {
+    const auto aruid = ctx.GetPID();
+    return system.GetAppletManager().GetByAppletResourceUserId(aruid);
 }
 
 } // namespace Service::AM