Merge d766c527c7 into ec52a74967

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/AudioUtils.kt

@@ -1,28 +0,0 @@
-package org.dolphinemu.dolphinemu.utils
-
-import android.content.Context
-import android.media.AudioManager
-import androidx.annotation.Keep
-import org.dolphinemu.dolphinemu.DolphinApplication
-
-object AudioUtils {
-    @JvmStatic @Keep
-    fun getSampleRate(): Int =
-        getAudioServiceProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE, 48000)
-
-    @JvmStatic @Keep
-    fun getFramesPerBuffer(): Int =
-        getAudioServiceProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER, 256)
-
-    private fun getAudioServiceProperty(property: String, fallback: Int): Int {
-        return try {
-            val context = DolphinApplication.getAppContext()
-            val am = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-            Integer.parseUnsignedInt(am.getProperty(property))
-        } catch (e: NullPointerException) {
-            fallback
-        } catch (e: NumberFormatException) {
-            fallback
-        }
-    }
-}

Source/Android/jni/AndroidCommon/IDCache.cpp

@@ -122,10 +122,6 @@ static jmethodID s_permission_handler_request_record_audio_permission;
 
 static jmethodID s_runnable_run;
 
-static jclass s_audio_utils_class;
-static jmethodID s_audio_utils_get_sample_rate;
-static jmethodID s_audio_utils_get_frames_per_buffer;
-
 namespace IDCache
 {
 JNIEnv* GetEnvForThread()
@@ -566,21 +562,6 @@ jmethodID GetRunnableRun()
   return s_runnable_run;
 }
 
-jclass GetAudioUtilsClass()
-{
-  return s_audio_utils_class;
-}
-
-jmethodID GetAudioUtilsGetSampleRate()
-{
-  return s_audio_utils_get_sample_rate;
-}
-
-jmethodID GetAudioUtilsGetFramesPerBuffer()
-{
-  return s_audio_utils_get_frames_per_buffer;
-}
-
 }  // namespace IDCache
 
 extern "C" {
@@ -817,13 +798,6 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
   s_runnable_run = env->GetMethodID(runnable_class, "run", "()V");
   env->DeleteLocalRef(runnable_class);
 
-  const jclass audio_utils_class = env->FindClass("org/dolphinemu/dolphinemu/utils/AudioUtils");
-  s_audio_utils_class = reinterpret_cast<jclass>(env->NewGlobalRef(audio_utils_class));
-  s_audio_utils_get_sample_rate = env->GetStaticMethodID(audio_utils_class, "getSampleRate", "()I");
-  s_audio_utils_get_frames_per_buffer =
-      env->GetStaticMethodID(audio_utils_class, "getFramesPerBuffer", "()I");
-  env->DeleteLocalRef(audio_utils_class);
-
   return JNI_VERSION;
 }
 
@@ -860,6 +834,5 @@ JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved)
   env->DeleteGlobalRef(s_core_device_control_class);
   env->DeleteGlobalRef(s_input_detector_class);
   env->DeleteGlobalRef(s_permission_handler_class);
-  env->DeleteGlobalRef(s_audio_utils_class);
 }
 }

Source/Android/jni/AndroidCommon/IDCache.h

@@ -121,8 +121,4 @@ jmethodID GetPermissionHandlerRequestRecordAudioPermission();
 
 jmethodID GetRunnableRun();
 
-jclass GetAudioUtilsClass();
-jmethodID GetAudioUtilsGetSampleRate();
-jmethodID GetAudioUtilsGetFramesPerBuffer();
-
 }  // namespace IDCache

Source/Core/AudioCommon/AudioCommon.cpp

@@ -16,7 +16,6 @@
 #include "AudioCommon/WASAPIStream.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
-#include "Common/TimeUtil.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/System.h"
@@ -220,11 +219,8 @@ void StartAudioDump(Core::System& system)
 
   std::string path_prefix = File::GetUserPath(D_DUMPAUDIO_IDX) + SConfig::GetInstance().GetGameID();
 
-  const auto local_time = Common::LocalTime(start_time);
-  if (!local_time)
-    return;
-
-  std::string base_name = fmt::format("{}_{:%Y-%m-%d_%H-%M-%S}", path_prefix, *local_time);
+  std::string base_name =
+      fmt::format("{}_{:%Y-%m-%d_%H-%M-%S}", path_prefix, fmt::localtime(start_time));
 
   const std::string audio_file_name_dtk = fmt::format("{}_dtkdump.wav", base_name);
   const std::string audio_file_name_dsp = fmt::format("{}_dspdump.wav", base_name);

Source/Core/AudioCommon/OpenSLESStream.cpp

@@ -8,27 +8,40 @@
 
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>
-#include <jni.h>
 
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Core/ConfigManager.h"
-#include "jni/AndroidCommon/IDCache.h"
 
-void OpenSLESStream::BQPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void* context)
-{
-  reinterpret_cast<OpenSLESStream*>(context)->PushSamples(bq);
-}
+// engine interfaces
+static SLObjectItf engineObject;
+static SLEngineItf engineEngine;
+static SLObjectItf outputMixObject;
 
-void OpenSLESStream::PushSamples(SLAndroidSimpleBufferQueueItf bq)
+// buffer queue player interfaces
+static SLObjectItf bqPlayerObject = nullptr;
+static SLPlayItf bqPlayerPlay;
+static SLAndroidSimpleBufferQueueItf bqPlayerBufferQueue;
+static SLVolumeItf bqPlayerVolume;
+static Mixer* g_mixer;
+#define BUFFER_SIZE 512
+#define BUFFER_SIZE_IN_SAMPLES (BUFFER_SIZE / 2)
+
+// Double buffering.
+static short buffer[2][BUFFER_SIZE];
+static int curBuffer = 0;
+
+static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void* context)
 {
-  ASSERT(bq == m_bq_player_buffer_queue);
+  ASSERT(bq == bqPlayerBufferQueue);
+  ASSERT(nullptr == context);
 
   // Render to the fresh buffer
-  m_mixer->Mix(m_buffer[m_current_buffer].data(), m_frames_per_buffer);
-  SLresult result = (*bq)->Enqueue(bq, m_buffer[m_current_buffer].data(), m_bytes_per_buffer);
-  m_current_buffer ^= 1;  // Switch buffer
+  g_mixer->Mix(reinterpret_cast<short*>(buffer[curBuffer]), BUFFER_SIZE_IN_SAMPLES);
+  SLresult result =
+      (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, buffer[curBuffer], sizeof(buffer[0]));
+  curBuffer ^= 1;  // Switch buffer
 
   // Comment from sample code:
   // the most likely other result is SL_RESULT_BUFFER_INSUFFICIENT,
@@ -38,78 +51,61 @@ void OpenSLESStream::PushSamples(SLAndroidSimpleBufferQueueItf bq)
 
 bool OpenSLESStream::Init()
 {
-  JNIEnv* env = IDCache::GetEnvForThread();
-  jclass audio_utils = IDCache::GetAudioUtilsClass();
-  const SLuint32 sample_rate =
-      env->CallStaticIntMethod(audio_utils, IDCache::GetAudioUtilsGetSampleRate());
-  m_frames_per_buffer =
-      env->CallStaticIntMethod(audio_utils, IDCache::GetAudioUtilsGetFramesPerBuffer());
-
-  INFO_LOG_FMT(AUDIO, "OpenSLES configuration: {} Hz, {} frames per buffer", sample_rate,
-               m_frames_per_buffer);
-
-  constexpr SLuint32 channels = 2;
-  const SLuint32 samples_per_buffer = m_frames_per_buffer * channels;
-  m_bytes_per_buffer = m_frames_per_buffer * channels * sizeof(m_buffer[0][0]);
-
-  for (std::vector<short>& buffer : m_buffer)
-    buffer.resize(samples_per_buffer);
-
   SLresult result;
   // create engine
-  result = slCreateEngine(&m_engine_object, 0, nullptr, 0, nullptr, nullptr);
+  result = slCreateEngine(&engineObject, 0, nullptr, 0, nullptr, nullptr);
   ASSERT(SL_RESULT_SUCCESS == result);
-  result = (*m_engine_object)->Realize(m_engine_object, SL_BOOLEAN_FALSE);
+  result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE);
   ASSERT(SL_RESULT_SUCCESS == result);
-  result = (*m_engine_object)->GetInterface(m_engine_object, SL_IID_ENGINE, &m_engine_engine);
+  result = (*engineObject)->GetInterface(engineObject, SL_IID_ENGINE, &engineEngine);
   ASSERT(SL_RESULT_SUCCESS == result);
-  result = (*m_engine_engine)->CreateOutputMix(m_engine_engine, &m_output_mix_object, 0, 0, 0);
+  result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, 0, 0);
   ASSERT(SL_RESULT_SUCCESS == result);
-  result = (*m_output_mix_object)->Realize(m_output_mix_object, SL_BOOLEAN_FALSE);
+  result = (*outputMixObject)->Realize(outputMixObject, SL_BOOLEAN_FALSE);
   ASSERT(SL_RESULT_SUCCESS == result);
 
   SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 2};
