From 92add93e445cc06fc1b4ea25f360c6390ec601e6 Mon Sep 17 00:00:00 2001 From: "U-DESKTOP-7SFAKTP\\Ron" Date: Sat, 20 Sep 2025 10:02:06 -0700 Subject: [PATCH] Changed the returned number of words on GetProgramInfoFromCia to 7 insteead of 8, futher reverted AppletUtility function to match its original form --- src/core/hle/service/am/am.cpp | 3 +-- src/core/hle/service/apt/apt.cpp | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index a0ac0bed3..9b0d5a709 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -3454,10 +3454,9 @@ void Module::Interface::GetProgramInfoFromCia(Kernel::HLERequestContext& ctx) { title_info.version = tmd.GetTitleVersion(); title_info.type = tmd.GetTitleType(); - IPC::RequestBuilder rb = rp.MakeBuilder(8, 0); + IPC::RequestBuilder rb = rp.MakeBuilder(7, 0); rb.Push(ResultSuccess); rb.PushRaw(title_info); - rb.Push(0x0); // make num words pushed match header so no assert occurrs } void Module::Interface::GetSystemMenuDataFromCia(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp index e6b79286d..002bd3728 100644 --- a/src/core/hle/service/apt/apt.cpp +++ b/src/core/hle/service/apt/apt.cpp @@ -698,14 +698,11 @@ void Module::APTInterface::AppletUtility(Kernel::HLERequestContext& ctx) { utility_command, input_size, output_size); std::vector out(output_size); - - if (utility_command == 0x6) { + if (utility_command == 0x6 && output_size > 0) { // Command 0x6 (TryLockTransition) expects a boolean return value indicating // whether the attempt succeeded. Since we don't implement any of the transition // locking stuff yet, fake a success result to avoid app crashes. - - if (output_size > 0) - out[0] = true; + out[0] = true; } IPC::RequestBuilder rb = rp.MakeBuilder(2, 2);