citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #3085 from Subv/get_service_handle 

HLE/SRV: Don't return the port handle if it isn't available when calling GetServiceHandle.
This commit is contained in:
Sebastian Valle 2017-11-15 13:46:12 -05:00 committed by GitHub
parent f55f4fc684 afb6dd7747
commit 947067de81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/hle/service/sm/srv.cpp
View File

@ -87,7 +87,7 @@ void SRV::GetServiceHandle(Kernel::HLERequestContext& ctx) {
size_t name_len = rp.Pop<u32>(); size_t name_len = rp.Pop<u32>();
u32 flags = rp.Pop<u32>(); u32 flags = rp.Pop<u32>();
bool return_port_on_failure = (flags & 1) == 0; bool wait_until_available = (flags & 1) == 0;
if (name_len > Service::kMaxPortSize) { if (name_len > Service::kMaxPortSize) {
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
@ -115,12 +115,10 @@ void SRV::GetServiceHandle(Kernel::HLERequestContext& ctx) {
IPC::RequestBuilder rb = rp.MakeBuilder(1, 2); IPC::RequestBuilder rb = rp.MakeBuilder(1, 2);
rb.Push(session.Code()); rb.Push(session.Code());
rb.PushObjects(std::move(session).Unwrap()); rb.PushObjects(std::move(session).Unwrap());
} else if (session.Code() == Kernel::ERR_MAX_CONNECTIONS_REACHED && return_port_on_failure) { } else if (session.Code() == Kernel::ERR_MAX_CONNECTIONS_REACHED && wait_until_available) {
LOG_WARNING(Service_SRV, "called service=%s -> ERR_MAX_CONNECTIONS_REACHED, *port*=%u", LOG_WARNING(Service_SRV, "called service=%s -> ERR_MAX_CONNECTIONS_REACHED", name.c_str());
name.c_str(), (*client_port)->GetObjectId()); // TODO(Subv): Put the caller guest thread to sleep until this port becomes available again.
IPC::RequestBuilder rb = rp.MakeBuilder(1, 2); UNIMPLEMENTED_MSG("Unimplemented wait until port %s is available.", name.c_str());
rb.Push(ERR_MAX_CONNECTIONS_REACHED);
rb.PushObjects(std::move(client_port).Unwrap());
} else { } else {
LOG_ERROR(Service_SRV, "called service=%s -> error 0x%08X", name.c_str(), LOG_ERROR(Service_SRV, "called service=%s -> error 0x%08X", name.c_str(),
session.Code().raw); session.Code().raw);