From 4fb1b24d68e140230da612d464a5edc226860946 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sun, 15 Oct 2017 01:24:22 -0400
Subject: hle: Implement ConvertSessionToDomain, various cleanups.

---
 src/core/hle/service/sm/controller.cpp | 30 ++++++++++++++++++++++++------
 src/core/hle/service/sm/controller.h   |  1 +
 src/core/hle/service/sm/sm.cpp         |  7 +++----
 3 files changed, 28 insertions(+), 10 deletions(-)

(limited to 'src/core/hle/service/sm')

diff --git a/src/core/hle/service/sm/controller.cpp b/src/core/hle/service/sm/controller.cpp
index 4b250d6ba..174ee8161 100644
--- a/src/core/hle/service/sm/controller.cpp
+++ b/src/core/hle/service/sm/controller.cpp
@@ -9,25 +9,43 @@
 namespace Service {
 namespace SM {
 
+/**
+ * Controller::ConvertSessionToDomain service function
+ *  Inputs:
+ *      0: 0x00000000
+ *  Outputs:
+ *      0: ResultCode
+ *      2: Handle of domain
+ */
+void Controller::ConvertSessionToDomain(Kernel::HLERequestContext& ctx) {
+    ctx.Session()->ConvertToDomain();
+    IPC::RequestBuilder rb{ctx, 3};
+    rb.Push(RESULT_SUCCESS);
+    rb.Skip(1, true);
+    Kernel::Handle handle = Kernel::g_handle_table.Create(ctx.Session()).Unwrap();
+    rb.Push(handle);
+    LOG_DEBUG(Service, "called, handle=0x%08x", handle);
+}
+
 /**
  * Controller::QueryPointerBufferSize service function
  *  Inputs:
  *      0: 0x00000003
  *  Outputs:
- *      1: ResultCode
- *      3: Size of memory
+ *      0: ResultCode
+ *      2: Size of memory
  */
 void Controller::QueryPointerBufferSize(Kernel::HLERequestContext& ctx) {
-    IPC::RequestBuilder rb{ctx, 2};
+    IPC::RequestBuilder rb{ctx, 3};
     rb.Push(RESULT_SUCCESS);
-    rb.Push(0x0U);
-    rb.Push(0x500U);
+    rb.Skip(1, true);
+    rb.Push<u32>(0x500);
     LOG_WARNING(Service, "(STUBBED) called");
 }
 
 Controller::Controller() : ServiceFramework("IpcController") {
     static const FunctionInfo functions[] = {
-        {0x00000000, nullptr, "ConvertSessionToDomain"},
+        {0x00000000, &Controller::ConvertSessionToDomain, "ConvertSessionToDomain"},
         {0x00000001, nullptr, "ConvertDomainToSession"},
         {0x00000002, nullptr, "DuplicateSession"},
         {0x00000003, &Controller::QueryPointerBufferSize, "QueryPointerBufferSize"},
diff --git a/src/core/hle/service/sm/controller.h b/src/core/hle/service/sm/controller.h
index c6aa6f502..bb5a815f8 100644
--- a/src/core/hle/service/sm/controller.h
+++ b/src/core/hle/service/sm/controller.h
@@ -15,6 +15,7 @@ public:
     ~Controller();
 
 private:
+    void ConvertSessionToDomain(Kernel::HLERequestContext& ctx);
     void QueryPointerBufferSize(Kernel::HLERequestContext& ctx);
 };
 
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp
index b027651d0..e77ec8df9 100644
--- a/src/core/hle/service/sm/sm.cpp
+++ b/src/core/hle/service/sm/sm.cpp
@@ -80,7 +80,7 @@ std::shared_ptr<ServiceManager> g_service_manager;
  *  Inputs:
  *      0: 0x00000000
  *  Outputs:
- *      1: ResultCode
+ *      0: ResultCode
  */
 void SM::Initialize(Kernel::HLERequestContext& ctx) {
     IPC::RequestBuilder rb{ctx, 1};
@@ -89,15 +89,14 @@ void SM::Initialize(Kernel::HLERequestContext& ctx) {
 }
 
 /**
- * SM::GetServiceHandle service function
+ * SM::GetService service function
  *  Inputs:
  *      0: 0x00000001
  *      1: Unknown
  *      2: Unknown
  *      3-4: 8-byte UTF-8 service name
  *  Outputs:
- *      1: ResultCode
- *      3: Service handle
+ *      0: ResultCode
  */
 void SM::GetService(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
-- 
cgit v1.2.3