[common] Fix RDTSC nanosecond conversion (#4422)

Split the RDTSC ticks-per-nanosecond ratio into integer and Q0.64 fractional components. This avoids overflowing GetFixedPoint64Factor for TSC frequencies above 1 GHz while preserving the multiply-only conversion path.

Use the invariant clock only above 1 GHz because the reverse nanoseconds-per-tick factor cannot represent an exact ratio of one.

- [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions).
- [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md)
- [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability.

-------------------

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4422
Reviewed-by: lizzie <lizzie@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>

.patch/boost/0001-clang-cl.patch

@@ -1,13 +0,0 @@
-diff --git a/libs/cobalt/include/boost/cobalt/concepts.hpp b/libs/cobalt/include/boost/cobalt/concepts.hpp
-index d49f2ec..a9bdb80 100644
---- a/libs/cobalt/include/boost/cobalt/concepts.hpp
-+++ b/libs/cobalt/include/boost/cobalt/concepts.hpp
-@@ -62,7 +62,7 @@ struct enable_awaitables
- template <typename T>
- concept with_get_executor = requires (T& t)
- {
--  {t.get_executor()} -> asio::execution::executor;
-+  t.get_executor();
- };
- 
- 

CMakeLists.txt

@@ -417,12 +417,9 @@ AddJsonPackage(boost)
 set(BOOST_NO_HEADERS ${Boost_ADDED})
 
 if (Boost_ADDED)
-    if (MSVC OR ANDROID)
+    add_compile_definitions(YUZU_BOOST_v1)
-        add_compile_definitions(YUZU_BOOST_v1)
-    endif()
-
     if (NOT MSVC OR CXX_CLANG)
-        # boost sucks
+        # solaris sucks
         if (SOLARIS)
             add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-pthreads>)
         endif()
@@ -431,8 +428,7 @@ if (Boost_ADDED)
         target_compile_options(boost_icl INTERFACE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow>)
         target_compile_options(boost_asio INTERFACE
             $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-fallthrough>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-fallthrough>)
-        )
     endif()
 endif()
 

cpmfile.json

