ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winmm: Guard accesses to joystick array with a critical section. 

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-12-03 12:19:08 +01:00 committed by Alexandre Julliard
parent 10c21c2e27
commit 591dcfda01
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dlls/winmm/joystick.c
View File

@ -40,6 +40,15 @@
WINE_DEFAULT_DEBUG_CHANNEL(winmm); WINE_DEFAULT_DEBUG_CHANNEL(winmm);
static CRITICAL_SECTION joystick_cs;
static CRITICAL_SECTION_DEBUG critsect_debug =
{
0, 0, &joystick_cs,
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
0, 0, { (DWORD_PTR)(__FILE__ ": joystick_cs") }
};
static CRITICAL_SECTION joystick_cs = { &critsect_debug, -1, 0, 0, 0, 0 };
#define JOY_PERIOD_MIN (10) /* min Capture time period */ #define JOY_PERIOD_MIN (10) /* min Capture time period */
#define JOY_PERIOD_MAX (1000) /* max Capture time period */ #define JOY_PERIOD_MAX (1000) /* max Capture time period */
@ -91,6 +100,8 @@ static void CALLBACK joystick_timer( HWND hwnd, UINT msg, UINT_PTR timer, DWORD
LONG pos; LONG pos;
int i; int i;
EnterCriticalSection( &joystick_cs );
for (i = 0; i < ARRAY_SIZE(joysticks); i++) for (i = 0; i < ARRAY_SIZE(joysticks); i++)
{ {
if (joysticks[i].capture != hwnd) continue; if (joysticks[i].capture != hwnd) continue;
@ -125,6 +136,8 @@ static void CALLBACK joystick_timer( HWND hwnd, UINT msg, UINT_PTR timer, DWORD
joysticks[i].info.wButtons = info.wButtons; joysticks[i].info.wButtons = info.wButtons;
} }
} }
LeaveCriticalSection( &joystick_cs );
} }
/************************************************************************** /**************************************************************************
@ -285,7 +298,10 @@ MMRESULT WINAPI joyGetThreshold( UINT id, UINT *threshold )
if (id >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS; if (id >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS;
EnterCriticalSection( &joystick_cs );
*threshold = joysticks[id].threshold; *threshold = joysticks[id].threshold;
LeaveCriticalSection( &joystick_cs );
return JOYERR_NOERROR; return JOYERR_NOERROR;
} }
@ -299,6 +315,8 @@ MMRESULT WINAPI joyReleaseCapture( UINT id )
if (id >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS; if (id >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS;
if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER; if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER;
EnterCriticalSection( &joystick_cs );
if (!joysticks[id].capture) if (!joysticks[id].capture)
TRACE("Joystick is not captured, ignoring request.\n"); TRACE("Joystick is not captured, ignoring request.\n");
else else
@ -308,6 +326,8 @@ MMRESULT WINAPI joyReleaseCapture( UINT id )
joysticks[id].timer = 0; joysticks[id].timer = 0;
} }
LeaveCriticalSection( &joystick_cs );
return JOYERR_NOERROR; return JOYERR_NOERROR;
} }
@ -316,6 +336,8 @@ MMRESULT WINAPI joyReleaseCapture( UINT id )
*/ */
MMRESULT WINAPI joySetCapture( HWND hwnd, UINT id, UINT period, BOOL changed ) MMRESULT WINAPI joySetCapture( HWND hwnd, UINT id, UINT period, BOOL changed )
{ {
MMRESULT res = JOYERR_NOERROR;
TRACE( "hwnd %p, id %u, period %u, changed %u.\n", hwnd, id, period, changed ); TRACE( "hwnd %p, id %u, period %u, changed %u.\n", hwnd, id, period, changed );
if (id >= ARRAY_SIZE(joysticks) || hwnd == 0) return JOYERR_PARMS; if (id >= ARRAY_SIZE(joysticks) || hwnd == 0) return JOYERR_PARMS;
@ -323,16 +345,22 @@ MMRESULT WINAPI joySetCapture( HWND hwnd, UINT id, UINT period, BOOL changed )
else if (period > JOY_PERIOD_MAX) period = JOY_PERIOD_MAX; else if (period > JOY_PERIOD_MAX) period = JOY_PERIOD_MAX;
if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER; if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER;
if (joysticks[id].capture || !IsWindow( hwnd )) EnterCriticalSection( &joystick_cs );
return JOYERR_NOCANDO; /* FIXME: what should be returned ? */
if (joyGetPos( id, &joysticks[id].info ) != JOYERR_NOERROR) return JOYERR_UNPLUGGED;
if ((joysticks[id].timer = SetTimer( hwnd, 0, period, joystick_timer )) == 0)
return JOYERR_NOCANDO;
if (joysticks[id].capture || !IsWindow( hwnd ))
res = JOYERR_NOCANDO; /* FIXME: what should be returned ? */
else if (joyGetPos( id, &joysticks[id].info ) != JOYERR_NOERROR)
res = JOYERR_UNPLUGGED;
else if ((joysticks[id].timer = SetTimer( hwnd, 0, period, joystick_timer )) == 0)
res = JOYERR_NOCANDO;
else
{
joysticks[id].capture = hwnd; joysticks[id].capture = hwnd;
joysticks[id].changed = changed; joysticks[id].changed = changed;
}
return JOYERR_NOERROR; LeaveCriticalSection( &joystick_cs );
return res;
} }
/************************************************************************** /**************************************************************************
@ -344,7 +372,9 @@ MMRESULT WINAPI joySetThreshold( UINT id, UINT threshold )
if (id >= ARRAY_SIZE(joysticks) || threshold > 65535) return MMSYSERR_INVALPARAM; if (id >= ARRAY_SIZE(joysticks) || threshold > 65535) return MMSYSERR_INVALPARAM;
EnterCriticalSection( &joystick_cs );
joysticks[id].threshold = threshold; joysticks[id].threshold = threshold;
LeaveCriticalSection( &joystick_cs );
return JOYERR_NOERROR; return JOYERR_NOERROR;
} }