Android 205

Merge yuzu-emu#12749
Merge yuzu-emu#12499
2024-01-22 20:48:56 +00:00 · 2024-01-22 20:48:56 +00:00 · 2024-01-22 20:48:56 +00:00
36 changed files with 242 additions and 291 deletions
--- a/README.md
+++ b/README.md
@ -1,9 +1,7 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
+| [12499](https://github.com/yuzu-emu/yuzu-android//pull/12499) | [`fc30a84fc`](https://github.com/yuzu-emu/yuzu-android//pull/12499/files) | Rework time services | [Kelebek1](https://github.com/Kelebek1/) | Yes |
 | [12749](https://github.com/yuzu-emu/yuzu-android//pull/12749) | [`e3171486d`](https://github.com/yuzu-emu/yuzu-android//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12759](https://github.com/yuzu-emu/yuzu-android//pull/12759) | [`a120f8ff4`](https://github.com/yuzu-emu/yuzu-android//pull/12759/files) | core: miscellaneous fixes | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12769](https://github.com/yuzu-emu/yuzu-android//pull/12769) | [`ad4622da2`](https://github.com/yuzu-emu/yuzu-android//pull/12769/files) | core: hid: Reduce controller requests | [german77](https://github.com/german77/) | Yes |
-| [12777](https://github.com/yuzu-emu/yuzu-android//pull/12777) | [`b8be8dff6`](https://github.com/yuzu-emu/yuzu-android//pull/12777/files) | android: Add key warning | [t895](https://github.com/t895/) | Yes |


 End of merge log. You can find the original README.md below the break.
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
@ -303,11 +303,6 @@ object NativeLibrary {
     */
    external fun getCpuBackend(): String

-    /**
-     * Returns the current GPU Driver.
-     */
-    external fun getGpuDriver(): String
-
    external fun applySettings()

    external fun logSettings()
@ -619,11 +614,6 @@ object NativeLibrary {
     */
    external fun clearFilesystemProvider()

-    /**
-     * Checks if all necessary keys are present for decryption
-     */
-    external fun areKeysPresent(): Boolean
-
    /**
     * Button type for use in onTouchEvent
     */
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AbstractDiffAdapter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AbstractDiffAdapter.kt
@ -14,20 +14,15 @@ import androidx.recyclerview.widget.RecyclerView
 * Generic adapter that implements an [AsyncDifferConfig] and covers some of the basic boilerplate
 * code used in every [RecyclerView].
 * Type assigned to [Model] must inherit from [Object] in order to be compared properly.
- * @param exact Decides whether each item will be compared by reference or by their contents
 */
-abstract class AbstractDiffAdapter<Model : Any, Holder : AbstractViewHolder<Model>>(
-    exact: Boolean = true
-) : ListAdapter<Model, Holder>(AsyncDifferConfig.Builder(DiffCallback<Model>(exact)).build()) {
+abstract class AbstractDiffAdapter<Model : Any, Holder : AbstractViewHolder<Model>> :
+    ListAdapter<Model, Holder>(AsyncDifferConfig.Builder(DiffCallback<Model>()).build()) {
    override fun onBindViewHolder(holder: Holder, position: Int) =
        holder.bind(currentList[position])

-    private class DiffCallback<Model>(val exact: Boolean) : DiffUtil.ItemCallback<Model>() {
+    private class DiffCallback<Model> : DiffUtil.ItemCallback<Model>() {
        override fun areItemsTheSame(oldItem: Model & Any, newItem: Model & Any): Boolean {
-            if (exact) {
-                return oldItem === newItem
-            }
-            return oldItem == newItem
+            return oldItem === newItem
        }

        @SuppressLint("DiffUtilEquals")
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt
@ -30,7 +30,7 @@ import org.yuzu.yuzu_emu.utils.GameIconUtils
 import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder

 class GameAdapter(private val activity: AppCompatActivity) :
-    AbstractDiffAdapter<Game, GameAdapter.GameViewHolder>(exact = false) {
+    AbstractDiffAdapter<Game, GameAdapter.GameViewHolder>() {
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameViewHolder {
        CardGameBinding.inflate(LayoutInflater.from(parent.context), parent, false)
            .also { return GameViewHolder(it) }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
@ -38,6 +38,7 @@ import androidx.window.layout.WindowLayoutInfo
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.HomeNavigationDirections
@ -140,9 +141,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {

        // So this fragment doesn't restart on configuration changes; i.e. rotation.
        retainInstance = true
-        emulationState = EmulationState(game.path) {
-            return@EmulationState driverViewModel.isInteractionAllowed.value
-        }
+        emulationState = EmulationState(game.path)
    }

    /**
@ -371,15 +370,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                    }
                }
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    driverViewModel.isInteractionAllowed.collect {
-                        if (it) {
-                            startEmulation()
-                        }
-                    }
-                }
-            }
            launch {
                repeatOnLifecycle(Lifecycle.State.CREATED) {
                    emulationViewModel.emulationStarted.collectLatest {
@ -408,10 +398,19 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                    }
                }
            }
+            launch {
+                repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                    driverViewModel.isInteractionAllowed.collect {
+                        if (it) {
+                            onEmulationStart()
+                        }
+                    }
+                }
+            }
        }
    }

-    private fun startEmulation() {
+    private fun onEmulationStart() {
        if (!NativeLibrary.isRunning() && !NativeLibrary.isPaused()) {
            if (!DirectoryInitialization.areDirectoriesReady) {
                DirectoryInitialization.start()
@ -486,15 +485,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            val FRAMETIME = 2
            val SPEED = 3
            perfStatsUpdater = {
-                if (emulationViewModel.emulationStarted.value &&
-                    !emulationViewModel.isEmulationStopping.value
-                ) {
+                if (emulationViewModel.emulationStarted.value) {
                    val perfStats = NativeLibrary.getPerfStats()
                    val cpuBackend = NativeLibrary.getCpuBackend()
-                    val gpuDriver = NativeLibrary.getGpuDriver()
                    if (_binding != null) {
                        binding.showFpsText.text =
-                            String.format("FPS: %.1f\n%s/%s", perfStats[FPS], cpuBackend, gpuDriver)
+                            String.format("FPS: %.1f\n%s", perfStats[FPS], cpuBackend)
                    }
                    perfStatsUpdateHandler.postDelayed(perfStatsUpdater!!, 800)
                }
@ -811,10 +807,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        }
    }

-    private class EmulationState(
-        private val gamePath: String,
-        private val emulationCanStart: () -> Boolean
-    ) {
+    private class EmulationState(private val gamePath: String) {
        private var state: State
        private var surface: Surface? = null

@ -908,7 +901,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                    State.PAUSED -> Log.warning(
                        "[EmulationFragment] Surface cleared while emulation paused."
                    )
-
                    else -> Log.warning(
                        "[EmulationFragment] Surface cleared while emulation stopped."
                    )
@ -918,10 +910,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {

        private fun runWithValidSurface() {
            NativeLibrary.surfaceChanged(surface)
-            if (!emulationCanStart.invoke()) {
-                return
-            }
-
            when (state) {
                State.STOPPED -> {
                    val emulationThread = Thread({
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt
@ -26,15 +26,9 @@ class MessageDialogFragment : DialogFragment() {
        val descriptionId = requireArguments().getInt(DESCRIPTION_ID)
        val descriptionString = requireArguments().getString(DESCRIPTION_STRING)!!
        val helpLinkId = requireArguments().getInt(HELP_LINK)
-        val dismissible = requireArguments().getBoolean(DISMISSIBLE)
-        val clearPositiveAction = requireArguments().getBoolean(CLEAR_POSITIVE_ACTION)

        val builder = MaterialAlertDialogBuilder(requireContext())

-        if (clearPositiveAction) {
-            messageDialogViewModel.positiveAction = null
-        }
-
        if (messageDialogViewModel.positiveAction == null) {
            builder.setPositiveButton(R.string.close, null)
        } else {
@ -57,8 +51,6 @@ class MessageDialogFragment : DialogFragment() {
            }
        }

-        isCancelable = dismissible
-
        return builder.show()
    }

@ -75,8 +67,6 @@ class MessageDialogFragment : DialogFragment() {
        private const val DESCRIPTION_ID = "DescriptionId"
        private const val DESCRIPTION_STRING = "DescriptionString"
        private const val HELP_LINK = "Link"
-        private const val DISMISSIBLE = "Dismissible"
-        private const val CLEAR_POSITIVE_ACTION = "ClearPositiveAction"

        fun newInstance(
            activity: FragmentActivity? = null,
@ -85,28 +75,22 @@ class MessageDialogFragment : DialogFragment() {
            descriptionId: Int = 0,
            descriptionString: String = "",
            helpLinkId: Int = 0,
-            dismissible: Boolean = true,
            positiveAction: (() -> Unit)? = null
        ): MessageDialogFragment {
-            var clearPositiveAction = false
-            if (activity != null) {
-                ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply {
-                    clear()
-                    this.positiveAction = positiveAction
-                }
-            } else {
-                clearPositiveAction = true
-            }
-
            val dialog = MessageDialogFragment()
-            val bundle = Bundle().apply {
+            val bundle = Bundle()
+            bundle.apply {
                putInt(TITLE_ID, titleId)
                putString(TITLE_STRING, titleString)
                putInt(DESCRIPTION_ID, descriptionId)
                putString(DESCRIPTION_STRING, descriptionString)
                putInt(HELP_LINK, helpLinkId)
-                putBoolean(DISMISSIBLE, dismissible)
-                putBoolean(CLEAR_POSITIVE_ACTION, clearPositiveAction)
+            }
+            if (activity != null) {
+                ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply {
+                    clear()
+                    this.positiveAction = positiveAction
+                }
            }
            dialog.arguments = bundle
            return dialog
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
@ -31,7 +31,6 @@ import androidx.preference.PreferenceManager
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.transition.MaterialFadeThrough
 import kotlinx.coroutines.launch
-import org.yuzu.yuzu_emu.NativeLibrary
 import java.io.File
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
@ -163,7 +162,7 @@ class SetupFragment : Fragment() {
                    R.string.install_prod_keys_warning_help,
                    {
                        val file = File(DirectoryInitialization.userDirectory + "/keys/prod.keys")
-                        if (file.exists() && NativeLibrary.areKeysPresent()) {
+                        if (file.exists()) {
                            StepState.COMPLETE
                        } else {
                            StepState.INCOMPLETE
@ -348,8 +347,7 @@ class SetupFragment : Fragment() {
    val getProdKey =
        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
            if (result != null) {
-                mainActivity.processKey(result)
-                if (NativeLibrary.areKeysPresent()) {
+                if (mainActivity.processKey(result)) {
                    keyCallback.onStepCompleted()
                }
            }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.kt
@ -144,7 +144,6 @@ class DriverViewModel : ViewModel() {
        val selectedDriverFile = File(StringSetting.DRIVER_PATH.getString())
        val selectedDriverMetadata = GpuDriverHelper.customDriverSettingData
        if (GpuDriverHelper.installedCustomDriverData == selectedDriverMetadata) {
-            setDriverReady()
            return
        }

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt
@ -70,19 +70,11 @@ class Game(
        }

    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
+        if (other !is Game) {
+            return false
+        }

-        other as Game
-
-        if (title != other.title) return false
-        if (path != other.path) return false
-        if (programId != other.programId) return false
-        if (developer != other.developer) return false
-        if (version != other.version) return false
-        if (isHomebrew != other.isHomebrew) return false
-
-        return true
+        return hashCode() == other.hashCode()
    }

    override fun hashCode(): Int {
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt
@ -31,9 +31,6 @@ class HomeViewModel : ViewModel() {
    private val _reloadPropertiesList = MutableStateFlow(false)
    val reloadPropertiesList get() = _reloadPropertiesList.asStateFlow()

-    private val _checkKeys = MutableStateFlow(false)
-    val checkKeys = _checkKeys.asStateFlow()
-
    var navigatedToSetup = false

    fun setNavigationVisibility(visible: Boolean, animated: Boolean) {
@ -69,8 +66,4 @@ class HomeViewModel : ViewModel() {
    fun reloadPropertiesList(reload: Boolean) {
        _reloadPropertiesList.value = reload
    }
-
-    fun setCheckKeys(value: Boolean) {
-        _checkKeys.value = value
-    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
@ -64,9 +64,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {

    override var themeId: Int = 0

-    private val CHECKED_DECRYPTION = "CheckedDecryption"
-    private var checkedDecryption = false
-
    override fun onCreate(savedInstanceState: Bundle?) {
        val splashScreen = installSplashScreen()
        splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }
@ -78,18 +75,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
        binding = ActivityMainBinding.inflate(layoutInflater)
        setContentView(binding.root)

-        if (savedInstanceState != null) {
-            checkedDecryption = savedInstanceState.getBoolean(CHECKED_DECRYPTION)
-        }
-        if (!checkedDecryption) {
-            val firstTimeSetup = PreferenceManager.getDefaultSharedPreferences(applicationContext)
-                .getBoolean(Settings.PREF_FIRST_APP_LAUNCH, true)
-            if (!firstTimeSetup) {
-                checkKeys()
-            }
-            checkedDecryption = true
-        }
-
        WindowCompat.setDecorFitsSystemWindows(window, false)
        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)

@ -165,16 +150,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                    }
                }
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    homeViewModel.checkKeys.collect {
-                        if (it) {
-                            checkKeys()
-                            homeViewModel.setCheckKeys(false)
-                        }
-                    }
-                }
-            }
        }

        // Dismiss previous notifications (should not happen unless a crash occurred)
@ -183,21 +158,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
        setInsets()
    }

-    private fun checkKeys() {
-        if (!NativeLibrary.areKeysPresent()) {
-            MessageDialogFragment.newInstance(
-                titleId = R.string.keys_missing,
-                descriptionId = R.string.keys_missing_description,
-                helpLinkId = R.string.keys_missing_help
-            ).show(supportFragmentManager, MessageDialogFragment.TAG)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putBoolean(CHECKED_DECRYPTION, checkedDecryption)
-    }
-
    fun finishSetup(navController: NavController) {
        navController.navigate(R.id.action_firstTimeSetupFragment_to_gamesFragment)
        (binding.navigationView as NavigationBarView).setupWithNavController(navController)
@ -389,7 +349,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                    R.string.install_keys_success,
                    Toast.LENGTH_SHORT
                ).show()
-                homeViewModel.setCheckKeys(true)
                gamesViewModel.reloadGames(true)
                return true
            } else {
@ -440,7 +399,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                        firmwarePath.deleteRecursively()
                        cacheFirmwareDir.copyRecursively(firmwarePath, true)
                        NativeLibrary.initializeSystem(true)
-                        homeViewModel.setCheckKeys(true)
                        getString(R.string.save_file_imported_success)
                    }
                } catch (e: Exception) {
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@ -247,7 +247,6 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
    m_system.GetCpuManager().OnGpuReady();
    m_system.RegisterExitCallback([&] { HaltEmulation(); });

-    OnEmulationStarted();
    return Core::SystemResultStatus::Success;
 }

@ -464,8 +463,8 @@ int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject
    };

    return static_cast<int>(
-        ContentManager::InstallNSP(EmulationSession::GetInstance().System(),
-                                   *EmulationSession::GetInstance().System().GetFilesystem(),
+        ContentManager::InstallNSP(&EmulationSession::GetInstance().System(),
+                                   EmulationSession::GetInstance().System().GetFilesystem().get(),
                                   GetJString(env, j_file), callback));
 }

@ -675,11 +674,6 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuBackend(JNIEnv* env, jclass
    return ToJString(env, "JIT");
 }

-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGpuDriver(JNIEnv* env, jobject jobj) {
-    return ToJString(env,
-                     EmulationSession::GetInstance().System().GPU().Renderer().GetDeviceVendor());
-}
-
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_applySettings(JNIEnv* env, jobject jobj) {
    EmulationSession::GetInstance().System().ApplySettings();
 }
@ -825,7 +819,7 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeUpdate(JNIEnv* env, jobject job
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj,
                                                     jstring jprogramId) {
    auto program_id = EmulationSession::GetProgramId(env, jprogramId);
-    ContentManager::RemoveAllDLC(EmulationSession::GetInstance().System(), program_id);
+    ContentManager::RemoveAllDLC(&EmulationSession::GetInstance().System(), program_id);
 }

 void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId,
@ -835,9 +829,8 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj,
                              program_id, GetJString(env, jname));
 }

-jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env,
-                                                                           jobject jobj,
-                                                                           jobject jcallback) {
+jobject Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env, jobject jobj,
+                                                                      jobject jcallback) {
    auto jlambdaClass = env->GetObjectClass(jcallback);
    auto jlambdaInvokeMethod = env->GetMethodID(
        jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
@ -849,7 +842,7 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEn

    auto& session = EmulationSession::GetInstance();
    std::vector<std::string> result = ContentManager::VerifyInstalledContents(
-        session.System(), *session.GetContentProvider(), callback);
+        &session.System(), session.GetContentProvider(), callback);
    jobjectArray jresult =
        env->NewObjectArray(result.size(), IDCache::GetStringClass(), ToJString(env, ""));
    for (size_t i = 0; i < result.size(); ++i) {
@ -870,7 +863,7 @@ jint Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobje
    };
    auto& session = EmulationSession::GetInstance();
    return static_cast<jint>(
-        ContentManager::VerifyGameContents(session.System(), GetJString(env, jpath), callback));
+        ContentManager::VerifyGameContents(&session.System(), GetJString(env, jpath), callback));
 }

 jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj,
@ -919,10 +912,4 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_clearFilesystemProvider(JNIEnv* env,
    EmulationSession::GetInstance().GetContentProvider()->ClearAllEntries();
 }

-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_areKeysPresent(JNIEnv* env, jobject jobj) {
-    auto& system = EmulationSession::GetInstance().System();
-    system.GetFileSystemController().CreateFactories(*system.GetFilesystem());
-    return ContentManager::AreKeysPresent();
-}
-
 } // extern "C"
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@ -144,9 +144,6 @@
    <string name="no_save_data_found">No save data found</string>
    <string name="verify_installed_content">Verify installed content</string>
    <string name="verify_installed_content_description">Checks all installed content for corruption</string>
-    <string name="keys_missing">Encryption keys are missing</string>
-    <string name="keys_missing_description">Firmware and retail games cannot be decrypted</string>
-    <string name="keys_missing_help">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string>

    <!-- Applet launcher strings -->
    <string name="applets">Applet launcher</string>
--- a/src/common/arm64/native_clock.cpp
+++ b/src/common/arm64/native_clock.cpp
@ -29,6 +29,10 @@ NativeClock::NativeClock() {
    gputick_cntfrq_factor = GetFixedPointFactor(GPUTickFreq, host_cntfrq);
 }

+void NativeClock::Reset() {
+    start_ticks = GetUptime();
+}
+
 std::chrono::nanoseconds NativeClock::GetTimeNS() const {
    return std::chrono::nanoseconds{MultiplyHigh(GetUptime(), ns_cntfrq_factor)};
 }
@ -42,11 +46,11 @@ std::chrono::milliseconds NativeClock::GetTimeMS() const {
 }

 s64 NativeClock::GetCNTPCT() const {
-    return MultiplyHigh(GetUptime(), guest_cntfrq_factor);
+    return MultiplyHigh(GetUptime() - start_ticks, guest_cntfrq_factor);
 }

 s64 NativeClock::GetGPUTick() const {
-    return MultiplyHigh(GetUptime(), gputick_cntfrq_factor);
+    return MultiplyHigh(GetUptime() - start_ticks, gputick_cntfrq_factor);
 }

 s64 NativeClock::GetUptime() const {
--- a/src/common/arm64/native_clock.h
+++ b/src/common/arm64/native_clock.h
@ -11,6 +11,8 @@ class NativeClock final : public WallClock {
 public:
    explicit NativeClock();

+    void Reset() override;
+
    std::chrono::nanoseconds GetTimeNS() const override;

    std::chrono::microseconds GetTimeUS() const override;
@ -40,6 +42,7 @@ private:
    FactorType ms_cntfrq_factor;
    FactorType guest_cntfrq_factor;
    FactorType gputick_cntfrq_factor;
+    s64 start_ticks;
 };

 } // namespace Common::Arm64
--- a/src/common/wall_clock.cpp
+++ b/src/common/wall_clock.cpp
@ -20,6 +20,10 @@ class StandardWallClock final : public WallClock {
 public:
    explicit StandardWallClock() {}

+    void Reset() override {
+        start_time = std::chrono::system_clock::now();
+    }
+
    std::chrono::nanoseconds GetTimeNS() const override {
        return std::chrono::duration_cast<std::chrono::nanoseconds>(
            std::chrono::system_clock::now().time_since_epoch());
@ -45,13 +49,16 @@ public:

    s64 GetUptime() const override {
        return std::chrono::duration_cast<std::chrono::nanoseconds>(
-                   std::chrono::steady_clock::now().time_since_epoch())
+                   std::chrono::system_clock::now() - start_time)
            .count();
    }

    bool IsNative() const override {
        return false;
    }
+
+private:
+    std::chrono::system_clock::time_point start_time{};
 };

 std::unique_ptr<WallClock> CreateOptimalClock() {
--- a/src/common/wall_clock.h
+++ b/src/common/wall_clock.h
@ -19,6 +19,8 @@ public:

    virtual ~WallClock() = default;

+    virtual void Reset() = 0;
+
    /// @returns The time in nanoseconds since the construction of this clock.
    virtual std::chrono::nanoseconds GetTimeNS() const = 0;

--- a/src/common/x64/native_clock.cpp
+++ b/src/common/x64/native_clock.cpp
@ -15,6 +15,10 @@ NativeClock::NativeClock(u64 rdtsc_frequency_)
      cntpct_rdtsc_factor{GetFixedPoint64Factor(CNTFRQ, rdtsc_frequency)},
      gputick_rdtsc_factor{GetFixedPoint64Factor(GPUTickFreq, rdtsc_frequency)} {}

+void NativeClock::Reset() {
+    start_ticks = FencedRDTSC();
+}
+
 std::chrono::nanoseconds NativeClock::GetTimeNS() const {
    return std::chrono::nanoseconds{MultiplyHigh(GetUptime(), ns_rdtsc_factor)};
 }
@ -28,11 +32,11 @@ std::chrono::milliseconds NativeClock::GetTimeMS() const {
 }

 s64 NativeClock::GetCNTPCT() const {
-    return MultiplyHigh(GetUptime(), cntpct_rdtsc_factor);
+    return MultiplyHigh(GetUptime() - start_ticks, cntpct_rdtsc_factor);
 }

 s64 NativeClock::GetGPUTick() const {
-    return MultiplyHigh(GetUptime(), gputick_rdtsc_factor);
+    return MultiplyHigh(GetUptime() - start_ticks, gputick_rdtsc_factor);
 }

 s64 NativeClock::GetUptime() const {
--- a/src/common/x64/native_clock.h
+++ b/src/common/x64/native_clock.h
@ -11,6 +11,8 @@ class NativeClock final : public WallClock {
 public:
    explicit NativeClock(u64 rdtsc_frequency_);

+    void Reset() override;
+
    std::chrono::nanoseconds GetTimeNS() const override;

    std::chrono::microseconds GetTimeUS() const override;
@ -26,6 +28,7 @@ public:
    bool IsNative() const override;

 private:
+    u64 start_ticks;
    u64 rdtsc_frequency;

    u64 ns_rdtsc_factor;
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@ -66,6 +66,7 @@ void CoreTiming::Initialize(std::function<void()>&& on_thread_init_) {
    event_fifo_id = 0;
    shutting_down = false;
    cpu_ticks = 0;
+    clock->Reset();
    if (is_multicore) {
        timer_thread = std::make_unique<std::jthread>(ThreadEntry, std::ref(*this));
    }
--- a/src/core/hle/kernel/k_page_table_base.cpp
+++ b/src/core/hle/kernel/k_page_table_base.cpp
@ -69,14 +69,9 @@ public:
 };

 template <typename AddressType>
-void InvalidateInstructionCache(KernelCore& kernel, KPageTableBase* table, AddressType addr,
-                                u64 size) {
+void InvalidateInstructionCache(KernelCore& kernel, AddressType addr, u64 size) {
    // TODO: lock the process list
    for (auto& process : kernel.GetProcessList()) {
-        if (std::addressof(process->GetPageTable().GetBasePageTable()) != table) {
-            continue;
-        }
-
        for (size_t i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) {
            auto* interface = process->GetArmInterface(i);
            if (interface) {
@ -1307,7 +1302,7 @@ Result KPageTableBase::UnmapCodeMemory(KProcessAddress dst_address, KProcessAddr
    bool reprotected_pages = false;
    SCOPE_EXIT({
        if (reprotected_pages && any_code_pages) {
-            InvalidateInstructionCache(m_kernel, this, dst_address, size);
+            InvalidateInstructionCache(m_kernel, dst_address, size);
        }
    });

@ -2041,7 +2036,7 @@ Result KPageTableBase::SetProcessMemoryPermission(KProcessAddress addr, size_t s
        for (const auto& block : pg) {
            StoreDataCache(GetHeapVirtualPointer(m_kernel, block.GetAddress()), block.GetSize());
        }
-        InvalidateInstructionCache(m_kernel, this, addr, size);
+        InvalidateInstructionCache(m_kernel, addr, size);
    }

    R_SUCCEED();
@ -3282,7 +3277,7 @@ Result KPageTableBase::WriteDebugMemory(KProcessAddress dst_address, KProcessAdd
    R_TRY(PerformCopy());

    // Invalidate the instruction cache, as this svc allows modifying executable pages.
-    InvalidateInstructionCache(m_kernel, this, dst_address, size);
+    InvalidateInstructionCache(m_kernel, dst_address, size);

    R_SUCCEED();
 }
--- a/src/core/hle/service/nvdrv/core/container.cpp
+++ b/src/core/hle/service/nvdrv/core/container.cpp
@ -112,7 +112,6 @@ SessionId Container::OpenSession(Kernel::KProcess* process) {

 void Container::CloseSession(SessionId session_id) {
    std::scoped_lock lk(impl->session_guard);
-    impl->file.UnmapAllHandles(session_id);
    auto& session = impl->sessions[session_id.id];
    auto& smmu = impl->host1x.MemoryManager();
    if (session.has_preallocated_area) {
--- a/src/core/hle/service/nvdrv/core/nvmap.cpp
+++ b/src/core/hle/service/nvdrv/core/nvmap.cpp
@ -326,17 +326,4 @@ std::optional<NvMap::FreeInfo> NvMap::FreeHandle(Handle::Id handle, bool interna
    return freeInfo;
 }

-void NvMap::UnmapAllHandles(NvCore::SessionId session_id) {
-    auto handles_copy = [&] {
-        std::scoped_lock lk{handles_lock};
-        return handles;
-    }();
-
-    for (auto& [id, handle] : handles_copy) {
-        if (handle->session_id.id == session_id.id) {
-            FreeHandle(id, false);
-        }
-    }
-}
-
 } // namespace Service::Nvidia::NvCore
--- a/src/core/hle/service/nvdrv/core/nvmap.h
+++ b/src/core/hle/service/nvdrv/core/nvmap.h
@ -152,8 +152,6 @@ public:
     */
    std::optional<FreeInfo> FreeHandle(Handle::Id handle, bool internal_session);

-    void UnmapAllHandles(NvCore::SessionId session_id);
-
 private:
    std::list<std::shared_ptr<Handle>> unmap_queue{};
    std::mutex unmap_queue_lock{}; //!< Protects access to `unmap_queue`
--- a/src/core/hle/service/nvdrv/nvdrv_interface.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv_interface.cpp
@ -4,7 +4,6 @@

 #include "common/logging/log.h"
 #include "common/scope_exit.h"
-#include "common/string_util.h"
 #include "core/core.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_process.h"
@ -30,7 +29,7 @@ void NVDRV::Open(HLERequestContext& ctx) {
    }

    const auto& buffer = ctx.ReadBuffer();
-    const std::string device_name(Common::StringFromBuffer(buffer));
+    const std::string device_name(buffer.begin(), buffer.end());

    if (device_name == "/dev/nvhost-prof-gpu") {
        rb.Push<DeviceFD>(0);
--- a/src/core/hle/service/set/system_settings_server.cpp
+++ b/src/core/hle/service/set/system_settings_server.cpp
@ -709,12 +709,12 @@ void ISystemSettingsServer::GetSettingsItemValueSize(HLERequestContext& ctx) {
    // The category of the setting. This corresponds to the top-level keys of
    // system_settings.ini.
    const auto setting_category_buf{ctx.ReadBuffer(0)};
-    const std::string setting_category{Common::StringFromBuffer(setting_category_buf)};
+    const std::string setting_category{setting_category_buf.begin(), setting_category_buf.end()};

    // The name of the setting. This corresponds to the second-level keys of
    // system_settings.ini.
    const auto setting_name_buf{ctx.ReadBuffer(1)};
-    const std::string setting_name{Common::StringFromBuffer(setting_name_buf)};
+    const std::string setting_name{setting_name_buf.begin(), setting_name_buf.end()};

    auto settings{GetSettings()};
    u64 response_size{0};
@ -732,12 +732,12 @@ void ISystemSettingsServer::GetSettingsItemValue(HLERequestContext& ctx) {
    // The category of the setting. This corresponds to the top-level keys of
    // system_settings.ini.
    const auto setting_category_buf{ctx.ReadBuffer(0)};
-    const std::string setting_category{Common::StringFromBuffer(setting_category_buf)};
+    const std::string setting_category{setting_category_buf.begin(), setting_category_buf.end()};

    // The name of the setting. This corresponds to the second-level keys of
    // system_settings.ini.
    const auto setting_name_buf{ctx.ReadBuffer(1)};
-    const std::string setting_name{Common::StringFromBuffer(setting_name_buf)};
+    const std::string setting_name{setting_name_buf.begin(), setting_name_buf.end()};

    std::vector<u8> value;
    auto response = GetSettingsItemValue(value, setting_category, setting_name);
--- a/src/core/hle/service/vi/vi.cpp
+++ b/src/core/hle/service/vi/vi.cpp
@ -15,7 +15,6 @@
 #include "common/logging/log.h"
 #include "common/math_util.h"
 #include "common/settings.h"
-#include "common/string_util.h"
 #include "common/swap.h"
 #include "core/core_timing.h"
 #include "core/hle/kernel/k_readable_event.h"
@ -695,7 +694,9 @@ private:
    void OpenLayer(HLERequestContext& ctx) {
        IPC::RequestParser rp{ctx};
        const auto name_buf = rp.PopRaw<std::array<u8, 0x40>>();
-        const std::string display_name(Common::StringFromBuffer(name_buf));
+        const auto end = std::find(name_buf.begin(), name_buf.end(), '\0');
+
+        const std::string display_name(name_buf.begin(), end);

        const u64 layer_id = rp.Pop<u64>();
        const u64 aruid = rp.Pop<u64>();
--- a/src/core/loader/nsp.cpp
+++ b/src/core/loader/nsp.cpp
@ -10,7 +10,6 @@
 #include "core/file_sys/nca_metadata.h"
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/registered_cache.h"
-#include "core/file_sys/romfs_factory.h"
 #include "core/file_sys/submission_package.h"
 #include "core/hle/kernel/k_process.h"
 #include "core/hle/service/filesystem/filesystem.h"
@ -110,13 +109,6 @@ AppLoader_NSP::LoadResult AppLoader_NSP::Load(Kernel::KProcess& process, Core::S
        return result;
    }

-    if (nsp->IsExtractedType()) {
-        system.GetFileSystemController().RegisterProcess(
-            process.GetProcessId(), {},
-            std::make_shared<FileSys::RomFSFactory>(*this, system.GetContentProvider(),
-                                                    system.GetFileSystemController()));
-    }
-
    FileSys::VirtualFile update_raw;
    if (ReadUpdateRaw(update_raw) == ResultStatus::Success && update_raw != nullptr) {
        system.GetFileSystemController().SetPackedUpdate(process.GetProcessId(),
--- a/src/frontend_common/content_manager.h
+++ b/src/frontend_common/content_manager.h
@ -47,14 +47,14 @@ inline bool RemoveDLC(const Service::FileSystem::FileSystemController& fs_contro

 /**
 * \brief Removes all DLC for a game
- * \param system Reference to the system instance
+ * \param system Raw pointer to the system instance
 * \param program_id Program ID for the game that will have all of its DLC removed
 * \return Number of DLC removed
 */
-inline size_t RemoveAllDLC(Core::System& system, const u64 program_id) {
+inline size_t RemoveAllDLC(Core::System* system, const u64 program_id) {
    size_t count{};
-    const auto& fs_controller = system.GetFileSystemController();
-    const auto dlc_entries = system.GetContentProvider().ListEntriesFilter(
+    const auto& fs_controller = system->GetFileSystemController();
+    const auto dlc_entries = system->GetContentProvider().ListEntriesFilter(
        FileSys::TitleType::AOC, FileSys::ContentRecordType::Data);
    std::vector<u64> program_dlc_entries;

@ -124,15 +124,15 @@ inline bool RemoveMod(const Service::FileSystem::FileSystemController& fs_contro

 /**
 * \brief Installs an NSP
- * \param system Reference to the system instance
- * \param vfs Reference to the VfsFilesystem instance in Core::System
+ * \param system Raw pointer to the system instance
+ * \param vfs Raw pointer to the VfsFilesystem instance in Core::System
 * \param filename Path to the NSP file
 * \param callback Callback to report the progress of the installation. The first size_t
 * parameter is the total size of the virtual file and the second is the current progress. If you
 * return true to the callback, it will cancel the installation as soon as possible.
 * \return [InstallResult] representing how the installation finished
 */
-inline InstallResult InstallNSP(Core::System& system, FileSys::VfsFilesystem& vfs,
+inline InstallResult InstallNSP(Core::System* system, FileSys::VfsFilesystem* vfs,
                                const std::string& filename,
                                const std::function<bool(size_t, size_t)>& callback) {
    const auto copy = [callback](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
@ -159,7 +159,7 @@ inline InstallResult InstallNSP(Core::System& system, FileSys::VfsFilesystem& vf
    };

    std::shared_ptr<FileSys::NSP> nsp;
-    FileSys::VirtualFile file = vfs.OpenFile(filename, FileSys::Mode::Read);
+    FileSys::VirtualFile file = vfs->OpenFile(filename, FileSys::Mode::Read);
    if (boost::to_lower_copy(file->GetName()).ends_with(std::string("nsp"))) {
        nsp = std::make_shared<FileSys::NSP>(file);
        if (nsp->IsExtractedType()) {
@ -173,7 +173,7 @@ inline InstallResult InstallNSP(Core::System& system, FileSys::VfsFilesystem& vf
        return InstallResult::Failure;
    }
    const auto res =
-        system.GetFileSystemController().GetUserNANDContents()->InstallEntry(*nsp, true, copy);
+        system->GetFileSystemController().GetUserNANDContents()->InstallEntry(*nsp, true, copy);
    switch (res) {
    case FileSys::InstallResult::Success:
        return InstallResult::Success;
@ -188,17 +188,17 @@ inline InstallResult InstallNSP(Core::System& system, FileSys::VfsFilesystem& vf

 /**
 * \brief Installs an NCA
- * \param vfs Reference to the VfsFilesystem instance in Core::System
+ * \param vfs Raw pointer to the VfsFilesystem instance in Core::System
 * \param filename Path to the NCA file
- * \param registered_cache Reference to the registered cache that the NCA will be installed to
+ * \param registered_cache Raw pointer to the registered cache that the NCA will be installed to
 * \param title_type Type of NCA package to install
 * \param callback Callback to report the progress of the installation. The first size_t
 * parameter is the total size of the virtual file and the second is the current progress. If you
 * return true to the callback, it will cancel the installation as soon as possible.
 * \return [InstallResult] representing how the installation finished
 */
-inline InstallResult InstallNCA(FileSys::VfsFilesystem& vfs, const std::string& filename,
-                                FileSys::RegisteredCache& registered_cache,
+inline InstallResult InstallNCA(FileSys::VfsFilesystem* vfs, const std::string& filename,
+                                FileSys::RegisteredCache* registered_cache,
                                const FileSys::TitleType title_type,
                                const std::function<bool(size_t, size_t)>& callback) {
    const auto copy = [callback](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
@ -224,7 +224,7 @@ inline InstallResult InstallNCA(FileSys::VfsFilesystem& vfs, const std::string&
        return true;
    };

-    const auto nca = std::make_shared<FileSys::NCA>(vfs.OpenFile(filename, FileSys::Mode::Read));
+    const auto nca = std::make_shared<FileSys::NCA>(vfs->OpenFile(filename, FileSys::Mode::Read));
    const auto id = nca->GetStatus();

    // Game updates necessary are missing base RomFS
@ -233,7 +233,7 @@ inline InstallResult InstallNCA(FileSys::VfsFilesystem& vfs, const std::string&
        return InstallResult::Failure;
    }

-    const auto res = registered_cache.InstallEntry(*nca, title_type, true, copy);
+    const auto res = registered_cache->InstallEntry(*nca, title_type, true, copy);
    if (res == FileSys::InstallResult::Success) {
        return InstallResult::Success;
    } else if (res == FileSys::InstallResult::OverwriteExisting) {
@ -245,19 +245,19 @@ inline InstallResult InstallNCA(FileSys::VfsFilesystem& vfs, const std::string&

 /**
 * \brief Verifies the installed contents for a given ManualContentProvider
- * \param system Reference to the system instance
- * \param provider Reference to the content provider that's tracking indexed games
+ * \param system Raw pointer to the system instance
+ * \param provider Raw pointer to the content provider that's tracking indexed games
 * \param callback Callback to report the progress of the installation. The first size_t
 * parameter is the total size of the installed contents and the second is the current progress. If
 * you return true to the callback, it will cancel the installation as soon as possible.
 * \return A list of entries that failed to install. Returns an empty vector if successful.
 */
 inline std::vector<std::string> VerifyInstalledContents(
-    Core::System& system, FileSys::ManualContentProvider& provider,
+    Core::System* system, FileSys::ManualContentProvider* provider,
    const std::function<bool(size_t, size_t)>& callback) {
    // Get content registries.
-    auto bis_contents = system.GetFileSystemController().GetSystemNANDContents();
-    auto user_contents = system.GetFileSystemController().GetUserNANDContents();
+    auto bis_contents = system->GetFileSystemController().GetSystemNANDContents();
+    auto user_contents = system->GetFileSystemController().GetUserNANDContents();

    std::vector<FileSys::RegisteredCache*> content_providers;
    if (bis_contents) {
@ -309,11 +309,11 @@ inline std::vector<std::string> VerifyInstalledContents(
            const auto title_id = nca.GetTitleId();
            std::string title_name = "unknown";

-            const auto control = provider.GetEntry(FileSys::GetBaseTitleID(title_id),
-                                                   FileSys::ContentRecordType::Control);
+            const auto control = provider->GetEntry(FileSys::GetBaseTitleID(title_id),
+                                                    FileSys::ContentRecordType::Control);
            if (control && control->GetStatus() == Loader::ResultStatus::Success) {
-                const FileSys::PatchManager pm{title_id, system.GetFileSystemController(),
-                                               provider};
+                const FileSys::PatchManager pm{title_id, system->GetFileSystemController(),
+                                               *provider};
                const auto [nacp, logo] = pm.ParseControlNCA(*control);
                if (nacp) {
                    title_name = nacp->GetApplicationName();
@ -335,7 +335,7 @@ inline std::vector<std::string> VerifyInstalledContents(

 /**
 * \brief Verifies the contents of a given game
- * \param system Reference to the system instance
+ * \param system Raw pointer to the system instance
 * \param game_path Patch to the game file
 * \param callback Callback to report the progress of the installation. The first size_t
 * parameter is the total size of the installed contents and the second is the current progress. If
@ -343,10 +343,10 @@ inline std::vector<std::string> VerifyInstalledContents(
 * \return GameVerificationResult representing how the verification process finished
 */
 inline GameVerificationResult VerifyGameContents(
-    Core::System& system, const std::string& game_path,
+    Core::System* system, const std::string& game_path,
    const std::function<bool(size_t, size_t)>& callback) {
-    const auto loader =
-        Loader::GetLoader(system, system.GetFilesystem()->OpenFile(game_path, FileSys::Mode::Read));
+    const auto loader = Loader::GetLoader(
+        *system, system->GetFilesystem()->OpenFile(game_path, FileSys::Mode::Read));
    if (loader == nullptr) {
        return GameVerificationResult::NotImplemented;
    }
@ -368,11 +368,4 @@ inline GameVerificationResult VerifyGameContents(
    return GameVerificationResult::Success;
 }

-/**
- * Checks if the keys required for decrypting firmware and games are available
- */
-inline bool AreKeysPresent() {
-    return !Core::Crypto::KeyManager::Instance().BaseDeriveNecessary();
-}
-
 } // namespace ContentManager
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@ -110,11 +110,7 @@ void EmulatedController::ReloadFromSettings() {
        original_npad_type = npad_type;
    }

-    // Disable special features before disconnecting
-    if (controller.right_polling_mode != Common::Input::PollingMode::Active) {
-        SetPollingMode(EmulatedDeviceIndex::RightIndex, Common::Input::PollingMode::Active);
-    }
-
+    SetPollingMode(EmulatedDeviceIndex::RightIndex, Common::Input::PollingMode::Active);
    Disconnect();
    if (player.connected) {
        Connect();
@ -1245,12 +1241,7 @@ bool EmulatedController::SetVibration(DeviceIndex device_index, const VibrationV
        return false;
    }

-    // Skip duplicated vibrations
-    if (last_vibration_value[index] == vibration) {
-        return Settings::values.vibration_enabled.GetValue();
-    }
-
-    last_vibration_value[index] = vibration;
+    last_vibration_value = vibration;

    if (!Settings::values.vibration_enabled) {
        return false;
@ -1281,10 +1272,7 @@ bool EmulatedController::SetVibration(DeviceIndex device_index, const VibrationV
 }

 VibrationValue EmulatedController::GetActualVibrationValue(DeviceIndex device_index) const {
-    if (device_index >= DeviceIndex::MaxDeviceIndex) {
-        return Core::HID::DEFAULT_VIBRATION_VALUE;
-    }
-    return last_vibration_value[static_cast<std::size_t>(device_index)];
+    return last_vibration_value;
 }

 bool EmulatedController::IsVibrationEnabled(std::size_t device_index) {
--- a/src/hid_core/frontend/emulated_controller.h
+++ b/src/hid_core/frontend/emulated_controller.h
@ -581,8 +581,7 @@ private:
    f32 motion_sensitivity{Core::HID::MotionInput::IsAtRestStandard};
    u32 turbo_button_state{0};
    std::size_t nfc_handles{0};
-    std::array<VibrationValue, 2> last_vibration_value{DEFAULT_VIBRATION_VALUE,
-                                                       DEFAULT_VIBRATION_VALUE};
+    VibrationValue last_vibration_value{DEFAULT_VIBRATION_VALUE};

    // Temporary values to avoid doing changes while the controller is in configuring mode
    NpadStyleIndex tmp_npad_type{NpadStyleIndex::None};
--- a/src/hid_core/hid_types.h
+++ b/src/hid_core/hid_types.h
@ -639,15 +639,6 @@ struct VibrationValue {
    f32 low_frequency{};
    f32 high_amplitude{};
    f32 high_frequency{};
-    bool operator==(const VibrationValue& b) {
-        if (low_amplitude != b.low_amplitude || high_amplitude != b.high_amplitude) {
-            return false;
-        }
-        if (low_frequency != b.low_amplitude || high_frequency != b.high_frequency) {
-            return false;
-        }
-        return true;
-    }
 };
 static_assert(sizeof(VibrationValue) == 0x10, "VibrationValue has incorrect size.");

--- a/src/video_core/vulkan_common/vulkan_wrapper.cpp
+++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp
@ -39,10 +39,6 @@ void SortPhysicalDevicesPerVendor(std::vector<VkPhysicalDevice>& devices,
    }
 }

-bool IsMicrosoftDozen(const char* device_name) {
-    return std::strstr(device_name, "Microsoft") != nullptr;
-}
-
 void SortPhysicalDevices(std::vector<VkPhysicalDevice>& devices, const InstanceDispatch& dld) {
    // Sort by name, this will set a base and make GPUs with higher numbers appear first
    // (e.g. GTX 1650 will intentionally be listed before a GTX 1080).
@ -56,12 +52,6 @@ void SortPhysicalDevices(std::vector<VkPhysicalDevice>& devices, const InstanceD
    });
    // Prefer Nvidia over AMD, AMD over Intel, Intel over the rest.
    SortPhysicalDevicesPerVendor(devices, dld, {0x10DE, 0x1002, 0x8086});
-    // Demote Microsoft's Dozen devices to the bottom.
-    SortPhysicalDevices(
-        devices, dld,
-        [](const VkPhysicalDeviceProperties& lhs, const VkPhysicalDeviceProperties& rhs) {
-            return IsMicrosoftDozen(rhs.deviceName) && !IsMicrosoftDozen(lhs.deviceName);
-        });
 }

 template <typename T>
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@ -423,7 +423,7 @@ GMainWindow::GMainWindow(std::unique_ptr<QtConfig> config_, bool has_broken_vulk
    RemoveCachedContents();

    // Gen keys if necessary
-    OnCheckFirmwareDecryption();
+    OnReinitializeKeys(ReinitializeKeyBehavior::NoWarning);

    game_list->LoadCompatibilityList();
    game_list->PopulateAsync(UISettings::values.game_dirs);
@ -1574,6 +1574,8 @@ void GMainWindow::ConnectMenuEvents() {
    connect(multiplayer_state, &MultiplayerState::SaveConfig, this, &GMainWindow::OnSaveConfig);

    // Tools
+    connect_menu(ui->action_Rederive, std::bind(&GMainWindow::OnReinitializeKeys, this,
+                                                ReinitializeKeyBehavior::Warning));
    connect_menu(ui->action_Load_Album, &GMainWindow::OnAlbum);
    connect_menu(ui->action_Load_Cabinet_Nickname_Owner,
                 [this]() { OnCabinet(Service::NFP::CabinetMode::StartNicknameAndOwnerSettings); });
@ -2499,7 +2501,7 @@ void GMainWindow::RemoveUpdateContent(u64 program_id, InstalledEntryType type) {
 }

 void GMainWindow::RemoveAddOnContent(u64 program_id, InstalledEntryType type) {
-    const size_t count = ContentManager::RemoveAllDLC(*system, program_id);
+    const size_t count = ContentManager::RemoveAllDLC(system.get(), program_id);
    if (count == 0) {
        QMessageBox::warning(this, GetGameListErrorRemoving(type),
                             tr("There are no DLC installed for this title."));
@ -2796,7 +2798,8 @@ void GMainWindow::OnGameListVerifyIntegrity(const std::string& game_path) {
        return progress.wasCanceled();
    };

-    const auto result = ContentManager::VerifyGameContents(*system, game_path, QtProgressCallback);
+    const auto result =
+        ContentManager::VerifyGameContents(system.get(), game_path, QtProgressCallback);
    progress.close();
    switch (result) {
    case ContentManager::GameVerificationResult::Success:
@ -3265,7 +3268,7 @@ void GMainWindow::OnMenuInstallToNAND() {
                return false;
            };
            future = QtConcurrent::run([this, &file, progress_callback] {
-                return ContentManager::InstallNSP(*system, *vfs, file.toStdString(),
+                return ContentManager::InstallNSP(system.get(), vfs.get(), file.toStdString(),
                                                  progress_callback);
            });

@ -3368,7 +3371,7 @@ ContentManager::InstallResult GMainWindow::InstallNCA(const QString& filename) {
        }
        return false;
    };
-    return ContentManager::InstallNCA(*vfs, filename.toStdString(), *registered_cache,
+    return ContentManager::InstallNCA(vfs.get(), filename.toStdString(), registered_cache,
                                      static_cast<FileSys::TitleType>(index), progress_callback);
 }

@ -4118,7 +4121,7 @@ void GMainWindow::OnVerifyInstalledContents() {
    };

    const std::vector<std::string> result =
-        ContentManager::VerifyInstalledContents(*system, *provider, QtProgressCallback);
+        ContentManager::VerifyInstalledContents(system.get(), provider.get(), QtProgressCallback);
    progress.close();

    if (result.empty()) {
@ -4548,20 +4551,122 @@ void GMainWindow::OnMouseActivity() {
    }
 }

-void GMainWindow::OnCheckFirmwareDecryption() {
+void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {
+    if (behavior == ReinitializeKeyBehavior::Warning) {
+        const auto res = QMessageBox::information(
+            this, tr("Confirm Key Rederivation"),
+            tr("You are about to force rederive all of your keys. \nIf you do not know what "
+               "this "
+               "means or what you are doing, \nthis is a potentially destructive action. "
+               "\nPlease "
+               "make sure this is what you want \nand optionally make backups.\n\nThis will "
+               "delete "
+               "your autogenerated key files and re-run the key derivation module."),
+            QMessageBox::StandardButtons{QMessageBox::Ok, QMessageBox::Cancel});
+
+        if (res == QMessageBox::Cancel)
+            return;
+
+        const auto keys_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::KeysDir);
+
+        Common::FS::RemoveFile(keys_dir / "prod.keys_autogenerated");
+        Common::FS::RemoveFile(keys_dir / "console.keys_autogenerated");
+        Common::FS::RemoveFile(keys_dir / "title.keys_autogenerated");
+    }
+
+    Core::Crypto::KeyManager& keys = Core::Crypto::KeyManager::Instance();
+    bool all_keys_present{true};
+
+    if (keys.BaseDeriveNecessary()) {
+        Core::Crypto::PartitionDataManager pdm{vfs->OpenDirectory("", FileSys::Mode::Read)};
+
+        const auto function = [this, &keys, &pdm] {
+            keys.PopulateFromPartitionData(pdm);
+
+            system->GetFileSystemController().CreateFactories(*vfs);
+            keys.DeriveETicket(pdm, system->GetContentProvider());
+        };
+
+        QString errors;
+        if (!pdm.HasFuses()) {
+            errors += tr("Missing fuses");
+        }
+        if (!pdm.HasBoot0()) {
+            errors += tr(" - Missing BOOT0");
+        }
+        if (!pdm.HasPackage2()) {
+            errors += tr(" - Missing BCPKG2-1-Normal-Main");
+        }
+        if (!pdm.HasProdInfo()) {
+            errors += tr(" - Missing PRODINFO");
+        }
+        if (!errors.isEmpty()) {
+            all_keys_present = false;
+            QMessageBox::warning(
+                this, tr("Derivation Components Missing"),
+                tr("Encryption keys are missing. "
+                   "<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu "
+                   "quickstart guide</a> to get all your keys, firmware and "
+                   "games.<br><br><small>(%1)</small>")
+                    .arg(errors));
+        }
+
+        QProgressDialog prog(this);
+        prog.setRange(0, 0);
+        prog.setLabelText(tr("Deriving keys...\nThis may take up to a minute depending \non your "
+                             "system's performance."));
+        prog.setWindowTitle(tr("Deriving Keys"));
+
+        prog.show();
+
+        auto future = QtConcurrent::run(function);
+        while (!future.isFinished()) {
+            QCoreApplication::processEvents();
+        }
+
+        prog.close();
+    }
+
    system->GetFileSystemController().CreateFactories(*vfs);
-    if (!ContentManager::AreKeysPresent()) {
+
+    if (all_keys_present && !this->CheckSystemArchiveDecryption()) {
+        LOG_WARNING(Frontend, "Mii model decryption failed");
        QMessageBox::warning(
-            this, tr("Derivation Components Missing"),
-            tr("Encryption keys are missing. "
+            this, tr("System Archive Decryption Failed"),
+            tr("Encryption keys failed to decrypt firmware. "
               "<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu "
               "quickstart guide</a> to get all your keys, firmware and "
               "games."));
    }
+
    SetFirmwareVersion();
+
+    if (behavior == ReinitializeKeyBehavior::Warning) {
+        game_list->PopulateAsync(UISettings::values.game_dirs);
+    }
+
    UpdateMenuState();
 }

+bool GMainWindow::CheckSystemArchiveDecryption() {
+    constexpr u64 MiiModelId = 0x0100000000000802;
+
+    auto bis_system = system->GetFileSystemController().GetSystemNANDContents();
+    if (!bis_system) {
+        // Not having system BIS files is not an error.
+        return true;
+    }
+
+    auto mii_nca = bis_system->GetEntry(MiiModelId, FileSys::ContentRecordType::Data);
+    if (!mii_nca) {
+        // Not having the Mii model is not an error.
+        return true;
+    }
+
+    // Return whether we are able to decrypt the RomFS of the Mii model.
+    return mii_nca->GetRomFS().get() != nullptr;
+}
+
 bool GMainWindow::CheckFirmwarePresence() {
    constexpr u64 MiiEditId = static_cast<u64>(Service::AM::Applets::AppletProgramId::MiiEdit);

--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@ -125,6 +125,11 @@ enum class EmulatedDirectoryTarget {
    SDMC,
 };

+enum class ReinitializeKeyBehavior {
+    NoWarning,
+    Warning,
+};
+
 namespace VkDeviceInfo {
 class Record;
 }
@ -395,7 +400,7 @@ private slots:
    void OnMiiEdit();
    void OnOpenControllerMenu();
    void OnCaptureScreenshot();
-    void OnCheckFirmwareDecryption();
+    void OnReinitializeKeys(ReinitializeKeyBehavior behavior);
    void OnLanguageChanged(const QString& locale);
    void OnMouseActivity();
    bool OnShutdownBegin();
@ -436,6 +441,7 @@ private:
    void LoadTranslation();
    void OpenPerGameConfiguration(u64 title_id, const std::string& file_name);
    bool CheckDarkMode();
+    bool CheckSystemArchiveDecryption();
    bool CheckFirmwarePresence();
    void SetFirmwareVersion();
    void ConfigureFilesystemProvider(const std::string& filepath);
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@ -224,6 +224,11 @@
    <string>&amp;Stop</string>
   </property>
  </action>
+  <action name="action_Rederive">
+   <property name="text">
+    <string>&amp;Reinitialize keys...</string>
+   </property>
+  </action>
  <action name="action_Verify_installed_contents">
   <property name="text">
    <string>&amp;Verify Installed Contents</string>
Author	SHA1	Message	Date
yuzubot	65f76b6af4	Android 205	2024-01-22 20:48:56 +00:00
yuzubot	d431619c14	Merge yuzu-emu#12749	2024-01-22 20:48:56 +00:00
yuzubot	51da014e53	Merge yuzu-emu#12499	2024-01-22 20:48:56 +00:00