diff options
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index ce3466df8..f79b6b47e 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp | |||
| @@ -64,7 +64,7 @@ void HLERequestContext::ParseCommandBuffer(const KHandleTable& handle_table, u32 | |||
| 64 | if (command_header->enable_handle_descriptor) { | 64 | if (command_header->enable_handle_descriptor) { |
| 65 | handle_descriptor_header = rp.PopRaw<IPC::HandleDescriptorHeader>(); | 65 | handle_descriptor_header = rp.PopRaw<IPC::HandleDescriptorHeader>(); |
| 66 | if (handle_descriptor_header->send_current_pid) { | 66 | if (handle_descriptor_header->send_current_pid) { |
| 67 | rp.Skip(2, false); | 67 | pid = rp.Pop<u64>(); |
| 68 | } | 68 | } |
| 69 | if (incoming) { | 69 | if (incoming) { |
| 70 | // Populate the object lists with the data in the IPC request. | 70 | // Populate the object lists with the data in the IPC request. |
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index 4fba300dc..e1b128281 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h | |||
| @@ -150,6 +150,10 @@ public: | |||
| 150 | return command_header->type; | 150 | return command_header->type; |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | u64 GetPID() const { | ||
| 154 | return pid; | ||
| 155 | } | ||
| 156 | |||
| 153 | u32 GetDataPayloadOffset() const { | 157 | u32 GetDataPayloadOffset() const { |
| 154 | return data_payload_offset; | 158 | return data_payload_offset; |
| 155 | } | 159 | } |
| @@ -305,11 +309,12 @@ private: | |||
| 305 | std::vector<IPC::BufferDescriptorABW> buffer_w_desciptors; | 309 | std::vector<IPC::BufferDescriptorABW> buffer_w_desciptors; |
| 306 | std::vector<IPC::BufferDescriptorC> buffer_c_desciptors; | 310 | std::vector<IPC::BufferDescriptorC> buffer_c_desciptors; |
| 307 | 311 | ||
| 312 | u32_le command{}; | ||
| 313 | u64 pid{}; | ||
| 308 | u32 data_payload_offset{}; | 314 | u32 data_payload_offset{}; |
| 309 | u32 handles_offset{}; | 315 | u32 handles_offset{}; |
| 310 | u32 domain_offset{}; | 316 | u32 domain_offset{}; |
| 311 | u32 data_size{}; | 317 | u32 data_size{}; |
| 312 | u32_le command{}; | ||
| 313 | 318 | ||
| 314 | std::vector<std::shared_ptr<SessionRequestHandler>> domain_request_handlers; | 319 | std::vector<std::shared_ptr<SessionRequestHandler>> domain_request_handlers; |
| 315 | bool is_thread_waiting{}; | 320 | bool is_thread_waiting{}; |