From 6052aa17f262418c361f1fda65bc9fbf6e7d773c Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Sun, 12 Apr 2020 05:13:23 -0700 Subject: [PATCH] Print the result name in SetTerminateResult if possible (#1105) --- .../ApplicationProxy/IApplicationFunctions.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs b/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs index b5ecb2f5..5d92b433 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs @@ -84,22 +84,13 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati // SetTerminateResult(u32) public ResultCode SetTerminateResult(ServiceCtx context) { - int errorCode = context.RequestData.ReadInt32(); - string result = GetFormattedErrorCode(errorCode); + Result result = new Result(context.RequestData.ReadUInt32()); - Logger.PrintInfo(LogClass.ServiceAm, $"Result = 0x{errorCode:x8} ({result})."); + Logger.PrintInfo(LogClass.ServiceAm, $"Result = 0x{result.Value:x8} ({result.ToStringWithName()})."); return ResultCode.Success; } - private string GetFormattedErrorCode(int errorCode) - { - int module = (errorCode >> 0) & 0x1ff; - int description = (errorCode >> 9) & 0x1fff; - - return $"{(2000 + module):d4}-{description:d4}"; - } - [Command(23)] // GetDisplayVersion() -> nn::oe::DisplayVersion public ResultCode GetDisplayVersion(ServiceCtx context)