Module: wine Branch: master Commit: 02be0aee726005dd8b9cebcf3940f7b7120b1be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02be0aee726005dd8b9cebcf39...
Author: Vitaliy Margolen wine-patches@kievinfo.com Date: Mon Jan 24 20:36:01 2011 -0700
dinput: Fix typo. Found by clang.
---
dlls/dinput/effect_linuxinput.c | 4 ++-- dlls/dinput/tests/joystick.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index b7c27cd..d0e77d6 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -289,8 +289,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetEffectGuid(
TRACE("(this=%p,%p)\n", This, pguid);
- pguid = &This->guid; - + *pguid = This->guid; + return DI_OK; }
diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index aad8049..a60d6e2 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -375,6 +375,7 @@ static BOOL CALLBACK EnumJoysticks( { DWORD effect_status; struct DIPROPDWORD diprop_word; + GUID guid = {0};
hr = IDirectInputEffect_Initialize(effect, hInstance, data->version, &GUID_ConstantForce); @@ -429,6 +430,9 @@ static BOOL CALLBACK EnumJoysticks( hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); todo_wine ok(effect_status!=0,"IDirectInputEffect_GetEffectStatus() reported effect as stopped\n"); + hr = IDirectInputEffect_GetEffectGuid(effect, &guid); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectGuid() failed: %08x\n", hr); + ok(IsEqualGUID(&GUID_ConstantForce, &guid), "Wrong guid returned\n");
/* Check autocenter status * State: initialy stopped