From 3215745bbdd8efc0b280d64fe7d5ae686e7d1ce5 Mon Sep 17 00:00:00 2001
From: crueter <crueter@eden-emu.dev>
Date: Mon, 29 Dec 2025 19:43:29 -0500
Subject: [PATCH] Revert "Fixes crashes in Diablo 3, in AC3, and allows you not
 to break the launch of guns of fury"

This reverts commit eed703bc81214a47a5fc7bd3abf22152cbd5c40b.
---
 .../am/service/library_applet_accessor.cpp    |  6 +++
 src/core/hle/service/set/settings_server.cpp  | 46 +++++++++++--------
 src/core/hle/service/set/settings_server.h    |  2 +-
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/core/hle/service/am/service/library_applet_accessor.cpp b/src/core/hle/service/am/service/library_applet_accessor.cpp
index c1d2943799..e2d561c183 100644
--- a/src/core/hle/service/am/service/library_applet_accessor.cpp
+++ b/src/core/hle/service/am/service/library_applet_accessor.cpp
@@ -65,6 +65,12 @@ Result ILibraryAppletAccessor::IsCompleted(Out<bool> out_is_completed) {
 Result ILibraryAppletAccessor::GetResult() {
     LOG_DEBUG(Service_AM, "called");
     std::scoped_lock lk{m_applet->lock};
+	if (auto caller_applet = m_applet->caller_applet.lock(); caller_applet) {
+        caller_applet->UpdateSuspensionStateLocked(true);
+    } else {
+		LOG_ERROR(Service_AM, "No caller applet available");
+        R_THROW(ResultUnknown);
+    }
     R_RETURN(m_applet->terminate_result);
 }
 
diff --git a/src/core/hle/service/set/settings_server.cpp b/src/core/hle/service/set/settings_server.cpp
index f6080926a7..0493054368 100644
--- a/src/core/hle/service/set/settings_server.cpp
+++ b/src/core/hle/service/set/settings_server.cpp
@@ -104,7 +104,7 @@ ISettingsServer::ISettingsServer(Core::System& system_) : ServiceFramework{syste
         {9, C<&ISettingsServer::GetKeyCodeMap2>, "GetKeyCodeMap2"},
         {10, nullptr, "GetFirmwareVersionForDebug"},
         {11, C<&ISettingsServer::GetDeviceNickName>, "GetDeviceNickName"},
-        {12, C<&ISettingsServer::GetKeyCodeMapByPort>, "GetKeyCodeMapByPort"},
+        {12, &ISettingsServer::GetKeyCodeMapByPort, "GetKeyCodeMapByPort"},
     };
     // clang-format on
 
@@ -243,27 +243,37 @@ Result ISettingsServer::GetDeviceNickName(
     R_SUCCEED();
 }
 
-Result ISettingsServer::GetKeyCodeMapByPort(OutLargeData<KeyCodeMap, BufferAttr_HipcMapAlias> out_key_code_map, u32 port) {
-    LOG_DEBUG(Service_SET, "called, port={}", port);
-
-    // Similar to other key code map functions, just pass through to the main implementation
-    R_UNLESS(out_key_code_map != nullptr, ResultNullPointer);
+void ISettingsServer::GetKeyCodeMapByPort(HLERequestContext& ctx) {
+    IPC::RequestParser rp(ctx);
+    const auto port_id = rp.Pop<u32>();
+    const auto buffer_size = rp.Pop<u64>();
+
+    static constexpr std::array<u8, 0x40> DEFAULT_MAPPING = {
+        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+        0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
+        0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
+        0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
+        0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
+        0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30,
+        0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
+        0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40
+    };
 
-    const auto language_code =
-        available_language_codes[static_cast<s32>(Settings::values.language_index.GetValue())];
-    const auto key_code =
-        std::find_if(language_to_layout.cbegin(), language_to_layout.cend(),
-                     [=](const auto& element) { return element.first == language_code; });
+    if (buffer_size < DEFAULT_MAPPING.size()) {
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(Result(static_cast<u32>(-0x3F81))); // Buffer too small
+        return;
+    }
 
-    if (key_code == language_to_layout.cend()) {
-        LOG_ERROR(Service_SET,
-                  "Could not find keyboard layout for language index {}, defaulting to English us",
-                  Settings::values.language_index.GetValue());
-        *out_key_code_map = KeyCodeMapEnglishUsInternational;
-        R_SUCCEED();
+    if (port_id > 7) {
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(Result(static_cast<u32>(-0x3F82))); // Invalid port
+        return;
     }
 
-    R_RETURN(GetKeyCodeMapImpl(*out_key_code_map, key_code->second, key_code->first));
+    ctx.WriteBuffer(DEFAULT_MAPPING);
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultSuccess);
 }
 
 } // namespace Service::Set
diff --git a/src/core/hle/service/set/settings_server.h b/src/core/hle/service/set/settings_server.h
index a9cee5f626..6571612ae5 100644
--- a/src/core/hle/service/set/settings_server.h
+++ b/src/core/hle/service/set/settings_server.h
@@ -47,7 +47,7 @@ private:
     Result GetDeviceNickName(
         OutLargeData<std::array<u8, 0x80>, BufferAttr_HipcMapAlias> out_device_name);
     
-    Result GetKeyCodeMapByPort(OutLargeData<KeyCodeMap, BufferAttr_HipcMapAlias> out_key_code_map, u32 port);
+    void GetKeyCodeMapByPort(HLERequestContext& ctx);
 };
 
 } // namespace Service::Set