[PATCH 0/2] MR1227: winmm: Use a separate last_check for joyGetDevCapsW and joyGetPosEx.

[Rémi Bernon]

Fixing spurious tests failures on the testbot.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1227

[PATCH 1/2] winmm: Use a separate last_check for joyGetDevCapsW and joyGetPosEx.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Fixing spurious tests failures on the testbot.
---
 dlls/winmm/joystick.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c
index 428593fa590..572cbb82e90 100644
--- a/dlls/winmm/joystick.c
+++ b/dlls/winmm/joystick.c
@@ -136,7 +136,6 @@ struct joystick
 static DIDEVICEINSTANCEW instances[16];
 static struct joystick joysticks[16];
 static IDirectInput8W *dinput;
-static ULONG last_check;
 
 static BOOL CALLBACK enum_instances( const DIDEVICEINSTANCEW *instance, void *context )
 {
@@ -313,6 +312,7 @@ UINT WINAPI DECLSPEC_HOTPATCH joyGetNumDevs(void)
  */
 MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, JOYCAPSW *caps, UINT size )
 {
+    static ULONG last_check;
     DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)};
     DIDEVCAPS dicaps = {.dwSize = sizeof(DIDEVCAPS)};
     DIPROPDWORD diprop =
@@ -464,6 +464,7 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA( UINT_PTR id, JOYCAPSA *caps, U
  */
 MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx( UINT id, JOYINFOEX *info )
 {
+    static ULONG last_check;
     DWORD i, ticks = GetTickCount();
     MMRESULT res = JOYERR_NOERROR;
     IDirectInputDevice8W *device;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/1227

[PATCH 2/2] winmm: Add missing void parameter in function definition.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/winmm/joystick.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c
index 572cbb82e90..0285074bd40 100644
--- a/dlls/winmm/joystick.c
+++ b/dlls/winmm/joystick.c
@@ -159,7 +159,7 @@ static BOOL WINAPI joystick_load_once( INIT_ONCE *once, void *param, void **cont
     return TRUE;
 }
 
-void joystick_unload()
+void joystick_unload(void)
 {
     int i;
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1227