winmm: Respect return value from joyGetPos (Coverity) (try 2)

Andrew Eikum aeikum at codeweavers.com
Wed Dec 23 08:52:41 CST 2015


Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>

On Tue, Dec 22, 2015 at 11:18:52PM +0100, André Hentschel wrote:
> Signed-off-by: André Hentschel <nerv at dawncrow.de>
> ---
> CID 1261597
> 
>  dlls/winmm/joystick.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c
> index 6ac67f4..8a52942 100644
> --- a/dlls/winmm/joystick.c
> +++ b/dlls/winmm/joystick.c
> @@ -84,6 +84,7 @@ static	void	CALLBACK	JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi
>  {
>      int			i;
>      WINE_JOYSTICK*	joy;
> +    MMRESULT		res;
>      JOYINFO		ji;
>      LONG		pos;
>      unsigned 		buttonChange;
> @@ -93,7 +94,12 @@ static	void	CALLBACK	JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi
>  
>  	if (joy->hCapture != hWnd) continue;
>  
> -	joyGetPos(i, &ji);
> +	res = joyGetPos(i, &ji);
> +	if (res != JOYERR_NOERROR) {
> +	    WARN("joyGetPos failed: %08x\n", res);
> +	    continue;
> +	}
> +
>  	pos = MAKELONG(ji.wXpos, ji.wYpos);
>  
>  	if (!joy->bChanged ||
> -- 
> 1.9.1
> 
> 
> 



More information about the wine-patches mailing list