Rémi Bernon : win32u: Move rawinput device cache ticks check to rawinput_update_device_list.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 464ce9a0858c4c2b1a2d5a5234a63413ce92bd1b
URL:    https://gitlab.winehq.org/wine/wine/-/commit/464ce9a0858c4c2b1a2d5a5234a6341...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Thu May  2 17:54:32 2024 +0200

win32u: Move rawinput device cache ticks check to rawinput_update_device_list.

---

 dlls/win32u/rawinput.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c
index c004f296038..5b1d9d211df 100644
--- a/dlls/win32u/rawinput.c
+++ b/dlls/win32u/rawinput.c
@@ -282,12 +282,17 @@ static void enumerate_devices( DWORD type, const WCHAR *class )
     NtClose( class_key );
 }
 
-static void rawinput_update_device_list(void)
+static void rawinput_update_device_list( BOOL force )
 {
+    unsigned int ticks = NtGetTickCount();
+    static unsigned int last_check;
     struct device *device, *next;
 
     TRACE( "\n" );
 
+    if (ticks - last_check <= 2000 && !force) return;
+    last_check = ticks;
+
     LIST_FOR_EACH_ENTRY_SAFE( device, next, &devices, struct device, entry )
     {
         list_remove( &device->entry );
@@ -309,7 +314,7 @@ static struct device *find_device_from_handle( HANDLE handle, BOOL refresh )
         if (device->handle == handle) return device;
     if (!refresh) return NULL;
 
-    rawinput_update_device_list();
+    rawinput_update_device_list( TRUE );
 
     LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry )
         if (device->handle == handle) return device;
@@ -322,8 +327,7 @@ static struct device *find_device_from_handle( HANDLE handle, BOOL refresh )
  */
 UINT WINAPI NtUserGetRawInputDeviceList( RAWINPUTDEVICELIST *device_list, UINT *device_count, UINT size )
 {
-    unsigned int count = 0, ticks = NtGetTickCount();
-    static unsigned int last_check;
+    unsigned int count = 0;
     struct device *device;
 
     TRACE( "device_list %p, device_count %p, size %u.\n", device_list, device_count, size );
@@ -342,11 +346,7 @@ UINT WINAPI NtUserGetRawInputDeviceList( RAWINPUTDEVICELIST *device_list, UINT *
 
     pthread_mutex_lock( &rawinput_mutex );
 
-    if (ticks - last_check > 2000)
-    {
-        last_check = ticks;
-        rawinput_update_device_list();
-    }
+    rawinput_update_device_list( FALSE );
 
     LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry )
     {