From ae83c9af7c0ee71b651d19b7d6291bf1186b45bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Fri, 25 Nov 2005 23:09:03 +0000 Subject: [PATCH] Sync to Wine-0_9_2: Christoph Frick - Moved and adopted joystick_linux.c code into the joystick_linuxinput.c. Francois Gouget - Remove spaces before '\n' in traces. Daniel Remenak - Add additional sanity checks to the linux input system dinput joystick implementation. svn path=/trunk/; revision=19587 --- reactos/lib/dinput/dinput_main.c | 2 +- reactos/lib/dinput/effect_linuxinput.c | 2 +- reactos/lib/dinput/joystick_linuxinput.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/lib/dinput/dinput_main.c b/reactos/lib/dinput/dinput_main.c index cc12e7a22c2..93b0005028c 100644 --- a/reactos/lib/dinput/dinput_main.c +++ b/reactos/lib/dinput/dinput_main.c @@ -173,7 +173,7 @@ static const char *_dump_DIDEVTYPE_value(DWORD dwDevType) { case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD"; case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK"; case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE"; - default: return "Unkown"; + default: return "Unknown"; } } diff --git a/reactos/lib/dinput/effect_linuxinput.c b/reactos/lib/dinput/effect_linuxinput.c index d86b0aca4bf..0a30d9bceea 100644 --- a/reactos/lib/dinput/effect_linuxinput.c +++ b/reactos/lib/dinput/effect_linuxinput.c @@ -823,7 +823,7 @@ HRESULT linuxinput_create_effect( HeapFree(GetProcessHeap(), 0, newEffect); return DIERR_INVALIDPARAM; default: - FIXME("Unkown force type.\n"); + FIXME("Unknown force type.\n"); HeapFree(GetProcessHeap(), 0, newEffect); return DIERR_INVALIDPARAM; } diff --git a/reactos/lib/dinput/joystick_linuxinput.c b/reactos/lib/dinput/joystick_linuxinput.c index 750251355a0..b1c555835cb 100644 --- a/reactos/lib/dinput/joystick_linuxinput.c +++ b/reactos/lib/dinput/joystick_linuxinput.c @@ -637,7 +637,7 @@ static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph) return i; } - /* XXX - the following part wont work with LiveForSpeed + /* XXX - the following part won't work with LiveForSpeed * - the game sets the dwTypes to something else then * the ddoi.dwType set in EnumObjects */