Просмотр исходного кода

Print the result name in SetTerminateResult if possible (#1105)

Alex Barney 6 лет назад
Родитель
Сommit
6052aa17f2

+ 2 - 11
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)
         // SetTerminateResult(u32)
         public ResultCode SetTerminateResult(ServiceCtx context)
         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;
             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)]
         [Command(23)]
         // GetDisplayVersion() -> nn::oe::DisplayVersion
         // GetDisplayVersion() -> nn::oe::DisplayVersion
         public ResultCode GetDisplayVersion(ServiceCtx context)
         public ResultCode GetDisplayVersion(ServiceCtx context)