summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-10-30 04:20:17 +0100
committerLioncash <mathew1800@gmail.com>2018-10-30 04:28:04 +0100
commit6383653a8df93d3daa1d5b8e1e694905684ccbda (patch)
treebba8b85a3aacf904bb5b1a18a87f69b586f0bca7
parenthle_ipc: Make GetDomainMessageHeader return a regular pointer (diff)
downloadyuzu-6383653a8df93d3daa1d5b8e1e694905684ccbda.tar
yuzu-6383653a8df93d3daa1d5b8e1e694905684ccbda.tar.gz
yuzu-6383653a8df93d3daa1d5b8e1e694905684ccbda.tar.bz2
yuzu-6383653a8df93d3daa1d5b8e1e694905684ccbda.tar.lz
yuzu-6383653a8df93d3daa1d5b8e1e694905684ccbda.tar.xz
yuzu-6383653a8df93d3daa1d5b8e1e694905684ccbda.tar.zst
yuzu-6383653a8df93d3daa1d5b8e1e694905684ccbda.zip
-rw-r--r--src/core/hle/ipc_helpers.h3
-rw-r--r--src/core/hle/kernel/hle_ipc.h4
-rw-r--r--src/core/hle/kernel/server_session.cpp2
3 files changed, 6 insertions, 3 deletions
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<u8> 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> 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) {