starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-16 11:24:36 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

Qt: Initialize COM before Qt

Browse Source 
Ensures we're consistent regardless of whether Qt initializes it or not.

Currently, it initializes it through OLE -> COM.
This commit is contained in:
Stenzek
2025-10-15 19:07:11 +10:00
parent 89e3ba29a5
commit 2b3c7e00c8
1 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/duckstation-qt/qthost.cpp
View File

@@ -75,6 +75,10 @@
#include <cstdlib>
#include <memory>
#ifdef _WIN32
#include <objbase.h> // CoInitializeEx
#endif
#include "moc_qthost.cpp"
LOG_CHANNEL(Host);
@@ -109,8 +113,10 @@ static constexpr u32 GDB_SERVER_POLLING_INTERVAL = 1;
// Local function declarations
//////////////////////////////////////////////////////////////////////////
namespace QtHost {
static bool VeryEarlyProcessStartup();
static bool PerformEarlyHardwareChecks();
static bool EarlyProcessStartup();
static void ProcessShutdown();
static void MessageOutputHandler(QtMsgType type, const QMessageLogContext& context, const QString& msg);
static void RegisterTypes();
static bool InitializeConfig();
@@ -205,6 +211,24 @@ bool QtHost::PerformEarlyHardwareChecks()
return okay;
}
bool QtHost::VeryEarlyProcessStartup()
{
CrashHandler::Install(&Bus::CleanupMemoryMap);
#ifdef _WIN32
// Ensure COM is initialized before Qt gets a chance to do it, since this could change in the future.
HRESULT hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
if (FAILED(hr)) [[unlikely]]
{
MessageBoxA(nullptr, fmt::format("CoInitializeEx failed: 0x{:08X}", hr).c_str(), "Error", MB_ICONERROR);
return false;
}
#endif
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
return true;
}
bool QtHost::EarlyProcessStartup()
{
#if !defined(_WIN32) && !defined(__APPLE__)
@@ -249,6 +273,19 @@ bool QtHost::EarlyProcessStartup()
return true;
}
void QtHost::ProcessShutdown()
{
System::ProcessShutdown();
// Ensure log is flushed.
Log::SetFileOutputParams(false, nullptr);
// Clean up CoInitializeEx() from VeryEarlyProcessStartup().
#ifdef _WIN32
CoUninitialize();
#endif
}
void QtHost::MessageOutputHandler(QtMsgType type, const QMessageLogContext& context, const QString& msg)
{
const char* function = context.function ? context.function : "<unknown>";
@@ -3351,9 +3388,8 @@ bool QtHost::RunSetupWizard()
int main(int argc, char* argv[])
{
CrashHandler::Install(&Bus::CleanupMemoryMap);
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
if (!QtHost::VeryEarlyProcessStartup())
return EXIT_FAILURE;
QApplication app(argc, argv);
if (!QtHost::PerformEarlyHardwareChecks())
@@ -3437,10 +3473,7 @@ shutdown_and_exit:
delete g_main_window;
Assert(!g_main_window);
// Ensure log is flushed.
Log::SetFileOutputParams(false, nullptr);
System::ProcessShutdown();
QtHost::ProcessShutdown();
return result;
}