Module: wine Branch: master Commit: 53f64a09cf696edcc6c346bab2a46585c6acabe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f64a09cf696edcc6c346bab2...
Author: Peter Dons Tychsen donpedro@dhcppc4 Date: Fri Jan 4 22:34:41 2008 +0100
dinput: Silence incorrect warning and move it to a valid place.
---
dlls/dinput/dinput_main.c | 5 +++++ dlls/dinput/joystick_linux.c | 1 - dlls/dinput/joystick_linuxinput.c | 1 - 3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index fc3c90a..2638710 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -464,6 +464,11 @@ static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, R ret_value = DIERR_NOINTERFACE; }
+ if (ret_value == DIERR_NOINTERFACE) + { + WARN("invalid device GUID %s\n", debugstr_guid(rguid)); + } + return ret_value; }
diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 90f20d6..4b0085c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -574,7 +574,6 @@ static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, RE return DIERR_NOINTERFACE; }
- WARN("invalid device GUID %s\n",debugstr_guid(rguid)); return DIERR_DEVICENOTREG; }
diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 13e413b..18a7e54 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -565,7 +565,6 @@ static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, RE return DIERR_NOINTERFACE; }
- WARN("invalid device GUID\n"); return DIERR_DEVICENOTREG; }