From a14438d013b96dac4ff6a31cb6fed1e51ef98f40 Mon Sep 17 00:00:00 2001 From: comex Date: Sat, 25 Jun 2022 18:00:29 -0700 Subject: [PATCH] Update src/core/hle/kernel/svc.cpp Co-authored-by: liamwhite --- src/core/hle/kernel/svc.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 0aa068f1d..fdfd69ebd 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -917,17 +917,25 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, Handle *result = system.Kernel().CurrentScheduler()->GetIdleThread()->GetCpuTime(); return ResultSuccess; } - case GetInfoType::MesosphereCurrentProcess: { + // Verify the input handle is invalid. R_UNLESS(handle == InvalidHandle, ResultInvalidHandle); + + // Verify the sub-type is valid. R_UNLESS(info_sub_id == 0, ResultInvalidCombination); - KProcess* const current_process = system.Kernel().CurrentProcess(); - Handle process_handle{}; - R_TRY(current_process->GetHandleTable().Add(&process_handle, current_process)); + // Get the handle table. + KProcess* current_process = system.Kernel().CurrentProcess(); + KHandleTable& handle_table = current_process->GetHandleTable(); - *result = process_handle; + // Get a new handle for the current process. + Handle tmp; + R_TRY(handle_table.Add(&tmp, current_process)); + + // Set the output. + *result = tmp; + + // We succeeded. return ResultSuccess; - } default: LOG_ERROR(Kernel_SVC, "Unimplemented svcGetInfo id=0x{:016X}", info_id); return ResultInvalidEnumValue;