Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51282 Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/user32/message.c | 4 +++- dlls/user32/rawinput.c | 8 +++++--- dlls/user32/user_private.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 03fa42f0ae5..d7dbc64d796 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2290,7 +2290,9 @@ static BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardwar { struct rawinput_thread_data *thread_data = rawinput_thread_data();
- if (msg->message == WM_INPUT) + if (msg->message == WM_INPUT_DEVICE_CHANGE) + rawinput_update_device_list(); + else { thread_data->buffer->header.dwSize = RAWINPUT_BUFFER_SIZE; if (!rawinput_from_hardware_message( thread_data->buffer, msg_data )) return FALSE; diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 3a316024656..2660874d12c 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -168,7 +168,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return device; }
-static void find_devices(void) +void rawinput_update_device_list(void) { SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; @@ -178,6 +178,8 @@ static void find_devices(void) HDEVINFO set; DWORD idx;
+ TRACE("\n"); + HidD_GetHidGuid(&hid_guid);
EnterCriticalSection(&rawinput_devices_cs); @@ -259,7 +261,7 @@ static struct device *find_device_from_handle(HANDLE handle) for (i = 0; i < rawinput_devices_count; ++i) if (rawinput_devices[i].handle == handle) return rawinput_devices + i; - find_devices(); + rawinput_update_device_list(); for (i = 0; i < rawinput_devices_count; ++i) if (rawinput_devices[i].handle == handle) return rawinput_devices + i; @@ -432,7 +434,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; }
- find_devices(); + rawinput_update_device_list();
if (!devices) { diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 96704ac68ae..6923ddb2906 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -160,6 +160,7 @@ struct hardware_msg_data; extern BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_msg_data *msg_data); extern BOOL rawinput_device_get_usages(HANDLE handle, USAGE *usage_page, USAGE *usage); extern struct rawinput_thread_data *rawinput_thread_data(void); +extern void rawinput_update_device_list(void);
extern void create_offscreen_window_surface( const RECT *visible_rect, struct window_surface **surface ) DECLSPEC_HIDDEN;
Up to once every 2s.
This fixes a regression from c2c78a2fe0ac13e4fca7ab4c17977b65e358485c, which caused severe FPS drop in Samurai Shodown.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51282 Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/user32/rawinput.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 2660874d12c..f3dc4ae67de 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -418,7 +418,8 @@ BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_ms */ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_count, UINT size) { - UINT i; + static UINT last_check; + UINT i, ticks = GetTickCount();
TRACE("devices %p, device_count %p, size %u.\n", devices, device_count, size);
@@ -434,7 +435,11 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; }
- rawinput_update_device_list(); + if (ticks - last_check > 2000) + { + last_check = ticks; + rawinput_update_device_list(); + }
if (!devices) {
-
Rémi Bernon