marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: Cope with NULL flags in LinuxInputEffectImpl_GetEffectStatus. 

Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Bruno Jesus 2016-08-18 22:50:13 -03:00 committed by Alexandre Julliard
parent 44303b6625
commit e8273ae497
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/dinput/effect_linuxinput.c
View File

@ -131,6 +131,9 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetEffectStatus(
{
TRACE("(this=%p,%p)\n", iface, pdwFlags);
if (!pdwFlags)
return E_POINTER;
/* linux sends the effect status through an event.
* that event is trapped by our parent joystick driver
* and there is no clean way to pass it back to us. */

3
dlls/dinput/tests/joystick.c
View File

@ -473,6 +473,9 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef)
* - effects are preserved (Download + Start doesn't complain
* about incomplete effect)
*/
hr = IDirectInputEffect_GetEffectStatus(effect, NULL);
ok(hr==E_POINTER,"IDirectInputEffect_GetEffectStatus() must fail with E_POINTER, got: %08x\n", hr);
effect_status = 0xdeadbeef;
hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status);
ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr);
ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n");