[PATCH] Silence incorrect warning and move it to a valid place. This fixes incrorrect warnings when creating joystick devices.
Peter Dons Tychsen (none)
donpedro at dhcppc4.
Fri Jan 4 15:34:41 CST 2008
---
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;
}
--
1.5.3.6
--=-w+C0eb4d7xwh+2ZS8zmT--
More information about the wine-patches
mailing list