@@ -6,22 +6,19 @@
         "version": "v0.19.0"
     },
     "boost": {
-        "artifact": "%VERSION%-cmake.tar.xz",
+        "artifact": "boost-%VERSION%.tar.zst",
         "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem",
-        "hash": "6ae6e94664fe7f2fb01976b59b276ac5df8085c7503fa829d810fbfe495960cfec44fa2c36e2cb23480bc19c956ed199d4952b02639a00a6c07625d4e7130c2d",
+        "hash": "681d97be4386767662e230b2e7c9754d45e709cc5db4e747c23c27d1f5b0e87770bdf19b0bc44dcb0e8349324887bbb8fffb432098f4d0ce74a5043021a90afc",
         "min_version": "1.57",
         "package": "Boost",
-        "patches": [
+        "repo": "eden-emulator/ext-boost",
-            "0001-clang-cl.patch"
+        "version": "1.92.0"
-        ],
-        "repo": "boostorg/boost",
-        "version": "boost-1.90.0"
     },
     "boost_headers": {
         "bundled": true,
-        "hash": "4ef845775e2277a8104ded6ddf749aa262ce52cf8438042869a048f9a0156dd772fbbcfa74efa1378fecef339b7286f6fe4b4feb5c45d49966b35d08e3e83507",
+        "hash": "c5fa2cd72f6e6666b7963b97bc359c75284b8fb540c30f3629a028b85270c9bc66c8a051383964f2bd4c1e005a4691593d15696e7ef39ea87cf6cff9e5691fb2",
         "repo": "boostorg/headers",
-        "version": "boost-1.90.0"
+        "version": "boost-1.91.0"
     },
     "catch2": {
         "hash": "7eea385d79d88a5690cde131fe7ccda97d5c54ea09d6f515000d7bf07c828809d61c1ac99912c1ee507cf933f61c1c47ecdcc45df7850ffa82714034b0fccf35",

src/android/app/src/main/res/values-ar/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">سيشغل هذا البرنامج ألعاب جهاز Nintendo Switch. لا يتضمن البرنامج أي ألعاب أو مفاتيح.<br /><br />قبل أن تبدأ، يرجى تحديد موقع ملف <![CDATA[<b> prod.keys </b>]]>  على وحدة تخزين جهازك.<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">اعرف المزيد</a>]]></string>
+    <string name="app_disclaimer">سيعمل هذا البرنامج على تشغيل ألعاب منصة ألعاب «نينتندو سويتش». لا يتضمن البرنامج أي ألعاب أو مفاتيح تفعيل.<br /><br /> قبل البدء، يرجى تحديد موقع ملف <![CDATA[<b> prod.keys</b> ]]> في مساحة التخزين بجهازك.<br /><br /><![CDATA[<a href=\"https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/user/QuickStart.md\">مزيد من المعلومات</a>]]></string>
     <string name="notice_notification_channel_name">الإشعارات والأخطاء</string>
     <string name="notice_notification_channel_description">عرض الإشعارات عند حدوث خطأ ما.</string>
     <string name="notification_permission_not_granted">لم يتم منح إذن الإشعار!</string>
@@ -291,6 +291,25 @@
     <string name="gpu_driver_fetcher">أداة جلب برامج تشغيل وحدة المعالجة الرسومية</string>
     <string name="gpu_driver_manager">إدارة برامج تشغيل وحدة معالجة الرسومات</string>
     <string name="install_gpu_driver_description">تثبيت برامج تشغيل بديلة لأداء أو دقة أفضل</string>
+    <string name="post_processing">تأثيرات ما بعد المعالجة</string>
+    <string name="post_processing_description">تأثيرات ReShade FX التي يتم تطبيقها بعد عملية العرض</string>
+    <string name="post_processing_per_game_description">ضبط تسلسل التأثيرات لهذه اللعبة</string>
+    <string name="post_processing_add">إضافة تأثير</string>
+    <string name="post_processing_remove">إزالة</string>
+    <string name="post_processing_open_list">فتح القائمة</string>
+    <string name="post_processing_close_list">إغلاق القائمة</string>
+    <string name="post_processing_remove_all">إزالة التأثيرات</string>
+    <string name="post_processing_preset_locked">الإعداد مسبقًا نشط. قم بتعديله في «تأثيرات ما بعد المعالجة» قبل بدء اللعبة.</string>
+    <string name="post_processing_preset_modified">تم تغيير القيم عن الإعداد الأصلي.</string>
+    <string name="post_processing_presets">الإعدادات المسبقة</string>
+    <string name="post_processing_preset_new">إعداد مسبق جديد</string>
+    <string name="post_processing_preset_new_description">يحفظ التأثيرات التي قمت بتحميلها، مع قيمها الحالية، كإعداد مسبق يمكنك اختياره لاحقًا.</string>
+    <string name="post_processing_preset_name_invalid">قم بتسمية الإعداد المسبق باسم لا يحتوي على علامة يساوي.</string>
+    <string name="post_processing_preset_none">لا يوجد إعداد مسبق</string>
+    <string name="post_processing_preset_delete">حذف الإعداد المسبق</string>
+    <string name="post_processing_preset_reset">إعادة تعيين القيم المحددة مسبقًا</string>
+    <string name="post_processing_reset">إعادة التعيين إلى الإعدادات الافتراضية</string>
+    <string name="post_processing_empty">لم يتم العثور على أي ملفات. ضع ملفات .fx في هذا المجلد:</string>
     <string name="frame_gen">توليد الإطار</string>
     <string name="frame_gen_per_game_description">ضبط إعدادات إنشاء الإطارات لهذه اللعبة</string>
     <string name="frame_gen_description">قم بإدراج الإطارات المُستكملة بين الإطارات المُعالجة باستخدام تقنية التحجيم بدون فقدان الجودة. يُفرض هذا الخيار عرض الإطارات وفقًا لترتيب FIFO عند تفعيله.</string>
@@ -305,6 +324,13 @@
     <string name="frame_gen_target_rate_60">60 إطارًا في الثانية</string>
     <string name="frame_gen_target_rate_90">90 إطارًا في الثانية</string>
     <string name="frame_gen_target_rate_120">120 إطارًا في الثانية</string>
+    <string name="frame_gen_on">تشغيل</string>
+    <string name="frame_gen_off">إيقاف</string>
+    <string name="frame_gen_fixed">مستقر</string>
+    <string name="frame_gen_flow_auto">تلقائي</string>
+    <string name="frame_gen_quick_description">قم بتشغيل أو إيقاف توليد الإطارات واختر مضاعف الإطارات.</string>
+    <string name="frame_gen_target_rate_quick_description">توليد إطارات بمعدل إطارات مستهدف. ويتم ضبط المضاعف تلقائيًا.</string>
+    <string name="frame_gen_flow_scale_quick_description">الدقة المستخدمة لتقدير الحركة بين الإطارات. تقلل القيم المنخفضة من الوقت الذي تستهلكه وحدة معالجة الرسومات.</string>
     <string name="frame_gen_queue_target">هدف قائمة انتظار الإطارات</string>
     <string name="frame_gen_queue_target_description">كم عدد الإطارات المكتملة التي قد تنتظر قبل عرضها؟ تعمل قوائم الانتظار الأكبر حجمًا على امتصاص الارتفاعات المفاجئة في حمل وحدة معالجة الرسومات على حساب زمن انتقال الإدخال.</string>
     <string name="frame_gen_queue_target_0">أقل زمن انتقال (بدون تخزين مؤقت)</string>
@@ -315,14 +341,14 @@
     <string name="frame_gen_flow_scale">دقة تقدير الحركة</string>
     <string name="frame_gen_flow_scale_description">دقة مسار التدفق البصري، كجزء من الناتج. ويُعد خفض هذه القيمة أرخص طريقة لاستعادة الأداء.</string>
     <string name="frame_gen_unsupported">توليد الإطار غير متاح</string>
-    <string name="frame_gen_unsupported_description">لا يدعم برنامج تشغيل وحدة معالجة الرسومات هذا نموذج ذاكرة Vulkan، الذي تتطلبه برامج التظليل الخاصة بـ«Lossless Scaling».</string>
+    <string name="frame_gen_unsupported_description">يفتقر برنامج تشغيل وحدة معالجة الرسومات هذا إلى نموذج ذاكرة Vulkan أو دعم الدقة النصفية (float16) التي تتطلبها برامج التظليل الخاصة بـ «Lossless Scaling».</string>
     <string name="lossless_scaling_setup_description">اختياري. قم بتوفير ملف Lossless.dll الخاص بك لتمكين إنشاء الإطارات لاحقًا</string>
     <string name="lossless_scaling_install">تثبيت ملف Lossless.dll</string>
     <string name="lossless_scaling_install_description">يتطلب إنشاء الإطارات أن تكون لديك نسخة قانونية خاصة بك من ملف Lossless.dll المأخوذ من برنامج Lossless Scaling</string>
     <string name="lossless_scaling_replace_description">اختر نسخة أخرى من ملف Lossless.dll</string>
     <string name="frame_generation_support">توليد الإطارات</string>
     <string name="frame_generation_supported">مدعوم</string>
-    <string name="frame_generation_unsupported">غير مدعوم (لا يتوفر نموذج ذاكرة Vulkan)</string>
+    <string name="frame_generation_unsupported">غير مدعوم (لا يتوفر نموذج ذاكرة Vulkan أو float16)</string>
     <string name="lossless_scaling">Lossless Scaling</string>
     <string name="lossless_scaling_description">قم بتوفير نسختك الخاصة من ملف Lossless.dll لتمكين توليد الإطارات</string>
     <string name="lossless_scaling_installed">مثبت</string>
@@ -912,7 +938,7 @@
     <string name="loader_error_file_not_found">ملف ROM غير موجود</string>
 
     <string name="loader_requires_firmware">اللعبة تتطلب الفيرموير</string>
-    <string name="loader_requires_firmware_description"><![CDATA[اللعبة التي تحاول تشغيلها تتطلب الفيرموير للتمهيد أو لتجاوز القائمة الافتتاحية. يرجى <a href=\"https://yuzu-mirror.github.io/help/quickstart\">نسخ وتثبيت الفيرموير</a>، أو اضغط \"موافق\" للمتابعة على أي حال.]]></string>
+    <string name="loader_requires_firmware_description"><![CDATA[قد تتطلب هذه اللعبة برنامجاً ثابتاً لتعمل بشكل صحيح، ولم يتم تثبيت أي منها لديك. يرجى تثبيت البرنامج الثابت قبل التشغيل، أو الضغط على \"موافق\" للتشغيل على أية حال.]]></string>
 
     <!-- Intent Launch strings -->
     <string name="searching_for_game">جارٍ البحث عن اللعبة...</string>

src/android/app/src/main/res/values-ckb/strings.xml

@@ -474,8 +474,6 @@
     <string name="loader_error_file_not_found">فایلی ڕۆم بوونی نییە</string>
 
     <string name="loader_requires_firmware">یارییەکە فریموێر پێویستە</string>
-    <string name="loader_requires_firmware_description"><![CDATA[یارییەکە کە تۆ هەوڵ دەدەیت بیخەیتە کار فریموێر پێویستە بۆ کردنەوە یان تێپەڕاندنی مێنیوی کردنەوە. تکایە <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> فریموێر دامپ بکە و دابنێ</a>, یان پەنجە بنێ سەر \"باشە\" بۆ بەردەوامبوون هەرچۆنێک بێت.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">گەڕان بە دوای یارییە...</string>
     <string name="game_not_found_for_title_id">یاری نەدۆزرایەوە بۆ ناسنامەی ناونیشان: %1$s</string>

src/android/app/src/main/res/values-cs/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">Tento software umožňuje spouštět hry pro herní konzoli Nintendo Switch. Neobsahuje žádné herní tituly ani klíče.<br /><br /> Nejdříve prosím vyhledejte soubor <![CDATA[<b> prod.keys </b>]]> v úložišti vašeho zařízení.<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Další informace</a>]]></string>
     <string name="notice_notification_channel_name">Upozornění a chyby</string>
     <string name="notice_notification_channel_description">Zobrazí oznámení v případě chyby.</string>
     <string name="notification_permission_not_granted">Oprávnění k zobrazení oznámení nebylo uděleno!</string>
@@ -605,8 +604,6 @@
     <string name="loader_error_file_not_found">ROM neexistuje</string>
 
     <string name="loader_requires_firmware">Hra vyžaduje firmware</string>
-    <string name="loader_requires_firmware_description"><![CDATA[Hra, kterou se pokoušíte spustit, vyžaduje firmware pro spuštění nebo pro překročení úvodní nabídky. Prosím <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> převezměte a nainstalujte firmware</a>, nebo stiskněte \"OK\" pro pokračování v každém případě.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Hledání hry...</string>
     <string name="game_not_found_for_title_id">Hra nebyla nalezena pro ID titulu: %1$s</string>

src/android/app/src/main/res/values-de/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">Diese Software führt Spiele für die Nintendo Switch-Konsole aus. Es sind keine Spiele oder Schlüssel enthalten. Suche, bevor du beginnst, deine <![CDATA[<b> prod.keys </b>]]>-Datei auf deinem Gerät.<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Mehr Erfahren</a>]]></string>
     <string name="notice_notification_channel_name">Hinweise und Fehler</string>
     <string name="notice_notification_channel_description">Zeigt Benachrichtigungen an, wenn etwas schief läuft.</string>
     <string name="notification_permission_not_granted">Berechtigung für Benachrichtigungen nicht zugelassen!</string>
@@ -307,12 +306,10 @@
     <string name="frame_gen_queue_target_1">Ausbalanciert (1 Bild)</string>
     <string name="frame_gen_queue_target_2">Flüssigste (2 Bilder)</string>
     <string name="frame_gen_unsupported">Frame-Generation nicht verfügbar</string>
-    <string name="frame_gen_unsupported_description">Dieser GPU-Treiber unterstützt das Vulkan-Memory-Model nicht, welches Lossless Scaling-Shader benötigen.</string>
     <string name="lossless_scaling_setup_description">Optional. Stelle deine eigene Lossless.dll zur Verfügung, um Frame-Generation später zu aktivieren.</string>
     <string name="lossless_scaling_install">Installiere Lossless.dll</string>
     <string name="lossless_scaling_replace_description">Wähle eine andere Kopie von Lossless.dll</string>
     <string name="frame_generation_supported">Unterstützt</string>
-    <string name="frame_generation_unsupported">Nicht unterstützt (kein Vulkan-Memory-Model)</string>
     <string name="lossless_scaling">Lossless Scaling</string>
     <string name="lossless_scaling_installed">Installiert</string>
     <string name="lossless_scaling_not_installed">Nicht installiert</string>
@@ -811,8 +808,6 @@ Wirklich fortfahren?</string>
     <string name="loader_error_file_not_found">ROM-Datei existiert nicht</string>
 
     <string name="loader_requires_firmware">Spiel erfordert Firmware</string>
-    <string name="loader_requires_firmware_description"><![CDATA[Das Spiel, das Sie starten möchten, benötigt Firmware zum Booten oder zum Überspringen des Startmenüs. Bitte <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> dumpen und installieren Sie Firmware</a>, oder drücken Sie \"OK\", um trotzdem zu starten.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Suche nach Spiel...</string>
     <string name="game_not_found_for_title_id">Spiel nicht gefunden für Titel-ID: %1$s</string>

src/android/app/src/main/res/values-es/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">Este software arrancará juegos para la consola Nintendo Switch. No se incluyen títulos ni claves de juego.<br /><br />Antes de continuar, por favor localiza tu archivo <![CDATA[prod.keys ]]> en el almacenamiento de tu dispositivo. <br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Aprender más</a>]]>&lt;b&gt;</string>
     <string name="notice_notification_channel_name">Avisos y errores</string>
     <string name="notice_notification_channel_description">Mostrar notificaciones cuando algo vaya mal.</string>
     <string name="notification_permission_not_granted">¡Permiso de notificación no concedido!</string>
@@ -290,6 +289,9 @@
     <string name="gpu_driver_fetcher">Obtenedor de controladores de la GPU</string>
     <string name="gpu_driver_manager">Gestor de controladores de la GPU</string>
     <string name="install_gpu_driver_description">Instale los controladores alternativos para obtener un posible mejor rendimiento o precisión</string>
+    <string name="post_processing_open_list">Abrir lista</string>
+    <string name="post_processing_close_list">Cerrar lista</string>
+    <string name="post_processing_reset">Restablecer a predeterminado</string>
     <string name="frame_gen">Generación de fotograma</string>
     <string name="frame_gen_per_game_description">Configurar la generación de fotogramas para este juego</string>
     <string name="frame_gen_multiplier">Multiplicador de fotograma</string>
@@ -309,7 +311,6 @@
     <string name="lossless_scaling_replace_description">Seleccionar una copia diferente de Lossless.dll</string>
     <string name="frame_generation_support">Generación de fotograma</string>
     <string name="frame_generation_supported">Soportado</string>
-    <string name="frame_generation_unsupported">No soportado (sin modelo de memoria de Vulkan)</string>
     <string name="lossless_scaling">Escalado sin pérdidas</string>
     <string name="lossless_scaling_installed">Instalado</string>
     <string name="lossless_scaling_not_installed">No instalado</string>
@@ -783,7 +784,7 @@
     <!-- Custom Paths settings -->
     <string name="custom_save_directory">Directorio de los datos de guardado</string>
     <string name="custom_save_directory_description">Establecer una ruta personalizada para el almacenamiento de los datos de guardado</string>
-    <string name="reset_to_nand">Restaurar valores predeterminados</string>
+    <string name="reset_to_nand">Restaurar los valores predeterminados</string>
     <string name="migrate_save_data">Migrar datos de guardado</string>
     <string name="migrate_save_data_question">¿Desea migrar los datos de guardado existentes a la nueva ubicación\?</string>
     <string name="save_migration_complete">Datos de guardado migrados con éxito</string>
@@ -877,8 +878,6 @@
     <string name="loader_error_file_not_found">Archivo ROM no existe</string>
 
     <string name="loader_requires_firmware">El juego requiere firmware</string>
-    <string name="loader_requires_firmware_description"><![CDATA[El juego que intenta iniciar requiere el firmware para arrancar o pasar el menú de inicio. Por favor <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> vuelque e instale el firmware</a>, o pulse \"Aceptar\" para continuar de todos modos.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Buscando juego...</string>
     <string name="game_not_found_for_title_id">Juego no encontrado para el ID de título: %1$s</string>

src/android/app/src/main/res/values-fr/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">Ce logiciel permet de jouer à des jeux de la console Nintendo Switch. Aucun titre ni clé de jeu n\'est inclus.<br /><br />Avant de commencer, veuillez localiser votre fichier <![CDATA[<b> prod.keys </b>]]> sur le stockage de votre appareil.<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">En savoir plus</a>]]></string>
     <string name="notice_notification_channel_name">Avis et erreurs</string>
     <string name="notice_notification_channel_description">Affiche des notifications en cas de problème.</string>
     <string name="notification_permission_not_granted">Permission de notification non accordée !</string>
@@ -785,8 +784,6 @@
     <string name="loader_error_file_not_found">Le fichier ROM n\'existe pas</string>
 
     <string name="loader_requires_firmware">Jeu nécessite un firmware</string>
-    <string name="loader_requires_firmware_description"><![CDATA[Ce jeu nécessite un firmware pour démarrer ou passer le menu d\'accueil. Veuillez <a href=\"https://yuzu-mirror.github.io/help/quickstart\">dumper et installer le firmware</a> ou appuyez sur \"OK\" pour continuer quand même.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Recherche du jeu...</string>
     <string name="game_not_found_for_title_id">Jeu non trouvé pour l\'ID de titre : %1$s</string>

src/android/app/src/main/res/values-he/strings.xml

@@ -510,8 +510,6 @@
     <string name="loader_error_file_not_found">קובץ המשחק לא קיים</string>
 
     <string name="loader_requires_firmware">המשחק דורש קושחה</string>
-    <string name="loader_requires_firmware_description"><![CDATA[המשחק שאתה מנסה להפעיל דורש קושחה לאתחול או למעבר מתפריט הפתיחה. אנא <a href=\"https://yuzu-mirror.github.io/help/quickstart\">שמור והתקן קושחה</a> או לחץ \"אישור\" כדי להמשיך בכל מקרה.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">מחפש משחק...</string>
     <string name="game_not_found_for_title_id">משחק לא נמצא למזהה כותרת: %1$s</string>

src/android/app/src/main/res/values-hu/strings.xml

@@ -598,8 +598,6 @@
     <string name="loader_error_file_not_found">ROM fájl nem létezik</string>
 
     <string name="loader_requires_firmware">A játék firmware-t igényel</string>
-    <string name="loader_requires_firmware_description"><![CDATA[A játék, amelyet el szeretne indítani, firmware-t igényel a bootoláshoz vagy a kezdőmenü átlépéséhez. Kérjük, <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> dumpolja és telepítse a firmware-t</a>, vagy nyomja meg az \"OK\" gombot a folytatáshoz.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Játék keresése...</string>
     <string name="game_not_found_for_title_id">A játék nem található a következő címazonosítóhoz: %1$s</string>

src/android/app/src/main/res/values-id/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">Perangkat lunak ini akan menjalankan permainan dari konsol Nintendo Switch. Permainan maupun keys tidak disediakan.<br /><br />Sebelum memulai, tolong temukan berkas <![CDATA[<b> prod.keys </b>]]> didalam tempat penyimpanan mu.<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Pelajari lebih lanjut</a>]]></string>
     <string name="notice_notification_channel_name">Pemberitahuan dan error</string>
     <string name="notice_notification_channel_description">Menampilkan pemberitahuan ketika terjadi kesalahan.</string>
     <string name="notification_permission_not_granted">Izin notifikasi tidak diberikan!</string>
@@ -638,8 +637,6 @@
     <string name="loader_error_file_not_found">Berkas Tidak Ditemukan</string>
 
     <string name="loader_requires_firmware">Game memerlukan firmware</string>
-    <string name="loader_requires_firmware_description"><![CDATA[Game yang ingin Anda jalankan memerlukan firmware untuk boot atau melewati menu pembuka. Silakan <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> dump dan instal firmware</a>, atau tekan \"OK\" untuk melanjutkan.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Mencari game...</string>
     <string name="game_not_found_for_title_id">Game tidak ditemukan untuk ID Judul: %1$s</string>

src/android/app/src/main/res/values-it/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">Questo software esegue giochi per la console Nintendo Switch. Non sono inclusi titoli di giochi o chiavi.<br /><br /> Prima di iniziare, individua il file <![CDATA[<b>prod.keys</b>]]> nella memoria del tuo dispositivo.<br /><br /> <![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Ulteriori informazioni</a>]]></string>
     <string name="notice_notification_channel_name">Avvisi ed errori</string>
     <string name="notice_notification_channel_description">Mostra le notifiche quando qualcosa va storto.</string>
     <string name="notification_permission_not_granted">Autorizzazione di notifica non concessa!</string>
@@ -662,8 +661,6 @@
     <string name="loader_error_file_not_found">Il file della ROM non esiste</string>
 
     <string name="loader_requires_firmware">Firmware richiesto</string>
-    <string name="loader_requires_firmware_description"><![CDATA[Il gioco che stai cercando di avviare richiede il firmware per poter partire o per superare il menù iniziale. <a href=\"https://yuzu-mirror.github.io/help/quickstart\">Esegui il dump del firmware e installalo</a>, o premi \"OK\" per continuare lo stesso.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Ricerca del gioco in corso...</string>
     <string name="game_not_found_for_title_id">Gioco non trovato per l\'ID titolo: %1$s</string>

src/android/app/src/main/res/values-ja/strings.xml

@@ -508,8 +508,6 @@
     <string name="loader_error_file_not_found">ROMファイルが存在しません</string>
 
     <string name="loader_requires_firmware">ゲームにはファームウェアが必要です</string>
-    <string name="loader_requires_firmware_description"><![CDATA[起動しようとしているゲームは、起動または開始メニューを通過するためにファームウェアが必要です。<a href=\"https://yuzu-mirror.github.io/help/quickstart\"> ファームウェアをダンプしてインストール</a>するか、\"OK\"を押して続行してください。]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">ゲームを検索中...</string>
     <string name="game_not_found_for_title_id">タイトルID: %1$s のゲームが見つかりません</string>

src/android/app/src/main/res/values-ko/strings.xml

@@ -558,8 +558,6 @@
     <string name="loader_error_file_not_found">롬 파일이 존재하지 않음</string>
 
     <string name="loader_requires_firmware">게임에 펌웨어가 필요합니다</string>
-    <string name="loader_requires_firmware_description"><![CDATA[실행하려는 게임은 부팅하거나 시작 메뉴를 통과하기 위해 펌웨어가 필요합니다. <a href=\"https://yuzu-mirror.github.io/help/quickstart\">펌웨어를 덤프하여 설치</a>하거나 \"확인\"을 눌러 계속 진행하세요.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">게임 검색 중...</string>
     <string name="game_not_found_for_title_id">타이틀 ID에 대한 게임을 찾을 수 없음: %1$s</string>

src/android/app/src/main/res/values-nb/strings.xml

@@ -487,8 +487,6 @@
     <string name="loader_error_file_not_found">ROM-filen finnes ikke</string>
 
     <string name="loader_requires_firmware">Spillet krever fastvare</string>
-    <string name="loader_requires_firmware_description"><![CDATA[Spillet du prøver å starte krever fastvare for oppstart eller for å komme forbi startmenyen. Vennligst <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> dump og installer fastvare</a>, eller trykk \"OK\" for å fortsette likevel.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Søker etter spill...</string>
     <string name="game_not_found_for_title_id">Spill ikke funnet for tittel-ID: %1$s</string>

src/android/app/src/main/res/values-pl/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">To oprogramowanie uruchamia gry na konsoli Nintendo Switch. Żadne tytuły gier ani klucze nie są dołączone.<br /><br />Zanim zaczniesz, zlokalizuj plik <![CDATA[<b> prod.keys </b>]]> na swoim urządzeniu.<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Więcej informacji</a>]]></string>
     <string name="notice_notification_channel_name">Powiadomienia błędy</string>
     <string name="notice_notification_channel_description">Pokaż powiadomienie gdy coś pójdzie źle</string>
     <string name="notification_permission_not_granted">Nie zezwolono na powiadomienia!</string>
@@ -758,8 +757,6 @@
     <string name="loader_error_file_not_found">Plik ROM nie istnieje</string>
 
     <string name="loader_requires_firmware">Gra wymaga oprogramowania sprzętowego</string>
-    <string name="loader_requires_firmware_description"><![CDATA[Gra, którą próbujesz uruchomić, wymaga oprogramowania sprzętowego do uruchomienia lub przejścia przez menu startowe. Proszę <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> zrzuć i zainstaluj oprogramowanie sprzętowe</a>, lub naciśnij \"OK\", aby kontynuować mimo to.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Wyszukiwanie gry...</string>
     <string name="game_not_found_for_title_id">Nie znaleziono gry dla ID tytułu: %1$s</string>

src/android/app/src/main/res/values-pt-rBR/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">Este programa serve para rodar jogos do Nintendo Switch. Nenhum jogo ou chaves do sistema são inclusos<br /><br />Antes de começar, localize o seu <![CDATA[<b> prod.keys </b>]]> salvo no seu sistema.<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Saiba mais</a>]]></string>
     <string name="notice_notification_channel_name">Notificações e erros</string>
     <string name="notice_notification_channel_description">Mostra notificações quando acontecer um erro.</string>
     <string name="notification_permission_not_granted">Acesso às notificações não foi permitido!</string>
@@ -717,8 +716,6 @@
     <string name="loader_error_file_not_found">O arquivo ROM não existe</string>
 
     <string name="loader_requires_firmware">O jogo requer firmware</string>
-    <string name="loader_requires_firmware_description"><![CDATA[O jogo que você está tentando iniciar requer firmware para inicializar ou passar do menu de abertura. Por favor <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> faça dump e instale o firmware</a>, ou pressione \"OK\" para continuar mesmo assim.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Procurando jogo...</string>
     <string name="game_not_found_for_title_id">Jogo não encontrado para o ID do Título: %1$s</string>

src/android/app/src/main/res/values-pt-rPT/strings.xml

@@ -609,8 +609,6 @@ uma tentativa de mapeamento automático</string>
     <string name="loader_error_file_not_found">O ficheiro da ROM não existe</string>
 
     <string name="loader_requires_firmware">O jogo requer firmware</string>
-    <string name="loader_requires_firmware_description"><![CDATA[O jogo que está a tentar iniciar requer firmware para arrancar ou passar o menu inicial. Por favor <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> faça dump e instale o firmware</a>, ou pressione \"OK\" para continuar mesmo assim.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">A procurar jogo...</string>
     <string name="game_not_found_for_title_id">Jogo não encontrado para o ID do Título: %1$s</string>

src/android/app/src/main/res/values-ru/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">Это программное обеспечение предназначено для запуска игр для игровой консоли Nintendo Switch. Игры и ключи в комплект не входят.<br /><br />Прежде чем начать, пожалуйста, найдите файл <![CDATA[<b>prod.keys</b>]]> на вашем устройстве.<br /><br /> <![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Узнать больше</a>]]></string>
+    <string name="app_disclaimer">Это программное обеспечение предназначено для запуска игр консоли Nintendo Switch. Никакие игры или ключи не входят в комплект.<br /><br />Перед началом работы найдите файл <![CDATA[<b> prod.keys </b>]]> во внутреннем хранилище вашего устройства. <br /><br /><![CDATA[<a href=\"https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/user/QuickStart.md\">Узнать больше</a>]]></string>
     <string name="notice_notification_channel_name">Уведомления и ошибки</string>
     <string name="notice_notification_channel_description">Показывает уведомления, когда что-то пошло не так</string>
     <string name="notification_permission_not_granted">Вы не предоставили разрешение на уведомления!</string>
@@ -291,6 +291,25 @@
     <string name="gpu_driver_fetcher">Получение драйверов ГПУ</string>
     <string name="gpu_driver_manager">Менеджер драйверов ГПУ</string>
     <string name="install_gpu_driver_description">Установите альтернативные драйверы для потенциально лучшей производительности и/или точности</string>
+    <string name="post_processing">Эффекты постобработки</string>
+    <string name="post_processing_description">Эффекты ReShade FX, применяемые после рендеринга</string>
+    <string name="post_processing_per_game_description">Настроить цепочку эффектов для этой игры</string>
+    <string name="post_processing_add">Добавить эффект</string>
+    <string name="post_processing_remove">Удалить</string>
+    <string name="post_processing_open_list">Открыть список</string>
+    <string name="post_processing_close_list">Закрыть список</string>
+    <string name="post_processing_remove_all">Удалить эффекты</string>
+    <string name="post_processing_preset_locked">Пресет активен. Отредактируйте его в разделе \"Эффекты постобработки\" перед запуском игры.</string>
+    <string name="post_processing_preset_modified">Значения изменены относительно исходного пресета.</string>
+    <string name="post_processing_presets">Пресеты</string>
+    <string name="post_processing_preset_new">Новый пресет</string>
+    <string name="post_processing_preset_new_description">Сохраняет загруженные вами эффекты вместе с их текущими значениями в виде пресета, который можно будет выбрать позже.</string>
+    <string name="post_processing_preset_name_invalid">Дайте пресету имя без знака равенства.</string>
+    <string name="post_processing_preset_none">Нет пресета</string>
+    <string name="post_processing_preset_delete">Удалить пресет</string>
+    <string name="post_processing_preset_reset">Сбросить значения пресета</string>
+    <string name="post_processing_reset">Сбросить до значений по умолчанию</string>
+    <string name="post_processing_empty">Эффекты не найдены. Поместите файлы .fx в эту папку:</string>
     <string name="frame_gen">Генерация кадров</string>
     <string name="frame_gen_per_game_description">Настройка генерации кадров для данной игры</string>
     <string name="frame_gen_description">Вставляет промежуточные кадры между отрендеренными с помощью Lossless Scaling. При включении принудительно устанавливает режим вывода FIFO.</string>
@@ -309,14 +328,12 @@
     <string name="frame_gen_flow_scale">Разрешение оценки движения</string>
     <string name="frame_gen_flow_scale_description">Разрешение прохода оптического потока в долях от выходного разрешения. Его понижение — самый дешёвый способ вернуть производительность.</string>
     <string name="frame_gen_unsupported">Генерация кадров недоступна</string>
-    <string name="frame_gen_unsupported_description">Драйвер ГПУ не поддерживает модель памяти Vulkan, требуемую шейдерами Lossless Scaling.</string>
     <string name="lossless_scaling_setup_description">Опционально. Укажите свой Lossless.dll для включения генерации кадров позже.</string>
     <string name="lossless_scaling_install">Установить Lossless.dll</string>
     <string name="lossless_scaling_install_description">Для генерации кадров требуется ваша собственная легальная копия Lossless.dll из Lossless Scaling</string>
     <string name="lossless_scaling_replace_description">Выбрать другой файл Lossless.dll</string>
     <string name="frame_generation_support">Генерация кадров</string>
     <string name="frame_generation_supported">Поддерживается</string>
-    <string name="frame_generation_unsupported">Не поддерживается (нет модели памяти Vulkan)</string>
     <string name="lossless_scaling_description">Предоставьте свою копию Lossless.dll для включения генерации кадров</string>
     <string name="lossless_scaling_installed">Установлена</string>
     <string name="lossless_scaling_not_installed">Не установлена</string>
@@ -613,6 +630,11 @@
     <string name="log">Логирование</string>
     <string name="flush_by_line">Сбрасывать логи отладки построчно</string>
     <string name="flush_by_line_description">Сбрасывает логи отладки после каждой написанной строки, упрощая отладку в случае сбоев или зависаний.</string>
+    <string name="extended_logging">Включить расширенное логирование</string>
+    <string name="extended_logging_description">Увеличивает максимальный размер файла журнала со 100 МБ до 1 ГБ.</string>
+    <string name="log_filter">Фильтр журнала</string>
+    <string name="log_filter_description">Управляет категориями журнала Eden. Пример: :Info Service.LM:Debug</string>
+
     <!-- GPU Logging strings -->
     <string name="gpu_logging_header">Ведение журнала ГПУ</string>
     <string name="gpu_log_level">Уровень журналирования</string>
@@ -896,7 +918,7 @@
     <string name="loader_error_file_not_found">Файл ROM не существует</string>
 
     <string name="loader_requires_firmware">Игре требуется прошивка</string>
-    <string name="loader_requires_firmware_description"><![CDATA[Для запуска этой игры или прохождения начального меню требуется прошивка. Пожалуйста, <a href=\"https://yuzu-mirror.github.io/help/quickstart\">сохраните и установите прошивку</a> или нажмите \"OK\" для запуска в любом случае.]]></string>
+    <string name="loader_requires_firmware_description"><![CDATA[Для корректной работы этой игры может потребоваться прошивка, а у вас она не установлена. Пожалуйста, установите прошивку перед запуском или нажмите \"OK\", чтобы всё равно запустить.]]></string>
 
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Поиск игры...</string>

src/android/app/src/main/res/values-sr/strings.xml

@@ -606,8 +606,6 @@
     <string name="loader_error_file_not_found">РОМ датотека не постоји</string>
 
     <string name="loader_requires_firmware">Игра захтева firmware</string>
-    <string name="loader_requires_firmware_description"><![CDATA[Игра коју покушавате да покренете захтева firmware за покретање или прелазак почетног менија. Молимо <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> направите дамп и инсталирајте firmware</a>, или притисните \"OK\" да бисте наставили у сваком случају.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Тражење игре...</string>
     <string name="game_not_found_for_title_id">Игра није пронађена за ID наслова: %1$s</string>

src/android/app/src/main/res/values-uk/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">Цей застосунок запускає ігри для ігрової консолі Nintendo Switch. Він не містить ігор чи ключів.<br /><br />Перш ніж почати, укажіть розташування файлу <![CDATA[<b> prod.keys </b>]]> у пам’яті вашого пристрою.<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Дізнатися більше</a>]]></string>
     <string name="notice_notification_channel_name">Сповіщення та помилки</string>
     <string name="notice_notification_channel_description">Показує сповіщення у разі виникнення проблем.</string>
     <string name="notification_permission_not_granted">Дозвіл на сповіщення не надано!</string>
@@ -830,8 +829,6 @@
     <string name="loader_error_file_not_found">ROM файлу не існує</string>
 
     <string name="loader_requires_firmware">Гра вимагає прошивки</string>
-    <string name="loader_requires_firmware_description"><![CDATA[Гра, яку ви намагаєтеся запустити, вимагає прошивки для завантаження або пропуску початкового меню. Будь ласка, <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> зробіть дамп і встановіть прошивку</a>, або натисніть \"OK\", щоб продовжити в будь-якому разі.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Пошук гри...</string>
     <string name="game_not_found_for_title_id">Гру не знайдено для ID заголовку: %1$s</string>

src/android/app/src/main/res/values-vi/strings.xml

@@ -483,8 +483,6 @@
     <string name="loader_error_file_not_found">Tệp ROM không tồn tại</string>
 
     <string name="loader_requires_firmware">Trò chơi yêu cầu firmware</string>
-    <string name="loader_requires_firmware_description"><![CDATA[Trò chơi bạn đang cố khởi chạy yêu cầu firmware để khởi động hoặc vượt qua menu mở đầu. Vui lòng <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> dump và cài đặt firmware</a>, hoặc nhấn \"OK\" để tiếp tục dù sao đi nữa.]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">Đang tìm kiếm trò chơi...</string>
     <string name="game_not_found_for_title_id">Không tìm thấy trò chơi cho ID Tiêu đề: %1$s</string>

src/android/app/src/main/res/values-zh-rCN/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">本软件可以运行Nintendo Switch游戏主机的游戏，但自身并不包含任何游戏或密钥。<br /><br />请于开始之前选定位于你的设备存储空间中的<![CDATA[<b>prod.keys</b>]]>。<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">了解更多</a>]]></string>
     <string name="notice_notification_channel_name">错误与注意事项</string>
     <string name="notice_notification_channel_description">当发生错误时显示通知。</string>
     <string name="notification_permission_not_granted">未授予通知权限！</string>
@@ -315,14 +314,12 @@
     <string name="frame_gen_flow_scale">运动预估分辨率</string>
     <string name="frame_gen_flow_scale_description">光流通道的分辨率,以输出的比例表示。降低它是提升性能最经济的做法。</string>
     <string name="frame_gen_unsupported">帧生成不可用</string>
-    <string name="frame_gen_unsupported_description">这个 GPU 驱动不支持无损缩放着色器所需的 Vulkan 内存模型。</string>
     <string name="lossless_scaling_setup_description">作为可选项。请提供您自己的 Lossless.dll 以便在之后可以启用帧生成。</string>
     <string name="lossless_scaling_install">安装 Lossless.dll</string>
     <string name="lossless_scaling_install_description">帧生成需要您自己从 Lossless Scaling 获得合法的 Lossless.dll 副本</string>
     <string name="lossless_scaling_replace_description">选择其它 Lossless.dll 副本</string>
     <string name="frame_generation_support">帧生成</string>
     <string name="frame_generation_supported">支持</string>
-    <string name="frame_generation_unsupported">不支持 (无 Vulkan 内存模型)</string>
     <string name="lossless_scaling">无损缩放</string>
     <string name="lossless_scaling_description">提供您自己的 Lossless.dll 文件以启用帧生成</string>
     <string name="lossless_scaling_installed">已安装</string>
@@ -897,8 +894,6 @@
     <string name="loader_error_file_not_found">ROM 文件不存在</string>
 
     <string name="loader_requires_firmware">游戏需要固件</string>
-    <string name="loader_requires_firmware_description"><![CDATA[您尝试启动的游戏需要固件才能引导或通过启动菜单。请<a href=\"https://yuzu-mirror.github.io/help/quickstart\">转储并安装固件</a>，或点击\"确定\"继续。]]></string>
-
     <!-- Intent Launch strings -->
     <string name="searching_for_game">正在搜索游戏...</string>
     <string name="game_not_found_for_title_id">未找到标题ID的游戏: %1$s</string>

src/android/app/src/main/res/values-zh-rTW/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
-    <string name="app_disclaimer">本軟體可執行Nintendo Switch主機的遊戲，軟體不提供遊戲和金鑰檔案。&lt;br/> &lt;br/>在開始之前，請先安裝您的 &lt;<![CDATA[ &lt;b>prod.keys&lt;/b> ]]> 檔案，&lt;br />&lt;br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">了解更多</a>]]></string>
+    <string name="app_disclaimer">本軟體可執行Nintendo Switch主機的遊戲，軟體不提供遊戲和金鑰檔案。<br /><br />在開始之前，請先安裝您的 <![CDATA[<b> prod.keys </b>]]> 檔案，<![CDATA[<a href=\"https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/user/QuickStart.md\">了解更多</a>]]></string>
     <string name="notice_notification_channel_name">通知和錯誤</string>
     <string name="notice_notification_channel_description">發生錯誤時顯示通知</string>
     <string name="notification_permission_not_granted">未授予通知權限！</string>
@@ -291,6 +291,25 @@
     <string name="gpu_driver_fetcher">GPU驅動程式下載器</string>
     <string name="gpu_driver_manager">GPU 驅動程式管理員</string>
     <string name="install_gpu_driver_description">安裝替代驅動程式以取得潛在的更佳效能或準確度</string>
+    <string name="post_processing">後製處理效果</string>
+    <string name="post_processing_description">在渲染完成後套用 ReShade FX 效果</string>
+    <string name="post_processing_per_game_description">為此遊戲設定特殊濾鏡或效果</string>
+    <string name="post_processing_add">新增效果</string>
+    <string name="post_processing_remove">移除</string>
+    <string name="post_processing_open_list">開啟清單</string>
+    <string name="post_processing_close_list">收起清單</string>
+    <string name="post_processing_remove_all">移除效果</string>
+    <string name="post_processing_preset_locked">濾鏡已啟用。請在開啟遊戲前於 後製處理效果 中調整</string>
+    <string name="post_processing_preset_modified">數值已變更，與原始濾鏡設定不同</string>
+    <string name="post_processing_presets">濾鏡</string>
+    <string name="post_processing_preset_new">新增濾鏡</string>
+    <string name="post_processing_preset_new_description">將目前載入的效果及數值儲存為設定檔方便日後使用</string>
+    <string name="post_processing_preset_name_invalid">請為此濾鏡設定檔命名，名稱中不得包含等號且不能與預先提供的設定檔名稱相同</string>
+    <string name="post_processing_preset_none">無濾鏡</string>
+    <string name="post_processing_preset_delete">刪除濾鏡</string>
+    <string name="post_processing_preset_reset">重設此濾鏡的所有設定值</string>
+    <string name="post_processing_reset">重設為預設值</string>
+    <string name="post_processing_empty">找不到設定檔。請將濾鏡效果的 .fx 檔案放置於此資料夾：</string>
     <string name="frame_gen">影格生成</string>
     <string name="frame_gen_per_game_description">調整此遊戲的影格生成設定</string>
     <string name="frame_gen_description">使用 Lossless Scaling 在已渲染的影格之間插入補間影格。啟用此功能時，會強制採用 FIFO 垂直同步</string>
@@ -315,10 +334,37 @@
     <string name="frame_gen_flow_scale">運動預測解析度</string>
     <string name="frame_gen_flow_scale_description">光流處理的解析度，以輸出解析度的比例表示。降低此設定值是減少效能負載最有效的方法</string>
     <string name="frame_gen_unsupported">無法使用影格生成</string>
-    <string name="frame_gen_unsupported_description">Lossless Scaling 的著色器需要 Vulkan 記憶體模型，所選的驅動程式不支援該功能</string>
     <string name="lossless_scaling_setup_description">可選擇安裝自己擁有的 Lossless.dll 以在之後啟用影格生成功能</string>
+    <string name="lossless_scaling_install">安裝 Lossless.dll</string>
+    <string name="lossless_scaling_install_description">您需要擁有從合法管道獲得的 Lossless Scaling 並從該軟體的資料夾中取得 Lossless.dll 檔案才能使用影格生成功能</string>
+    <string name="lossless_scaling_replace_description">安裝不同的 Lossless.dll 檔案</string>
+    <string name="frame_generation_support">影格生成</string>
+    <string name="frame_generation_supported">支援</string>
+    <string name="lossless_scaling">Lossless Scaling</string>
+    <string name="lossless_scaling_description">安裝您擁有的 Lossless.dll 檔案以使用影格生成</string>
+    <string name="lossless_scaling_installed">已安裝</string>
+    <string name="lossless_scaling_not_installed">未安裝</string>
+    <string name="lossless_scaling_replace">替換</string>
+    <string name="lossless_scaling_remove">刪除</string>
+    <string name="lossless_scaling_remove_description">刪除已安裝的 Lossless.dll 及預先編譯的著色器</string>
+    <string name="lossless_scaling_remove_confirmation">影格生成功能會停止運作直到您重新安裝 Lossless.dll 。您的 Lossless.dll 原始檔並不會被 Eden 修改</string>
+    <string name="lossless_scaling_missing">Lossless.dll 未安裝</string>
+    <string name="lossless_scaling_missing_description">前往 設定 -&gt; Lossless Scaling 安裝以使用影格生成功能</string>
+    <string name="lossless_scaling_locked">請先關閉遊戲</string>
+    <string name="lossless_scaling_locked_description">Lossless.dll 無法在遊戲執行時進行更換</string>
+    <string name="lossless_scaling_remove_unavailable">沒有東西可以刪除</string>
+    <string name="lossless_scaling_remove_unavailable_description">尚未安裝 Lossless.dll</string>
+    <string name="lossless_scaling_installing">準備影格生成著色器中...</string>
+    <string name="lossless_scaling_install_success">成功安裝 Lossless.dll</string>
+    <string name="lossless_scaling_install_failed">無法安裝 Lossless.dll</string>
+    <string name="error_lossless_copy_failed">無法複製選取的檔案</string>
+    <string name="error_lossless_unreadable">無法讀取選取的檔案</string>
+    <string name="error_lossless_not_pe">選取的檔案並不是 Windows 程式庫。請在 Lossless Scaling 的安裝位置（資料夾）中選擇 Lossless.dll</string>
+    <string name="error_lossless_missing_shaders">這個 Lossless.dll 的副本並未包含影格生成著色器。請更新 Lossless Scaling 後再試一次</string>
+    <string name="error_lossless_translation_failed">無法轉譯影格生成著色器。尚不支援此 Lossless Scaling 版本</string>
+    <string name="error_lossless_cache_failed">轉譯的著色器無法寫入到儲存空間。請確認手機容量是否充足</string>
     <string name="advanced_settings">進階設定</string>
-    <string name="settings_description">進行模擬器設定</string>
+    <string name="settings_description">調整模擬器設定</string>
     <string name="search_recently_played">最近遊玩</string>
     <string name="search_recently_added">最近新增</string>
     <string name="open_user_folder">開啟 Eden 資料夾</string>
@@ -512,7 +558,7 @@
     <string name="renderer_async_presentation">非同步呈現</string>
     <string name="renderer_async_presentation_description">此修改可以透過將渲染移至單獨的 CPU 執行緒來提升性能，但可能會導致圖形問題</string>
     <string name="renderer_reactive_flushing">使用重新啟用排清</string>
-    <string name="renderer_reactive_flushing_description">犧牲效能，以改善部分遊戲的轉譯準確度。</string>
+    <string name="renderer_reactive_flushing_description">犧牲效能，以改善部分遊戲的轉譯準確度</string>
     <string name="enable_buffer_history">啟用緩衝區歷史</string>
     <string name="enable_buffer_history_description">允許存取先前的緩衝區狀態。此選項可能會改善部分遊戲的渲染品質與效能穩定性</string>
     <string name="enable_gpu_buffer_readback">啟用 GPU 緩衝區讀回</string>
@@ -525,7 +571,7 @@
     <string name="fast_gpu_time">GPU 時脈</string>
     <string name="fast_gpu_time_description">讓遊戲誤以為 GPU 工作能更快完成，避免遊戲為了配合 Switch 的時脈而降低解析度與渲染距離</string>
     <string name="skip_cpu_inner_invalidation">跳過CPU內部失效處理</string>
-    <string name="skip_cpu_inner_invalidation_description">在記憶體更新期間跳過某些CPU端快取的失效處理，減少CPU使用率並提高其性能。可能會導致某些遊戲出現故障或當機。</string>
+    <string name="skip_cpu_inner_invalidation_description">在記憶體更新期間跳過某些CPU端快取的失效處理，減少CPU使用率並提高其性能。可能會導致某些遊戲出現故障或當機</string>
     <string name="fix_bloom_effects">修正光暈特效</string>
     <string name="fix_bloom_effects_description">在 薩爾達傳說：織夢島 和 薩爾達傳說：智慧的再現 中 減少光暈模糊的問題並移除 橫衝直撞：狂飆樂園重製版 中的光暈效果 (Adreno A6XX - A7XX/ Turnip)。警告：可能會在其它遊戲中導致圖形異常</string>
     <string name="emulate_bgr565">模擬 BGR565</string>
@@ -585,6 +631,11 @@
     <string name="log">日誌</string>
     <string name="flush_by_line">按行寫入偵錯日誌</string>
     <string name="flush_by_line_description">在每行寫入時重新整理偵錯日誌，讓程式在當機或閃退時更容易偵錯。</string>
+    <string name="extended_logging">啟用更詳細的日誌記錄</string>
+    <string name="extended_logging_description">將日誌檔的最大檔案限制從 100MB 提高到 1GB</string>
+    <string name="log_filter">日誌過濾器</string>
+    <string name="log_filter_description">控制 Eden 日誌的紀錄類別。例如： *:Info Service.LM:Debug</string>
+
     <!-- GPU Logging strings -->
     <string name="gpu_logging_header">GPU 日誌</string>
     <string name="gpu_log_level">記錄層級</string>
@@ -709,7 +760,7 @@
     <string name="import_failed">導入失敗</string>
     <string name="cancelling">正在取消</string>
     <string name="install">安裝</string>
-    <string name="fetch">獲取</string>
+    <string name="fetch">下載</string>
     <string name="delete">刪除</string>
     <string name="edit">編輯</string>
     <string name="import_success">已成功導入</string>
@@ -734,12 +785,12 @@
 
     <!-- GPU driver fetcher -->
     <string name="show_releases">顯示版本</string>
-    <string name="failed_to_fetch">獲取失敗</string>
+    <string name="failed_to_fetch">下載失敗</string>
-    <string name="error_during_fetch">獲取過程中發生錯誤</string>
+    <string name="error_during_fetch">下載過程中發生錯誤</string>
     <string name="show_downloads">顯示下載</string>
     <string name="hide_downloads">隱藏下載</string>
     <string name="failed_cache_dir">快取目錄不可用</string>
-    <string name="empty_response_body">回應內容為空</string>
+    <string name="empty_response_body">未回傳任何資料</string>
     <string name="successfully_installed">%1$s 安裝成功</string>
     <string name="driver_failed_title">驅動程式安裝失敗</string>
     <string name="failed_install_driver">無法安裝 %1$s 驅動程式，您的系統支援此驅動程式嗎？</string>
@@ -780,13 +831,21 @@
     <string name="save_migration_complete">成功遷移儲存資料</string>
     <string name="save_migration_failed">儲存資料遷移失敗</string>
     <string name="save_directory_set">存檔目錄設定完成</string>
+    <string name="destination_has_saves">所選取的位置已有儲存資料。是否要取代該檔案？</string>
+    <string name="all_files_permission_required">若要自訂路徑必須授予所有檔案的存取權</string>
+    <string name="grant_permission">授予權限</string>
+    <string name="custom_nand_directory">NAND 路徑</string>
+    <string name="custom_nand_directory_description">設定 NAND 資料的自訂路徑</string>
+    <string name="custom_sdmc_directory">虛擬 SD卡 路徑</string>
+    <string name="custom_sdmc_directory_description">設定虛擬 SD卡 儲存空間的自訂路徑</string>
+    <string name="path_set">路徑設定成功</string>
     <string name="skip_migration">跳過</string>
 
     <!-- Game properties -->
-    <string name="info">資訊</string>
+    <string name="info">軟體資訊</string>
     <string name="info_description">程式 ID、開發人員及版本資訊</string>
     <string name="per_game_settings">個別遊戲設定</string>
-    <string name="per_game_settings_description">編輯此遊戲的特定設定</string>
+    <string name="per_game_settings_description">調整此遊戲的專用設定</string>
     <string name="launch_options">啟動設定</string>
     <string name="path">路徑</string>
     <string name="program_id">程式 ID</string>
@@ -821,17 +880,17 @@
     <string name="save_data_description">管理此遊戲的儲存資料</string>
     <string name="delete_save_data">刪除儲存資料</string>
     <string name="delete_save_data_description">刪除此遊戲的所有儲存資料</string>
-    <string name="delete_save_data_warning_description">這將會刪除此遊戲的所有儲存資料，且無法復原，您確定要繼續嗎？</string>
+    <string name="delete_save_data_warning_description">這將會刪除此遊戲的所有儲存資料且無法復原，您確定要繼續嗎？</string>
     <string name="save_data_deleted_successfully">儲存資料已成功刪除</string>
     <string name="select_content_type">內容類型</string>
     <string name="updates_and_dlc">更新及 DLC</string>
-    <string name="mods_and_cheats">模組及密技</string>
+    <string name="mods_and_cheats">模組及金手指</string>
     <string name="addon_notice">重要的˙附加元件通知</string>
     <!-- \"cheats/" "romfs/" and \"exefs/ should not be translated -->
-    <string name="addon_notice_description">若要安裝模組及密技，您必須選擇一個包含 cheats/、romfs/ 或 exefs/ 的目錄。我們無法驗證這些內容是否與您的遊戲相容，所以請謹慎安裝！</string>
+    <string name="addon_notice_description">若要安裝模組及金手指，您必須選擇一個包含 cheats/、romfs/ 或 exefs/ 的目錄。我們無法驗證這些內容是否與您的遊戲相容，所以請謹慎安裝！</string>
     <string name="invalid_directory">無效的目錄</string>
     <!-- \"cheats/" "romfs/" and \"exefs/ should not be translated -->
-    <string name="invalid_directory_description">請確保您選取的目錄包含 cheats/、romfs/ 或 exefs/ 資料夾，然後再試一次。</string>
+    <string name="invalid_directory_description">請確保您選取的目錄包含 cheats/、romfs/ 或 exefs/ 資料夾，然後再試一次</string>
     <string name="addon_installed_successfully">附加元件已成功安裝</string>
     <string name="verifying_content">正在驗證內容…</string>
     <string name="content_install_notice">內容安裝通知</string>
@@ -839,11 +898,12 @@
     <string name="confirm_uninstall">確認刪除</string>
     <string name="confirm_uninstall_description">您確定要刪除此附加元件嗎？</string>
     <string name="verify_integrity">完整性驗證</string>
+    <string name="verifying">驗證中...</string>
     <string name="verify_success">完整性驗證成功！</string>
     <string name="verify_failure">完整性驗證失敗！</string>
     <string name="verify_failure_description">文件可能已經損壞</string>
-    <string name="verify_no_result">無法執行完整性驗證</string>
+    <string name="verify_no_result">無法正常執行完整性驗證</string>
-    <string name="verify_no_result_description">未檢查文件的完整性</string>
+    <string name="verify_no_result_description">未完成文件完整性檢查</string>
     <string name="verification_failed_for">以下文件的完整性驗證失敗：\n %1$s</string>
     <string name="share_game_settings">分享設定</string>
     <string name="import_config">導入設定</string>
@@ -853,13 +913,13 @@
     <!-- ROM loading errors -->
     <string name="loader_error_encrypted">您的 ROM 已加密</string>
     <string name="loader_error_encrypted_roms_description"><![CDATA[請按照指南重新轉儲您的<a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-physical-titles-game-cards\">遊戲卡</a>或<a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-digital-titles-eshop\">數位版遊戲</a>。]]></string>
-    <string name="loader_error_encrypted_keys_description"><![CDATA[請確保您的 <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> 檔案已安裝，讓遊戲可以解密。]]></string>
+    <string name="loader_error_encrypted_keys_description"><![CDATA[請確保您的 <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> 檔案已安裝，讓遊戲可以正常解密]]></string>
     <string name="loader_error_video_core">初始化視訊核心時發生錯誤</string>
     <string name="loader_error_video_core_description">這經常是因為不相容的 GPU 驅動程式造成，安裝自訂 GPU 驅動程式可能會解決此問題。</string>
     <string name="loader_error_file_not_found">ROM 檔案不存在</string>
 
     <string name="loader_requires_firmware">遊戲需要韌體</string>
-    <string name="loader_requires_firmware_description"><![CDATA[您嘗試啟動的遊戲需要韌體才能啟動或通過遊戲主選單。請<a href=\"https://yuzu-mirror.github.io/help/quickstart\">轉儲並安裝韌體</a>，或點擊\"確定\"繼續。]]></string>
+    <string name="loader_requires_firmware_description"><![CDATA[您嘗試啟動的遊戲需要韌體才能正常運作，而您並未安裝任何韌體。請於遊戲啟動前安裝韌體或按\"確定\"強制啟動遊戲]]></string>
 
     <!-- Intent Launch strings -->
     <string name="searching_for_game">正在搜尋遊戲...</string>
@@ -881,15 +941,15 @@
     <string name="config_write_failed">設定寫入失敗</string>
     <string name="config_apply_failed">套用設定失敗</string>
     <string name="config_already_exists_title">設定已存在</string>
-    <string name="config_already_exists_message">%1$s已存在自訂設定\n\n您要覆寫它嗎？\n\n這個動作無法復原</string>
+    <string name="config_already_exists_message">%1$s已存在自訂設定\n\n您要取代它嗎？\n\n這個動作無法復原</string>
     <string name="config_exists_prompt">正在檢查現有設定...</string>
-    <string name="overwrite_cancelled">覆寫已取消</string>
+    <string name="overwrite_cancelled">已取消取代該設定</string>
-    <string name="overwrite">覆寫</string>
+    <string name="overwrite">取代</string>
 
     <!-- Driver strings -->
-    <string name="driver_not_found">未安裝所需的驅動程式: %s</string>
+    <string name="driver_not_found">未安裝所需的驅動程式： %s</string>
-    <string name="invalid_driver_file">無效的驅動程式檔案: %s</string>
+    <string name="invalid_driver_file">無效的驅動程式檔案： %s</string>
-    <string name="network_unavailable">無可用網路連線。請檢查您的網路連線並重試。</string>
+    <string name="network_unavailable">無可用網路連線。請檢查您的網路連線並重試</string>
     <string name="driver_missing_title">需要GPU驅動程式</string>
     <string name="driver_missing_message">這個遊戲的設定需要 \"%s\"驅動程式，而它並沒有安裝在您的裝置上\n\n要下載並安裝此驅動程式嗎？</string>
     <string name="driver_download_cancelled">驅動程式下載已取消。沒有所需的驅動程式無法啟動遊戲。</string>
@@ -901,7 +961,7 @@
     <string name="emulation_toggle_controls">切換控制</string>
     <string name="emulation_rel_stick_center">相對搖桿中心</string>
     <string name="emulation_dpad_slide">方向鍵滑動</string>
-    <string name="emulation_haptics">觸覺回饋技術</string>
+    <string name="emulation_haptics">觸覺回饋</string>
     <string name="emulation_show_overlay">顯示虛擬按鍵</string>
     <string name="emulation_hide_overlay">隱藏虛擬按鍵</string>
     <string name="emulation_toggle_all">全部切換</string>
@@ -910,8 +970,9 @@
     <string name="emulation_control_opacity">不透明度</string>
     <string name="emulation_touch_overlay_reset">重設虛擬按鍵</string>
     <string name="emulation_touch_overlay_edit">編輯虛擬按鍵</string>
+    <string name="emulation_snap_to_grid">對齊網格</string>
     <string name="emulation_pause">暫停模擬</string>
-    <string name="emulation_unpause">取消暫停模擬</string>
+    <string name="emulation_unpause">繼續模擬</string>
     <string name="emulation_input_overlay">疊加層/虛擬按鍵設定</string>
     <string name="load_amiibo">導入Amiibo</string>
     <string name="touchscreen">觸控螢幕</string>

src/common/CMakeLists.txt

@@ -110,7 +110,6 @@ add_library(
     socket_types.h
     sparse_large_vector.cpp
     sparse_large_vector.h
-    spin_lock.h
     stb.cpp
     stb.h
     steady_clock.cpp

src/common/cpu_features.cpp

@@ -244,7 +244,8 @@ WallClock::WallClock(bool invariant_, u64 rdtsc_frequency_) noexcept
     , ns_rdtsc_factor{invariant_ ? GetFixedPoint64Factor(NsRatio::den, rdtsc_frequency_) : 0}
     , us_rdtsc_factor{invariant_ ? GetFixedPoint64Factor(UsRatio::den, rdtsc_frequency_) : 0}
     , ms_rdtsc_factor{invariant_ ? GetFixedPoint64Factor(MsRatio::den, rdtsc_frequency_) : 0}
-    , rdtsc_ns_factor{invariant_ ? GetFixedPoint64Factor(rdtsc_frequency_, NsRatio::den) : 1}
+    , rdtsc_ns_integer{invariant_ ? rdtsc_frequency_ / NsRatio::den : 1}
+    , rdtsc_ns_factor{invariant_ ? GetFixedPoint64Factor(rdtsc_frequency_ % NsRatio::den, NsRatio::den) : 0}
     , cntpct_rdtsc_factor{invariant_ ? GetFixedPoint64Factor(CNTFRQ, rdtsc_frequency_) : 0}
     , gputick_rdtsc_factor{invariant_ ? GetFixedPoint64Factor(GPUTickFreq, rdtsc_frequency_) : 0}
     , invariant{invariant_}
@@ -291,7 +292,7 @@ bool WallClock::IsNative() const {
 }
 
 u64 WallClock::NsToTicks(std::chrono::nanoseconds ns) const {
-    return invariant ? MultiplyHigh(ns.count(), rdtsc_ns_factor) : ns.count();
+    return ns.count() * rdtsc_ns_integer + MultiplyHigh(ns.count(), rdtsc_ns_factor);
 }
 #elif defined(HAS_NCE)
 namespace {
@@ -416,7 +417,7 @@ u64 WallClock::NsToTicks(std::chrono::nanoseconds ns) const {
 const WallClock g_wall_clock = [] {
 #if defined(ARCHITECTURE_x86_64)
     auto const& caps = Common::g_cpu_caps;
-    return WallClock(caps.invariant_tsc && caps.tsc_frequency >= std::nano::den, caps.tsc_frequency);
+    return WallClock(caps.invariant_tsc && caps.tsc_frequency > std::nano::den, caps.tsc_frequency);
 #elif defined(HAS_NCE)
     return WallClock(false, 1);
 #else

src/common/cpu_features.h

@@ -96,6 +96,7 @@ public:
     u64 ns_rdtsc_factor;
     u64 us_rdtsc_factor;
     u64 ms_rdtsc_factor;
+    u64 rdtsc_ns_integer;
     u64 rdtsc_ns_factor;
     u64 cntpct_rdtsc_factor;
     u64 gputick_rdtsc_factor;

src/common/fs/path_util.cpp

@@ -5,6 +5,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <algorithm>
+#include <cctype>
 #include <iostream>
 #include <sstream>
 #include "common/container/unordered_map.h"
@@ -480,28 +481,80 @@ std::string SanitizePath(std::string_view path_, DirectorySeparator directory_se
                            [type2](char c1, char c2) { return c1 == type2 && c2 == type2; }),
                path.end());
 
-    const bool absolute = !path.empty() && path[0] == type2;
+    std::string root;
-    std::vector<std::string_view> parts;
+    std::string_view components{path};
+    bool drive_relative = false;
 
-    for (const auto part : SplitPathComponents(path))
+#ifdef _WIN32
-    {
+    const bool network = path.size() > 1 && path[0] == type2 && path[1] == type2;
-        if (part.empty() || part == ".")
+    const bool drive =
-            continue;
+        path.size() > 1 && std::isalpha(static_cast<unsigned char>(path[0])) && path[1] == ':';
-        if (part == ".." && !parts.empty() && parts.back() != "..")
+
-            parts.pop_back();
+    if (network) {
-        else if (part != "..") parts.push_back(part);
+        root.assign(2, type2);
+        components.remove_prefix(2);
+    } else if (drive) {
+        root.assign(path.data(), 2);
+        components.remove_prefix(2);
+        if (!components.empty() && components.front() == type2) {
+            root += type2;
+            components.remove_prefix(1);
+        } else {
+            drive_relative = true;
+        }
+    }
+#endif
+
+    if (root.empty() && !components.empty() && components.front() == type2) {
+        root += type2;
+        components.remove_prefix(1);
     }
 
-    std::string resolved = absolute ? std::string(1, type2) : std::string{};
+    const auto path_parts = SplitPathComponents(components);
-    for (std::size_t i = 0; i < parts.size(); ++i)
+    std::size_t root_component_count = 0;
-    {
+#ifdef _WIN32
-        if (i != 0)
+    if (network) {
+        root_component_count = 2;
+
+        const auto is_unc = [](std::string_view part) {
+            return part.size() == 3 && (part[0] == 'U' || part[0] == 'u') &&
+                   (part[1] == 'N' || part[1] == 'n') && (part[2] == 'C' || part[2] == 'c');
+        };
+        if (path_parts.size() >= 2 && path_parts[0] == "?" && is_unc(path_parts[1])) {
+            root_component_count = 4;
+        }
+    }
+#endif
+
+    std::vector<std::string_view> parts;
+    for (std::size_t i = 0; i < path_parts.size(); ++i) {
+        const auto part = path_parts[i];
+        if (i < root_component_count) {
+            parts.push_back(part);
+        } else if (part.empty() || part == ".") {
+            continue;
+        } else if (part == "..") {
+            if (parts.size() > root_component_count) {
+                parts.pop_back();
+            }
+        } else {
+            parts.push_back(part);
+        }
+    }
+
+    const std::size_t root_length = root.size();
+    std::string resolved = std::move(root);
+    for (std::size_t i = 0; i < parts.size(); ++i) {
+        if (i != 0 || (!resolved.empty() && resolved.back() != type2 && !drive_relative))
             resolved += type2;
         resolved.append(parts[i].data(), parts[i].size());
     }
 
     path = std::move(resolved);
 
+    if (!path.empty() && path.size() == root_length) {
+        return path;
+    }
     return std::string(RemoveTrailingSlash(path));
 }
 

src/common/fs/path_util.h

@@ -347,8 +347,9 @@ enum class DirectorySeparator {
 // i.e. "C:\Users\Yuzu\Documents\save.bin" becomes {"C:", "Users", "Yuzu", "Documents", "save.bin" }
 [[nodiscard]] std::vector<std::string> SplitPathComponentsCopy(std::string_view filename);
 
-// Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'. Makes '/' into '\\'
+// Normalizes directory separators, removes duplicate and non-root trailing separators, and resolves
-// depending if directory_separator is BackwardSlash or PlatformDefault and running on windows
+// '.' and '..' components without traversing above the path root. Windows drive and UNC roots are
+// preserved.
 [[nodiscard]] std::string SanitizePath(
     std::string_view path,
     DirectorySeparator directory_separator = DirectorySeparator::ForwardSlash);

src/common/page_table.h

@@ -96,15 +96,15 @@ struct PageTable {
         }
 
         /// Write page info atomically
-        constexpr void Store(bool marked, PageType type, u16 block, uintptr_t pointer) noexcept {
+        inline void Store(bool marked, PageType type, u16 block, uintptr_t pointer) noexcept {
             data_raw.store(std::bit_cast<u64>(Data{marked, type, block, pointer}));
         }
 
-        constexpr void MarkRasterizerCached() noexcept {
+        inline void MarkRasterizerCached() noexcept {
             data_raw.fetch_or(0b111);
         }
 
-        constexpr void MarkDebug(u64 ptr, u16 block) noexcept {
+        inline void MarkDebug(u64 ptr, u16 block) noexcept {
             Store(true, PageType::DebugMemory, block, ptr);
         }
 

src/common/sparse_large_vector.h

@@ -38,7 +38,8 @@ void FreeMemoryPages(void* base, std::size_t size) noexcept;
 
 /// A large page-aligned buffer that has optimized memory usage for zero-writes.
 template <typename T>
-requires std::is_trivially_copyable_v<T>
+    // MSVC doesn't regard structs with atomics as trivially copyable
+    // requires std::is_trivially_copyable_v<T>
 class SparseLargeVector final {
 public:
     constexpr SparseLargeVector() = default;

src/common/spin_lock.h

@@ -1,50 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#ifdef _MSC_VER
-#include <intrin.h>
-#elif defined(ARCHITECTURE_x86_64)
-#include <xmmintrin.h>
-#endif
-#include <atomic>
-
-namespace Common {
-
-/// @brief A lock similar to mutex that forces a thread to spin wait instead calling the
-/// supervisor. Should be used on short sequences of code.
-struct SpinLock {
-    SpinLock() noexcept = default;
-    SpinLock(const SpinLock&) noexcept = delete;
-    SpinLock& operator=(const SpinLock&) noexcept = delete;
-    SpinLock(SpinLock&&) noexcept = delete;
-    SpinLock& operator=(SpinLock&&) noexcept = delete;
-
-    inline void lock() noexcept {
-        while (lck.test_and_set(std::memory_order_acquire)) {
-#if defined(ARCHITECTURE_x86_64)
-            _mm_pause();
-#elif defined(ARCHITECTURE_arm64) && defined(_MSC_VER)
-            __yield();
-#elif defined(ARCHITECTURE_arm64)
-            asm("yield");
-#endif
-        }
-    }
-
-    inline void unlock() noexcept {
-        lck.clear(std::memory_order_release);
-    }
-
-    [[nodiscard]] inline bool try_lock() noexcept {
-        return !lck.test_and_set(std::memory_order_acquire);
-    }
-
-    std::atomic_flag lck = ATOMIC_FLAG_INIT;
-};
-
-} // namespace Common

src/common/uuid.cpp

@@ -208,9 +208,9 @@ UUID UUID::MakeRandomRFC4122V4() {
     return uuid;
 }
 
-UUID UUID::MakeRFC4122V5(std::span<u8, 20> sha1) {
+UUID UUID::MakeRFC4122V5(std::span<u8, 16> sha1) {
     UUID uuid{};
-    std::memcpy(&uuid.uuid, sha1.data(), sizeof(UUID));
+    std::memcpy(&uuid.uuid, sha1.data(), sha1.size());
     uuid.uuid[8] = 0x80 | (uuid.uuid[8] & 0x3F);
     uuid.uuid[6] = 0x50 | (uuid.uuid[6] & 0xF);
     return uuid;

src/common/uuid.h

@@ -104,7 +104,7 @@ struct UUID {
     /// @returns A random UUID that is RFC 4122 Version 4 compliant.
     [[nodiscard]] static UUID MakeRandomRFC4122V4();
 
-    [[nodiscard]] static UUID MakeRFC4122V5(std::span<u8, 20> sha1);
+    [[nodiscard]] static UUID MakeRFC4122V5(std::span<u8, 16> sha1);
 
     friend constexpr bool operator==(const UUID& lhs, const UUID& rhs) = default;
 };

src/core/CMakeLists.txt

@@ -796,6 +796,8 @@ add_library(core STATIC
     hle/service/ns/application_manager_interface.h
     hle/service/ns/application_version_interface.cpp
     hle/service/ns/application_version_interface.h
+    hle/service/ns/async_result.cpp
+    hle/service/ns/async_result.h
     hle/service/ns/content_management_interface.cpp
     hle/service/ns/content_management_interface.h
     hle/service/ns/develop_interface.cpp
@@ -1261,23 +1263,11 @@ if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 OR ARCHITECTURE_riscv64 OR ARCHITE
     target_link_libraries(core PRIVATE dynarmic::dynarmic)
 endif()
 
-target_sources(core PRIVATE hle/service/ssl/ssl_backend_openssl.cpp)
+if (TARGET OpenSSL::SSL)
-
+    target_sources(core PRIVATE hle/service/ssl/ssl_backend_openssl.cpp)
-target_link_libraries(core PRIVATE OpenSSL::SSL OpenSSL::Crypto)
+    target_link_libraries(core PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-
+else()
-# TODO
+    target_sources(core PRIVATE hle/service/ssl/ssl_backend_none.cpp)
-
+endif()
-# elseif (APPLE)
-#     target_sources(core PRIVATE
-#         hle/service/ssl/ssl_backend_securetransport.cpp)
-#     target_link_libraries(core PRIVATE "-framework Security")
-# elseif (WIN32)
-#     target_sources(core PRIVATE
-#         hle/service/ssl/ssl_backend_schannel.cpp)
-#     target_link_libraries(core PRIVATE crypt32 secur32)
-# else()
-#     target_sources(core PRIVATE
-#         hle/service/ssl/ssl_backend_none.cpp)
-# endif()
 
 create_target_directory_groups(core)

src/core/arm/dynarmic/arm_dynarmic_32.cpp

@@ -177,7 +177,7 @@ void ArmDynarmic32::MakeJit(Common::PageTable* page_table) {
         config.page_table = reinterpret_cast<std::array<std::uint8_t*, NumPageTableEntries>*>(
             const_cast<Common::PageTable::PageEntryData*>(page_table->entries.data()));
         config.page_table_pointer_mask = Common::PageTable::ATTRIBUTE_MASK;
-        config.page_table_marked_bit = 0;
+        config.page_table_marked_bit = uint8_t(0);
         config.absolute_offset_page_table = true;
         config.detect_misaligned_access_via_page_table = 16 | 32 | 64 | 128;
         config.only_detect_misalignment_via_page_table_on_page_boundary = true;
@@ -193,7 +193,7 @@ void ArmDynarmic32::MakeJit(Common::PageTable* page_table) {
             Kernel::Board::Nintendo::Nx::KSystemControl::Init::GetIntendedMemorySize()) < (1ULL << 39)) {
             // Systems like FreeBSD allocate memory really low by default, and since we pack our page table entries,
             // we have to manually sign extend when our actual pointer is negative.
-            config.page_table_sign_extension = Common::PageTable::SIGN_BIT;
+            config.page_table_sign_extension = std::uint8_t(Common::PageTable::SIGN_BIT);
         }
     }
 

src/core/arm/dynarmic/arm_dynarmic_64.cpp

@@ -216,7 +216,7 @@ void ArmDynarmic64::MakeJit(Common::PageTable* page_table, std::size_t address_s
             const_cast<Common::PageTable::PageEntryData*>(page_table->entries.data()));
         config.page_table_address_space_bits = std::uint32_t(address_space_bits);
         config.page_table_pointer_mask = Common::PageTable::ATTRIBUTE_MASK;
-        config.page_table_marked_bit = 0;
+        config.page_table_marked_bit = uint8_t(0);
         config.silently_mirror_page_table = false;
         config.absolute_offset_page_table = true;
         config.detect_misaligned_access_via_page_table = 16 | 32 | 64 | 128;
@@ -235,7 +235,7 @@ void ArmDynarmic64::MakeJit(Common::PageTable* page_table, std::size_t address_s
             Kernel::Board::Nintendo::Nx::KSystemControl::Init::GetIntendedMemorySize()) < (1ULL << 39)) {
             // Systems like FreeBSD allocate memory really low by default, and since we pack our page table entries,
             // we have to manually sign extend when our actual pointer is negative.
-            config.page_table_sign_extension = Common::PageTable::SIGN_BIT;
+            config.page_table_sign_extension = std::uint8_t(Common::PageTable::SIGN_BIT);
         }
     }
 

src/core/file_sys/ips_layer.cpp

@@ -100,8 +100,7 @@ VirtualFile PatchIPS(const VirtualFile& in, const VirtualFile& ips) {
 
 
 struct IPSwitchRecord {
-    std::array<uint8_t, 256 - sizeof(size_t)> data;
+    std::vector<uint8_t> data;
-    size_t count;
 };
 struct IPSwitchCompiler::IPSwitchPatch {
     ::Common::unordered_map<u32, IPSwitchRecord> records;
@@ -122,22 +121,23 @@ static IPSwitchRecord EscapeStringSequences(std::string_view sv) {
     IPSwitchRecord r{};
     for (auto it = sv.cbegin(); it < sv.cend(); ) {
         if (*it == '\\' && it + 1 < sv.cend()) {
-            switch (it[1]) {
+            r.data.push_back([it]() {
-            case 'a': r.data[r.count] = '\a'; break;
+                switch (it[1]) {
-            case 'b': r.data[r.count] = '\b'; break;
+                case 'a': return '\a';
-            case 'e': r.data[r.count] = '\e'; break;
+                case 'b': return '\b';
-            case 'f': r.data[r.count] = '\f'; break;
+                case 'e': return '\e';
-            case 'n': r.data[r.count] = '\n'; break;
+                case 'f': return '\f';
-            case 'r': r.data[r.count] = '\r'; break;
+                case 'n': return '\n';
-            case 't': r.data[r.count] = '\t'; break;
+                case 'r': return '\r';
-            case 'v': r.data[r.count] = '\v'; break;
+                case 't': return '\t';
-            case '?': r.data[r.count] = '\?'; break;
+                case 'v': return '\v';
-            default: r.data[r.count] = it[1]; break;
+                case '?': return '\?';
-            }
+                default: return it[1];
-            ++r.count;
+                }
+            }());
             it += 2;
         } else {
-            ++r.count;
+            r.data.push_back(*it);
             ++it;
         }
     }
@@ -223,8 +223,8 @@ void IPSwitchCompiler::Parse(std::span<u8 const> bytes) {
                 if (start <= line.cend() && end <= line.cend()) {
                     // Actually IPS wants ordering from {lsb, ..., msb} -- so LE and BE are inverted, fun!
                     auto const hs = Common::HexStringToVector({start, end}, is_little_endian);
+                    r.data.resize(hs.size());
                     std::memcpy(r.data.data(), hs.data(), hs.size());
-                    r.count = hs.size();
                     LOG_INFO(Loader, "[H] value @ {:#08X}", offset);
                     patches.back().records.insert_or_assign(u32(offset), std::move(r));
                 } else {
@@ -293,7 +293,7 @@ VirtualFile IPSwitchCompiler::Apply(const VirtualFile& in) const {
         if (patch.enabled) {
             for (const auto& record : patch.records) {
                 if (record.first < in_data.size()) {
-                    auto replace_size = record.second.count;
+                    auto replace_size = record.second.data.size();
                     if (record.first + replace_size > in_data.size())
                         replace_size = in_data.size() - record.first;
                     std::memcpy(in_data.data() + record.first, record.second.data.data(), replace_size);

src/core/frontend/applets/controller.cpp

@@ -12,6 +12,7 @@
 #include "hid_core/frontend/emulated_controller.h"
 #include "hid_core/hid_core.h"
 #include "hid_core/hid_types.h"
+#include <array>
 
 namespace Core::Frontend {
 
@@ -29,23 +30,39 @@ void DefaultControllerApplet::ReconfigureControllers(ReconfigureCallback callbac
 
     const std::size_t min_supported_players =
         parameters.enable_single_mode ? 1 : parameters.min_players;
+    using Core::HID::NpadStyleIndex;
+    const std::size_t max_supported_players = parameters.enable_single_mode ? 1 : parameters.max_players;
+    std::size_t num_selected_players = 0;
+    std::array<bool, HID::HIDCore::available_controllers> keep_connected{};
 
-    // Disconnect Handheld first.
+    // reserve existing AND valid players before filling slots. include Handheld, but not other
+    for (std::size_t index = 0; index < hid_core.available_controllers - 1; ++index) {
+        const auto* controller = hid_core.GetEmulatedControllerByIndex(index);
+        if (!parameters.keep_controllers_connected || !controller->IsConnected() || num_selected_players >= max_supported_players) continue;
+
+        const auto style = controller->GetNpadStyleIndex();
+        keep_connected[index] =
+            (style == NpadStyleIndex::Fullkey && parameters.allow_pro_controller) ||
+            (style == NpadStyleIndex::JoyconDual && parameters.allow_dual_joycons) ||
+            (style == NpadStyleIndex::JoyconLeft && parameters.allow_left_joycon) ||
+            (style == NpadStyleIndex::JoyconRight && parameters.allow_right_joycon) ||
+            (style == NpadStyleIndex::Handheld && parameters.enable_single_mode && parameters.allow_handheld && !Settings::IsDockedMode()) ||
+            (style == NpadStyleIndex::GameCube && parameters.allow_gamecube_controller);
+        num_selected_players += keep_connected[index];
+    }
     auto* handheld = hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
-    handheld->Disconnect();
+    if (!keep_connected[hid_core.available_controllers - 2]) handheld->Disconnect();
 
     // Deduce the best configuration based on the input parameters.
     for (std::size_t index = 0; index < hid_core.available_controllers - 2; ++index) {
         auto* controller = hid_core.GetEmulatedControllerByIndex(index);
 
-        // First, disconnect all controllers regardless of the value of keep_controllers_connected.
+        if (keep_connected[index]) continue;
-        // This makes it easy to connect the desired controllers.
         controller->Disconnect();
 
-        // Only connect the minimum number of required players.
+        // only add players still needed to reach the minimum
-        if (index >= min_supported_players) {
+        if (num_selected_players >= min_supported_players) continue;
-            continue;
+        ++num_selected_players;
-        }
 
         // Connect controllers based on the following priority list from highest to lowest priority:
         // Pro Controller -> Dual Joycons -> Left Joycon/Right Joycon -> Handheld

src/core/hle/kernel/k_scheduler.cpp

@@ -465,6 +465,10 @@ void KScheduler::ScheduleImplFiber(KernelCore& kernel) {
         // Check if we need scheduling. If we do, then we can't complete the switch and should
         // retry.
         if (m_state.needs_scheduling.load(std::memory_order_seq_cst)) {
+            // Some libc++ lazily init mutex
+            [[maybe_unused]] auto const can_lock = highest_priority_thread->m_context_guard.try_lock();
+            DEBUG_ASSERT(!can_lock);
+
             // Our switch failed.
             // We should unlock the thread context, and then retry.
             highest_priority_thread->m_context_guard.unlock();
@@ -496,6 +500,10 @@ void KScheduler::Unload(KernelCore& kernel, KThread* thread) {
 
     // Check if the thread is terminated by checking the DPC flags.
     if ((thread->GetStackParameters().dpc_flags & static_cast<u32>(DpcFlag::Terminated)) == 0) {
+        // Some libc++ lazily init mutex
+        [[maybe_unused]] auto const can_lock = thread->m_context_guard.try_lock();
+        DEBUG_ASSERT(!can_lock);
+
         // The thread isn't terminated, so we want to unlock it.
         thread->m_context_guard.unlock();
     }

src/core/hle/kernel/k_slab_heap.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -12,7 +12,6 @@
 #include "common/atomic_ops.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "common/spin_lock.h"
 
 namespace Kernel {
 
@@ -30,7 +29,7 @@ public:
     };
 
 public:
-    constexpr KSlabHeapImpl() = default;
+    KSlabHeapImpl() = default;
 
     void Initialize() {
         ASSERT(m_head == nullptr);
@@ -68,7 +67,7 @@ public:
 
 private:
     std::atomic<Node*> m_head{};
-    Common::SpinLock m_lock;
+    std::mutex m_lock;
 };
 
 } // namespace impl

src/core/hle/kernel/k_thread.h

@@ -19,7 +19,6 @@
 
 #include "common/intrusive_red_black_tree.h"
 #include "common/scratch_buffer.h"
-#include "common/spin_lock.h"
 #include "core/arm/arm_interface.h"
 #include "core/hle/kernel/k_affinity_mask.h"
 #include "core/hle/kernel/k_light_lock.h"
@@ -920,7 +919,7 @@ private:
     bool m_resource_limit_release_hint{};
     bool m_is_kernel_address_key{};
     StackParameters m_stack_parameters{};
-    Common::SpinLock m_context_guard{};
+    std::mutex m_context_guard{};
 
     // For emulation
     std::shared_ptr<Common::Fiber> m_host_context{};

src/core/hle/service/acc/profile_manager.h

@@ -23,6 +23,12 @@ constexpr std::size_t profile_username_size{32};
 using ProfileUsername = std::array<u8, profile_username_size>;
 using UserIDArray = std::array<Common::UUID, MAX_USERS>;
 
+// This is nn::account::Uid
+struct Uid {
+    std::array<u8, 0x10> unk0;
+};
+static_assert(sizeof(Uid) == 0x10);
+
 /// Contains extra data related to a user.
 /// TODO: RE this structure
 struct UserData {

src/core/hle/service/am/service/application_functions.cpp

@@ -347,21 +347,22 @@ Result IApplicationFunctions::NotifyRunning(Out<bool> out_became_running) {
 
 Result IApplicationFunctions::GetPseudoDeviceId(Out<Common::UUID> out_pseudo_device_id) {
     LOG_WARNING(Service_AM, "(stubbed)");
-    R_UNLESS(out_pseudo_device_id, ResultUnknown);
+    R_UNLESS(out_pseudo_device_id != nullptr, ResultUnknown);
 
     // This should be hashed with the device specific hash
     // for now this will do
     const auto res = FileSys::PatchManager::GetMetadataFromBaseOrUpdate(system, m_applet->program_id);
-    u8 hash[EVP_MAX_MD_SIZE];
+    R_UNLESS(res.first != nullptr, ResultUnknown);
+    std::array<u8, EVP_MAX_MD_SIZE> hash;
     unsigned int hash_len = 0;
     auto const seed = res.first->raw.seed_for_pseudo_device_id;
     EVP_MD_CTX *ctx = EVP_MD_CTX_new();
     auto const algorithm = EVP_sha1();
     EVP_DigestInit_ex(ctx, algorithm, nullptr);
     EVP_DigestUpdate(ctx, &seed, sizeof(seed));
-    EVP_DigestFinal_ex(ctx, hash, &hash_len);
+    EVP_DigestFinal_ex(ctx, hash.data(), &hash_len);
     EVP_MD_CTX_free(ctx);
-    *out_pseudo_device_id = Common::UUID::MakeRFC4122V5(std::span<u8, 20>{hash, std::size(hash)});
+    *out_pseudo_device_id = Common::UUID::MakeRFC4122V5(std::span<u8, 16>{hash.begin(), hash.begin() + 16});
     R_SUCCEED();
 }
 

src/core/hle/service/filesystem/fsp/fsp_srv.cpp

@@ -154,6 +154,9 @@ FSP_SRV::FSP_SRV(Core::System& system_)
         {720, nullptr, "AbandonAccessFailure"},
         {800, nullptr, "GetAndClearFileSystemProxyErrorInfo"},
         {810, nullptr, "RegisterProgramIndexMapInfo"},
+        {820, nullptr, "GetContentStorageInfoIndex"},
+        {830, nullptr, "EncryptStreamPlaySaveData"},
+        {831, nullptr, "DecryptStreamPlaySaveData"},
         {1000, nullptr, "SetBisRootForHost"},
         {1001, nullptr, "SetSaveDataSize"},
         {1002, nullptr, "SetSaveDataRootPath"},

src/core/hle/service/ipc_helpers.h

@@ -22,6 +22,7 @@
 
 namespace IPC {
 
+constexpr Result ResultNotSupported{ErrorModule::HIPC, 1};
 constexpr Result ResultSessionClosed{ErrorModule::HIPC, 301};
 
 struct ResponseBuilder {

src/core/hle/service/nfp/nfp.cpp

@@ -42,6 +42,7 @@ public:
             {22, &IUser::GetApplicationAreaSize, "GetApplicationAreaSize"},
             {23, &IUser::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"},
             {24, &IUser::RecreateApplicationArea, "RecreateApplicationArea"},
+            {25, &IUser::StartDetection, "StartDetectionWithFilter"},
         };
         // clang-format on
 
@@ -74,6 +75,7 @@ public:
             {20, &ISystem::GetDeviceState, "GetDeviceState"},
             {21, &ISystem::GetNpadId, "GetNpadId"},
             {23, &ISystem::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"},
+            {25, &ISystem::StartDetection, "StartDetectionWithFilter"},
             {100, &ISystem::Format, "Format"},
             {101, &ISystem::GetAdminInfo, "GetAdminInfo"},
             {102, &ISystem::GetRegisterInfoPrivate, "GetRegisterInfoPrivate"},
@@ -118,6 +120,7 @@ public:
             {22, &IDebug::GetApplicationAreaSize, "GetApplicationAreaSize"},
             {23, &IDebug::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"},
             {24, &IDebug::RecreateApplicationArea, "RecreateApplicationArea"},
+            {25, &IDebug::StartDetection, "StartDetectionWithFilter"},
             {100, &IDebug::Format, "Format"},
             {101, &IDebug::GetAdminInfo, "GetAdminInfo"},
             {102, &IDebug::GetRegisterInfoPrivate, "GetRegisterInfoPrivate"},

src/core/hle/service/ngc/ngc.cpp

@@ -6,10 +6,16 @@
 
 #include "common/string_util.h"
 #include "core/core.h"
+#include "core/hle/kernel/k_client_session.h"
+#include "core/hle/result.h"
+#include "core/hle/service/acc/profile_manager.h"
+#include "core/hle/service/cmif_types.h"
+#include "core/hle/service/cmif_serialization.h"
 #include "core/hle/service/ipc_helpers.h"
 #include "core/hle/service/ngc/ngc.h"
 #include "core/hle/service/server_manager.h"
 #include "core/hle/service/service.h"
+#include "frontend_common/firmware_manager.h"
 
 namespace Service::NGC {
 
@@ -166,12 +172,123 @@ public:
     }
 };
 
+struct SaveDataHandle {
+    u64 unk0;
+};
+static_assert(sizeof(SaveDataHandle) == 0x08);
+
+class IUserShimScopedObject final : public ServiceFramework<IUserShimScopedObject> {
+public:
+    explicit IUserShimScopedObject(Core::System& system_) : ServiceFramework(system_, "IUserShimScopedObject") {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {450, nullptr, "InitializeForSaveData"},
+            {451, nullptr, "FinalizeForSaveData"},
+            {452, D<&IUserShimScopedObject::OpenSaveData>, "OpenSaveData"},
+            {453, nullptr, "CloseSaveData"},
+            {454, D<&IUserShimScopedObject::ReadSaveSlot>, "ReadSaveSlot"},
+            {455, D<&IUserShimScopedObject::WriteSaveSlot>, "WriteSaveSlot"},
+            {456, nullptr, "FlushSaveSlot"},
+            {457, nullptr, "CommitSaveData"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+
+    Result OpenSaveData(Account::Uid unk0, Out<SaveDataHandle> unk1) {
+        LOG_WARNING(Service_NGC, "stubbed");
+        R_THROW(IPC::ResultNotSupported);
+    }
+
+    Result ReadSaveSlot(s32 offset, SaveDataHandle handle, OutBuffer<BufferAttr_HipcAutoSelect> out_data, Out<u32> out_size) {
+        LOG_WARNING(Service_NGC, "stubbed");
+        R_THROW(IPC::ResultNotSupported);
+    }
+
+    Result WriteSaveSlot(s32 offset, SaveDataHandle handle, InBuffer<BufferAttr_HipcAutoSelect> out_data) {
+        LOG_WARNING(Service_NGC, "stubbed");
+        // to implement
+        R_SUCCEED();
+    }
+};
+
+class IUserService final : public ServiceFramework<IUserService> {
+public:
+    explicit IUserService(Core::System& system_) : ServiceFramework(system_, "stpl:u") {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0 , D<&IUserService::Cmd0>, "Cmd0"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+    Result Cmd0(u32 unk0, OutInterface<IUserShimScopedObject> out_interface) {
+        LOG_WARNING(Service_NGC, "stubbed");
+        *out_interface = std::make_shared<IUserShimScopedObject>(system);
+        R_SUCCEED();
+    }
+};
+
+class ISystemShimScopedObject final : public ServiceFramework<ISystemShimScopedObject> {
+public:
+    explicit ISystemShimScopedObject(Core::System& system_) : ServiceFramework(system_, "ISystemShimScopedObject") {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {106, nullptr, "Cmd106"},
+            {107, nullptr, "Cmd107"},
+            {108, D<&ISystemShimScopedObject::Cmd108>, "Cmd108"},
+            {207, nullptr, "Cmd207"},
+            {208, D<&ISystemShimScopedObject::Cmd208>, "Cmd208"},
+            {209, nullptr, "Cmd209"},
+            {210, nullptr, "Cmd210"},
+            {211, nullptr, "Cmd211"},
+            {212, nullptr, "Cmd212"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+
+    Result Cmd108() {
+        LOG_WARNING(Service_NGC, "stubbed");
+        R_THROW(IPC::ResultNotSupported);
+    }
+
+    Result Cmd208(Out<std::array<u8, 0x20>> unk0) {
+        LOG_WARNING(Service_NGC, "stubbed");
+        R_THROW(IPC::ResultNotSupported);
+    }
+};
+
+class ISystemService final : public ServiceFramework<ISystemService> {
+public:
+    explicit ISystemService(Core::System& system_) : ServiceFramework(system_, "stpl:sys") {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0 , D<&ISystemService::Cmd0>, "Cmd0"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+    Result Cmd0(OutInterface<ISystemShimScopedObject> out_interface) {
+        LOG_WARNING(Service_NGC, "stubbed");
+        *out_interface = std::make_shared<ISystemShimScopedObject>(system);
+        R_SUCCEED();
+    }
+};
+
 void LoopProcess(Core::System& system) {
     auto server_manager = std::make_unique<ServerManager>(system);
 
     server_manager->RegisterNamedService("ngct:u", std::make_shared<IService>(system), 4);
     server_manager->RegisterNamedService("ngct:s", std::make_shared<IServiceWithManagementApi>(system), 4);
     server_manager->RegisterNamedService("ngc:u", std::make_shared<NgcServiceImpl>(system), 4);
+
+    // +23.0.0
+    if (FirmwareManager::GetFirmwareVersion(system).first.major >= 23) {
+        server_manager->RegisterNamedService("stpl:u", std::make_shared<IUserService>(system), 4);
+        server_manager->RegisterNamedService("stpl:sys", std::make_shared<ISystemService>(system), 4);
+    }
+
     ServerManager::RunServer(std::move(server_manager));
 }
 

src/core/hle/service/ns/application_manager_interface.cpp

@@ -228,9 +228,9 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_
         {930, nullptr, "Unknown930"}, //20.0.0+
         {931, nullptr, "Unknown931"}, //20.0.0+
         {933, nullptr, "Unknown933"}, //20.0.0+
-        {934, nullptr, "Unknown934"}, //20.0.0+
+        {934, nullptr, "Unknown934"}, //21.0.0+
-        {935, nullptr, "Unknown935"}, //20.0.0+
+        {935, nullptr, "Unknown935"}, //21.0.0+
-        {936, nullptr, "Unknown936"}, //20.0.0+
+        {936, D<&IApplicationManagerInterface::Unknown936>, "Unknown936"}, //21.0.0+
         {1000, nullptr, "RequestVerifyApplicationDeprecated"},
         {1001, nullptr, "CorruptApplicationForDebug"},
         {1002, nullptr, "RequestVerifyAddOnContentsRights"},
@@ -422,7 +422,7 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_
         {4039, nullptr, "Unknown4039"}, //20.0.0+
         {4040, nullptr, "Unknown4040"}, //20.0.0+
         {4041, nullptr, "Unknown4041"}, //20.0.0+
-        {4042, nullptr, "Unknown4042"}, //20.0.0+
+        {4042, D<&IApplicationManagerInterface::Unknown4042>, "Unknown4042"}, //20.0.0+
         {4043, nullptr, "Unknown4043"}, //20.0.0+
         {4044, nullptr, "Unknown4044"}, //20.0.0+
         {4045, nullptr, "Unknown4045"}, //20.0.0+
@@ -476,6 +476,7 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_
         {4096, nullptr, "Unknown4096"}, //20.0.0+
         {4097, nullptr, "Unknown4097"}, //20.0.0+
         {4099, nullptr, "Unknown4099"}, //21.0.0+
+        {4105, D<&IApplicationManagerInterface::Unknown4105>, "Unknown4105"}, //23.0.0+
         {5000, nullptr, "Unknown5000"}, //18.0.0+
         {5001, nullptr, "Unknown5001"}, //18.0.0+
         {9999, nullptr, "GetApplicationCertificate"}, //10.0.0-10.2.0
@@ -638,6 +639,12 @@ Result IApplicationManagerInterface::IsGameCardApplicationRunning(Out<bool> out_
     R_SUCCEED();
 }
 
+Result IApplicationManagerInterface::Unknown936(Out<u64> out_result) {
+    LOG_WARNING(Service_NS, "(STUBBED) called.");
+    *out_result = 0;
+    R_SUCCEED();
+}
+
 Result IApplicationManagerInterface::IsAnyApplicationEntityInstalled(
     Out<bool> out_is_any_application_entity_installed) {
     LOG_WARNING(Service_NS, "(STUBBED) called");
@@ -861,11 +868,25 @@ Result IApplicationManagerInterface::Unknown4023(Out<u64> out_result) {
     R_SUCCEED();
 }
 
+Result IApplicationManagerInterface::Unknown4042(OutInterface<IAsyncResult> out_interface,
+                                                 OutCopyHandle<Kernel::KReadableEvent> out_event,
+                                                 u64 arg1, u64 arg2) {
+    LOG_WARNING(Service_NS, "(STUBBED) called, arg1={:016X}, arg2={:016X}", arg1, arg2);
+    *out_event = unknown_event.GetHandle();
+    *out_interface = std::make_shared<IAsyncResult>(system, &unknown_event);
+    R_SUCCEED();
+}
+
 Result IApplicationManagerInterface::Unknown4053() {
     LOG_WARNING(Service_NS, "(STUBBED) called.");
     R_SUCCEED();
 }
 
+Result IApplicationManagerInterface::Unknown4105() {
+    LOG_WARNING(Service_NS, "(STUBBED) called.");
+    R_SUCCEED();
+}
+
 void IApplicationManagerInterface::PushApplicationRecord(HLERequestContext& ctx) {
     const auto record = ctx.ReadBuffer();
     u64 application_id{};

src/core/hle/service/ns/application_manager_interface.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include "core/hle/service/cmif_types.h"
+#include "core/hle/service/ns/async_result.h"
 #include "core/hle/service/ns/language.h"
 #include "core/hle/service/ns/ns_types.h"
 #include "core/hle/service/os/event.h"
@@ -34,6 +35,7 @@ public:
     Result GetGameCardMountFailureEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
     Result GetGameCardWakenReadyEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
     Result IsGameCardApplicationRunning(Out<bool> out_is_running);
+    Result Unknown936(Out<u64> out_result);
     Result IsAnyApplicationEntityInstalled(Out<bool> out_is_any_application_entity_installed);
     Result GetApplicationViewDeprecated(
         OutArray<ApplicationViewV19, BufferAttr_HipcMapAlias> out_application_views,
@@ -71,7 +73,11 @@ public:
                                   InBuffer<BufferAttr_HipcMapAlias> logo_path_buffer);
     Result Unknown4022(OutCopyHandle<Kernel::KReadableEvent> out_event);
     Result Unknown4023(Out<u64> out_result);
+    Result Unknown4042(OutInterface<IAsyncResult> out_interface,
+                       OutCopyHandle<Kernel::KReadableEvent> out_event,
+                       u64 arg1, u64 arg2);
     Result Unknown4053();
+    Result Unknown4105();
 
     Result RequestDownloadApplicationControlDataInBackground(u64 control_source,
                                                              u64 application_id);

src/core/hle/service/ns/async_result.cpp

@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "core/hle/service/cmif_serialization.h"
+#include "core/hle/service/ns/async_result.h"
+
+#include <cstring>
+
+namespace Service::NS {
+
+IAsyncResult::IAsyncResult(Core::System& system_, Service::Event* event_)
+    : ServiceFramework{system_, "nn::ns::detail::IAsyncResult"}, event{event_} {
+    // clang-format off
+    static const FunctionInfo functions[] = {
+        {0, nullptr, "Get"},
+        {1, D<&IAsyncResult::Cancel>, "Cancel"},
+        {2, nullptr, "GetErrorContext"}, // 4.0.0+
+    };
+    // clang-format on
+
+    RegisterHandlers(functions);
+}
+
+IAsyncResult::~IAsyncResult() = default;
+
+Result IAsyncResult::Cancel() {
+    LOG_DEBUG(Service_NS, "called");
+    if (event != nullptr) {
+        event->Signal(system.Kernel());
+    }
+
+    R_SUCCEED();
+}
+
+} // namespace Service::NS

src/core/hle/service/ns/async_result.h

@@ -0,0 +1,19 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "core/hle/service/service.h"
+
+namespace Service::NS {
+
+class IAsyncResult final : public ServiceFramework<IAsyncResult> {
+public:
+    explicit IAsyncResult(Core::System& system_, Service::Event* event_);
+    ~IAsyncResult() override;
+
+private:
+    Result Cancel();
+
+    Service::Event* event{};
+};
+
+} // namespace Service::NS

src/core/hle/service/ns/read_only_application_control_data_interface.cpp

@@ -142,7 +142,7 @@ IReadOnlyApplicationControlDataInterface::IReadOnlyApplicationControlDataInterfa
         {10, &IReadOnlyApplicationControlDataInterface::ListApplicationIcon, "ListApplicationIcon"},
         {13, &IReadOnlyApplicationControlDataInterface::ListApplicationTitle, "ListApplicationTitle"},
         {19, D<&IReadOnlyApplicationControlDataInterface::GetApplicationControlData3>, "GetApplicationControlData"},
-        {23, D<&IReadOnlyApplicationControlDataInterface::GetApplicationControlData3>, "GetApplicationControlData"},
+        {23, D<&IReadOnlyApplicationControlDataInterface::GetApplicationControlData3>, "GetApplicationControlData"}, //23.0.0+
     };
     // clang-format on
 
@@ -311,27 +311,30 @@ void IReadOnlyApplicationControlDataInterface::ListApplicationIcon(HLERequestCon
         // u64 - app count
         memory.WriteBlock(t_mem_address + out_length, &app_count, sizeof(u64));
         out_length += sizeof(u64);
+        ASSERT(out_length <= t_mem->GetSize());
         // [list of u64] - size of icons
         for (size_t i = 0; i < app_count; ++i) {
             const u64 app_id = app_ids_buffer[i];
             const FileSys::PatchManager pm{app_id, system.GetFileSystemController(), system.GetContentProvider()};
-            const auto control = pm.GetControlMetadata();
+            if (const auto control = pm.GetControlMetadata(); control.second) {
-            u64 full_size = control.second->GetSize();
+                u64 full_size = control.second->GetSize();
-            memory.WriteBlock(t_mem_address + out_length, &full_size, sizeof(u64));
+                memory.WriteBlock(t_mem_address + out_length, &full_size, sizeof(u64));
+            }
             out_length += sizeof(u64);
+            ASSERT(out_length <= t_mem->GetSize());
         }
         // [list of raw icon data]
-        std::vector<u8> full_icon_data;
         for (size_t i = 0; i < app_count; ++i) {
             const u64 app_id = app_ids_buffer[i];
             const FileSys::PatchManager pm{app_id, system.GetFileSystemController(), system.GetContentProvider()};
-            const auto control = pm.GetControlMetadata();
+            if (const auto control = pm.GetControlMetadata(); control.second) {
-            auto const full_size = control.second->GetSize();
+                if (auto const full_size = control.second->GetSize(); full_size > 0) {
-            if (full_size > 0) {
+                    std::vector<u8> full_icon_data(full_size);
-                full_icon_data.resize(full_size);
+                    control.second->Read(full_icon_data.data(), full_size, 0);
-                control.second->Read(full_icon_data.data(), full_size, 0);
+                    memory.WriteBlock(t_mem_address + out_length, full_icon_data.data(), full_size);
-                memory.WriteBlock(t_mem_address + out_length, full_icon_data.data(), full_size);
+                    out_length += full_size;
-                out_length += full_size;
+                    ASSERT(out_length <= t_mem->GetSize());
+                }
             }
         }
     }
@@ -345,6 +348,12 @@ void IReadOnlyApplicationControlDataInterface::ListApplicationIcon(HLERequestCon
 void IReadOnlyApplicationControlDataInterface::ListApplicationTitle(HLERequestContext& ctx) {
     const auto app_ids_buffer = ctx.ReadBuffer();
     const size_t app_count = app_ids_buffer.size() / sizeof(u64);
+
+    std::vector<u64> application_ids(app_count);
+    if (app_count > 0) {
+        std::memcpy(application_ids.data(), app_ids_buffer.data(), app_count * sizeof(u64));
+    }
+
     auto t_mem_obj = ctx.GetObjectFromHandle<Kernel::KTransferMemory>(ctx.GetCopyHandle(0));
     auto* t_mem = t_mem_obj.GetPointerUnsafe();
     constexpr size_t title_entry_size = sizeof(FileSys::LanguageEntry);
@@ -354,8 +363,9 @@ void IReadOnlyApplicationControlDataInterface::ListApplicationTitle(HLERequestCo
         auto& memory = system.ApplicationMemory();
         const auto t_mem_address = t_mem->GetSourceAddress();
         for (size_t i = 0; i < app_count; ++i) {
-            const u64 app_id = app_ids_buffer[i];
+            const u64 app_id = application_ids[i];
-            const FileSys::PatchManager pm{app_id, system.GetFileSystemController(), system.GetContentProvider()};
+            const FileSys::PatchManager pm{app_id, system.GetFileSystemController(),
+                                           system.GetContentProvider()};
             const auto control = pm.GetControlMetadata();
             FileSys::LanguageEntry entry{};
             if (control.first != nullptr) {

src/core/hle/service/olsc/transfer_task_list_controller.cpp

@@ -36,7 +36,7 @@ ITransferTaskListController::ITransferTaskListController(Core::System& system_)
         {18, nullptr, "ListTransferTaskInfo"},
         {19, nullptr, "DeleteTransferTask"},
         {20, nullptr, "RaiseTransferTaskPriority"},
-        {21, nullptr, "GetTransferTaskProgress"},
+        {21, D<&ITransferTaskListController::GetTransferTaskProgress>, "GetTransferTaskProgress"}, //10.1.0+
         {22, nullptr, "GetTransferTaskLastResult"},
         {23, nullptr, "SuspendTransferTask"},
         {24, D<&ITransferTaskListController::GetCurrentTransferTaskInfo>, "GetCurrentTransferTaskInfo"},
@@ -82,6 +82,11 @@ Result ITransferTaskListController::GetCurrentTransferTaskInfo(Out<std::array<u8
     R_SUCCEED();
 }
 
+Result ITransferTaskListController::GetTransferTaskProgress() {
+    LOG_WARNING(Service_OLSC, "(STUBBED) called.");
+    R_SUCCEED();
+}
+
 Result ITransferTaskListController::FindTransferTaskInfo(Out<std::array<u8, 0x30>> out_info,
                                                         InBuffer<BufferAttr_HipcAutoSelect> in) {
     LOG_WARNING(Service_OLSC, "(STUBBED) called, in_size={}", in.size());

src/core/hle/service/olsc/transfer_task_list_controller.h

@@ -24,6 +24,7 @@ private:
     Result GetTransferTaskStartEventNativeHandleHolder(Out<SharedPointer<INativeHandleHolder>> out_holder);
     Result StopNextTransferTaskExecution(Out<SharedPointer<IStopperObject>> out_stopper);
     Result GetTransferTaskCount(Out<u32> out_count, u8 unknown);
+    Result GetTransferTaskProgress();
     Result GetCurrentTransferTaskInfo(Out<std::array<u8, 0x30>> out_info, u8 unknown);
     Result FindTransferTaskInfo(Out<std::array<u8, 0x30>> out_info, InBuffer<BufferAttr_HipcAutoSelect> in);
 };

src/core/hle/service/ssl/ssl.cpp

@@ -48,6 +48,12 @@ enum class OptionType : u32 {
     EnableAlpn = 3,
 };
 
+// This is nn::ssl::sf::RenegotiationMode
+enum RenegotiationMode : u32 {
+    None = 0, ///< None
+    Secure = 1, ///< Secure
+};
+
 // This is nn::ssl::sf::SslVersion
 struct SslVersion {
     union {
@@ -75,34 +81,34 @@ public:
           shared_data{shared_data_in}, backend{std::move(backend_in)} {
         // clang-format off
         static const FunctionInfo functions[] = {
-            {0, &ISslConnection::SetSocketDescriptor, "SetSocketDescriptor"},
+            {0, D<&ISslConnection::SetSocketDescriptor>, "SetSocketDescriptor"},
-            {1, &ISslConnection::SetHostName, "SetHostName"},
+            {1, D<&ISslConnection::SetHostName>, "SetHostName"},
-            {2, &ISslConnection::SetVerifyOption, "SetVerifyOption"},
+            {2, D<&ISslConnection::SetVerifyOption>, "SetVerifyOption"},
-            {3, &ISslConnection::SetIoMode, "SetIoMode"},
+            {3, D<&ISslConnection::SetIoMode>, "SetIoMode"},
-            {4, nullptr, "GetSocketDescriptor"},
+            {4, D<&ISslConnection::GetSocketDescriptor>, "GetSocketDescriptor"},
-            {5, nullptr, "GetHostName"},
+            {5, D<&ISslConnection::GetHostName>, "GetHostName"},
             {6, nullptr, "GetVerifyOption"},
-            {7, nullptr, "GetIoMode"},
+            {7, D<&ISslConnection::GetIoMode>, "GetIoMode"},
-            {8, &ISslConnection::DoHandshake, "DoHandshake"},
+            {8, D<&ISslConnection::DoHandshake>, "DoHandshake"},
             {9, &ISslConnection::DoHandshakeGetServerCert, "DoHandshakeGetServerCert"},
-            {10, &ISslConnection::Read, "Read"},
+            {10, D<&ISslConnection::Read>, "Read"},
-            {11, &ISslConnection::Write, "Write"},
+            {11, D<&ISslConnection::Write>, "Write"},
-            {12, &ISslConnection::Pending, "Pending"},
+            {12, D<&ISslConnection::Pending>, "Pending"},
-            {13, nullptr, "Peek"},
+            {13, D<&ISslConnection::Peek>, "Peek"},
-            {14, nullptr, "Poll"},
+            {14, D<&ISslConnection::Poll>, "Poll"},
-            {15, nullptr, "GetVerifyCertError"},
+            {15, D<&ISslConnection::GetVerifyCertError>, "GetVerifyCertError"},
-            {16, nullptr, "GetNeededServerCertBufferSize"},
+            {16, D<&ISslConnection::GetNeededServerCertBufferSize>, "GetNeededServerCertBufferSize"},
-            {17, &ISslConnection::SetSessionCacheMode, "SetSessionCacheMode"},
+            {17, D<&ISslConnection::SetSessionCacheMode>, "SetSessionCacheMode"},
-            {18, nullptr, "GetSessionCacheMode"},
+            {18, D<&ISslConnection::GetSessionCacheMode>, "GetSessionCacheMode"},
-            {19, nullptr, "FlushSessionCache"},
+            {19, D<&ISslConnection::FlushSessionCache>, "FlushSessionCache"},
-            {20, nullptr, "SetRenegotiationMode"},
+            {20, D<&ISslConnection::SetRenegotiationMode>, "SetRenegotiationMode"},
-            {21, nullptr, "GetRenegotiationMode"},
+            {21, D<&ISslConnection::GetRenegotiationMode>, "GetRenegotiationMode"},
-            {22, &ISslConnection::SetOption, "SetOption"},
+            {22, D<&ISslConnection::SetOption>, "SetOption"},
-            {23, &ISslConnection::GetOption, "GetOption"},
+            {23, D<&ISslConnection::GetOption>, "GetOption"},
             {24, nullptr, "GetVerifyCertErrors"},
             {25, nullptr, "GetCipherInfo"},
-            {26, &ISslConnection::SetNextAlpnProto, "SetNextAlpnProto"},
+            {26, D<&ISslConnection::SetNextAlpnProto>, "SetNextAlpnProto"},
-            {27, &ISslConnection::GetNextAlpnProto, "GetNextAlpnProto"},
+            {27, D<&ISslConnection::GetNextAlpnProto>, "GetNextAlpnProto"},
             {28, nullptr, "SetDtlsSocketDescriptor"},
             {29, nullptr, "GetDtlsHandshakeTimeout"},
             {30, nullptr, "SetPrivateOption"},
@@ -141,80 +147,6 @@ public:
     }
 
 private:
-    SslVersion ssl_version;
-    std::shared_ptr<SslContextSharedData> shared_data;
-    std::unique_ptr<SSLConnectionBackend> backend;
-    std::optional<int> fd_to_close;
-    bool do_not_close_socket = false;
-    bool get_server_cert_chain = false;
-    bool skip_default_verify = false;
-    bool enable_alpn = false;
-    std::shared_ptr<Network::SocketBase> socket;
-    std::vector<u8> next_alpn_proto;
-    bool did_handshake = false;
-    u32 verify_option = 0;
-
-    Result SetSocketDescriptorImpl(s32* out_fd, s32 fd) {
-        LOG_DEBUG(Service_SSL, "called, fd={}", fd);
-        ASSERT(!did_handshake);
-        auto bsd = system.ServiceManager().GetService<Service::Sockets::BSD_USA>("bsd:u");
-        ASSERT_OR_EXECUTE(bsd, { return ResultInternalError; });
-
-        auto const res_v = bsd->DuplicateSocketImpl(fd);
-        if (auto *res = std::get_if<s32>(&res_v)) {
-            const s32 duplicated_fd = *res;
-            if (do_not_close_socket) {
-                *out_fd = duplicated_fd;
-            } else {
-                *out_fd = -1;
-                fd_to_close = duplicated_fd;
-            }
-            std::optional<std::shared_ptr<Network::SocketBase>> sock = bsd->GetSocket(duplicated_fd);
-            if (!sock.has_value()) {
-                LOG_ERROR(Service_SSL, "invalid socket fd {} after duplication", duplicated_fd);
-                return ResultInvalidSocket;
-            }
-            socket = std::move(*sock);
-            backend->SetSocket(socket);
-            return ResultSuccess;
-        }
-        LOG_ERROR(Service_SSL, "Failed to duplicate socket with fd {}", fd);
-        return ResultInvalidSocket;
-    }
-
-    Result SetHostNameImpl(const std::string& hostname) {
-        LOG_DEBUG(Service_SSL, "called. hostname={}", hostname);
-        ASSERT(!did_handshake);
-        return backend->SetHostName(hostname);
-    }
-
-    Result SetVerifyOptionImpl(u32 option) {
-        ASSERT(!did_handshake);
-        LOG_DEBUG(Service_SSL, "called. option={} (forcing 0)", option);
-        verify_option = 0;
-        backend->SetVerifyOption(0);
-        return ResultSuccess;
-    }
-
-    Result SetIoModeImpl(u32 input_mode) {
-        auto mode = static_cast<IoMode>(input_mode);
-        ASSERT(mode == IoMode::Blocking || mode == IoMode::NonBlocking);
-        ASSERT_OR_EXECUTE(socket, { return ResultNoSocket; });
-
-        const bool non_block = mode == IoMode::NonBlocking;
-        const Network::Errno error = socket->SetNonBlock(non_block);
-        if (error != Network::Errno::SUCCESS) {
-            LOG_ERROR(Service_SSL, "Failed to set native socket non-block flag to {}", non_block);
-        }
-        return ResultSuccess;
-    }
-
-    Result SetSessionCacheModeImpl(u32 mode) {
-        ASSERT(!did_handshake);
-        LOG_WARNING(Service_SSL, "(STUBBED) called. value={}", mode);
-        return ResultSuccess;
-    }
-
     Result DoHandshakeImpl() {
         ASSERT_OR_EXECUTE(!did_handshake && socket, { return ResultNoSocket; });
         Result res = backend->DoHandshake();
@@ -234,19 +166,17 @@ private:
         };
         if (!get_server_cert_chain) {
             // Just return the first one, unencoded.
-            ASSERT_OR_EXECUTE_MSG(
+            ASSERT_OR_EXECUTE_MSG(!certs.empty(), { return {}; }, "Should be at least one server cert");
-                !certs.empty(), { return {}; }, "Should be at least one server cert");
             return certs[0];
         }
         std::vector<u8> ret;
-        Header header{0x4E4D684374726543, static_cast<u32>(certs.size()), 0};
+        Header header{0x4E4D684374726543, u32(certs.size()), 0};
         ret.insert(ret.end(), reinterpret_cast<u8*>(&header), reinterpret_cast<u8*>(&header + 1));
         size_t data_offset = sizeof(Header) + certs.size() * sizeof(EntryHeader);
         for (auto& cert : certs) {
-            EntryHeader entry_header{static_cast<u32>(cert.size()), static_cast<u32>(data_offset)};
+            EntryHeader entry_header{u32(cert.size()), u32(data_offset)};
             data_offset += cert.size();
-            ret.insert(ret.end(), reinterpret_cast<u8*>(&entry_header),
+            ret.insert(ret.end(), reinterpret_cast<u8*>(&entry_header), reinterpret_cast<u8*>(&entry_header + 1));
-                       reinterpret_cast<u8*>(&entry_header + 1));
         }
         for (auto& cert : certs) {
             ret.insert(ret.end(), cert.begin(), cert.end());
@@ -254,65 +184,77 @@ private:
         return ret;
     }
 
-    Result ReadImpl(std::vector<u8>* out_data) {
+    Result SetSocketDescriptor(s32 in_fd, Out<s32> out_fd) {
-        ASSERT_OR_EXECUTE(did_handshake, { return ResultInternalError; });
+        LOG_DEBUG(Service_SSL, "called, fd={}", in_fd);
-        size_t actual_size{};
+        ASSERT(!did_handshake);
-        Result res = backend->Read(&actual_size, *out_data);
+        auto bsd = system.ServiceManager().GetService<Service::Sockets::BSD_USA>("bsd:u");
-        if (res != ResultSuccess) {
+        ASSERT_OR_EXECUTE(bsd, { return ResultInternalError; });
-            return res;
+
+        auto const res_v = bsd->DuplicateSocketImpl(in_fd);
+        if (auto *res = std::get_if<s32>(&res_v)) {
+            const s32 dup_fd = *res;
+            *out_fd = do_not_close_socket ? dup_fd : -1;
+            if (!do_not_close_socket)
+                fd_to_close = dup_fd;
+            auto const sock = bsd->GetSocket(dup_fd);
+            if (!sock.has_value()) {
+                LOG_ERROR(Service_SSL, "invalid socket fd {} after duplication", dup_fd);
+                return ResultInvalidSocket;
+            }
+            socket = std::move(*sock);
+            backend->SetSocket(std::move(socket));
+            return ResultSuccess;
         }
-        out_data->resize(actual_size);
+        LOG_ERROR(Service_SSL, "Failed to duplicate socket with fd {}", in_fd);
-        return res;
+        return ResultInvalidSocket;
     }
 
-    Result WriteImpl(size_t* out_size, std::span<const u8> data) {
+    Result SetHostName(InBuffer<BufferAttr_HipcMapAlias> buf) {
-        ASSERT_OR_EXECUTE(did_handshake, { return ResultInternalError; });
+        auto const hostname = Common::StringFromBuffer(buf);
-        return backend->Write(out_size, data);
+        LOG_DEBUG(Service_SSL, "called. hostname={}", hostname);
+        ASSERT(!did_handshake);
+        return backend->SetHostName(hostname.c_str());
     }
 
-    Result PendingImpl(s32* out_pending) {
+    Result SetVerifyOption(u32 option) {
-        LOG_WARNING(Service_SSL, "(STUBBED) called.");
+        LOG_DEBUG(Service_SSL, "called. option={} (forcing 0)", option);
-        *out_pending = 0;
+        ASSERT(!did_handshake);
-        return ResultSuccess;
+        verify_option = 0;
+        backend->SetVerifyOption(0);
+        R_SUCCEED();
     }
 
-    void SetSocketDescriptor(HLERequestContext& ctx) {
+    Result SetIoMode(u32 input_mode) {
-        IPC::RequestParser rp{ctx};
+        auto mode = IoMode(input_mode);
-        const s32 in_fd = rp.Pop<s32>();
+        ASSERT(mode == IoMode::Blocking || mode == IoMode::NonBlocking);
-        s32 out_fd{-1};
+        R_UNLESS(socket, ResultNoSocket);
-        const Result res = SetSocketDescriptorImpl(&out_fd, in_fd);
+        const bool non_block = mode == IoMode::NonBlocking;
-        IPC::ResponseBuilder rb{ctx, 3};
+        const Network::Errno error = socket->SetNonBlock(non_block);
-        rb.Push(res);
+        if (error != Network::Errno::SUCCESS) {
-        rb.Push<s32>(out_fd);
+            LOG_ERROR(Service_SSL, "Failed to set native socket non-block flag to {}", non_block);
+        }
+        R_SUCCEED();
     }
 
-    void SetHostName(HLERequestContext& ctx) {
+    Result GetSocketDescriptor(Out<u32> out_fd) {
-        const std::string hostname = Common::StringFromBuffer(ctx.ReadBuffer());
+        LOG_WARNING(Service_SSL, "(STUBBED)");
-        const Result res = SetHostNameImpl(hostname);
+        *out_fd = uint32_t(socket->GetFD());
-        IPC::ResponseBuilder rb{ctx, 2};
+        R_SUCCEED();
-        rb.Push(res);
     }
 
-    void SetVerifyOption(HLERequestContext& ctx) {
+    Result GetHostName(OutBuffer<BufferAttr_HipcMapAlias> data, Out<u32> out_size) {
-        IPC::RequestParser rp{ctx};
+        LOG_WARNING(Service_SSL, "(STUBBED)");
-        const u32 option = rp.Pop<u32>();
+        ASSERT(!did_handshake);
-        const Result res = SetVerifyOptionImpl(option);
+        return backend->GetHostName(std::span<u8>{data.begin(), data.end()}, out_size);
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(res);
     }
 
-    void SetIoMode(HLERequestContext& ctx) {
+    Result GetIoMode(Out<u32> out_mode) {
-        IPC::RequestParser rp{ctx};
+        LOG_WARNING(Service_SSL, "(STUBBED)");
-        const u32 mode = rp.Pop<u32>();
+        R_SUCCEED();
-        const Result res = SetIoModeImpl(mode);
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(res);
     }
 
-    void DoHandshake(HLERequestContext& ctx) {
+    Result DoHandshake() {
-        const Result res = DoHandshakeImpl();
+        return DoHandshakeImpl();
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(res);
     }
 
     void DoHandshakeGetServerCert(HLERequestContext& ctx) {
@@ -351,131 +293,158 @@ private:
         rb.PushRaw(out);
     }
 
-    void Read(HLERequestContext& ctx) {
+    Result Read(OutBuffer<BufferAttr_HipcMapAlias> data, Out<u32> out_size) {
-        std::vector<u8> output_bytes(ctx.GetWriteBufferSize());
+        R_UNLESS(did_handshake, ResultInternalError);
-        const Result res = ReadImpl(&output_bytes);
+        size_t tmp{};
-        IPC::ResponseBuilder rb{ctx, 3};
+        auto const res = backend->Read(&tmp, data);
-        rb.Push(res);
+        *out_size = u32(tmp);
-        if (res == ResultSuccess) {
+        return res;
-            rb.Push(static_cast<u32>(output_bytes.size()));
-            ctx.WriteBuffer(output_bytes);
-        } else {
-            rb.Push(static_cast<u32>(0));
-        }
     }
 
-    void Write(HLERequestContext& ctx) {
+    Result Write(InBuffer<BufferAttr_HipcMapAlias> data, Out<u32> out_size) {
-        size_t write_size{0};
+        R_UNLESS(did_handshake, ResultInternalError);
-        const Result res = WriteImpl(&write_size, ctx.ReadBuffer());
+        size_t tmp{};
-        IPC::ResponseBuilder rb{ctx, 3};
+        auto const res = backend->Write(&tmp, data);
-        rb.Push(res);
+        *out_size = u32(tmp);
-        rb.Push(static_cast<u32>(write_size));
+        return res;
     }
 
-    void Pending(HLERequestContext& ctx) {
+    Result Pending(Out<s32> out_pending_size) {
-        s32 pending_size{0};
+        LOG_WARNING(Service_SSL, "(STUBBED)");
-        const Result res = PendingImpl(&pending_size);
+        *out_pending_size = s32(backend->Pending());
-        IPC::ResponseBuilder rb{ctx, 3};
+        R_SUCCEED();
-        rb.Push(res);
-        rb.Push<s32>(pending_size);
     }
 
-    void SetSessionCacheMode(HLERequestContext& ctx) {
+    Result Peek(OutBuffer<BufferAttr_HipcMapAlias> data, Out<u32> out_size) {
-        IPC::RequestParser rp{ctx};
+        LOG_WARNING(Service_SSL, "(STUBBED)");
-        const u32 mode = rp.Pop<u32>();
+        size_t tmp{};
-        const Result res = SetSessionCacheModeImpl(mode);
+        auto const res = backend->Peek(&tmp, data);
-        IPC::ResponseBuilder rb{ctx, 2};
+        *out_size = u32(tmp);
-        rb.Push(res);
+        return res;
     }
 
-    void SetOption(HLERequestContext& ctx) {
+    Result Poll(u32 in_pollevent, u32 timer, Out<u32> out_pollevent) {
-        struct Parameters {
+        LOG_WARNING(Service_SSL, "(STUBBED)");
-            OptionType option;
+        R_SUCCEED();
-            s32 value;
-        };
-        static_assert(sizeof(Parameters) == 0x8, "Parameters is an invalid size");
-
-        IPC::RequestParser rp{ctx};
-        const auto parameters = rp.PopRaw<Parameters>();
-
-        switch (parameters.option) {
-        case OptionType::DoNotCloseSocket:
-            do_not_close_socket = static_cast<bool>(parameters.value);
-            break;
-        case OptionType::GetServerCertChain:
-            get_server_cert_chain = static_cast<bool>(parameters.value);
-            break;
-        case OptionType::SkipDefaultVerify:
-            skip_default_verify = static_cast<bool>(parameters.value);
-            break;
-        case OptionType::EnableAlpn:
-            enable_alpn = static_cast<bool>(parameters.value);
-            break;
-        default:
-            LOG_WARNING(Service_SSL, "Unknown option={}, value={}", parameters.option,
-                        parameters.value);
-        }
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
     }
 
-    void GetOption(HLERequestContext& ctx) {
+    Result GetVerifyCertError() {
-        IPC::RequestParser rp{ctx};
+        LOG_WARNING(Service_SSL, "(STUBBED)");
-        const auto option = rp.PopRaw<OptionType>();
+        R_SUCCEED();
+    }
 
-        u8 value = 0;
+    Result GetNeededServerCertBufferSize(Out<u32> out_needed_buffer_size) {
+        LOG_WARNING(Service_SSL, "(STUBBED)");
+        R_SUCCEED();
+    }
 
+    Result SetSessionCacheMode(u32 mode) {
+        LOG_WARNING(Service_SSL, "(STUBBED) called. value={}", mode);
+        R_UNLESS(!did_handshake, ResultInternalError);
+        R_SUCCEED();
+    }
+
+    Result GetSessionCacheMode(Out<u32> mode) {
+        LOG_WARNING(Service_SSL, "(STUBBED)");
+        R_UNLESS(!did_handshake, ResultInternalError);
+        R_SUCCEED();
+    }
+
+    Result FlushSessionCache() {
+        LOG_WARNING(Service_SSL, "(STUBBED)");
+        R_UNLESS(!did_handshake, ResultInternalError);
+        R_SUCCEED();
+    }
+
+    Result SetRenegotiationMode(RenegotiationMode mode) {
+        LOG_WARNING(Service_SSL, "(STUBBED)");
+        backend->SetRenegotiationMode(u32(mode));
+        R_SUCCEED();
+    }
+
+    Result GetRenegotiationMode(Out<RenegotiationMode> mode) {
+        LOG_WARNING(Service_SSL, "(STUBBED)");
+        u32 tmp{};
+        auto const res = backend->GetRenegotiationMode(&tmp);
+        *mode = RenegotiationMode(tmp);
+        return res;
+    }
+
+    Result SetOption(OptionType option, s32 value) {
         switch (option) {
         case OptionType::DoNotCloseSocket:
-            value = static_cast<u8>(do_not_close_socket);
+            do_not_close_socket = bool(value);
             break;
         case OptionType::GetServerCertChain:
-            value = static_cast<u8>(get_server_cert_chain);
+            get_server_cert_chain = bool(value);
             break;
         case OptionType::SkipDefaultVerify:
-            value = static_cast<u8>(skip_default_verify);
+            skip_default_verify = bool(value);
             break;
         case OptionType::EnableAlpn:
-            value = static_cast<u8>(enable_alpn);
+            enable_alpn = bool(value);
             break;
         default:
-            LOG_WARNING(Service_SSL, "Unknown option={}", option);
+            LOG_WARNING(Service_SSL, "Unknown option={}, value={}", option, value);
-            value = 0;
+        }
+        R_SUCCEED();
+    }
+
+    Result GetOption(OptionType option, Out<u8> value) {
+        switch (option) {
+        case OptionType::DoNotCloseSocket:
+            *value = u8(do_not_close_socket);
+            break;
+        case OptionType::GetServerCertChain:
+            *value = u8(get_server_cert_chain);
+            break;
+        case OptionType::SkipDefaultVerify:
+            *value = u8(skip_default_verify);
+            break;
+        case OptionType::EnableAlpn:
+            *value = u8(enable_alpn);
+            break;
+        default:
+            LOG_WARNING(Service_SSL, "Unknown option={}", u32(option));
+            *value = 0;
             break;
         }
-
+        LOG_DEBUG(Service_SSL, "GetOption called, option={}, ret value={}", u32(option), *value);
-        LOG_DEBUG(Service_SSL, "GetOption called, option={}, ret value={}", option, value);
+        R_SUCCEED();
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(ResultSuccess);
-        rb.Push<u8>(value);
     }
 
-    void SetNextAlpnProto(HLERequestContext& ctx) {
+    Result SetNextAlpnProto(InBuffer<BufferAttr_HipcMapAlias> data) {
-        const auto data = ctx.ReadBuffer(0);
+        auto const to_write = u32((std::min)(next_alpn_proto.size(), data.size()));
-        next_alpn_proto.assign(data.begin(), data.end());
+        next_alpn_proto.assign(data.begin(), data.begin() + to_write);
-
         LOG_DEBUG(Service_SSL, "SetNextAlpnProto called, size={}", next_alpn_proto.size());
-
+        R_SUCCEED();
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
     }
 
-    void GetNextAlpnProto(HLERequestContext& ctx) {
+    Result GetNextAlpnProto(OutBuffer<BufferAttr_HipcMapAlias> data, Out<u32> to_write) {
-        const size_t writable = ctx.GetWriteBufferSize();
+        *to_write = u32((std::min)(next_alpn_proto.size(), data.size()));
-        const size_t to_write = (std::min)(next_alpn_proto.size(), writable);
+        next_alpn_proto.assign(data.begin(), data.begin() + *to_write);
-
+        LOG_DEBUG(Service_SSL, "GetNextAlpnProto called, size={}", *to_write);
-        if (to_write != 0) {
+        R_SUCCEED();
-            ctx.WriteBuffer(std::span<const u8>(next_alpn_proto.data(), to_write));
-        }
-
-        LOG_DEBUG(Service_SSL, "GetNextAlpnProto called, size={}", to_write);
-
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(ResultSuccess);
-        rb.Push<u32>(static_cast<u32>(to_write));
     }
+
+    Result GetVerifyCertErrors(OutBuffer<BufferAttr_HipcMapAlias> unk0, Out<u32> unk1, Out<u32> unk2) {
+        LOG_WARNING(Service_SSL, "(STUBBED)");
+        R_SUCCEED();
+    }
+
+    SslVersion ssl_version;
+    std::shared_ptr<SslContextSharedData> shared_data;
+    std::unique_ptr<SSLConnectionBackend> backend;
+    std::optional<int> fd_to_close;
+    std::shared_ptr<Network::SocketBase> socket;
+    std::vector<u8> next_alpn_proto;
+    u32 verify_option = 0;
+
+    bool do_not_close_socket = false;
+    bool get_server_cert_chain = false;
+    bool skip_default_verify = false;
+    bool enable_alpn = false;
+    bool did_handshake = false;
 };
 
 class ISslContext final : public ServiceFramework<ISslContext> {
@@ -492,7 +461,7 @@ public:
             {5, &ISslContext::ImportClientPki, "ImportClientPki"},
             {6, nullptr, "RemoveServerPki"},
             {7, nullptr, "RemoveClientPki"},
-            {8, nullptr, "RegisterInternalPki"},
+            {8, D<&ISslContext::RegisterInternalPki>, "RegisterInternalPki"},
             {9, nullptr, "AddPolicyOid"},
             {10, nullptr, "ImportCrl"},
             {11, nullptr, "RemoveCrl"},
@@ -587,6 +556,11 @@ private:
         rb.Push(ResultSuccess);
         rb.Push(client_id);
     }
+
+    Result RegisterInternalPki() {
+        LOG_WARNING(Service_SSL, "(STUBBED) called");
+        R_SUCCEED();
+    }
 };
 
 class ISslService final : public ServiceFramework<ISslService> {

src/core/hle/service/ssl/ssl_backend.h

@@ -36,12 +36,17 @@ class SSLConnectionBackend {
 public:
     virtual ~SSLConnectionBackend() {}
     virtual void SetSocket(std::shared_ptr<Network::SocketBase> socket) = 0;
-    virtual Result SetHostName(const std::string& hostname) = 0;
     virtual void SetVerifyOption(u32 option) = 0;
     virtual Result DoHandshake() = 0;
     virtual Result Read(size_t* out_size, std::span<u8> data) = 0;
+    virtual Result Peek(size_t* out_size, std::span<u8> data) = 0;
     virtual Result Write(size_t* out_size, std::span<const u8> data) = 0;
     virtual Result GetServerCerts(std::vector<std::vector<u8>>* out_certs) = 0;
+    virtual Result SetHostName(const char* hostname) = 0;
+    virtual Result GetHostName(std::span<u8> hostname, u32* out_size) = 0;
+    virtual int Pending() = 0;
+    virtual Result SetRenegotiationMode(u32 mode) = 0;
+    virtual Result GetRenegotiationMode(u32* mode) = 0;
 };
 
 Result CreateSSLConnectionBackend(std::unique_ptr<SSLConnectionBackend>* out_backend);

src/core/hle/service/ssl/ssl_backend_openssl.cpp

@@ -157,18 +157,30 @@ public:
         socket = std::move(socket_in);
     }
 
-    Result SetHostName(const std::string& hostname) override {
+    Result SetHostName(const char* hostname) override {
         if (!skip_cert_verification) {
-            if (!SSL_set1_host(ssl, hostname.c_str())) {
+            if (!SSL_set1_host(ssl, hostname)) {
                 LOG_ERROR(Service_SSL, "SSL_set1_host({}) failed", hostname);
                 return CheckOpenSSLErrors();
             }
         }
-        if (!SSL_set_tlsext_host_name(ssl, hostname.c_str())) { // hostname for SNI
+        if (!SSL_set_tlsext_host_name(ssl, hostname)) { // hostname for SNI
             LOG_ERROR(Service_SSL, "SSL_set_tlsext_host_name({}) failed", hostname);
             return CheckOpenSSLErrors();
         }
-        return ResultSuccess;
+        R_SUCCEED();
+    }
+
+    Result GetHostName(std::span<u8> data, u32* out_size) override {
+        auto const peer_name = SSL_get0_peername(ssl);
+        if (peer_name == nullptr) {
+            LOG_ERROR(Service_SSL, "SSL_get0_peername()");
+            return CheckOpenSSLErrors();
+        }
+        auto const s = std::string{peer_name};
+        *out_size = u32(s.size());
+        std::memcpy(data.data(), s.data(), (std::min)(s.size(), data.size()));
+        R_SUCCEED();
     }
 
     void SetVerifyOption(u32 option) override {
@@ -213,6 +225,13 @@ public:
         return HandleReturn("SSL_read_ex", out_size, ret);
     }
 
+    Result Peek(size_t* out_size, std::span<u8> data) override {
+        auto const n = (std::min)(data.size(), *out_size);
+        const int ret = SSL_peek(ssl, data.data(), int(n));
+        *out_size = n;
+        return HandleReturn("SSL_write_ex", out_size, ret);
+    }
+
     Result Write(size_t* out_size, std::span<const u8> data) override {
         const int ret = SSL_write_ex(ssl, data.data(), data.size(), out_size);
         return HandleReturn("SSL_write_ex", out_size, ret);
@@ -263,7 +282,25 @@ public:
             out_certs->emplace_back(buf, buf + len);
             OPENSSL_free(buf);
         }
-        return ResultSuccess;
+        R_SUCCEED();
+    }
+
+    int Pending() override {
+        return SSL_pending(ssl);
+    }
+
+    Result SetRenegotiationMode(u32 mode) override {
+        if (mode == 0) {
+            SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_RENEGOTIATION);
+        } else {
+            SSL_CTX_set_options(ssl_ctx, SSL_OP_ALLOW_CLIENT_RENEGOTIATION);
+        }
+        R_SUCCEED();
+    }
+
+    Result GetRenegotiationMode(u32* mode) override {
+        *mode = SSL_get_secure_renegotiation_support(ssl) ? 1 : 0;
+        R_SUCCEED();
     }
 
     ~SSLConnectionBackendOpenSSL() {

src/core/hle/service/ssl/ssl_backend_schannel.cpp

@@ -1,563 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <mutex>
-
-#include "common/error.h"
-#include "common/fs/file.h"
-#include "common/hex_util.h"
-#include "common/string_util.h"
-
-#include "core/hle/service/ssl/ssl_backend.h"
-#include "core/internal_network/network.h"
-#include "core/internal_network/sockets.h"
-
-namespace {
-
-// These includes are inside the namespace to avoid a conflict on MinGW where
-// the headers define an enum containing Network and Service as enumerators
-// (which clash with the correspondingly named namespaces).
-#define SECURITY_WIN32
-#include <schnlsp.h>
-#include <security.h>
-#include <wincrypt.h>
-
-std::once_flag one_time_init_flag;
-bool one_time_init_success = false;
-
-SCHANNEL_CRED schannel_cred{};
-CredHandle cred_handle;
-
-static void OneTimeInit() {
-    schannel_cred.dwVersion = SCHANNEL_CRED_VERSION;
-    schannel_cred.dwFlags =
-        SCH_USE_STRONG_CRYPTO |        // don't allow insecure protocols
-        SCH_CRED_NO_SERVERNAME_CHECK | // don't validate server names
-        SCH_CRED_NO_DEFAULT_CREDS;     // don't automatically present a client certificate
-    // ^ I'm assuming that nobody would want to connect Yuzu to a
-    // service that requires some OS-provided corporate client
-    // certificate, and presenting one to some arbitrary server
-    // might be a privacy concern?  Who knows, though.
-
-    const SECURITY_STATUS ret =
-        AcquireCredentialsHandle(nullptr, const_cast<LPTSTR>(UNISP_NAME), SECPKG_CRED_OUTBOUND,
-                                 nullptr, &schannel_cred, nullptr, nullptr, &cred_handle, nullptr);
-    if (ret != SEC_E_OK) {
-        // SECURITY_STATUS codes are a type of HRESULT and can be used with NativeErrorToString.
-        LOG_ERROR(Service_SSL, "AcquireCredentialsHandle failed: {}",
-                  Common::NativeErrorToString(ret));
-        return;
-    }
-
-    if (getenv("SSLKEYLOGFILE")) {
-        LOG_CRITICAL(Service_SSL, "SSLKEYLOGFILE was set but Schannel does not support exporting "
-                                  "keys; not logging keys!");
-        // Not fatal.
-    }
-
-    one_time_init_success = true;
-}
-
-} // namespace
-
-namespace Service::SSL {
-
-class SSLConnectionBackendSchannel final : public SSLConnectionBackend {
-public:
-    Result Init() {
-        std::call_once(one_time_init_flag, OneTimeInit);
-
-        if (!one_time_init_success) {
-            LOG_ERROR(
-                Service_SSL,
-                "Can't create SSL connection because Schannel one-time initialization failed");
-            return ResultInternalError;
-        }
-
-        return ResultSuccess;
-    }
-
-    void SetSocket(std::shared_ptr<Network::SocketBase> socket_in) override {
-        socket = std::move(socket_in);
-    }
-
-    Result SetHostName(const std::string& hostname_in) override {
-        hostname = hostname_in;
-        return ResultSuccess;
-    }
-
-    void SetVerifyOption(u32 option) override {
-        skip_cert_verification = (option == 0);
-        LOG_WARNING(Service_SSL, "option={} skip_verification={}", option,
-                    skip_cert_verification);
-    }
-
-    Result DoHandshake() override {
-        while (1) {
-            Result r;
-            switch (handshake_state) {
-            case HandshakeState::Initial:
-                if ((r = FlushCiphertextWriteBuf()) != ResultSuccess ||
-                    (r = CallInitializeSecurityContext()) != ResultSuccess) {
-                    return r;
-                }
-                // CallInitializeSecurityContext updated `handshake_state`.
-                continue;
-            case HandshakeState::ContinueNeeded:
-            case HandshakeState::IncompleteMessage:
-                if ((r = FlushCiphertextWriteBuf()) != ResultSuccess ||
-                    (r = FillCiphertextReadBuf()) != ResultSuccess) {
-                    return r;
-                }
-                if (ciphertext_read_buf.empty()) {
-                    LOG_ERROR(Service_SSL, "SSL handshake failed because server hung up");
-                    return ResultInternalError;
-                }
-                if ((r = CallInitializeSecurityContext()) != ResultSuccess) {
-                    return r;
-                }
-                // CallInitializeSecurityContext updated `handshake_state`.
-                continue;
-            case HandshakeState::DoneAfterFlush:
-                if ((r = FlushCiphertextWriteBuf()) != ResultSuccess) {
-                    return r;
-                }
-                handshake_state = HandshakeState::Connected;
-                return ResultSuccess;
-            case HandshakeState::Connected:
-                LOG_ERROR(Service_SSL, "Called DoHandshake but we already handshook");
-                return ResultInternalError;
-            case HandshakeState::Error:
-                return ResultInternalError;
-            }
-        }
-    }
-
-    Result FillCiphertextReadBuf() {
-        const size_t fill_size = read_buf_fill_size ? read_buf_fill_size : 4096;
-        read_buf_fill_size = 0;
-        // This unnecessarily zeroes the buffer; oh well.
-        const size_t offset = ciphertext_read_buf.size();
-        ASSERT_OR_EXECUTE(offset + fill_size >= offset, { return ResultInternalError; });
-        ciphertext_read_buf.resize(offset + fill_size, 0);
-        const auto read_span = std::span(ciphertext_read_buf).subspan(offset, fill_size);
-        const auto [actual, err] = socket->Recv(0, read_span);
-        switch (err) {
-        case Network::Errno::SUCCESS:
-            ASSERT(static_cast<size_t>(actual) <= fill_size);
-            ciphertext_read_buf.resize(offset + actual);
-            return ResultSuccess;
-        case Network::Errno::AGAIN:
-            ciphertext_read_buf.resize(offset);
-            return ResultWouldBlock;
-        default:
-            ciphertext_read_buf.resize(offset);
-            LOG_ERROR(Service_SSL, "Socket recv returned Network::Errno {}", err);
-            return ResultInternalError;
-        }
-    }
-
-    // Returns success if the write buffer has been completely emptied.
-    Result FlushCiphertextWriteBuf() {
-        while (!ciphertext_write_buf.empty()) {
-            const auto [actual, err] = socket->Send(ciphertext_write_buf, 0);
-            switch (err) {
-            case Network::Errno::SUCCESS:
-                ASSERT(static_cast<size_t>(actual) <= ciphertext_write_buf.size());
-                ciphertext_write_buf.erase(ciphertext_write_buf.begin(),
-                                           ciphertext_write_buf.begin() + actual);
-                break;
-            case Network::Errno::AGAIN:
-                return ResultWouldBlock;
-            default:
-                LOG_ERROR(Service_SSL, "Socket send returned Network::Errno {}", err);
-                return ResultInternalError;
-            }
-        }
-        return ResultSuccess;
-    }
-
-    Result CallInitializeSecurityContext() {
-        unsigned long req = ISC_REQ_ALLOCATE_MEMORY | ISC_REQ_CONFIDENTIALITY |
-                            ISC_REQ_INTEGRITY | ISC_REQ_REPLAY_DETECT |
-                            ISC_REQ_SEQUENCE_DETECT | ISC_REQ_STREAM |
-                            ISC_REQ_USE_SUPPLIED_CREDS;
-
-        if (skip_cert_verification) {
-            req |= ISC_REQ_MANUAL_CRED_VALIDATION;
-        }
-
-        unsigned long attr;
-        // https://learn.microsoft.com/en-us/windows/win32/secauthn/initializesecuritycontext--schannel
-        std::array<SecBuffer, 2> input_buffers{{
-            // only used if `initial_call_done`
-            {
-                // [0]
-                .cbBuffer = static_cast<unsigned long>(ciphertext_read_buf.size()),
-                .BufferType = SECBUFFER_TOKEN,
-                .pvBuffer = ciphertext_read_buf.data(),
-            },
-            {
-                // [1] (will be replaced by SECBUFFER_MISSING when SEC_E_INCOMPLETE_MESSAGE is
-                //     returned, or SECBUFFER_EXTRA when SEC_E_CONTINUE_NEEDED is returned if the
-                //     whole buffer wasn't used)
-                .cbBuffer = 0,
-                .BufferType = SECBUFFER_EMPTY,
-                .pvBuffer = nullptr,
-            },
-        }};
-        std::array<SecBuffer, 2> output_buffers{{
-            {
-                .cbBuffer = 0,
-                .BufferType = SECBUFFER_TOKEN,
-                .pvBuffer = nullptr,
-            }, // [0]
-            {
-                .cbBuffer = 0,
-                .BufferType = SECBUFFER_ALERT,
-                .pvBuffer = nullptr,
-            }, // [1]
-        }};
-        SecBufferDesc input_desc{
-            .ulVersion = SECBUFFER_VERSION,
-            .cBuffers = static_cast<unsigned long>(input_buffers.size()),
-            .pBuffers = input_buffers.data(),
-        };
-        SecBufferDesc output_desc{
-            .ulVersion = SECBUFFER_VERSION,
-            .cBuffers = static_cast<unsigned long>(output_buffers.size()),
-            .pBuffers = output_buffers.data(),
-        };
-        ASSERT_OR_EXECUTE_MSG(
-            input_buffers[0].cbBuffer == ciphertext_read_buf.size(),
-            { return ResultInternalError; }, "read buffer too large");
-
-        bool initial_call_done = handshake_state != HandshakeState::Initial;
-        if (initial_call_done) {
-            LOG_DEBUG(Service_SSL, "Passing {} bytes into InitializeSecurityContext",
-                      ciphertext_read_buf.size());
-        }
-
-        char* hostname_ptr = hostname ? const_cast<char*>(hostname->c_str()) : nullptr;
-        const SECURITY_STATUS ret = InitializeSecurityContextA(
-            &cred_handle, initial_call_done ? &ctxt : nullptr, hostname_ptr, req,
-            0, // Reserved1
-            0, // TargetDataRep not used with Schannel
-            initial_call_done ? &input_desc : nullptr,
-            0, // Reserved2
-            initial_call_done ? nullptr : &ctxt, &output_desc, &attr,
-            nullptr); // ptsExpiry
-
-        if (output_buffers[0].pvBuffer) {
-            const std::span span(static_cast<u8*>(output_buffers[0].pvBuffer),
-                                 output_buffers[0].cbBuffer);
-            ciphertext_write_buf.insert(ciphertext_write_buf.end(), span.begin(), span.end());
-            FreeContextBuffer(output_buffers[0].pvBuffer);
-        }
-
-        if (output_buffers[1].pvBuffer) {
-            const std::span span(static_cast<u8*>(output_buffers[1].pvBuffer),
-                                 output_buffers[1].cbBuffer);
-            // The documentation doesn't explain what format this data is in.
-            LOG_DEBUG(Service_SSL, "Got a {}-byte alert buffer: {}", span.size(),
-                      Common::HexToString(span));
-        }
-
-        switch (ret) {
-        case SEC_I_CONTINUE_NEEDED:
-            LOG_DEBUG(Service_SSL, "InitializeSecurityContext => SEC_I_CONTINUE_NEEDED");
-            if (input_buffers[1].BufferType == SECBUFFER_EXTRA) {
-                LOG_DEBUG(Service_SSL, "EXTRA of size {}", input_buffers[1].cbBuffer);
-                ASSERT(input_buffers[1].cbBuffer <= ciphertext_read_buf.size());
-                ciphertext_read_buf.erase(ciphertext_read_buf.begin(),
-                                          ciphertext_read_buf.end() - input_buffers[1].cbBuffer);
-            } else {
-                ASSERT(input_buffers[1].BufferType == SECBUFFER_EMPTY);
-                ciphertext_read_buf.clear();
-            }
-            handshake_state = HandshakeState::ContinueNeeded;
-            return ResultSuccess;
-        case SEC_E_INCOMPLETE_MESSAGE:
-            LOG_DEBUG(Service_SSL, "InitializeSecurityContext => SEC_E_INCOMPLETE_MESSAGE");
-            ASSERT(input_buffers[1].BufferType == SECBUFFER_MISSING);
-            read_buf_fill_size = input_buffers[1].cbBuffer;
-            handshake_state = HandshakeState::IncompleteMessage;
-            return ResultSuccess;
-        case SEC_E_OK:
-            LOG_DEBUG(Service_SSL, "InitializeSecurityContext => SEC_E_OK");
-            ciphertext_read_buf.clear();
-            handshake_state = HandshakeState::DoneAfterFlush;
-            return GrabStreamSizes();
-        default:
-            LOG_ERROR(Service_SSL,
-                      "InitializeSecurityContext failed (probably certificate/protocol issue): {}",
-                      Common::NativeErrorToString(ret));
-            handshake_state = HandshakeState::Error;
-            return ResultInternalError;
-        }
-    }
-
-    Result GrabStreamSizes() {
-        const SECURITY_STATUS ret =
-            QueryContextAttributes(&ctxt, SECPKG_ATTR_STREAM_SIZES, &stream_sizes);
-        if (ret != SEC_E_OK) {
-            LOG_ERROR(Service_SSL, "QueryContextAttributes(SECPKG_ATTR_STREAM_SIZES) failed: {}",
-                      Common::NativeErrorToString(ret));
-            handshake_state = HandshakeState::Error;
-            return ResultInternalError;
-        }
-        return ResultSuccess;
-    }
-
-    Result Read(size_t* out_size, std::span<u8> data) override {
-        *out_size = 0;
-        if (handshake_state != HandshakeState::Connected) {
-            LOG_ERROR(Service_SSL, "Called Read but we did not successfully handshake");
-            return ResultInternalError;
-        }
-        if (data.size() == 0 || got_read_eof) {
-            return ResultSuccess;
-        }
-        while (1) {
-            if (!cleartext_read_buf.empty()) {
-                *out_size = (std::min)(cleartext_read_buf.size(), data.size());
-                std::memcpy(data.data(), cleartext_read_buf.data(), *out_size);
-                cleartext_read_buf.erase(cleartext_read_buf.begin(),
-                                         cleartext_read_buf.begin() + *out_size);
-                return ResultSuccess;
-            }
-            if (!ciphertext_read_buf.empty()) {
-                SecBuffer empty{
-                    .cbBuffer = 0,
-                    .BufferType = SECBUFFER_EMPTY,
-                    .pvBuffer = nullptr,
-                };
-                std::array<SecBuffer, 5> buffers{{
-                    {
-                        .cbBuffer = static_cast<unsigned long>(ciphertext_read_buf.size()),
-                        .BufferType = SECBUFFER_DATA,
-                        .pvBuffer = ciphertext_read_buf.data(),
-                    },
-                    empty,
-                    empty,
-                    empty,
-                }};
-                ASSERT_OR_EXECUTE_MSG(
-                    buffers[0].cbBuffer == ciphertext_read_buf.size(),
-                    { return ResultInternalError; }, "read buffer too large");
-                SecBufferDesc desc{
-                    .ulVersion = SECBUFFER_VERSION,
-                    .cBuffers = static_cast<unsigned long>(buffers.size()),
-                    .pBuffers = buffers.data(),
-                };
-                SECURITY_STATUS ret =
-                    DecryptMessage(&ctxt, &desc, /*MessageSeqNo*/ 0, /*pfQOP*/ nullptr);
-                switch (ret) {
-                case SEC_E_OK:
-                    ASSERT_OR_EXECUTE(buffers[0].BufferType == SECBUFFER_STREAM_HEADER,
-                                      { return ResultInternalError; });
-                    ASSERT_OR_EXECUTE(buffers[1].BufferType == SECBUFFER_DATA,
-                                      { return ResultInternalError; });
-                    ASSERT_OR_EXECUTE(buffers[2].BufferType == SECBUFFER_STREAM_TRAILER,
-                                      { return ResultInternalError; });
-                    cleartext_read_buf.assign(static_cast<u8*>(buffers[1].pvBuffer),
-                                              static_cast<u8*>(buffers[1].pvBuffer) +
-                                                  buffers[1].cbBuffer);
-                    if (buffers[3].BufferType == SECBUFFER_EXTRA) {
-                        ASSERT(buffers[3].cbBuffer <= ciphertext_read_buf.size());
-                        ciphertext_read_buf.erase(ciphertext_read_buf.begin(),
-                                                  ciphertext_read_buf.end() - buffers[3].cbBuffer);
-                    } else {
-                        ASSERT(buffers[3].BufferType == SECBUFFER_EMPTY);
-                        ciphertext_read_buf.clear();
-                    }
-                    continue;
-                case SEC_E_INCOMPLETE_MESSAGE:
-                    break;
-                case SEC_I_CONTEXT_EXPIRED:
-                    // Server hung up by sending close_notify.
-                    got_read_eof = true;
-                    *out_size = 0;
-                    return ResultSuccess;
-                default:
-                    LOG_ERROR(Service_SSL, "DecryptMessage failed: {}",
-                              Common::NativeErrorToString(ret));
-                    return ResultInternalError;
-                }
-            }
-            const Result r = FillCiphertextReadBuf();
-            if (r != ResultSuccess) {
-                return r;
-            }
-            if (ciphertext_read_buf.empty()) {
-                got_read_eof = true;
-                *out_size = 0;
-                return ResultSuccess;
-            }
-        }
-    }
-
-    Result Write(size_t* out_size, std::span<const u8> data) override {
-        *out_size = 0;
-
-        if (handshake_state != HandshakeState::Connected) {
-            LOG_ERROR(Service_SSL, "Called Write but we did not successfully handshake");
-            return ResultInternalError;
-        }
-        if (data.size() == 0) {
-            return ResultSuccess;
-        }
-        data = data.subspan(0, std::min<size_t>(data.size(), stream_sizes.cbMaximumMessage));
-        if (!cleartext_write_buf.empty()) {
-            // Already in the middle of a write.  It wouldn't make sense to not
-            // finish sending the entire buffer since TLS has
-            // header/MAC/padding/etc.
-            if (data.size() != cleartext_write_buf.size() ||
-                std::memcmp(data.data(), cleartext_write_buf.data(), data.size())) {
-                LOG_ERROR(Service_SSL, "Called Write but buffer does not match previous buffer");
-                return ResultInternalError;
-            }
-            return WriteAlreadyEncryptedData(out_size);
-        } else {
-            cleartext_write_buf.assign(data.begin(), data.end());
-        }
-
-        std::vector<u8> header_buf(stream_sizes.cbHeader, 0);
-        std::vector<u8> tmp_data_buf = cleartext_write_buf;
-        std::vector<u8> trailer_buf(stream_sizes.cbTrailer, 0);
-
-        std::array<SecBuffer, 3> buffers{{
-            {
-                .cbBuffer = stream_sizes.cbHeader,
-                .BufferType = SECBUFFER_STREAM_HEADER,
-                .pvBuffer = header_buf.data(),
-            },
-            {
-                .cbBuffer = static_cast<unsigned long>(tmp_data_buf.size()),
-                .BufferType = SECBUFFER_DATA,
-                .pvBuffer = tmp_data_buf.data(),
-            },
-            {
-                .cbBuffer = stream_sizes.cbTrailer,
-                .BufferType = SECBUFFER_STREAM_TRAILER,
-                .pvBuffer = trailer_buf.data(),
-            },
-        }};
-        ASSERT_OR_EXECUTE_MSG(
-            buffers[1].cbBuffer == tmp_data_buf.size(), { return ResultInternalError; },
-            "temp buffer too large");
-        SecBufferDesc desc{
-            .ulVersion = SECBUFFER_VERSION,
-            .cBuffers = static_cast<unsigned long>(buffers.size()),
-            .pBuffers = buffers.data(),
-        };
-
-        const SECURITY_STATUS ret = EncryptMessage(&ctxt, /*fQOP*/ 0, &desc, /*MessageSeqNo*/ 0);
-        if (ret != SEC_E_OK) {
-            LOG_ERROR(Service_SSL, "EncryptMessage failed: {}", Common::NativeErrorToString(ret));
-            return ResultInternalError;
-        }
-        ciphertext_write_buf.insert(ciphertext_write_buf.end(), header_buf.begin(),
-                                    header_buf.end());
-        ciphertext_write_buf.insert(ciphertext_write_buf.end(), tmp_data_buf.begin(),
-                                    tmp_data_buf.end());
-        ciphertext_write_buf.insert(ciphertext_write_buf.end(), trailer_buf.begin(),
-                                    trailer_buf.end());
-        return WriteAlreadyEncryptedData(out_size);
-    }
-
-    Result WriteAlreadyEncryptedData(size_t* out_size) {
-        const Result r = FlushCiphertextWriteBuf();
-        if (r != ResultSuccess) {
-            return r;
-        }
-        // write buf is empty
-        *out_size = cleartext_write_buf.size();
-        cleartext_write_buf.clear();
-        return ResultSuccess;
-    }
-
-    Result GetServerCerts(std::vector<std::vector<u8>>* out_certs) override {
-        PCCERT_CONTEXT returned_cert = nullptr;
-        const SECURITY_STATUS ret =
-            QueryContextAttributes(&ctxt, SECPKG_ATTR_REMOTE_CERT_CONTEXT, &returned_cert);
-        if (ret != SEC_E_OK) {
-            LOG_ERROR(Service_SSL,
-                      "QueryContextAttributes(SECPKG_ATTR_REMOTE_CERT_CONTEXT) failed: {}",
-                      Common::NativeErrorToString(ret));
-            return ResultInternalError;
-        }
-        PCCERT_CONTEXT some_cert = nullptr;
-        while ((some_cert = CertEnumCertificatesInStore(returned_cert->hCertStore, some_cert)) !=
-               nullptr) {
-            out_certs->emplace_back(static_cast<u8*>(some_cert->pbCertEncoded),
-                                    static_cast<u8*>(some_cert->pbCertEncoded) +
-                                        some_cert->cbCertEncoded);
-        }
-        std::reverse(out_certs->begin(),
-                     out_certs->end()); // Windows returns certs in reverse order from what we want
-        CertFreeCertificateContext(returned_cert);
-        return ResultSuccess;
-    }
-
-    ~SSLConnectionBackendSchannel() {
-        if (handshake_state != HandshakeState::Initial) {
-            DeleteSecurityContext(&ctxt);
-        }
-    }
-
-    enum class HandshakeState {
-        // Haven't called anything yet.
-        Initial,
-        // `SEC_I_CONTINUE_NEEDED` was returned by
-        // `InitializeSecurityContext`; must finish sending data (if any) in
-        // the write buffer, then read at least one byte before calling
-        // `InitializeSecurityContext` again.
-        ContinueNeeded,
-        // `SEC_E_INCOMPLETE_MESSAGE` was returned by
-        // `InitializeSecurityContext`; hopefully the write buffer is empty;
-        // must read at least one byte before calling
-        // `InitializeSecurityContext` again.
-        IncompleteMessage,
-        // `SEC_E_OK` was returned by `InitializeSecurityContext`; must
-        // finish sending data in the write buffer before having `DoHandshake`
-        // report success.
-        DoneAfterFlush,
-        // We finished the above and are now connected.  At this point, writing
-        // and reading are separate 'state machines' represented by the
-        // nonemptiness of the ciphertext and cleartext read and write buffers.
-        Connected,
-        // Another error was returned and we shouldn't allow initialization
-        // to continue.
-        Error,
-    } handshake_state = HandshakeState::Initial;
-
-    CtxtHandle ctxt;
-    SecPkgContext_StreamSizes stream_sizes;
-
-    std::shared_ptr<Network::SocketBase> socket;
-    std::optional<std::string> hostname;
-
-    std::vector<u8> ciphertext_read_buf;
-    std::vector<u8> ciphertext_write_buf;
-    std::vector<u8> cleartext_read_buf;
-    std::vector<u8> cleartext_write_buf;
-
-    bool got_read_eof = false;
-    bool skip_cert_verification = false;
-    size_t read_buf_fill_size = 0;
-};
-
-Result CreateSSLConnectionBackend(std::unique_ptr<SSLConnectionBackend>* out_backend) {
-    auto conn = std::make_unique<SSLConnectionBackendSchannel>();
-
-    R_TRY(conn->Init());
-
-    *out_backend = std::move(conn);
-    return ResultSuccess;
-}
-
-} // namespace Service::SSL

src/core/hle/service/ssl/ssl_backend_securetransport.cpp

@@ -1,236 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <mutex>
-
-// SecureTransport has been deprecated in its entirety in favor of
-// Network.framework, but that does not allow layering TLS on top of an
-// arbitrary socket.
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#include <Security/SecureTransport.h>
-#pragma GCC diagnostic pop
-#endif
-
-#include "core/hle/service/ssl/ssl_backend.h"
-#include "core/internal_network/network.h"
-#include "core/internal_network/sockets.h"
-
-namespace {
-
-template <typename T>
-struct CFReleaser {
-    T ptr;
-
-    YUZU_NON_COPYABLE(CFReleaser);
-    constexpr CFReleaser() : ptr(nullptr) {}
-    constexpr CFReleaser(T ptr) : ptr(ptr) {}
-    constexpr operator T() {
-        return ptr;
-    }
-    ~CFReleaser() {
-        if (ptr) {
-            CFRelease(ptr);
-        }
-    }
-};
-
-std::string CFStringToString(CFStringRef cfstr) {
-    CFReleaser<CFDataRef> cfdata(
-        CFStringCreateExternalRepresentation(nullptr, cfstr, kCFStringEncodingUTF8, 0));
-    ASSERT_OR_EXECUTE(cfdata, { return "???"; });
-    return std::string(reinterpret_cast<const char*>(CFDataGetBytePtr(cfdata)),
-                       CFDataGetLength(cfdata));
-}
-
-std::string OSStatusToString(OSStatus status) {
-    CFReleaser<CFStringRef> cfstr(SecCopyErrorMessageString(status, nullptr));
-    if (!cfstr) {
-        return "[unknown error]";
-    }
-    return CFStringToString(cfstr);
-}
-
-} // namespace
-
-namespace Service::SSL {
-
-class SSLConnectionBackendSecureTransport final : public SSLConnectionBackend {
-public:
-    Result Init() {
-        static std::once_flag once_flag;
-        std::call_once(once_flag, []() {
-            if (getenv("SSLKEYLOGFILE")) {
-                LOG_CRITICAL(Service_SSL, "SSLKEYLOGFILE was set but SecureTransport does not "
-                                          "support exporting keys; not logging keys!");
-                // Not fatal.
-            }
-        });
-
-        context.ptr = SSLCreateContext(nullptr, kSSLClientSide, kSSLStreamType);
-        if (!context) {
-            LOG_ERROR(Service_SSL, "SSLCreateContext failed");
-            return ResultInternalError;
-        }
-
-        OSStatus status;
-        if ((status = SSLSetIOFuncs(context, ReadCallback, WriteCallback)) ||
-            (status = SSLSetConnection(context, this))) {
-            LOG_ERROR(Service_SSL, "SSLContext initialization failed: {}",
-                      OSStatusToString(status));
-            return ResultInternalError;
-        }
-
-        return ResultSuccess;
-    }
-
-    void SetSocket(std::shared_ptr<Network::SocketBase> in_socket) override {
-        socket = std::move(in_socket);
-    }
-
-    Result SetHostName(const std::string& hostname) override {
-        OSStatus status = SSLSetPeerDomainName(context, hostname.c_str(), hostname.size());
-        if (status) {
-            LOG_ERROR(Service_SSL, "SSLSetPeerDomainName failed: {}", OSStatusToString(status));
-            return ResultInternalError;
-        }
-        return ResultSuccess;
-    }
-
-    void SetVerifyOption(u32 option) override {
-        skip_cert_verification = (option == 0);
-        LOG_WARNING(Service_SSL, "option={} skip_verification={}", option,
-                    skip_cert_verification);
-        if (skip_cert_verification) {
-            SSLSetSessionOption(context, kSSLSessionOptionBreakOnServerAuth, true);
-        }
-    }
-
-    Result DoHandshake() override {
-        OSStatus status = SSLHandshake(context);
-
-        if (skip_cert_verification && status == errSSLServerAuthCompleted) {
-            LOG_DEBUG(Service_SSL, "Skipping certificate verification as requested");
-            status = SSLHandshake(context);
-        }
-
-        return HandleReturn("SSLHandshake", 0, status);
-    }
-
-    Result Read(size_t* out_size, std::span<u8> data) override {
-        OSStatus status = SSLRead(context, data.data(), data.size(), out_size);
-        return HandleReturn("SSLRead", out_size, status);
-    }
-
-    Result Write(size_t* out_size, std::span<const u8> data) override {
-        OSStatus status = SSLWrite(context, data.data(), data.size(), out_size);
-        return HandleReturn("SSLWrite", out_size, status);
-    }
-
-    Result HandleReturn(const char* what, size_t* actual, OSStatus status) {
-        switch (status) {
-        case 0:
-            return ResultSuccess;
-        case errSSLWouldBlock:
-            return ResultWouldBlock;
-        default: {
-            std::string reason;
-            if (got_read_eof) {
-                reason = "server hung up";
-            } else {
-                reason = OSStatusToString(status);
-            }
-            LOG_ERROR(Service_SSL, "{} failed: {}", what, reason);
-            return ResultInternalError;
-        }
-        }
-    }
-
-    Result GetServerCerts(std::vector<std::vector<u8>>* out_certs) override {
-        CFReleaser<SecTrustRef> trust;
-        OSStatus status = SSLCopyPeerTrust(context, &trust.ptr);
-        if (status) {
-            LOG_ERROR(Service_SSL, "SSLCopyPeerTrust failed: {}", OSStatusToString(status));
-            return ResultInternalError;
-        }
-        for (CFIndex i = 0, count = SecTrustGetCertificateCount(trust); i < count; i++) {
-            SecCertificateRef cert = SecTrustGetCertificateAtIndex(trust, i);
-            CFReleaser<CFDataRef> data(SecCertificateCopyData(cert));
-            ASSERT_OR_EXECUTE(data, { return ResultInternalError; });
-            const u8* ptr = CFDataGetBytePtr(data);
-            out_certs->emplace_back(ptr, ptr + CFDataGetLength(data));
-        }
-        return ResultSuccess;
-    }
-
-    static OSStatus ReadCallback(SSLConnectionRef connection, void* data, size_t* dataLength) {
-        return ReadOrWriteCallback(connection, data, dataLength, true);
-    }
-
-    static OSStatus WriteCallback(SSLConnectionRef connection, const void* data,
-                                  size_t* dataLength) {
-        return ReadOrWriteCallback(connection, const_cast<void*>(data), dataLength, false);
-    }
-
-    static OSStatus ReadOrWriteCallback(SSLConnectionRef connection, void* data, size_t* dataLength,
-                                        bool is_read) {
-        auto self =
-            static_cast<SSLConnectionBackendSecureTransport*>(const_cast<void*>(connection));
-        ASSERT_OR_EXECUTE_MSG(
-            self->socket, { return 0; }, "SecureTransport asked to {} but we have no socket",
-            is_read ? "read" : "write");
-
-        // SecureTransport callbacks (unlike OpenSSL BIO callbacks) are
-        // expected to read/write the full requested dataLength or return an
-        // error, so we have to add a loop ourselves.
-        size_t requested_len = *dataLength;
-        size_t offset = 0;
-        while (offset < requested_len) {
-            std::span cur(reinterpret_cast<u8*>(data) + offset, requested_len - offset);
-            auto [actual, err] = is_read ? self->socket->Recv(0, cur) : self->socket->Send(cur, 0);
-            LOG_CRITICAL(Service_SSL, "op={}, offset={} actual={}/{} err={}", is_read, offset,
-                         actual, cur.size(), static_cast<s32>(err));
-            switch (err) {
-            case Network::Errno::SUCCESS:
-                offset += actual;
-                if (actual == 0) {
-                    ASSERT(is_read);
-                    self->got_read_eof = true;
-                    return errSecEndOfData;
-                }
-                break;
-            case Network::Errno::AGAIN:
-                *dataLength = offset;
-                return errSSLWouldBlock;
-            default:
-                LOG_ERROR(Service_SSL, "Socket {} returned Network::Errno {}",
-                          is_read ? "recv" : "send", err);
-                return errSecIO;
-            }
-        }
-        ASSERT(offset == requested_len);
-        return 0;
-    }
-
-private:
-    CFReleaser<SSLContextRef> context = nullptr;
-    bool got_read_eof = false;
-    bool skip_cert_verification = false;
-
-    std::shared_ptr<Network::SocketBase> socket;
-};
-
-Result CreateSSLConnectionBackend(std::unique_ptr<SSLConnectionBackend>* out_backend) {
-    auto conn = std::make_unique<SSLConnectionBackendSecureTransport>();
-
-    R_TRY(conn->Init());
-
-    *out_backend = std::move(conn);
-    return ResultSuccess;
-}
-
-} // namespace Service::SSL

src/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.h

@@ -85,8 +85,13 @@ template<>
 
     code.mov(tmp, vaddr);
     code.shr(tmp, int(page_table_const_bits));
-    code.shl(tmp, int(ctx.conf.page_table_log2_stride));
+
-    code.mov(page, qword[r14 + tmp.cvt64()]);
+    if (ctx.conf.page_table_log2_stride > 3) {
+        code.shl(tmp, int(ctx.conf.page_table_log2_stride));
+        code.mov(page, qword[r14 + tmp.cvt64()]);
+    } else {
+        code.mov(page, qword[r14 + tmp.cvt64() * int(1 << ctx.conf.page_table_log2_stride)]);
+    }
 
     // check for marked bit, use as unmapped if marked
 	if (ctx.conf.page_table_marked_bit) {
@@ -102,9 +107,10 @@ template<>
         code.mov(tmp, ctx.conf.page_table_pointer_mask);
         code.and_(page, tmp);
     }
+    // check for sign bit, apply sign extension as needed
     if (ctx.conf.page_table_sign_extension) {
-        code.shl(page, *ctx.conf.page_table_sign_extension);
+        code.shl(page, 63 - int(*ctx.conf.page_table_sign_extension));
-        code.sar(page, *ctx.conf.page_table_sign_extension);
+        code.sar(page, 63 - int(*ctx.conf.page_table_sign_extension));
     }
 
     code.jz(abort, code.T_NEAR);
@@ -155,8 +161,12 @@ template<>
         code.jnz(abort, code.T_NEAR);
     }
 
-    code.shl(tmp, int(ctx.conf.page_table_log2_stride));
+    if (ctx.conf.page_table_log2_stride > 3) {
-    code.mov(page, qword[r14 + tmp]);
+        code.shl(tmp, int(ctx.conf.page_table_log2_stride));
+        code.mov(page, qword[r14 + tmp.cvt64()]);
+    } else {
+        code.mov(page, qword[r14 + tmp.cvt64() * int(1 << ctx.conf.page_table_log2_stride)]);
+    }
 
     // check for marked bit, use as unmapped if marked
     if (ctx.conf.page_table_marked_bit) {
@@ -172,6 +182,7 @@ template<>
         code.mov(tmp, ctx.conf.page_table_pointer_mask);
         code.and_(page, tmp);
     }
+    // check for sign bit, apply sign extension as needed
     if (ctx.conf.page_table_sign_extension) {
         code.shl(page, *ctx.conf.page_table_sign_extension);
         code.sar(page, *ctx.conf.page_table_sign_extension);

src/qt_common/config/shared_translation.cpp

@@ -23,7 +23,7 @@ namespace ConfigurationShared {
 
 std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent) {
     std::unique_ptr<TranslationMap> translations = std::make_unique<TranslationMap>();
-    const auto& tr = [parent](const char* text) -> QString { return parent->tr(text); };
+    const auto& tr = [](const char* text) -> QString { return QCoreApplication::translate("ConfigurationShared", text); };
 
 #define INSERT(SETTINGS, ID, NAME, TOOLTIP)                                                        \
     translations->insert(std::pair{SETTINGS::values.ID.Id(), std::pair{(NAME), (TOOLTIP)}})
@@ -151,6 +151,9 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent) {
            tr("The anti-aliasing method to use.\nSMAA offers the best quality.\nFXAA "
               "can produce a more stable picture in lower resolutions."));
     INSERT(Settings, post_shader_chain, QString(), QString());
+    INSERT(Settings, post_shader_preset, QString(), QString());
+    INSERT(Settings, post_shader_enabled, tr("Enable post-processing effects"),
+           tr("Applies post-processing effects to the final image."));
     INSERT(Settings, fullscreen_mode, tr("Fullscreen Mode:"),
            tr("The method used to render the window in fullscreen.\nBorderless offers the best "
               "compatibility with the on-screen keyboard that some games request for "
@@ -368,8 +371,8 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent) {
 std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent) {
     std::unique_ptr<ComboboxTranslationMap> translations =
         std::make_unique<ComboboxTranslationMap>();
-    const auto& tr = [&](const char* text, const char* context = "") {
+    const auto& tr = [](const char* text, const char* context = "") {
-        return parent->tr(text, context);
+        return QCoreApplication::translate("ConfigurationShared", text, context);
     };
 
 #define PAIR(ENUM, VALUE, TRANSLATION) {static_cast<u32>(Settings::ENUM::VALUE), (TRANSLATION)}

src/video_core/renderer_vulkan/vk_texture_cache.cpp

@@ -2850,8 +2850,6 @@ Sampler::VariantKey Sampler::MakeKey(const ImageView& image_view, bool is_depth)
     VariantKey key{};
     key.reduce_anisotropy = has_added_anisotropy && !image_view.SupportsAnisotropy();
     key.force_nearest = has_linear_filtering && IsPixelFormatInteger(image_view.format);
-    key.drop_depth_comparison =
-        is_depth && has_depth_comparison && !image_view.SupportsDepthComparison();
     key.drop_reduction = has_minmax_reduction && !image_view.SupportsMinmaxFilter();
     key.drop_custom_border = has_custom_border_colors && image_view.RequiresBorderColorFormat();
     key.srgb_border = has_srgb_border_color && IsPixelFormatSRGB(image_view.format);
@@ -2929,9 +2927,6 @@ VkSampler Sampler::Emplace(VariantKey key) {
         create_info.anisotropyEnable = static_cast<VkBool32>(default_anisotropy > 1.0f);
         create_info.maxAnisotropy = default_anisotropy;
     }
-    if (key.drop_depth_comparison) {
-        create_info.compareEnable = VK_FALSE;
-    }
     if (!custom_border) {
         create_info.borderColor = ConvertBorderColor(color);
     }

src/video_core/renderer_vulkan/vk_texture_cache.h

@@ -536,7 +536,6 @@ private:
     struct VariantKey {
         bool reduce_anisotropy;
         bool force_nearest;
-        bool drop_depth_comparison;
         bool drop_reduction;
         bool drop_custom_border;
         bool srgb_border;

src/yuzu/configuration/configure_graphics.cpp

@@ -37,6 +37,10 @@
 #include "yuzu/configuration/configure_graphics.h"
 #include "yuzu/configuration/shared_widget.h"
 
+#ifdef HAS_RESHADE
+#include "yuzu/configuration/configure_post_processing.h"
+#endif
+
 ConfigureGraphics::ConfigureGraphics(
     const Core::System& system_, std::vector<VkDeviceInfo::Record>& records_,
     const std::function<void()>& expose_compute_option_,
@@ -216,6 +220,12 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
     std::vector<QWidget*> hold_api;
 
     for (const auto setting : Settings::values.linkage.by_category[Settings::Category::Renderer]) {
+#ifndef HAS_RESHADE
+        if (setting->Id() == Settings::values.post_shader_enabled.Id()) {
+            continue;
+        }
+#endif
+
         ConfigurationShared::Widget* widget = [&]() {
             if (setting->Id() == Settings::values.fsr_sharpening_slider.Id()) {
                 // FSR needs a reversed slider and a 0.5 multiplier
@@ -295,6 +305,23 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
             // Keep track of the resolution combobox to update other UI tabs that need it
             resolution_combobox = widget->combobox;
             hold_graphics.emplace(setting->Id(), widget);
+#ifdef HAS_RESHADE
+        } else if (setting->Id() == Settings::values.post_shader_enabled.Id()) {
+            QPushButton* post_shader_button = new QPushButton(tr("Configure Effects..."), widget);
+            post_shader_button->setVisible(widget->checkbox->isChecked());
+
+            connect(post_shader_button, &QAbstractButton::clicked, this, [this]() {
+                ConfigurePostProcessing dialog(this);
+                dialog.exec();
+            });
+            connect(widget->checkbox, &QCheckBox::toggled, post_shader_button,
+                    &QWidget::setVisible);
+
+            QBoxLayout* row = qobject_cast<QBoxLayout*>(widget->layout());
+            row->insertWidget(1, post_shader_button);
+
+            hold_graphics.emplace(setting->Id(), widget);
+#endif
         } else {
             hold_graphics.emplace(setting->Id(), widget);
         }

src/yuzu/configuration/configure_post_processing.cpp

@@ -70,10 +70,8 @@ ConfigurePostProcessing::ConfigurePostProcessing(QWidget* parent) : QDialog(pare
 
     auto* root = new QVBoxLayout(this);
 
-    auto* description = new QLabel(
+    auto* description =
-        tr("ReShade FX effects are loaded from the post_shaders folder in the Eden data "
+        new QLabel(tr("Changes apply immediately while a game is running."), this);
-           "directory. Changes apply immediately while a game is running."),
-        this);
     description->setWordWrap(true);
     root->addWidget(description);
 
@@ -128,17 +126,15 @@ ConfigurePostProcessing::ConfigurePostProcessing(QWidget* parent) : QDialog(pare
     });
     preset_row->addWidget(save_button);
 
-    auto* delete_button = new QPushButton(tr("Delete"), this);
+    auto* clear_button = new QPushButton(tr("Clear"), this);
-    connect(delete_button, &QPushButton::clicked, this, [this]() {
+    clear_button->setToolTip(tr("Remove every effect in use and deselect the preset."));
-        const QString name = preset_combo->currentData().toString();
+    connect(clear_button, &QPushButton::clicked, this, [this]() {
-        if (name.isEmpty()) {
+        VideoCore::FxChain::Instance().Clear();
-            return;
+        VideoCore::SetActiveFxPreset(std::string());
-        }
+        preset_combo->setCurrentIndex(0);
-        VideoCore::DeleteFxPreset(name.toStdString());
+        ApplyStructuralChange();
-        PopulatePresetCombo();
-        RefreshPresetStatus();
     });
-    preset_row->addWidget(delete_button);
+    preset_row->addWidget(clear_button);
 
     root->addLayout(preset_row);
 
@@ -203,6 +199,7 @@ void ConfigurePostProcessing::ApplyStructuralChange() {
 void ConfigurePostProcessing::PopulatePresetCombo() {
     const QString previous = preset_combo->currentData().toString();
     preset_combo->clear();
+    preset_combo->addItem(tr("None"), QString());
 
     for (const auto& preset : VideoCore::GetFxPresetCatalog()) {
         const QString name = QString::fromStdString(preset.name);
@@ -212,7 +209,7 @@ void ConfigurePostProcessing::PopulatePresetCombo() {
     }
 
     const int restored = preset_combo->findData(previous);
-    if (restored >= 0) {
+    if (!previous.isEmpty() && restored >= 0) {
         preset_combo->setCurrentIndex(restored);
         return;
     }
@@ -220,12 +217,21 @@ void ConfigurePostProcessing::PopulatePresetCombo() {
     const int active = preset_combo->findData(QString::fromStdString(VideoCore::GetActiveFxPreset()));
     if (active >= 0) {
         preset_combo->setCurrentIndex(active);
+        return;
     }
+
+    preset_combo->setCurrentIndex(0);
 }
 
 void ConfigurePostProcessing::RefreshPresetStatus() {
     const std::string active = VideoCore::GetActiveFxPreset();
     if (active.empty()) {
+        if (VideoCore::FxChain::Instance().Size() == 0) {
+            preset_status->setText(
+                tr("No effects in use. Pick a preset and press Apply, or add effects one "
+                   "by one."));
+            return;
+        }
         preset_status->setText(tr("Custom chain. Pick a preset above and press Apply to replace it."));
         return;
     }

src/yuzu/main_window.cpp

@@ -15,6 +15,7 @@
 #include "render/performance_overlay.h"
 #ifdef HAS_RESHADE
 #include "configuration/configure_post_processing.h"
+#include "video_core/post_processing/fx_preset.h"
 #endif
 #include "updater/update_dialog.h"
 
@@ -1090,6 +1091,41 @@ void MainWindow::InitializeWidgets() {
 
     statusBar()->insertPermanentWidget(0, volume_button);
 
+#ifdef HAS_RESHADE
+    post_shader_status_button = new QPushButton();
+    post_shader_status_button->setObjectName(QStringLiteral("TogglableStatusBarButton"));
+    post_shader_status_button->setFocusPolicy(Qt::NoFocus);
+    post_shader_status_button->setCheckable(true);
+    connect(post_shader_status_button, &QPushButton::clicked, this, [this] {
+        const bool enabled = Settings::values.post_shader_enabled.GetValue();
+        Settings::values.post_shader_enabled.SetValue(!enabled);
+        UpdatePostShaderText();
+    });
+    UpdatePostShaderText();
+    post_shader_status_button->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(post_shader_status_button, &QPushButton::customContextMenuRequested,
+            [this](const QPoint& menu_location) {
+                QMenu context_menu;
+
+                for (auto const& preset : VideoCore::GetFxPresetCatalog()) {
+                    context_menu.addAction(QString::fromStdString(preset.name),
+                                           [this, name = preset.name] {
+                                               VideoCore::ApplyFxPreset(name);
+                                               Settings::values.post_shader_enabled.SetValue(true);
+                                               UpdatePostShaderText();
+                                           });
+                }
+
+                context_menu.addSeparator();
+                context_menu.addAction(tr("Configure Effects..."), this,
+                                       &MainWindow::OnPostProcessingShaders);
+
+                context_menu.exec(post_shader_status_button->mapToGlobal(menu_location));
+                post_shader_status_button->repaint();
+            });
+    statusBar()->insertPermanentWidget(0, post_shader_status_button);
+#endif
+
     // setup AA button
     aa_status_button = new QPushButton();
     aa_status_button->setObjectName(QStringLiteral("TogglableStatusBarButton"));
@@ -3908,6 +3944,7 @@ void MainWindow::OnPostProcessingShaders() {
         connect(post_processing_dialog, &QDialog::finished, post_processing_dialog, [this]() {
             post_processing_dialog->deleteLater();
             post_processing_dialog = nullptr;
+            UpdatePostShaderText();
         });
     }
 
@@ -4262,6 +4299,26 @@ void MainWindow::UpdateAAText() {
                                   : aa_text.toUpper());
 }
 
+#ifdef HAS_RESHADE
+void MainWindow::UpdatePostShaderText() {
+    const bool enabled = Settings::values.post_shader_enabled.GetValue();
+    post_shader_status_button->setChecked(enabled);
+
+    if (!enabled) {
+        post_shader_status_button->setText(tr("NO FX"));
+        return;
+    }
+
+    const std::string preset = VideoCore::GetActiveFxPreset();
+    if (preset.empty()) {
+        post_shader_status_button->setText(tr("FX"));
+        return;
+    }
+
+    post_shader_status_button->setText(QString::fromStdString(preset).toUpper());
+}
+#endif
+
 void MainWindow::UpdateVolumeUI() {
     const auto volume_value = static_cast<int>(Settings::values.volume.GetValue());
     volume_slider->setValue(volume_value);

src/yuzu/main_window.h

@@ -448,6 +448,7 @@ private:
     void UpdateAPIText();
     void UpdateFilterText();
     void UpdateAAText();
+    void UpdatePostShaderText();
     void UpdateVolumeUI();
     void UpdateStatusBar();
     void UpdateGPUAccuracyButton();
@@ -524,6 +525,7 @@ private:
     QPushButton* dock_status_button = nullptr;
     QPushButton* filter_status_button = nullptr;
     QPushButton* aa_status_button = nullptr;
+    QPushButton* post_shader_status_button = nullptr;
     VolumeButton* volume_button = nullptr;
     QWidget* volume_popup = nullptr;
     QSlider* volume_slider = nullptr;