early-access version 1659

src/core/hle/ipc_helpers.h

@@ -13,9 +13,12 @@
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "core/hle/ipc.h"
+#include "core/hle/kernel/client_port.h"
+#include "core/hle/kernel/client_session.h"
 #include "core/hle/kernel/hle_ipc.h"
-#include "core/hle/kernel/k_client_port.h"
-#include "core/hle/kernel/k_session.h"
+#include "core/hle/kernel/object.h"
+#include "core/hle/kernel/server_session.h"
+#include "core/hle/kernel/session.h"
 #include "core/hle/result.h"
 
 namespace IPC {
@@ -134,11 +137,9 @@ public:
         if (context->Session()->IsDomain()) {
             context->AddDomainObject(std::move(iface));
         } else {
-            auto* session = Kernel::KSession::Create(kernel);
-            session->Initialize(nullptr, iface->GetServiceName());
-
-            context->AddMoveObject(&session->GetClientSession());
-            iface->ClientConnected(&session->GetServerSession());
+            auto [client, server] = Kernel::Session::Create(kernel, iface->GetServiceName());
+            context->AddMoveObject(std::move(client));
+            iface->ClientConnected(std::move(server));
         }
     }
 
@@ -214,16 +215,10 @@ public:
     void PushRaw(const T& value);
 
     template <typename... O>
-    void PushMoveObjects(O*... pointers);
+    void PushMoveObjects(std::shared_ptr<O>... pointers);
 
     template <typename... O>
-    void PushMoveObjects(O&... pointers);
-
-    template <typename... O>
-    void PushCopyObjects(O*... pointers);
-
-    template <typename... O>
-    void PushCopyObjects(O&... pointers);
+    void PushCopyObjects(std::shared_ptr<O>... pointers);
 
 private:
     u32 normal_params_size{};
@@ -306,34 +301,18 @@ void ResponseBuilder::Push(const First& first_value, const Other&... other_value
 }
 
 template <typename... O>
-inline void ResponseBuilder::PushCopyObjects(O*... pointers) {
+inline void ResponseBuilder::PushCopyObjects(std::shared_ptr<O>... pointers) {
     auto objects = {pointers...};
     for (auto& object : objects) {
-        context->AddCopyObject(object);
+        context->AddCopyObject(std::move(object));
     }
 }
 
 template <typename... O>
-inline void ResponseBuilder::PushCopyObjects(O&... pointers) {
-    auto objects = {&pointers...};
-    for (auto& object : objects) {
-        context->AddCopyObject(object);
-    }
-}
-
-template <typename... O>
-inline void ResponseBuilder::PushMoveObjects(O*... pointers) {
+inline void ResponseBuilder::PushMoveObjects(std::shared_ptr<O>... pointers) {
     auto objects = {pointers...};
     for (auto& object : objects) {
-        context->AddMoveObject(object);
-    }
-}
-
-template <typename... O>
-inline void ResponseBuilder::PushMoveObjects(O&... pointers) {
-    auto objects = {&pointers...};
-    for (auto& object : objects) {
-        context->AddMoveObject(object);
+        context->AddMoveObject(std::move(object));
     }
 }
 
@@ -380,6 +359,12 @@ public:
     template <typename T>
     T PopRaw();
 
+    template <typename T>
+    std::shared_ptr<T> GetMoveObject(std::size_t index);
+
+    template <typename T>
+    std::shared_ptr<T> GetCopyObject(std::size_t index);
+
     template <class T>
     std::shared_ptr<T> PopIpcInterface() {
         ASSERT(context->Session()->IsDomain());
@@ -484,4 +469,14 @@ void RequestParser::Pop(First& first_value, Other&... other_values) {
     Pop(other_values...);
 }
 
+template <typename T>
+std::shared_ptr<T> RequestParser::GetMoveObject(std::size_t index) {
+    return context->GetMoveObject<T>(index);
+}
+
+template <typename T>
+std::shared_ptr<T> RequestParser::GetCopyObject(std::size_t index) {
+    return context->GetCopyObject<T>(index);
+}
+
 } // namespace IPC