From 0cc347462d3a6992a6d66ccd69629a71cd500cb3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 29 Oct 2018 23:18:21 -0400 Subject: hle_ipc: Make GetDomainMessageHeader return a regular pointer Nothing requires the shared owner ship here, so we can just return a plain pointer. --- src/core/hle/kernel/hle_ipc.h | 4 ++-- src/core/hle/kernel/server_session.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index f01491daa..2e49826a8 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -161,8 +161,8 @@ public: return buffer_c_desciptors; } - const std::shared_ptr& GetDomainMessageHeader() const { - return domain_message_header; + const IPC::DomainMessageHeader* GetDomainMessageHeader() const { + return domain_message_header.get(); } /// Helper function to read a buffer using the appropriate buffer descriptor diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp index 5fc320403..afb3beed2 100644 --- a/src/core/hle/kernel/server_session.cpp +++ b/src/core/hle/kernel/server_session.cpp @@ -63,7 +63,7 @@ void ServerSession::Acquire(Thread* thread) { } ResultCode ServerSession::HandleDomainSyncRequest(Kernel::HLERequestContext& context) { - auto& domain_message_header = context.GetDomainMessageHeader(); + auto* const domain_message_header = context.GetDomainMessageHeader(); if (domain_message_header) { // Set domain handlers in HLE context, used for domain objects (IPC interfaces) as inputs context.SetDomainRequestHandlers(domain_request_handlers); -- cgit v1.2.3 From 6383653a8df93d3daa1d5b8e1e694905684ccbda Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 29 Oct 2018 23:20:17 -0400 Subject: hle_ipc: Add member function for querying the existence of a domain header Gets rid of the need to call the getter and then check for null. --- src/core/hle/ipc_helpers.h | 3 +-- src/core/hle/kernel/hle_ipc.h | 4 ++++ src/core/hle/kernel/server_session.cpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h index a4bfe2eb0..0a7142ada 100644 --- a/src/core/hle/ipc_helpers.h +++ b/src/core/hle/ipc_helpers.h @@ -117,8 +117,7 @@ public: AlignWithPadding(); - const bool request_has_domain_header{context.GetDomainMessageHeader() != nullptr}; - if (context.Session()->IsDomain() && request_has_domain_header) { + if (context.Session()->IsDomain() && context.HasDomainMessageHeader()) { IPC::DomainMessageHeader domain_header{}; domain_header.num_objects = num_domain_objects; PushRaw(domain_header); diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index 2e49826a8..a38e34b74 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -165,6 +165,10 @@ public: return domain_message_header.get(); } + bool HasDomainMessageHeader() const { + return domain_message_header != nullptr; + } + /// Helper function to read a buffer using the appropriate buffer descriptor std::vector ReadBuffer(int buffer_index = 0) const; diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp index afb3beed2..80897f3a4 100644 --- a/src/core/hle/kernel/server_session.cpp +++ b/src/core/hle/kernel/server_session.cpp @@ -111,7 +111,7 @@ ResultCode ServerSession::HandleSyncRequest(SharedPtr thread) { ResultCode result = RESULT_SUCCESS; // If the session has been converted to a domain, handle the domain request - if (IsDomain() && context.GetDomainMessageHeader()) { + if (IsDomain() && context.HasDomainMessageHeader()) { result = HandleDomainSyncRequest(context); // If there is no domain header, the regular session handler is used } else if (hle_handler != nullptr) { -- cgit v1.2.3