-  SLDataFormat_PCM format_pcm = {
-      SL_DATAFORMAT_PCM,           channels,
-      sample_rate * 1000,          SL_PCMSAMPLEFORMAT_FIXED_16,
-      SL_PCMSAMPLEFORMAT_FIXED_16, SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT,
-      SL_BYTEORDER_LITTLEENDIAN};
+  SLDataFormat_PCM format_pcm = {SL_DATAFORMAT_PCM,
+                                 2,
+                                 m_mixer->GetSampleRate() * 1000,
+                                 SL_PCMSAMPLEFORMAT_FIXED_16,
+                                 SL_PCMSAMPLEFORMAT_FIXED_16,
+                                 SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT,
+                                 SL_BYTEORDER_LITTLEENDIAN};
 
   SLDataSource audioSrc = {&loc_bufq, &format_pcm};
 
   // configure audio sink
-  SLDataLocator_OutputMix loc_outmix = {SL_DATALOCATOR_OUTPUTMIX, m_output_mix_object};
+  SLDataLocator_OutputMix loc_outmix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject};
   SLDataSink audioSnk = {&loc_outmix, nullptr};
 
   // create audio player
   const SLInterfaceID ids[2] = {SL_IID_BUFFERQUEUE, SL_IID_VOLUME};
   const SLboolean req[2] = {SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE};
-  result = (*m_engine_engine)
-               ->CreateAudioPlayer(m_engine_engine, &m_bq_player_object, &audioSrc, &audioSnk, 2,
-                                   ids, req);
+  result =
+      (*engineEngine)
+          ->CreateAudioPlayer(engineEngine, &bqPlayerObject, &audioSrc, &audioSnk, 2, ids, req);
   ASSERT(SL_RESULT_SUCCESS == result);
 
-  result = (*m_bq_player_object)->Realize(m_bq_player_object, SL_BOOLEAN_FALSE);
+  result = (*bqPlayerObject)->Realize(bqPlayerObject, SL_BOOLEAN_FALSE);
   ASSERT(SL_RESULT_SUCCESS == result);
-  result = (*m_bq_player_object)->GetInterface(m_bq_player_object, SL_IID_PLAY, &m_bq_player_play);
-  ASSERT(SL_RESULT_SUCCESS == result);
-  result = (*m_bq_player_object)
-               ->GetInterface(m_bq_player_object, SL_IID_BUFFERQUEUE, &m_bq_player_buffer_queue);
+  result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_PLAY, &bqPlayerPlay);
   ASSERT(SL_RESULT_SUCCESS == result);
   result =
-      (*m_bq_player_object)->GetInterface(m_bq_player_object, SL_IID_VOLUME, &m_bq_player_volume);
+      (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_BUFFERQUEUE, &bqPlayerBufferQueue);
   ASSERT(SL_RESULT_SUCCESS == result);
-  result = (*m_bq_player_buffer_queue)
-               ->RegisterCallback(m_bq_player_buffer_queue, BQPlayerCallback, this);
+  result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_VOLUME, &bqPlayerVolume);
   ASSERT(SL_RESULT_SUCCESS == result);
-  result = (*m_bq_player_play)->SetPlayState(m_bq_player_play, SL_PLAYSTATE_PLAYING);
+  result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, bqPlayerCallback, nullptr);
+  ASSERT(SL_RESULT_SUCCESS == result);
+  result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_PLAYING);
   ASSERT(SL_RESULT_SUCCESS == result);
 
   // Render and enqueue a first buffer.
-  m_current_buffer ^= 1;
+  curBuffer ^= 1;
+  g_mixer = m_mixer.get();
 
-  result = (*m_bq_player_buffer_queue)
-               ->Enqueue(m_bq_player_buffer_queue, m_buffer[0].data(), m_bytes_per_buffer);
+  result = (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, buffer[0], sizeof(buffer[0]));
   if (SL_RESULT_SUCCESS != result)
     return false;
 
@@ -118,39 +114,39 @@ bool OpenSLESStream::Init()
 
 OpenSLESStream::~OpenSLESStream()
 {
-  if (m_bq_player_object != nullptr)
+  if (bqPlayerObject != nullptr)
   {
-    (*m_bq_player_object)->Destroy(m_bq_player_object);
-    m_bq_player_object = nullptr;
-    m_bq_player_play = nullptr;
-    m_bq_player_buffer_queue = nullptr;
-    m_bq_player_volume = nullptr;
+    (*bqPlayerObject)->Destroy(bqPlayerObject);
+    bqPlayerObject = nullptr;
+    bqPlayerPlay = nullptr;
+    bqPlayerBufferQueue = nullptr;
+    bqPlayerVolume = nullptr;
   }
 
-  if (m_output_mix_object != nullptr)
+  if (outputMixObject != nullptr)
   {
-    (*m_output_mix_object)->Destroy(m_output_mix_object);
-    m_output_mix_object = nullptr;
+    (*outputMixObject)->Destroy(outputMixObject);
+    outputMixObject = nullptr;
   }
 
-  if (m_engine_object != nullptr)
+  if (engineObject != nullptr)
   {
-    (*m_engine_object)->Destroy(m_engine_object);
-    m_engine_object = nullptr;
-    m_engine_engine = nullptr;
+    (*engineObject)->Destroy(engineObject);
+    engineObject = nullptr;
+    engineEngine = nullptr;
   }
 }
 
 bool OpenSLESStream::SetRunning(bool running)
 {
   SLuint32 new_state = running ? SL_PLAYSTATE_PLAYING : SL_PLAYSTATE_PAUSED;
-  return (*m_bq_player_play)->SetPlayState(m_bq_player_play, new_state) == SL_RESULT_SUCCESS;
+  return (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, new_state) == SL_RESULT_SUCCESS;
 }
 
 void OpenSLESStream::SetVolume(int volume)
 {
   const SLmillibel attenuation =
       volume <= 0 ? SL_MILLIBEL_MIN : static_cast<SLmillibel>(2000 * std::log10(volume / 100.0f));
-  (*m_bq_player_volume)->SetVolumeLevel(m_bq_player_volume, attenuation);
+  (*bqPlayerVolume)->SetVolumeLevel(bqPlayerVolume, attenuation);
 }
 #endif  // HAVE_OPENSL_ES

Source/Core/AudioCommon/OpenSLESStream.h

@@ -3,15 +3,10 @@
 
 #pragma once
 
-#ifdef HAVE_OPENSL_ES
-#include <array>
-#include <vector>
-
-#include <SLES/OpenSLES.h>
-#include <SLES/OpenSLES_Android.h>
-#endif  // HAVE_OPENSL_ES
+#include <thread>
 
 #include "AudioCommon/SoundStream.h"
+#include "Common/Event.h"
 
 class OpenSLESStream final : public SoundStream
 {
@@ -24,25 +19,7 @@ public:
   static bool IsValid() { return true; }
 
 private:
-  static void BQPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void* context);
-  void PushSamples(SLAndroidSimpleBufferQueueItf bq);
-
-  // engine interfaces
-  SLObjectItf m_engine_object;
-  SLEngineItf m_engine_engine;
-  SLObjectItf m_output_mix_object;
-
-  // buffer queue player interfaces
-  SLObjectItf m_bq_player_object = nullptr;
-  SLPlayItf m_bq_player_play;
-  SLAndroidSimpleBufferQueueItf m_bq_player_buffer_queue;
-  SLVolumeItf m_bq_player_volume;
-
-  SLuint32 m_frames_per_buffer;
-  SLuint32 m_bytes_per_buffer;
-
-  // Double buffering.
-  std::array<std::vector<short>, 2> m_buffer;
-  int m_current_buffer = 0;
+  std::thread thread;
+  Common::Event soundSyncEvent;
 #endif  // HAVE_OPENSL_ES
 };

Source/Core/AudioCommon/WASAPIStream.h

@@ -32,7 +32,7 @@ class WASAPIStream final : public SoundStream
 #ifdef _WIN32
 public:
   explicit WASAPIStream();
-  ~WASAPIStream() override;
+  ~WASAPIStream();
   bool Init() override;
   bool SetRunning(bool running) override;
 

Source/Core/Common/Assembler/GekkoIRGen.cpp

@@ -31,7 +31,7 @@ public:
   {
     m_active_block = &m_output_result.blocks.emplace_back(base_addr);
   }
-  ~GekkoIRPlugin() override = default;
+  virtual ~GekkoIRPlugin() = default;
 
   void OnDirectivePre(GekkoDirective directive) override;
   void OnDirectivePost(GekkoDirective directive) override;

Source/Core/Common/Crypto/AES.cpp

@@ -46,7 +46,8 @@ public:
       ASSERT(!mbedtls_aes_setkey_dec(&ctx, key, 128));
   }
 
-  bool Crypt(const u8* iv, u8* iv_out, const u8* buf_in, u8* buf_out, size_t len) const override
+  virtual bool Crypt(const u8* iv, u8* iv_out, const u8* buf_in, u8* buf_out,
+                     size_t len) const override
   {
     std::array<u8, BLOCK_SIZE> iv_tmp{};
     if (iv)
@@ -205,7 +206,8 @@ public:
       _mm_storeu_si128(&((__m128i*)buf_out)[d], block[d]);
   }
 
