Просмотр исходного кода

IPC: Take the number of domain objects as a parameter in MakeBuilder.

Subv 8 лет назад
Родитель
Сommit
ba2ffd7b81
2 измененных файлов с 6 добавлено и 4 удалено
  1. 4 2
      src/core/hle/ipc_helpers.h
  2. 2 2
      src/core/hle/service/sm/sm.cpp

+ 4 - 2
src/core/hle/ipc_helpers.h

@@ -205,12 +205,14 @@ public:
     }
 
     RequestBuilder MakeBuilder(u32 normal_params_size, u32 num_handles_to_copy,
-                               u32 num_handles_to_move, bool validate_header = true) {
+                               u32 num_handles_to_move, u32 num_domain_objects,
+                               bool validate_header = true) {
         if (validate_header) {
             ValidateHeader();
         }
 
-        return {*context, normal_params_size, num_handles_to_copy, num_handles_to_move};
+        return {*context, normal_params_size, num_handles_to_copy, num_handles_to_move,
+                num_domain_objects};
     }
 
     template <typename T>

+ 2 - 2
src/core/hle/service/sm/sm.cpp

@@ -99,7 +99,7 @@ void SM::GetService(Kernel::HLERequestContext& ctx) {
 
     auto client_port = service_manager->GetServicePort(name);
     if (client_port.Failed()) {
-        IPC::RequestBuilder rb = rp.MakeBuilder(2, 0, 0);
+        IPC::RequestBuilder rb = rp.MakeBuilder(2, 0, 0, 0);
         rb.Push(client_port.Code());
         LOG_ERROR(Service_SM, "called service=%s -> error 0x%08X", name.c_str(),
                   client_port.Code().raw);
@@ -111,7 +111,7 @@ void SM::GetService(Kernel::HLERequestContext& ctx) {
     if (session.Succeeded()) {
         LOG_DEBUG(Service_SM, "called service=%s -> session=%u", name.c_str(),
                   (*session)->GetObjectId());
-        IPC::RequestBuilder rb = rp.MakeBuilder(2, 0, 1);
+        IPC::RequestBuilder rb = rp.MakeBuilder(2, 0, 1, 0);
         rb.Push(session.Code());
         rb.PushMoveObjects(std::move(session).Unwrap());
     }