[DINPUT]
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 26 Sep 2014 09:03:58 +0000 (09:03 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 26 Sep 2014 09:03:58 +0000 (09:03 +0000)
* Sync with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=64297

reactos/dll/directx/wine/dinput/joystick.c
reactos/media/doc/README.WINE

index a67596f..df42d16 100644 (file)
@@ -403,7 +403,6 @@ void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps)
     TRACE("dwSize: %d\n", lpDIDevCaps->dwSize);
     TRACE("dwFlags: %08x\n", lpDIDevCaps->dwFlags);
     TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType,
-          lpDIDevCaps->dwDevType == DIDEVTYPE_DEVICE ? "DIDEVTYPE_DEVICE" :
           lpDIDevCaps->dwDevType == DIDEVTYPE_DEVICE ? "DIDEVTYPE_DEVICE" :
           lpDIDevCaps->dwDevType == DIDEVTYPE_MOUSE ? "DIDEVTYPE_MOUSE" :
           lpDIDevCaps->dwDevType == DIDEVTYPE_KEYBOARD ? "DIDEVTYPE_KEYBOARD" :
index 01c02ed..edc4b00 100644 (file)
@@ -35,7 +35,7 @@ reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.27
 reactos/dll/directx/wine/d3dxof         # Synced to Wine-1.7.27
 reactos/dll/directx/wine/ddraw          # Synced to Wine-1.7.27
 reactos/dll/directx/wine/devenum        # Synced to Wine-1.7.27
-reactos/dll/directx/wine/dinput         # Synced to Wine-1.7.17
+reactos/dll/directx/wine/dinput         # Synced to Wine-1.7.27
 reactos/dll/directx/wine/dinput8        # Synced to Wine-1.7.17
 reactos/dll/directx/wine/dmusic         # Synced to Wine-1.7.17
 reactos/dll/directx/wine/dplay          # Synced to Wine-1.7.17