-  bool Crypt(const u8* iv, u8* iv_out, const u8* buf_in, u8* buf_out, size_t len) const override
+  virtual bool Crypt(const u8* iv, u8* iv_out, const u8* buf_in, u8* buf_out,
+                     size_t len) const override
   {
     if (len % BLOCK_SIZE)
       return false;

Source/Core/Common/Crypto/SHA1.cpp

@@ -41,18 +41,18 @@ public:
     mbedtls_sha1_init(&ctx);
     ASSERT(!mbedtls_sha1_starts_ret(&ctx));
   }
-  ~ContextMbed() override { mbedtls_sha1_free(&ctx); }
-  void Update(const u8* msg, size_t len) override
+  ~ContextMbed() { mbedtls_sha1_free(&ctx); }
+  virtual void Update(const u8* msg, size_t len) override
   {
     ASSERT(!mbedtls_sha1_update_ret(&ctx, msg, len));
   }
-  Digest Finish() override
+  virtual Digest Finish() override
   {
     Digest digest;
     ASSERT(!mbedtls_sha1_finish_ret(&ctx, digest.data()));
     return digest;
   }
-  bool HwAccelerated() const override { return false; }
+  virtual bool HwAccelerated() const override { return false; }
 
 private:
   mbedtls_sha1_context ctx{};
@@ -204,7 +204,7 @@ private:
   }
 
   ATTRIBUTE_TARGET("sha")
-  void ProcessBlock(const u8* msg) override
+  virtual void ProcessBlock(const u8* msg) override
   {
     // There are 80 rounds with 4 bytes per round, giving 0x140 byte work space, but we can keep
     // active state in just 0x40 bytes.
@@ -248,7 +248,7 @@ private:
     // clang-format on
   }
 
-  Digest GetDigest() override
+  virtual Digest GetDigest() override
   {
     Digest digest;
     _mm_storeu_si128((__m128i*)&digest[0], byterev_16B(state[0]));
@@ -257,7 +257,7 @@ private:
     return digest;
   }
 
-  bool HwAccelerated() const override { return true; }
+  virtual bool HwAccelerated() const override { return true; }
 
   std::array<XmmReg, 2> state{};
 };

Source/Core/Common/FatFsUtil.cpp

@@ -25,7 +25,6 @@
 #include "Common/Logging/Log.h"
 #include "Common/ScopeGuard.h"
 #include "Common/StringUtil.h"
-#include "Common/TimeUtil.h"
 
 #include "Core/Config/MainSettings.h"
 
