From 30cb98f874d0df9e818976f2140135ac8fe1501b Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 17 Jan 2018 01:16:55 -0500 Subject: ipc: Implement domain command CloseVirtualHandle. --- src/core/hle/kernel/hle_ipc.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/core/hle/kernel/hle_ipc.cpp') diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index afa09b404..2ccc242f6 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp @@ -102,13 +102,20 @@ void HLERequestContext::ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming) { data_payload_header = std::make_unique(rp.PopRaw()); + data_payload_offset = rp.GetCurrentOffset(); + + if (domain_message_header && domain_message_header->command == + IPC::DomainMessageHeader::CommandType::CloseVirtualHandle) { + // CloseVirtualHandle command does not have SFC* or any data + return; + } + if (incoming) { ASSERT(data_payload_header->magic == Common::MakeMagic('S', 'F', 'C', 'I')); } else { ASSERT(data_payload_header->magic == Common::MakeMagic('S', 'F', 'C', 'O')); } - data_payload_offset = rp.GetCurrentOffset(); command = rp.Pop(); rp.Skip(1, false); // The command is actually an u64, but we don't use the high part. } -- cgit v1.2.3 From b588cbcb1dd1c4256c6d0011a424af9d888ecb20 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 17 Jan 2018 11:37:26 -0500 Subject: hle_ipc: Clang format. --- src/core/hle/kernel/hle_ipc.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/core/hle/kernel/hle_ipc.cpp') diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 2ccc242f6..ac62a0d5a 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp @@ -104,8 +104,9 @@ void HLERequestContext::ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming) { data_payload_offset = rp.GetCurrentOffset(); - if (domain_message_header && domain_message_header->command == - IPC::DomainMessageHeader::CommandType::CloseVirtualHandle) { + if (domain_message_header && + domain_message_header->command == + IPC::DomainMessageHeader::CommandType::CloseVirtualHandle) { // CloseVirtualHandle command does not have SFC* or any data return; } -- cgit v1.2.3