winmm: Introduce compare_uint helper.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-05-27 23:55:50 +02:00 committed by Alexandre Julliard
parent 72a36736a9
commit 12f6e8086b
1 changed files with 9 additions and 3 deletions

View File

@ -55,6 +55,12 @@ typedef struct tagWINE_JOYSTICK {
static WINE_JOYSTICK JOY_Sticks[MAXJOYSTICK]; static WINE_JOYSTICK JOY_Sticks[MAXJOYSTICK];
static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff)
{
unsigned int diff = x > y ? x - y : y - x;
return diff <= max_diff;
}
/************************************************************************** /**************************************************************************
* JOY_LoadDriver [internal] * JOY_LoadDriver [internal]
*/ */
@ -106,14 +112,14 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi
pos = MAKELONG(ji.wXpos, ji.wYpos); pos = MAKELONG(ji.wXpos, ji.wYpos);
if (!joy->bChanged || if (!joy->bChanged ||
abs(joy->ji.wXpos - ji.wXpos) > joy->threshold || !compare_uint(joy->ji.wXpos, ji.wXpos, joy->threshold) ||
abs(joy->ji.wYpos - ji.wYpos) > joy->threshold) { !compare_uint(joy->ji.wYpos, ji.wYpos, joy->threshold)) {
SendMessageA(joy->hCapture, MM_JOY1MOVE + i, ji.wButtons, pos); SendMessageA(joy->hCapture, MM_JOY1MOVE + i, ji.wButtons, pos);
joy->ji.wXpos = ji.wXpos; joy->ji.wXpos = ji.wXpos;
joy->ji.wYpos = ji.wYpos; joy->ji.wYpos = ji.wYpos;
} }
if (!joy->bChanged || if (!joy->bChanged ||
abs(joy->ji.wZpos - ji.wZpos) > joy->threshold) { !compare_uint(joy->ji.wZpos, ji.wZpos, joy->threshold)) {
SendMessageA(joy->hCapture, MM_JOY1ZMOVE + i, ji.wButtons, pos); SendMessageA(joy->hCapture, MM_JOY1ZMOVE + i, ji.wButtons, pos);
joy->ji.wZpos = ji.wZpos; joy->ji.wZpos = ji.wZpos;
} }