@@ -96,7 +95,12 @@ int SDCardDiskIOCtl(File::IOFile* image, u8 pdrv, u8 cmd, void* buff)
 u32 GetSystemTimeFAT()
 {
   const std::time_t time = std::time(nullptr);
-  std::tm tm = *Common::LocalTime(time);
+  std::tm tm;
+#ifdef _WIN32
+  localtime_s(&tm, &time);
+#else
+  localtime_r(&time, &tm);
+#endif
 
   DWORD fattime = 0;
   fattime |= (tm.tm_year - 80) << 25;

Source/Core/Common/GL/GLInterface/WGL.h

@@ -10,9 +10,9 @@
 class GLContextWGL final : public GLContext
 {
 public:
-  ~GLContextWGL() override;
+  ~GLContextWGL();
 
-  bool IsHeadless() const override;
+  bool IsHeadless() const;
 
   std::unique_ptr<GLContext> CreateSharedContext() override;
 

Source/Core/Common/HostDisassembler.cpp

@@ -101,7 +101,7 @@ class HostDisassemblerBochs final : public HostDisassembler
 {
 public:
   explicit HostDisassemblerBochs();
-  ~HostDisassemblerBochs() override = default;
+  ~HostDisassemblerBochs() = default;
 
 private:
   disassembler m_disasm;

Source/Core/Common/Logging/ConsoleListener.h

@@ -9,7 +9,7 @@ class ConsoleListener : public Common::Log::LogListener
 {
 public:
   ConsoleListener();
-  ~ConsoleListener() override;
+  ~ConsoleListener();
 
   void Log(Common::Log::LogLevel level, const char* text) override;
 

Source/Core/Common/SettingsHandler.cpp

@@ -122,6 +122,7 @@ std::string SettingsWriter::GenerateSerialNumber()
 
   // Must be 9 characters at most; otherwise the serial number will be rejected by SDK libraries,
   // as there is a check to ensure the string length is strictly lower than 10.
-  return fmt::format("{:09}", t % 1000000000);
+  // 3 for %j, 2 for %H, 2 for %M, 2 for %S.
+  return fmt::format("{:%j%H%M%S}", fmt::localtime(t));
 }
 }  // namespace Common

Source/Core/Common/TimeUtil.cpp

@@ -2,25 +2,23 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "Common/TimeUtil.h"
-#include "Common/Logging/Log.h"
 
 #include <ctime>
 #include <optional>
 
 namespace Common
 {
-std::optional<std::tm> LocalTime(std::time_t time)
+std::optional<std::tm> Localtime(std::time_t time)
 {
   std::tm local_time;
 #ifdef _MSC_VER
   if (localtime_s(&local_time, &time) != 0)
-#else
-  if (localtime_r(&time, &local_time) == NULL)
-#endif
-  {
-    ERROR_LOG_FMT(COMMON, "Failed to convert time to local time: {}", std::strerror(errno));
     return std::nullopt;
-  }
+#else
+  std::tm* result = localtime_r(&time, &local_time);
+  if (result != &local_time)
+    return std::nullopt;
+#endif
   return local_time;
 }
 }  // Namespace Common

Source/Core/Common/TimeUtil.h

@@ -9,5 +9,5 @@
 namespace Common
 {
 // Threadsafe and error-checking variant of std::localtime()
-std::optional<std::tm> LocalTime(std::time_t time);
+std::optional<std::tm> Localtime(std::time_t time);
 }  // Namespace Common

Source/Core/Core/Boot/DolReader.h

@@ -20,7 +20,7 @@ public:
   explicit DolReader(const std::string& filename);
   explicit DolReader(File::IOFile file);
   explicit DolReader(std::vector<u8> buffer);
-  ~DolReader() override;
+  ~DolReader();
 
   bool IsValid() const override { return m_is_valid; }
   bool IsWii() const override { return m_is_wii; }

Source/Core/Core/Boot/ElfReader.h

@@ -28,7 +28,7 @@ public:
   explicit ElfReader(const std::string& filename);
   explicit ElfReader(File::IOFile file);
   explicit ElfReader(std::vector<u8> buffer);
-  ~ElfReader() override;
+  ~ElfReader();
   u32 Read32(int off) const { return base32[off >> 2]; }
   // Quick accessors
   ElfType GetType() const { return (ElfType)(header->e_type); }

Source/Core/Core/Core.cpp

@@ -8,7 +8,6 @@
 #include <cstring>
 #include <functional>
 #include <mutex>
-#include <optional>
 #include <queue>
 #include <utility>
 #include <variant>
@@ -35,7 +34,6 @@
 #include "Common/ScopeGuard.h"
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"
-#include "Common/TimeUtil.h"
 #include "Common/Version.h"
 
 #include "Core/AchievementManager.h"
@@ -735,17 +733,15 @@ static std::string GenerateScreenshotFolderPath()
   return path;
 }
 
-static std::optional<std::string> GenerateScreenshotName()
+static std::string GenerateScreenshotName()
 {
   // append gameId, path only contains the folder here.
   const std::string path_prefix =
       GenerateScreenshotFolderPath() + SConfig::GetInstance().GetGameID();
 
   const std::time_t cur_time = std::time(nullptr);
-  const auto local_time = Common::LocalTime(cur_time);
-  if (!local_time)
-    return std::nullopt;
-  const std::string base_name = fmt::format("{}_{:%Y-%m-%d_%H-%M-%S}", path_prefix, *local_time);
+  const std::string base_name =
+      fmt::format("{}_{:%Y-%m-%d_%H-%M-%S}", path_prefix, fmt::localtime(cur_time));
 
   // First try a filename without any suffixes, if already exists then append increasing numbers
   std::string name = fmt::format("{}.png", base_name);
@@ -761,9 +757,7 @@ static std::optional<std::string> GenerateScreenshotName()
 void SaveScreenShot()
 {
   const Core::CPUThreadGuard guard(Core::System::GetInstance());
-  std::optional<std::string> name = GenerateScreenshotName();
-  if (name)
-    g_frame_dumper->SaveScreenshot(*name);
+  g_frame_dumper->SaveScreenshot(GenerateScreenshotName());
 }
 
 void SaveScreenShot(std::string_view name)

Source/Core/Core/Debugger/OSThread.h

@@ -132,7 +132,7 @@ class OSThreadView : public Common::Debug::ThreadView
 {
 public:
   explicit OSThreadView(const Core::CPUThreadGuard& guard, u32 addr);
-  ~OSThreadView() override = default;
+  ~OSThreadView() = default;
 
   const OSThread& Data() const;
 

Source/Core/Core/FifoPlayer/FifoPlayer.cpp

@@ -220,7 +220,7 @@ class FifoPlayer::CPUCore final : public CPUCoreBase
 public:
   explicit CPUCore(FifoPlayer* parent) : m_parent(parent) {}
   CPUCore(const CPUCore&) = delete;
-  ~CPUCore() override {}
+  ~CPUCore() {}
   CPUCore& operator=(const CPUCore&) = delete;
 
   void Init() override

Source/Core/Core/HLE/HLE_VarArgs.h

@@ -157,7 +157,7 @@ class VAListStruct : public VAList
 {
 public:
   explicit VAListStruct(const Core::CPUThreadGuard& guard, u32 address);
-  ~VAListStruct() override = default;
+  ~VAListStruct() = default;
 
 private:
   struct svr4_va_list

Source/Core/Core/HW/DSPHLE/DSPHLE.h

@@ -28,7 +28,7 @@ public:
   DSPHLE(DSPHLE&& other) = delete;
   DSPHLE& operator=(const DSPHLE& other) = delete;
   DSPHLE& operator=(DSPHLE&& other) = delete;
-  ~DSPHLE() override;
+  ~DSPHLE();
 
   bool Initialize(bool wii, bool dsp_thread) override;
   void Shutdown() override;

Source/Core/Core/HW/DSPHLE/UCodes/AESnd.h

@@ -27,7 +27,7 @@ public:
   AESndAccelerator(AESndAccelerator&&) = delete;
   AESndAccelerator& operator=(const AESndAccelerator&) = delete;
   AESndAccelerator& operator=(AESndAccelerator&&) = delete;
-  ~AESndAccelerator() override;
+  ~AESndAccelerator();
 
 protected:
   void OnRawReadEndException() override {}

Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h

@@ -129,7 +129,7 @@ public:
   HLEAccelerator(HLEAccelerator&&) = delete;
   HLEAccelerator& operator=(const HLEAccelerator&) = delete;
   HLEAccelerator& operator=(HLEAccelerator&&) = delete;
-  ~HLEAccelerator() override = default;
+  ~HLEAccelerator() = default;
 
   PB_TYPE* acc_pb = nullptr;
 

Source/Core/Core/HW/DSPLLE/DSPLLE.h

@@ -20,7 +20,7 @@ class DSPLLE : public DSPEmulator
 {
 public:
   DSPLLE();
-  ~DSPLLE() override;
+  ~DSPLLE();
 
   bool Initialize(bool wii, bool dsp_thread) override;
   void Shutdown() override;

Source/Core/Core/HW/EXI/EXI_DeviceAGP.h

@@ -18,7 +18,7 @@ class CEXIAgp : public IEXIDevice
 {
 public:
   CEXIAgp(Core::System& system, const Slot slot);
-  ~CEXIAgp() override;
+  virtual ~CEXIAgp() override;
   bool IsPresent() const override { return true; }
   void ImmWrite(u32 _uData, u32 _uSize) override;
   u32 ImmRead(u32 _uSize) override;

Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h

@@ -216,7 +216,7 @@ class CEXIETHERNET : public IEXIDevice
 {
 public:
   CEXIETHERNET(Core::System& system, BBADeviceType type);
-  ~CEXIETHERNET() override;
+  virtual ~CEXIETHERNET();
   void SetCS(int cs) override;
   bool IsPresent() const override;
   bool IsInterruptSet() override;

Source/Core/Core/HW/EXI/EXI_DeviceMic.h

@@ -18,7 +18,7 @@ class CEXIMic : public IEXIDevice
 {
 public:
   CEXIMic(Core::System& system, const int index);
-  ~CEXIMic() override;
+  virtual ~CEXIMic();
   void SetCS(int cs) override;
   bool IsInterruptSet() override;
   bool IsPresent() const override;

Source/Core/Core/HW/EXI/EXI_DeviceModem.h

@@ -33,7 +33,7 @@ class CEXIModem : public IEXIDevice
 {
 public:
   CEXIModem(Core::System& system, ModemDeviceType type);
-  ~CEXIModem() override;
+  virtual ~CEXIModem();
   void SetCS(int cs) override;
   bool IsPresent() const override;
   bool IsInterruptSet() override;
@@ -136,13 +136,13 @@ private:
     TAPServerNetworkInterface(CEXIModem* modem_ref, const std::string& destination);
 
   public:
-    bool Activate() override;
-    void Deactivate() override;
-    bool IsActivated() override;
-    bool SendAndRemoveAllHDLCFrames(std::string* send_buffer) override;
-    bool RecvInit() override;
-    void RecvStart() override;
-    void RecvStop() override;
+    virtual bool Activate() override;
+    virtual void Deactivate() override;
+    virtual bool IsActivated() override;
+    virtual bool SendAndRemoveAllHDLCFrames(std::string* send_buffer) override;
+    virtual bool RecvInit() override;
+    virtual void RecvStart() override;
+    virtual void RecvStop() override;
 
   private:
     TAPServerConnection m_tapserver_if;

Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.h

@@ -24,7 +24,7 @@ class GCMemcardDirectory : public MemoryCardBase
 public:
   GCMemcardDirectory(const std::string& directory, ExpansionInterface::Slot slot,
                      const Memcard::HeaderData& header_data, u32 game_id);
-  ~GCMemcardDirectory() override;
+  ~GCMemcardDirectory();
 
   GCMemcardDirectory(const GCMemcardDirectory&) = delete;
   GCMemcardDirectory& operator=(const GCMemcardDirectory&) = delete;

Source/Core/Core/HW/GCMemcard/GCMemcardRaw.h

@@ -19,7 +19,7 @@ class MemoryCard : public MemoryCardBase
 public:
   MemoryCard(const std::string& filename, ExpansionInterface::Slot card_slot,
              u16 size_mbits = Memcard::MBIT_SIZE_MEMORY_CARD_2043);
-  ~MemoryCard() override;
+  ~MemoryCard();
   void FlushThread();
   void MakeDirty();
 

Source/Core/Core/HW/MMIO.cpp

@@ -39,7 +39,7 @@ class ConstantHandlingMethod : public ReadHandlingMethod<T>
 {
 public:
   explicit ConstantHandlingMethod(T value) : value_(value) {}
-  ~ConstantHandlingMethod() override = default;
+  virtual ~ConstantHandlingMethod() = default;
   void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const override
   {
     v.VisitConstant(value_);
@@ -62,7 +62,7 @@ class NopHandlingMethod : public WriteHandlingMethod<T>
 {
 public:
   NopHandlingMethod() {}
-  ~NopHandlingMethod() override = default;
+  virtual ~NopHandlingMethod() = default;
   void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const override { v.VisitNop(); }
 };
 template <typename T>
@@ -79,7 +79,7 @@ class DirectHandlingMethod : public ReadHandlingMethod<T>, public WriteHandlingM
 {
 public:
   DirectHandlingMethod(T* addr, u32 mask) : addr_(addr), mask_(mask) {}
-  ~DirectHandlingMethod() override = default;
+  virtual ~DirectHandlingMethod() = default;
   void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const override
   {
     v.VisitDirect(addr_, mask_);
@@ -122,7 +122,7 @@ public:
   {
   }
 
-  ~ComplexHandlingMethod() override = default;
+  virtual ~ComplexHandlingMethod() = default;
   void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const override
   {
     v.VisitComplex(&read_lambda_);

Source/Core/Core/HW/SI/SI_DeviceGBAEmu.h

@@ -21,7 +21,7 @@ class CSIDevice_GBAEmu final : public ISIDevice
 {
 public:
   CSIDevice_GBAEmu(Core::System& system, SIDevices device, int device_number);
-  ~CSIDevice_GBAEmu() override;
+  ~CSIDevice_GBAEmu();
 
   int RunBuffer(u8* buffer, int request_length) override;
   int TransferInterval() override;

Source/Core/Core/HW/WiimoteEmu/Extension/Extension.h

@@ -120,7 +120,7 @@ protected:
   using EncryptedExtension::EncryptedExtension;
 
 private:
-  void UpdateEncryptionKey() final;
+  void UpdateEncryptionKey() final override;
 };
 
 class Extension3rdParty : public EncryptedExtension
@@ -129,7 +129,7 @@ protected:
   using EncryptedExtension::EncryptedExtension;
 
 private:
-  void UpdateEncryptionKey() final;
+  void UpdateEncryptionKey() final override;
 };
 
 }  // namespace WiimoteEmu

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h

@@ -137,7 +137,7 @@ public:
   static constexpr const char* SIDEWAYS_OPTION = "Sideways Wiimote";
 
   explicit Wiimote(unsigned int index);
-  ~Wiimote() override;
+  ~Wiimote();
 
   std::string GetName() const override;
 

Source/Core/Core/HW/WiimoteReal/IOhidapi.h

@@ -34,7 +34,7 @@ class WiimoteScannerHidapi final : public WiimoteScannerBackend
 {
 public:
   WiimoteScannerHidapi();
-  ~WiimoteScannerHidapi() override;
+  ~WiimoteScannerHidapi();
   bool IsReady() const override;
   void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&) override;
   void Update() override {}                // not needed for hidapi

Source/Core/Core/HotkeyManager.h

@@ -233,7 +233,7 @@ class HotkeyManager : public ControllerEmu::EmulatedController
 {
 public:
   HotkeyManager();
-  ~HotkeyManager() override;
+  ~HotkeyManager();
 
   void GetInput(HotkeyStatus* hk, bool ignore_focus);
   std::string GetName() const override;

Source/Core/Core/IOS/ES/ES.h

@@ -234,7 +234,7 @@ public:
   ESDevice(ESDevice&& other) = delete;
   ESDevice& operator=(const ESDevice& other) = delete;
   ESDevice& operator=(ESDevice&& other) = delete;
-  ~ESDevice() override;
+  ~ESDevice();
 
   static void InitializeEmulationState(CoreTiming::CoreTimingManager& core_timing);
   static void FinalizeEmulationState();

Source/Core/Core/IOS/FS/FileSystemProxy.h

@@ -117,7 +117,7 @@ class FSDevice final : public EmulationDevice
 {
 public:
   FSDevice(EmulationKernel& ios, FSCore& core, const std::string& device_name);
-  ~FSDevice() override;
+  ~FSDevice();
 
   void DoState(PointerWrap& p) override;
 

Source/Core/Core/IOS/FS/HostBackend/FS.h

@@ -23,7 +23,7 @@ class HostFileSystem final : public FileSystem
 {
 public:
   HostFileSystem(const std::string& root_path, std::vector<NandRedirect> nand_redirects = {});
-  ~HostFileSystem() override;
+  ~HostFileSystem();
 
   void DoState(PointerWrap& p) override;
 

Source/Core/Core/IOS/IOS.h

@@ -153,7 +153,7 @@ class EmulationKernel final : public Kernel
 {
 public:
   EmulationKernel(Core::System& system, u64 ios_title_id);
-  ~EmulationKernel() override;
+  ~EmulationKernel();
 
   // Get a resource manager by name.
   // This only works for devices which are part of the device map.

Source/Core/Core/IOS/Network/SSL.h

@@ -84,7 +84,7 @@ class NetSSLDevice : public EmulationDevice
 public:
   NetSSLDevice(EmulationKernel& ios, const std::string& device_name);
 
-  ~NetSSLDevice() override;
+  virtual ~NetSSLDevice();
 
   std::optional<IPCReply> IOCtl(const IOCtlRequest& request) override;
   std::optional<IPCReply> IOCtlV(const IOCtlVRequest& request) override;

Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h

@@ -41,7 +41,7 @@ class BluetoothEmuDevice final : public BluetoothBaseDevice
 public:
   BluetoothEmuDevice(EmulationKernel& ios, const std::string& device_name);
 
-  ~BluetoothEmuDevice() override;
+  virtual ~BluetoothEmuDevice();
 
   std::optional<IPCReply> Close(u32 fd) override;
   std::optional<IPCReply> IOCtlV(const IOCtlVRequest& request) override;

Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h

@@ -73,7 +73,7 @@ class SkylanderUSB final : public Device
 {
 public:
   SkylanderUSB();
-  ~SkylanderUSB() override;
+  ~SkylanderUSB();
   DeviceDescriptor GetDeviceDescriptor() const override;
   std::vector<ConfigDescriptor> GetConfigurations() const override;
   std::vector<InterfaceDescriptor> GetInterfaces(u8 config) const override;

Source/Core/Core/IOS/USB/Host.h

@@ -25,7 +25,7 @@ class USBHost : public EmulationDevice
 {
 public:
   USBHost(EmulationKernel& ios, const std::string& device_name);
-  ~USBHost() override;
+  virtual ~USBHost();
 
   std::optional<IPCReply> Open(const OpenRequest& request) override;
 

Source/Core/Core/IOS/USB/LibusbDevice.h

@@ -27,7 +27,7 @@ class LibusbDevice final : public Device
 {
 public:
   LibusbDevice(libusb_device* device, const libusb_device_descriptor& device_descriptor);
-  ~LibusbDevice() override;
+  ~LibusbDevice();
   DeviceDescriptor GetDeviceDescriptor() const override;
   std::vector<ConfigDescriptor> GetConfigurations() const override;
   std::vector<InterfaceDescriptor> GetInterfaces(u8 config) const override;

Source/Core/Core/NetPlayClient.h

@@ -116,7 +116,7 @@ public:
 
   NetPlayClient(const std::string& address, const u16 port, NetPlayUI* dialog,
                 const std::string& name, const NetTraversalConfig& traversal_config);
-  ~NetPlayClient() override;
+  ~NetPlayClient();
 
   std::vector<const Player*> GetPlayers();
   const NetSettings& GetNetSettings() const;

Source/Core/Core/NetPlayServer.h

@@ -44,7 +44,7 @@ public:
 
   NetPlayServer(u16 port, bool forward_port, NetPlayUI* dialog,
                 const NetTraversalConfig& traversal_config);
-  ~NetPlayServer() override;
+  ~NetPlayServer();
 
   bool ChangeGame(const SyncIdentifier& sync_identifier, const std::string& netplay_name);
   bool ComputeGameDigest(const SyncIdentifier& sync_identifier);

Source/Core/Core/NetworkCaptureLogger.cpp

@@ -16,7 +16,6 @@
 #include "Common/Network.h"
 #include "Common/PcapFile.h"
 #include "Common/ScopeGuard.h"
-#include "Common/TimeUtil.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
 
@@ -83,7 +82,7 @@ PCAPSSLCaptureLogger::PCAPSSLCaptureLogger()
 {
   const std::string filepath =
       fmt::format("{}{} {:%Y-%m-%d %Hh%Mm%Ss}.pcap", File::GetUserPath(D_DUMPSSL_IDX),
-                  SConfig::GetInstance().GetGameID(), *Common::LocalTime(std::time(nullptr)));
+                  SConfig::GetInstance().GetGameID(), fmt::localtime(std::time(nullptr)));
   m_file = std::make_unique<Common::PCAP>(
       new File::IOFile(filepath, "wb", File::SharedAccess::Read), Common::PCAP::LinkType::Ethernet);
 }

Source/Core/Core/NetworkCaptureLogger.h

@@ -86,7 +86,7 @@ class PCAPSSLCaptureLogger final : public NetworkCaptureLogger
 {
 public:
   PCAPSSLCaptureLogger();
-  ~PCAPSSLCaptureLogger() override;
+  ~PCAPSSLCaptureLogger();
 
   void OnNewSocket(s32 socket) override;
 

Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.h

@@ -31,7 +31,7 @@ public:
   CachedInterpreter(CachedInterpreter&&) = delete;
   CachedInterpreter& operator=(const CachedInterpreter&) = delete;
   CachedInterpreter& operator=(CachedInterpreter&&) = delete;
-  ~CachedInterpreter() override;
+  ~CachedInterpreter();
 
   void Init() override;
   void Shutdown() override;

Source/Core/Core/PowerPC/Interpreter/Interpreter.h

@@ -30,7 +30,7 @@ public:
   Interpreter(Interpreter&&) = delete;
   Interpreter& operator=(const Interpreter&) = delete;
   Interpreter& operator=(Interpreter&&) = delete;
-  ~Interpreter() override;
+  ~Interpreter();
 
   void Init() override;
   void Shutdown() override;

Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.h

@@ -8,7 +8,7 @@
 class CSVSignatureDB final : public HashSignatureDB
 {
 public:
-  ~CSVSignatureDB() override = default;
+  ~CSVSignatureDB() = default;
   bool Load(const std::string& file_path) override;
   bool Save(const std::string& file_path) const override;
 };

Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.h

@@ -8,7 +8,7 @@
 class DSYSignatureDB final : public HashSignatureDB
 {
 public:
-  ~DSYSignatureDB() override = default;
+  ~DSYSignatureDB() = default;
   bool Load(const std::string& file_path) override;
   bool Save(const std::string& file_path) const override;
 };

Source/Core/Core/State.cpp

@@ -281,7 +281,7 @@ static std::string SystemTimeAsDoubleToString(double time)
 {
   // revert adjustments from GetSystemTimeAsDouble() to get a normal Unix timestamp again
   const time_t seconds = static_cast<time_t>(time) + DOUBLE_TIME_OFFSET;
-  const auto local_time = Common::LocalTime(seconds);
+  const auto local_time = Common::Localtime(seconds);
   if (!local_time)
     return "";
 

Source/Core/DiscIO/Blob.h

@@ -107,7 +107,7 @@ protected:
 class SectorReader : public BlobReader
 {
 public:
-  ~SectorReader() override = 0;
+  virtual ~SectorReader() = 0;
 
   bool Read(u64 offset, u64 size, u8* out_ptr) override;
 

Source/Core/DiscIO/CompressedBlob.h

@@ -45,7 +45,7 @@ class CompressedBlobReader final : public SectorReader
 public:
   static std::unique_ptr<CompressedBlobReader> Create(File::IOFile file,
                                                       const std::string& filename);
-  ~CompressedBlobReader() override;
+  ~CompressedBlobReader();
 
   const CompressedBlobHeader& GetHeader() const { return m_header; }
 

Source/Core/DiscIO/VolumeGC.h

@@ -29,7 +29,7 @@ class VolumeGC final : public VolumeDisc
 {
 public:
   VolumeGC(std::unique_ptr<BlobReader> reader);
-  ~VolumeGC() override;
+  ~VolumeGC();
   bool Read(u64 offset, u64 length, u8* buffer,
             const Partition& partition = PARTITION_NONE) const override;
   const FileSystem* GetFileSystem(const Partition& partition = PARTITION_NONE) const override;

Source/Core/DiscIO/VolumeWii.h

@@ -58,7 +58,7 @@ public:
   static_assert(sizeof(HashBlock) == BLOCK_HEADER_SIZE);
 
   VolumeWii(std::unique_ptr<BlobReader> reader);
-  ~VolumeWii() override;
+  ~VolumeWii();
   bool Read(u64 offset, u64 length, u8* buffer, const Partition& partition) const override;
   bool HasWiiHashes() const override;
   bool HasWiiEncryption() const override;

Source/Core/DiscIO/WIABlob.h

@@ -44,7 +44,7 @@ template <bool RVZ>
 class WIARVZFileReader final : public BlobReader
 {
 public:
-  ~WIARVZFileReader() override;
+  ~WIARVZFileReader();
 
   static std::unique_ptr<WIARVZFileReader> Create(File::IOFile file, const std::string& path);
 

Source/Core/DiscIO/WIACompression.h

@@ -75,7 +75,7 @@ private:
 class Bzip2Decompressor final : public Decompressor
 {
 public:
-  ~Bzip2Decompressor() override;
+  ~Bzip2Decompressor();
 
   bool Decompress(const DecompressionBuffer& in, DecompressionBuffer* out,
                   size_t* in_bytes_read) override;
@@ -89,7 +89,7 @@ class LZMADecompressor final : public Decompressor
 {
 public:
   LZMADecompressor(bool lzma2, const u8* filter_options, size_t filter_options_size);
-  ~LZMADecompressor() override;
+  ~LZMADecompressor();
 
   bool Decompress(const DecompressionBuffer& in, DecompressionBuffer* out,
                   size_t* in_bytes_read) override;
@@ -106,7 +106,7 @@ class ZstdDecompressor final : public Decompressor
 {
 public:
   ZstdDecompressor();
-  ~ZstdDecompressor() override;
+  ~ZstdDecompressor();
 
   bool Decompress(const DecompressionBuffer& in, DecompressionBuffer* out,
                   size_t* in_bytes_read) override;
@@ -164,7 +164,7 @@ class PurgeCompressor final : public Compressor
 {
 public:
   PurgeCompressor();
-  ~PurgeCompressor() override;
+  ~PurgeCompressor();
 
   bool Start(std::optional<u64> size) override;
   bool AddPrecedingDataOnlyForPurgeHashing(const u8* data, size_t size) override;
@@ -184,7 +184,7 @@ class Bzip2Compressor final : public Compressor
 {
 public:
   Bzip2Compressor(int compression_level);
-  ~Bzip2Compressor() override;
+  ~Bzip2Compressor();
 
   bool Start(std::optional<u64> size) override;
   bool Compress(const u8* data, size_t size) override;
@@ -206,7 +206,7 @@ class LZMACompressor final : public Compressor
 public:
   LZMACompressor(bool lzma2, int compression_level, u8 compressor_data_out[7],
                  u8* compressor_data_size_out);
-  ~LZMACompressor() override;
+  ~LZMACompressor();
 
   bool Start(std::optional<u64> size) override;
   bool Compress(const u8* data, size_t size) override;
@@ -229,7 +229,7 @@ class ZstdCompressor final : public Compressor
 {
 public:
   ZstdCompressor(int compression_level);
-  ~ZstdCompressor() override;
+  ~ZstdCompressor();
 
   bool Start(std::optional<u64> size) override;
   bool Compress(const u8* data, size_t size) override;

Source/Core/DiscIO/WbfsBlob.h

@@ -18,7 +18,7 @@ static constexpr u32 WBFS_MAGIC = 0x53464257;  // "WBFS" (byteswapped to little
 class WbfsFileReader final : public BlobReader
 {
 public:
-  ~WbfsFileReader() override;
+  ~WbfsFileReader();
 
   static std::unique_ptr<WbfsFileReader> Create(File::IOFile file, const std::string& path);
 

Source/Core/DolphinQt/CheatsManager.h

@@ -34,7 +34,7 @@ class CheatsManager : public QDialog
   Q_OBJECT
 public:
   explicit CheatsManager(Core::System& system, QWidget* parent = nullptr);
-  ~CheatsManager() override;
+  ~CheatsManager();
 
 signals:
   void OpenGeneralSettings();

Source/Core/DolphinQt/Config/ARCodeWidget.cpp

@@ -23,6 +23,7 @@
 #include "DolphinQt/Config/CheatWarningWidget.h"
 #include "DolphinQt/Config/HardcoreWarningWidget.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 
 ARCodeWidget::ARCodeWidget(std::string game_id, u16 game_revision, bool restart_required)
     : m_game_id(std::move(game_id)), m_game_revision(game_revision),
@@ -256,6 +257,7 @@ void ARCodeWidget::OnCodeAddClicked()
   ar.enabled = true;
 
   m_cheat_code_editor->SetARCode(&ar);
+  SetQWidgetWindowDecorations(m_cheat_code_editor);
   if (m_cheat_code_editor->exec() == QDialog::Rejected)
     return;
 
@@ -273,6 +275,7 @@ void ARCodeWidget::OnCodeEditClicked()
 
   const auto* const selected = items[0];
   auto& current_ar = m_ar_codes[m_code_list->row(selected)];
+  SetQWidgetWindowDecorations(m_cheat_code_editor);
 
   if (current_ar.user_defined)
   {

Source/Core/DolphinQt/Config/CommonControllersWidget.cpp

@@ -13,6 +13,7 @@
 
 #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"
 
@@ -59,6 +60,7 @@ void CommonControllersWidget::OnControllerInterfaceConfigure()
   ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
   window->setAttribute(Qt::WA_DeleteOnClose, true);
   window->setWindowModality(Qt::WindowModality::WindowModal);
+  SetQWidgetWindowDecorations(window);
   window->show();
 }
 

Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientWidget.cpp

@@ -14,6 +14,7 @@
 #include "Common/Config/Config.h"
 #include "DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h"
 
 DualShockUDPClientWidget::DualShockUDPClientWidget()
@@ -111,6 +112,7 @@ void DualShockUDPClientWidget::OnServerAdded()
   DualShockUDPClientAddServerDialog add_server_dialog(this);
   connect(&add_server_dialog, &DualShockUDPClientAddServerDialog::accepted, this,
           &DualShockUDPClientWidget::RefreshServerList);
+  SetQWidgetWindowDecorations(&add_server_dialog);
   add_server_dialog.exec();
 }
 

Source/Core/DolphinQt/Config/FilesystemWidget.cpp

@@ -25,6 +25,7 @@
 #include "DolphinQt/QtUtils/DolphinFileDialog.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/ParallelProgressDialog.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Resources.h"
 
 #include "UICommon/UICommon.h"
@@ -366,6 +367,7 @@ void FilesystemWidget::ExtractDirectory(const DiscIO::Partition& partition, cons
     dialog.Reset();
   });
 
+  SetQWidgetWindowDecorations(dialog.GetRaw());
   dialog.GetRaw()->exec();
   future.get();
 }

Source/Core/DolphinQt/Config/FreeLookWidget.cpp

@@ -19,6 +19,7 @@
 #include "DolphinQt/Config/Mapping/MappingWindow.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"
 
 FreeLookWidget::FreeLookWidget(QWidget* parent) : QWidget(parent)
@@ -103,6 +104,7 @@ void FreeLookWidget::OnFreeLookControllerConfigured()
   MappingWindow* window = new MappingWindow(this, MappingWindow::Type::MAPPING_FREELOOK, index);
   window->setAttribute(Qt::WA_DeleteOnClose, true);
   window->setWindowModality(Qt::WindowModality::WindowModal);
+  SetQWidgetWindowDecorations(window);
   window->show();
 }
 

Source/Core/DolphinQt/Config/GameConfigHighlighter.h

@@ -17,7 +17,7 @@ class GameConfigHighlighter : public QSyntaxHighlighter
 
 public:
   explicit GameConfigHighlighter(QTextDocument* parent = nullptr);
-  ~GameConfigHighlighter() override;
+  ~GameConfigHighlighter();
 
 protected:
   void highlightBlock(const QString& text) override;

Source/Core/DolphinQt/Config/GameConfigWidget.h

@@ -29,7 +29,7 @@ class GameConfigWidget : public QWidget
   Q_OBJECT
 public:
   explicit GameConfigWidget(const UICommon::GameFile& game);
-  ~GameConfigWidget() override;
+  ~GameConfigWidget();
 
 private:
   void CreateWidgets();

Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp

@@ -24,6 +24,7 @@
 #include "DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h"
 #include "DolphinQt/Config/Mapping/MappingWindow.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"
 
@@ -139,6 +140,7 @@ void GamecubeControllersWidget::OnGCPadConfigure(size_t index)
   case SerialInterface::SIDEVICE_WIIU_ADAPTER:
   {
     GCPadWiiUConfigDialog dialog(static_cast<int>(index), this);
+    SetQWidgetWindowDecorations(&dialog);
     dialog.exec();
     return;
   }
@@ -164,6 +166,7 @@ void GamecubeControllersWidget::OnGCPadConfigure(size_t index)
   MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index));
   window->setAttribute(Qt::WA_DeleteOnClose, true);
   window->setWindowModality(Qt::WindowModality::WindowModal);
+  SetQWidgetWindowDecorations(window);
   window->show();
 }
 

Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp

@@ -30,6 +30,7 @@
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
 #include "DolphinQt/QtUtils/QtUtils.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/QtUtils/WrapInScrollArea.h"
 
 GeckoCodeWidget::GeckoCodeWidget(std::string game_id, std::string gametdb_id, u16 game_revision,
@@ -209,6 +210,7 @@ void GeckoCodeWidget::AddCode()
   code.enabled = true;
 
   m_cheat_code_editor->SetGeckoCode(&code);
+  SetQWidgetWindowDecorations(m_cheat_code_editor);
   if (m_cheat_code_editor->exec() == QDialog::Rejected)
     return;
 
@@ -226,6 +228,7 @@ void GeckoCodeWidget::EditCode()
   const int index = item->data(Qt::UserRole).toInt();
 
   m_cheat_code_editor->SetGeckoCode(&m_gecko_codes[index]);
+  SetQWidgetWindowDecorations(m_cheat_code_editor);
   if (m_cheat_code_editor->exec() == QDialog::Rejected)
     return;
 

Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp

@@ -25,6 +25,7 @@
 #include "DolphinQt/Config/Graphics/PostProcessingConfigWindow.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipPushButton.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"
 
 #include "VideoCommon/PostProcessing.h"
@@ -628,6 +629,7 @@ void EnhancementsWidget::AddDescriptions()
 void EnhancementsWidget::ConfigureColorCorrection()
 {
   ColorCorrectionConfigWindow dialog(this);
+  SetQWidgetWindowDecorations(&dialog);
   dialog.exec();
 }
 
@@ -635,5 +637,6 @@ void EnhancementsWidget::ConfigurePostProcessingShader()
 {
   const std::string shader = ReadSetting(Config::GFX_ENHANCE_POST_SHADER);
   PostProcessingConfigWindow dialog(this, shader);
+  SetQWidgetWindowDecorations(&dialog);
   dialog.exec();
 }

Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp

@@ -27,6 +27,7 @@
 #include "DolphinQt/Config/Graphics/GraphicsWindow.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipComboBox.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"
 
 #include "VideoCommon/VideoBackendBase.h"
@@ -198,6 +199,7 @@ void GeneralWidget::BackendWarning()
       confirm_sw.setWindowTitle(tr("Confirm backend change"));
       confirm_sw.setText(tr(warningMessage->c_str()));
 
+      SetQWidgetWindowDecorations(&confirm_sw);
       if (confirm_sw.exec() != QMessageBox::Yes)
       {
         m_backend_combo->setCurrentIndex(m_previous_backend);

Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.h

@@ -27,7 +27,7 @@ class PostProcessingConfigWindow final : public QDialog
   Q_OBJECT
 public:
   explicit PostProcessingConfigWindow(EnhancementsWidget* parent, const std::string& shader);
-  ~PostProcessingConfigWindow() override;
+  ~PostProcessingConfigWindow();
 
 private:
   class ConfigGroup final

Source/Core/DolphinQt/Config/GraphicsModListWidget.h

@@ -35,7 +35,7 @@ class GraphicsModListWidget : public QWidget
   Q_OBJECT
 public:
   explicit GraphicsModListWidget(const UICommon::GameFile& game);
-  ~GraphicsModListWidget() override;
+  ~GraphicsModListWidget();
 
   void SaveToDisk();
 

Source/Core/DolphinQt/Config/LogConfigWidget.h

@@ -17,7 +17,7 @@ class LogConfigWidget final : public QDockWidget
   Q_OBJECT
 public:
   explicit LogConfigWidget(QWidget* parent = nullptr);
-  ~LogConfigWidget() override;
+  ~LogConfigWidget();
 
 protected:
   void closeEvent(QCloseEvent* event) override;

Source/Core/DolphinQt/Config/LogWidget.h

@@ -23,7 +23,7 @@ class LogWidget final : public QDockWidget
   Q_OBJECT
 public:
   explicit LogWidget(QWidget* parent = nullptr);
-  ~LogWidget() override;
+  ~LogWidget();
 
 protected:
   void closeEvent(QCloseEvent*) override;

Source/Core/DolphinQt/Config/Mapping/FreeLookRotation.cpp

@@ -11,6 +11,7 @@
 
 #include "Core/FreeLookManager.h"
 #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "InputCommon/InputConfig.h"
 
 FreeLookRotation::FreeLookRotation(MappingWindow* window) : MappingWidget(window)
@@ -33,6 +34,7 @@ void FreeLookRotation::CreateMainLayout()
     ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
     window->setAttribute(Qt::WA_DeleteOnClose, true);
     window->setWindowModality(Qt::WindowModality::WindowModal);
+    SetQWidgetWindowDecorations(window);
     window->show();
   });
   m_main_layout->addLayout(alternate_input_layout, 0, 0, 1, -1);

Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h

@@ -15,7 +15,7 @@ class GCPadWiiUConfigDialog final : public QDialog
   Q_OBJECT
 public:
   explicit GCPadWiiUConfigDialog(int port, QWidget* parent = nullptr);
-  ~GCPadWiiUConfigDialog() override;
+  ~GCPadWiiUConfigDialog();
 
 private:
   void LoadSettings();

Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp

@@ -28,6 +28,7 @@
 #include "DolphinQt/Config/Mapping/MappingWindow.h"
 #include "DolphinQt/QtUtils/BlockUserInputFilter.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"
 
 #include "InputCommon/ControlReference/ControlReference.h"
@@ -258,6 +259,8 @@ IOWindow::IOWindow(MappingWindow* window, ControllerEmu::EmulatedController* con
     : QDialog(window), m_reference(ref), m_original_expression(ref->GetExpression()),
       m_controller(controller), m_type(type)
 {
+  SetQWidgetWindowDecorations(this);
+
   CreateMainLayout();
 
   connect(window, &MappingWindow::Update, this, &IOWindow::Update);

Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp

@@ -18,6 +18,7 @@
 #include "DolphinQt/Config/Mapping/MappingIndicator.h"
 #include "DolphinQt/Config/Mapping/MappingNumeric.h"
 #include "DolphinQt/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 
 #include "InputCommon/ControllerEmu/Control/Control.h"
 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
@@ -281,6 +282,7 @@ void MappingWidget::ShowAdvancedControlGroupDialog(ControllerEmu::ControlGroup*
   // Enable "Close" button functionality.
   connect(button_box, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
 
+  SetQWidgetWindowDecorations(&dialog);
   dialog.exec();
 }
 

Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp

@@ -51,6 +51,7 @@
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
 #include "DolphinQt/QtUtils/QtUtils.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/QtUtils/WindowActivationEventFilter.h"
 #include "DolphinQt/QtUtils/WrapInScrollArea.h"
 #include "DolphinQt/Settings.h"
@@ -270,6 +271,7 @@ void MappingWindow::OnDeleteProfilePressed()
     error.setIcon(QMessageBox::Critical);
     error.setWindowTitle(tr("Error"));
     error.setText(tr("The profile '%1' does not exist").arg(profile_name));
+    SetQWidgetWindowDecorations(&error);
     error.exec();
     return;
   }
@@ -282,6 +284,7 @@ void MappingWindow::OnDeleteProfilePressed()
   confirm.setInformativeText(tr("This cannot be undone!"));
   confirm.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
 
+  SetQWidgetWindowDecorations(&confirm);
   if (confirm.exec() != QMessageBox::Yes)
   {
     return;
@@ -309,6 +312,7 @@ void MappingWindow::OnLoadProfilePressed()
     error.setIcon(QMessageBox::Critical);
     error.setWindowTitle(tr("Error"));
     error.setText(tr("The profile '%1' does not exist").arg(m_profiles_combo->currentText()));
+    SetQWidgetWindowDecorations(&error);
     error.exec();
     return;
   }

Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.cpp

@@ -15,6 +15,7 @@
 
 #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
 #include "DolphinQt/QtUtils/QtUtils.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 
 #include "InputCommon/InputConfig.h"
 
@@ -42,6 +43,7 @@ void WiimoteEmuExtensionMotionInput::CreateNunchukLayout()
   warning_layout->addWidget(warning_input_sources_button);
   connect(warning_input_sources_button, &QPushButton::clicked, this, [this] {
     ControllerInterfaceWindow window{this};
+    SetQWidgetWindowDecorations(&window);
     window.exec();
   });
   layout->addLayout(warning_layout, 0, 0, 1, -1);

Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControlIMU.cpp

@@ -16,6 +16,7 @@
 
 #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
 #include "DolphinQt/QtUtils/QtUtils.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 
 #include "InputCommon/InputConfig.h"
 
@@ -40,6 +41,7 @@ void WiimoteEmuMotionControlIMU::CreateMainLayout()
   warning_layout->addWidget(warning_input_sources_button);
   connect(warning_input_sources_button, &QPushButton::clicked, this, [this] {
     ControllerInterfaceWindow window{this};
+    SetQWidgetWindowDecorations(&window);
     window.exec();
   });
 

Source/Core/DolphinQt/Config/PatchesWidget.cpp

@@ -16,6 +16,7 @@
 
 #include "DolphinQt/Config/HardcoreWarningWidget.h"
 #include "DolphinQt/Config/NewPatchDialog.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 
 #include "UICommon/GameFile.h"
 
@@ -93,6 +94,7 @@ void PatchesWidget::OnAdd()
   bool new_patch_confirmed = false;
   {
     NewPatchDialog dialog(this, patch);
+    SetQWidgetWindowDecorations(&dialog);
     new_patch_confirmed = dialog.exec();
   }
   if (new_patch_confirmed)
@@ -122,6 +124,7 @@ void PatchesWidget::OnEdit()
   bool new_patch_confirmed = false;
   {
     NewPatchDialog dialog(this, patch);
+    SetQWidgetWindowDecorations(&dialog);
     new_patch_confirmed = dialog.exec();
   }
   if (new_patch_confirmed)

Source/Core/DolphinQt/Config/VerifyWidget.cpp

@@ -21,6 +21,7 @@
 #include "DiscIO/Volume.h"
 #include "DiscIO/VolumeVerifier.h"
 #include "DolphinQt/QtUtils/ParallelProgressDialog.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"
 
 VerifyWidget::VerifyWidget(std::shared_ptr<DiscIO::Volume> volume) : m_volume(std::move(volume))
@@ -179,6 +180,7 @@ void VerifyWidget::Verify()
                    progress.Reset();
                    return verifier.GetResult();
                  });
+  SetQWidgetWindowDecorations(progress.GetRaw());
   progress.GetRaw()->exec();
 
   std::optional<DiscIO::VolumeVerifier::Result> result = future.get();

Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp

@@ -37,6 +37,7 @@
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
 #include "DolphinQt/QtUtils/QueueOnObject.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"
 
@@ -377,6 +378,7 @@ void WiimoteControllersWidget::OnWiimoteConfigure(size_t index)
   MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index));
   window->setAttribute(Qt::WA_DeleteOnClose, true);
   window->setWindowModality(Qt::WindowModality::WindowModal);
+  SetQWidgetWindowDecorations(window);
   window->show();
 }
 

Source/Core/DolphinQt/ConvertDialog.cpp

@@ -31,6 +31,7 @@
 #include "DolphinQt/QtUtils/DolphinFileDialog.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/ParallelProgressDialog.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "UICommon/GameFile.h"
 #include "UICommon/UICommon.h"
 
@@ -282,6 +283,7 @@ bool ConvertDialog::ShowAreYouSureDialog(const QString& text)
   warning.setInformativeText(text);
   warning.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
 
+  SetQWidgetWindowDecorations(&warning);
   return warning.exec() == QMessageBox::Yes;
 }
 
@@ -406,6 +408,7 @@ void ConvertDialog::Convert()
                                     .arg(dst_info.fileName()));
         confirm_replace.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
 
+        SetQWidgetWindowDecorations(&confirm_replace);
         if (confirm_replace.exec() == QMessageBox::No)
           continue;
       }
@@ -516,6 +519,7 @@ void ConvertDialog::Convert()
         break;
       }
 
+      SetQWidgetWindowDecorations(progress_dialog.GetRaw());
       progress_dialog.GetRaw()->exec();
       if (!success.get())
       {

Source/Core/DolphinQt/Debugger/AssemblerWidget.h

@@ -31,10 +31,10 @@ public:
 
   bool ApplicationCloseRequest();
 
-  ~AssemblerWidget() override;
+  ~AssemblerWidget();
 
 protected:
-  void closeEvent(QCloseEvent*) override;
+  void closeEvent(QCloseEvent*);
 
 private:
   enum class AsmKind

Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp

@@ -47,6 +47,7 @@
 #include "DolphinQt/Host.h"
 #include "DolphinQt/QtUtils/DolphinFileDialog.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Resources.h"
 #include "DolphinQt/Settings.h"
 

Source/Core/DolphinQt/Debugger/BreakpointWidget.cpp

@@ -30,6 +30,7 @@
 #include "DolphinQt/Debugger/BreakpointDialog.h"
 #include "DolphinQt/Debugger/MemoryWidget.h"
 #include "DolphinQt/Host.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Resources.h"
 #include "DolphinQt/Settings.h"
 
@@ -64,8 +65,7 @@ public:
   CustomDelegate(BreakpointWidget* parent) : QStyledItemDelegate(parent) {}
 
 private:
-  void paint(QPainter* painter, const QStyleOptionViewItem& option,
-             const QModelIndex& index) const override
+  void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
   {
     Q_ASSERT(index.isValid());
 
@@ -442,6 +442,7 @@ void BreakpointWidget::OnNewBreakpoint()
 {
   BreakpointDialog* dialog = new BreakpointDialog(this);
   dialog->setAttribute(Qt::WA_DeleteOnClose, true);
+  SetQWidgetWindowDecorations(dialog);
   dialog->exec();
 }
 
@@ -452,6 +453,7 @@ void BreakpointWidget::OnEditBreakpoint(u32 address, bool is_instruction_bp)
     auto* dialog = new BreakpointDialog(
         this, m_system.GetPowerPC().GetBreakPoints().GetRegularBreakpoint(address));
     dialog->setAttribute(Qt::WA_DeleteOnClose, true);
+    SetQWidgetWindowDecorations(dialog);
     dialog->exec();
   }
   else
@@ -459,6 +461,7 @@ void BreakpointWidget::OnEditBreakpoint(u32 address, bool is_instruction_bp)
     auto* dialog =
         new BreakpointDialog(this, m_system.GetPowerPC().GetMemChecks().GetMemCheck(address));
     dialog->setAttribute(Qt::WA_DeleteOnClose, true);
+    SetQWidgetWindowDecorations(dialog);
     dialog->exec();
   }
 

Source/Core/DolphinQt/Debugger/BreakpointWidget.h

@@ -31,7 +31,7 @@ class BreakpointWidget : public QDockWidget
   Q_OBJECT
 public:
   explicit BreakpointWidget(QWidget* parent = nullptr);
-  ~BreakpointWidget() override;
+  ~BreakpointWidget();
 
   void AddBP(u32 addr);
   void AddBP(u32 addr, bool break_on_hit, bool log_on_hit, const QString& condition);

Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp

@@ -40,6 +40,7 @@
 #include "DolphinQt/Debugger/PatchInstructionDialog.h"
 #include "DolphinQt/Host.h"
 #include "DolphinQt/QtUtils/FromStdString.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Resources.h"
 #include "DolphinQt/Settings.h"
 
@@ -742,6 +743,7 @@ void CodeViewWidget::AutoStep(CodeTrace::AutoStop option)
             .arg(QString::fromStdString(fmt::format("{:#x}", fmt::join(mem_out, ", "))));
 
     msgbox.setInformativeText(msgtext);
+    SetQWidgetWindowDecorations(&msgbox);
     msgbox.exec();
 
   } while (msgbox.clickedButton() == (QAbstractButton*)run_button);
@@ -1029,6 +1031,7 @@ void CodeViewWidget::DoPatchInstruction(bool assemble)
   if (assemble)
   {
     AssembleInstructionDialog dialog(this, addr, debug_interface.ReadInstruction(guard, addr));
+    SetQWidgetWindowDecorations(&dialog);
     if (dialog.exec() == QDialog::Accepted)
     {
       debug_interface.SetPatch(guard, addr, dialog.GetCode());
@@ -1038,6 +1041,7 @@ void CodeViewWidget::DoPatchInstruction(bool assemble)
   else
   {
     PatchInstructionDialog dialog(this, addr, debug_interface.ReadInstruction(guard, addr));
+    SetQWidgetWindowDecorations(&dialog);
     if (dialog.exec() == QDialog::Accepted)
     {
       debug_interface.SetPatch(guard, addr, dialog.GetCode());

Source/Core/DolphinQt/Debugger/CodeWidget.cpp

@@ -29,6 +29,7 @@
 #include "Core/System.h"
 #include "DolphinQt/Debugger/BranchWatchDialog.h"
 #include "DolphinQt/Host.h"
+#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"
 
 static const QString BOX_SPLITTER_STYLESHEET = QStringLiteral(
@@ -221,6 +222,7 @@ void CodeWidget::OnBranchWatchDialog()
     m_branch_watch_dialog = new BranchWatchDialog(m_system, m_system.GetPowerPC().GetBranchWatch(),
                                                   m_ppc_symbol_db, this, this);
   }
+  SetQWidgetWindowDecorations(m_branch_watch_dialog);
   m_branch_watch_dialog->show();
   m_branch_watch_dialog->raise();
   m_branch_watch_dialog->activateWindow();

Source/Core/DolphinQt/Debugger/CodeWidget.h

@@ -33,7 +33,7 @@ class CodeWidget : public QDockWidget
   Q_OBJECT
 public:
   explicit CodeWidget(QWidget* parent = nullptr);
-  ~CodeWidget() override;
+  ~CodeWidget();
 
   void Step();
   void StepOver();

Source/Core/DolphinQt/Debugger/GekkoSyntaxHighlight.cpp

@@ -16,7 +16,7 @@ using namespace Common::GekkoAssembler::detail;
 class HighlightParsePlugin : public ParsePlugin
 {
 public:
-  ~HighlightParsePlugin() override = default;
+  virtual ~HighlightParsePlugin() = default;
 
   std::vector<std::pair<int, int>>&& MoveParens() { return std::move(m_matched_parens); }
   std::vector<std::tuple<int, int, HighlightFormat>>&& MoveFormatting()

Source/Core/DolphinQt/Debugger/MemoryWidget.h

@@ -32,7 +32,7 @@ class MemoryWidget : public QDockWidget
   Q_OBJECT
 public:
   explicit MemoryWidget(Core::System& system, QWidget* parent = nullptr);
-  ~MemoryWidget() override;
+  ~MemoryWidget();
 
   void SetAddress(u32 address);
   void Update();