VERY experimental Nintendo Switch 2 emulator
C++
[kernel, service] Return ResultSessionClosed when a session is closed (#4318)
Maufeat28ab4a1a01e1
diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cppindex e3cfe6b6c2..35b4e78534 100644--- a/src/core/hle/kernel/k_server_session.cpp+++ b/src/core/hle/kernel/k_server_session.cpp@@ -1216,7 +1216,7 @@ Result KServerSession::ReceiveRequest(KernelCore& kernel, uintptr_t server_messa}Result KServerSession::SendReply(KernelCore& kernel, uintptr_t server_message, uintptr_t server_buffer_size,- KPhysicalAddress server_message_paddr, bool is_hle) {+ KPhysicalAddress server_message_paddr, bool is_hle, bool session_closed) {// Lock the session.KScopedLightLock lk{m_lock};@@ -1248,7 +1248,7 @@ Result KServerSession::SendReply(KernelCore& kernel, uintptr_t server_message, uKEvent* event = request->GetEvent();// Check whether we're closed.- const bool closed = (client_thread == nullptr || m_parent->IsClientClosed());+ const bool closed = (client_thread == nullptr || m_parent->IsClientClosed() || session_closed);Result result = ResultSuccess;if (!closed) {diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.hindex 217e7dc7be..90aaa6dd77 100644--- a/src/core/hle/kernel/k_server_session.h+++ b/src/core/hle/kernel/k_server_session.h@@ -54,14 +54,14 @@ public:Result OnRequest(KernelCore& kernel, KSessionRequest* request);Result SendReply(KernelCore& kernel, uintptr_t server_message, uintptr_t server_buffer_size,- KPhysicalAddress server_message_paddr, bool is_hle = false);+ KPhysicalAddress server_message_paddr, bool is_hle = false, bool session_closed = false);Result ReceiveRequest(KernelCore& kernel, uintptr_t server_message, uintptr_t server_buffer_size,KPhysicalAddress server_message_paddr,std::shared_ptr<Service::HLERequestContext>* out_context = nullptr,std::weak_ptr<Service::SessionRequestManager> manager = {});- Result SendReplyHLE(KernelCore& kernel) {- R_RETURN(this->SendReply(kernel, 0, 0, 0, true));+ Result SendReplyHLE(KernelCore& kernel, bool session_closed = false) {+ R_RETURN(this->SendReply(kernel, 0, 0, 0, true, session_closed));}Result ReceiveRequestHLE(KernelCore& kernel, std::shared_ptr<Service::HLERequestContext>* out_context,diff --git a/src/core/hle/service/server_manager.cpp b/src/core/hle/service/server_manager.cppindex ee0dc83ee8..4b3db04c76 100644--- a/src/core/hle/service/server_manager.cpp+++ b/src/core/hle/service/server_manager.cpp@@ -393,7 +393,7 @@ Result ServerManager::CompleteSyncRequest(Session* session) {}// Send the reply.- res = server_session->SendReplyHLE(m_system.Kernel());+ res = server_session->SendReplyHLE(m_system.Kernel(), service_res == IPC::ResultSessionClosed);// If the session has been closed, we're done.if (res == Kernel::ResultSessionClosed || service_res == IPC::ResultSessionClosed) {