early-access version 4154EA-4154

10 files changed, 114 insertions, 40 deletions

diff --git a/README.md b/README.md
index daf5402ff..cb98f7715 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 4153.
+This is the source code for early-access 4154.
 
 ## Legal Notice
 
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
index 8f724835e..03d81ceb3 100755
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
@@ -75,6 +75,9 @@ abstract class SettingsItem(
         get() = NativeLibrary.isRunning() && !setting.global &&
             !NativeConfig.isPerGameConfigLoaded()
 
+    val clearable: Boolean
+        get() = !setting.global && NativeConfig.isPerGameConfigLoaded()
+
     companion object {
         const val TYPE_HEADER = 0
         const val TYPE_SWITCH = 1
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt
index 367db7fd2..0309fad59 100755
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt
@@ -13,7 +13,6 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding
 import org.yuzu.yuzu_emu.features.settings.model.view.DateTimeSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
-import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible
 
 class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
@@ -32,9 +31,7 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA
         val dateFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
         binding.textSettingValue.text = dateFormatter.format(zonedTime)
 
-        binding.buttonClear.setVisible(
-            !setting.setting.global || NativeConfig.isPerGameConfigLoaded()
-        )
+        binding.buttonClear.setVisible(setting.clearable)
         binding.buttonClear.setOnClickListener {
             adapter.onClearClick(setting, bindingAdapterPosition)
         }
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt
index e2fe0b072..489f55455 100755
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt
@@ -10,7 +10,6 @@ import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.model.view.SingleChoiceSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.StringSingleChoiceSetting
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
-import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible
 
 class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
@@ -48,9 +47,7 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Setti
             binding.textSettingValue.setVisible(false)
         }
 
-        binding.buttonClear.setVisible(
-            !setting.setting.global || NativeConfig.isPerGameConfigLoaded()
-        )
+        binding.buttonClear.setVisible(setting.clearable)
         binding.buttonClear.setOnClickListener {
             adapter.onClearClick(setting, bindingAdapterPosition)
         }
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt
index a37b59b44..90a7138cb 100755
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt
@@ -9,7 +9,6 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.model.view.SliderSetting
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
-import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible
 
 class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
@@ -28,9 +27,7 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAda
             setting.units
         )
 
-        binding.buttonClear.setVisible(
-            !setting.setting.global || NativeConfig.isPerGameConfigLoaded()
-        )
+        binding.buttonClear.setVisible(setting.clearable)
         binding.buttonClear.setOnClickListener {
             adapter.onClearClick(setting, bindingAdapterPosition)
         }
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
index 53f7b301f..e5763264a 100755
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
@@ -9,7 +9,6 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingSwitchBinding
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.model.view.SwitchSetting
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
-import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible
 
 class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter: SettingsAdapter) :
@@ -29,9 +28,7 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter
             adapter.onBooleanClick(setting, binding.switchWidget.isChecked, bindingAdapterPosition)
         }
 
-        binding.buttonClear.setVisible(
-            !setting.setting.global || NativeConfig.isPerGameConfigLoaded()
-        )
+        binding.buttonClear.setVisible(setting.clearable)
         binding.buttonClear.setOnClickListener {
             adapter.onClearClick(setting, bindingAdapterPosition)
         }
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt
index ed112a38d..737e03584 100755
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt
@@ -28,6 +28,7 @@ import org.yuzu.yuzu_emu.features.input.NativeInput
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.features.input.model.NativeAnalog
 import org.yuzu.yuzu_emu.features.input.model.NativeButton
+import org.yuzu.yuzu_emu.features.input.model.NpadStyleIndex
 import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
 import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.overlay.model.OverlayControl
@@ -99,12 +100,10 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
         }
 
         var shouldUpdateView = false
