RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-31 20:41:45 +01:00
Code Issues Releases Wiki Activity

Qt: Fix device notification registration segfault

Browse Source 
The main window does not exist if we boot with no-gui
This commit is contained in:
Megamouse 2025-01-24 19:01:16 +01:00
parent f1f85335a7
commit 10d038e43f
2 changed files with 59 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
rpcs3/rpcs3qt/gui_application.cpp
View File

@ -76,10 +76,7 @@ gui_application::~gui_application()
discord::shutdown();
#endif
#ifdef _WIN32
if (m_device_notification_handle && !UnregisterDeviceNotification(m_device_notification_handle))
{
gui_log.error("UnregisterDeviceNotification() failed: %s", fmt::win_error{GetLastError(), nullptr});
}
unregister_device_notification();
#endif
}
@ -205,17 +202,9 @@ bool gui_application::Init()
#ifdef _WIN32 // Currently only needed for raw mouse input on windows
installNativeEventFilter(&m_native_event_filter);
// Enable usb device hotplug events
// Currently only needed for hotplug on windows, as libusb handles other platforms
DEV_BROADCAST_DEVICEINTERFACE notification_filter {};
notification_filter.dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE);
notification_filter.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
notification_filter.dbcc_classguid = GUID_DEVINTERFACE_USB_DEVICE;
m_device_notification_handle = RegisterDeviceNotification(reinterpret_cast<HWND>(m_main_window->winId()), &notification_filter, DEVICE_NOTIFY_WINDOW_HANDLE);
if (!m_device_notification_handle )
if (m_main_window)
{
gui_log.error("RegisterDeviceNotification() failed: %s", fmt::win_error{GetLastError(), nullptr});
register_device_notification(m_main_window->winId());
}
#endif
@ -491,11 +480,26 @@ std::unique_ptr<gs_frame> gui_application::get_gs_frame()
}
m_game_window = frame;
ensure(m_game_window);
#ifdef _WIN32
if (!m_show_gui)
{
register_device_notification(m_game_window->winId());
}
#endif
connect(m_game_window, &gs_frame::destroyed, this, [this]()
{
gui_log.notice("gui_application: Deleting old game window");
m_game_window = nullptr;
#ifdef _WIN32
if (!m_show_gui)
{
unregister_device_notification();
}
#endif
});
return std::unique_ptr<gs_frame>(frame);
@ -1234,3 +1238,40 @@ bool gui_application::native_event_filter::nativeEventFilter([[maybe_unused]] co
return false;
}
#ifdef _WIN32
void gui_application::register_device_notification(WId window_id)
{
if (m_device_notification_handle) return;
gui_log.notice("Registering device notifications...");
// Enable usb device hotplug events
// Currently only needed for hotplug on windows, as libusb handles other platforms
DEV_BROADCAST_DEVICEINTERFACE notification_filter {};
notification_filter.dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE);
notification_filter.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
notification_filter.dbcc_classguid = GUID_DEVINTERFACE_USB_DEVICE;
m_device_notification_handle = RegisterDeviceNotification(reinterpret_cast<HWND>(window_id), &notification_filter, DEVICE_NOTIFY_WINDOW_HANDLE);
if (!m_device_notification_handle )
{
gui_log.error("RegisterDeviceNotification() failed: %s", fmt::win_error{GetLastError(), nullptr});
}
}
void gui_application::unregister_device_notification()
{
if (m_device_notification_handle)
{
gui_log.notice("Unregistering device notifications...");
if (!UnregisterDeviceNotification(m_device_notification_handle))
{
gui_log.error("UnregisterDeviceNotification() failed: %s", fmt::win_error{GetLastError(), nullptr});
}
m_device_notification_handle = {};
}
}
#endif

4
rpcs3/rpcs3qt/gui_application.h
View File

@ -121,9 +121,13 @@ private:
u64 m_pause_delayed_tag = 0;
typename Emulator::stop_counter_t m_emu_focus_out_emulation_id{};
bool m_is_pause_on_focus_loss_active = false;
#ifdef _WIN32
void register_device_notification(WId window_id);
void unregister_device_notification();
HDEVNOTIFY m_device_notification_handle {};
#endif
private Q_SLOTS:
void OnChangeStyleSheetRequest();
void OnShortcutChange();