-        val playerIndex =
-            if (NativeInput.isHandheldOnly()) {
-                NativeInput.ConsoleDevice
-            } else {
-                NativeInput.Player1Device
-            }
+        val playerIndex = when (NativeInput.getStyleIndex(0)) {
+            NpadStyleIndex.Handheld -> 8
+            else -> 0
+        }
 
         for (button in overlayButtons) {
             if (!button.updateStatus(event)) {
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 2fd4434b0..62ce5beac 100755
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1604,6 +1604,7 @@ void GMainWindow::ConnectMenuEvents() {
     connect_menu(ui->action_Open_yuzu_Folder, &GMainWindow::OnOpenYuzuFolder);

     connect_menu(ui->action_Verify_installed_contents, &GMainWindow::OnVerifyInstalledContents);

     connect_menu(ui->action_Install_Firmware, &GMainWindow::OnInstallFirmware);

+    connect_menu(ui->action_Install_Keys, &GMainWindow::OnInstallDecryptionKeys);

     connect_menu(ui->action_About, &GMainWindow::OnAbout);

 }

 

@@ -1633,6 +1634,7 @@ void GMainWindow::UpdateMenuState() {
     }

 

     ui->action_Install_Firmware->setEnabled(!emulation_running);

+    ui->action_Install_Keys->setEnabled(!emulation_running);

 

     for (QAction* action : applet_actions) {

         action->setEnabled(is_firmware_available && !emulation_running);

@@ -4169,9 +4171,8 @@ void GMainWindow::OnInstallFirmware() {
         return;

     }

 

-    QString firmware_source_location =

-        QFileDialog::getExistingDirectory(this, tr("Select Dumped Firmware Source Location"),

-                                          QString::fromStdString(""), QFileDialog::ShowDirsOnly);

+    const QString firmware_source_location = QFileDialog::getExistingDirectory(

+        this, tr("Select Dumped Firmware Source Location"), {}, QFileDialog::ShowDirsOnly);

     if (firmware_source_location.isEmpty()) {

         return;

     }

@@ -4202,8 +4203,9 @@ void GMainWindow::OnInstallFirmware() {
     std::vector<std::filesystem::path> out;

     const Common::FS::DirEntryCallable callback =

         [&out](const std::filesystem::directory_entry& entry) {

-            if (entry.path().has_extension() && entry.path().extension() == ".nca")

+            if (entry.path().has_extension() && entry.path().extension() == ".nca") {

                 out.emplace_back(entry.path());

+            }

 

             return true;

         };

@@ -4235,7 +4237,6 @@ void GMainWindow::OnInstallFirmware() {
     auto firmware_vdir = sysnand_content_vdir->GetDirectoryRelative("registered");

 

     bool success = true;

-    bool cancelled = false;

     int i = 0;

     for (const auto& firmware_src_path : out) {

         i++;

@@ -4250,24 +4251,22 @@ void GMainWindow::OnInstallFirmware() {
             success = false;

         }

 

-        if (QtProgressCallback(100, 20 + (int)(((float)(i) / (float)out.size()) * 70.0))) {

-            success = false;

-            cancelled = true;

-            break;

+        if (QtProgressCallback(

+                100, 20 + static_cast<int>(((i) / static_cast<float>(out.size())) * 70.0))) {

+            progress.close();

+            QMessageBox::warning(

+                this, tr("Firmware install failed"),

+                tr("Firmware installation cancelled, firmware may be in bad state, "

+                   "restart yuzu or re-install firmware."));

+            return;

         }

     }

 

-    if (!success && !cancelled) {

+    if (!success) {

         progress.close();

         QMessageBox::critical(this, tr("Firmware install failed"),

                               tr("One or more firmware files failed to copy into NAND."));

         return;

-    } else if (cancelled) {

-        progress.close();

-        QMessageBox::warning(this, tr("Firmware install failed"),

-                             tr("Firmware installation cancelled, firmware may be in bad state, "

-                                "restart yuzu or re-install firmware."));

-        return;

     }

 

     // Re-scan VFS for the newly placed firmware files.

@@ -4295,6 +4294,84 @@ void GMainWindow::OnInstallFirmware() {
     OnCheckFirmwareDecryption();

 }

 

+void GMainWindow::OnInstallDecryptionKeys() {

+    // Don't do this while emulation is running.

+    if (emu_thread != nullptr && emu_thread->IsRunning()) {

+        return;

+    }

+

+    const QString key_source_location = QFileDialog::getOpenFileName(

+        this, tr("Select Dumped Keys Location"), {}, QStringLiteral("prod.keys (prod.keys)"), {},

+        QFileDialog::ReadOnly);

+    if (key_source_location.isEmpty()) {

+        return;

+    }

+

+    // Verify that it contains prod.keys, title.keys and optionally, key_retail.bin

+    LOG_INFO(Frontend, "Installing key files from {}", key_source_location.toStdString());

+

+    const std::filesystem::path prod_key_path = key_source_location.toStdString();

+    const std::filesystem::path key_source_path = prod_key_path.parent_path();

+    if (!Common::FS::IsDir(key_source_path)) {

+        return;

+    }

+

+    bool prod_keys_found = false;

+    std::vector<std::filesystem::path> source_key_files;

+

+    if (Common::FS::Exists(prod_key_path)) {

+        prod_keys_found = true;

+        source_key_files.emplace_back(prod_key_path);

+    }

+

+    if (Common::FS::Exists(key_source_path / "title.keys")) {

+        source_key_files.emplace_back(key_source_path / "title.keys");

+    }

+

+    if (Common::FS::Exists(key_source_path / "key_retail.bin")) {

+        source_key_files.emplace_back(key_source_path / "key_retail.bin");

+    }

+

+    // There should be at least prod.keys.

+    if (source_key_files.empty() || !prod_keys_found) {

+        QMessageBox::warning(this, tr("Decryption Keys install failed"),

+                             tr("prod.keys is a required decryption key file."));

+        return;

+    }

+

+    const auto yuzu_keys_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::KeysDir);

+    for (auto key_file : source_key_files) {

+        std::filesystem::path destination_key_file = yuzu_keys_dir / key_file.filename();

+        if (!std::filesystem::copy_file(key_file, destination_key_file,

+                                        std::filesystem::copy_options::overwrite_existing)) {

+            LOG_ERROR(Frontend, "Failed to copy file {} to {}", key_file.string(),

+                      destination_key_file.string());

+            QMessageBox::critical(this, tr("Decryption Keys install failed"),

+                                  tr("One or more keys failed to copy."));

+            return;

+        }

+    }

+

+    // Reinitialize the key manager, re-read the vfs (for update/dlc files),

+    // and re-populate the game list in the UI if the user has already added

+    // game folders.

+    Core::Crypto::KeyManager::Instance().ReloadKeys();

+    system->GetFileSystemController().CreateFactories(*vfs);

+    game_list->PopulateAsync(UISettings::values.game_dirs);

+

+    if (ContentManager::AreKeysPresent()) {

+        QMessageBox::information(this, tr("Decryption Keys install succeeded"),

+                                 tr("Decryption Keys were successfully installed"));

+    } else {

+        QMessageBox::critical(

+            this, tr("Decryption Keys install failed"),

+            tr("Decryption Keys failed to initialize. Check that your dumping tools are "

+               "up to date and re-dump keys."));

+    }

+

+    OnCheckFirmwareDecryption();

+}

+

 void GMainWindow::OnAbout() {

     AboutDialog aboutDialog(this);

     aboutDialog.exec();

diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 8510f0035..697c38e57 100755
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -381,6 +381,7 @@ private slots:
     void OnOpenYuzuFolder();

     void OnVerifyInstalledContents();

     void OnInstallFirmware();

+    void OnInstallDecryptionKeys();

     void OnAbout();

     void OnToggleFilterBar();

     void OnToggleStatusBar();

diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui
index 656c3e8ef..0387bb710 100755
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -165,8 +165,9 @@
      <addaction name="separator"/>

      <addaction name="action_Configure_Tas"/>

     </widget>

-    <addaction name="action_Verify_installed_contents"/>

+    <addaction name="action_Install_Keys"/>

     <addaction name="action_Install_Firmware"/>

+    <addaction name="action_Verify_installed_contents"/>

     <addaction name="separator"/>

     <addaction name="menu_cabinet_applet"/>

     <addaction name="action_Load_Album"/>

@@ -469,6 +470,11 @@
     <string>Install Firmware</string>

    </property>

   </action>

+  <action name="action_Install_Keys">

+   <property name="text">

+    <string>Install Decryption Keys</string>

+   </property>

+  </action>

  </widget>

  <resources>

   <include location="yuzu.qrc"/>