[DINPUT8]

* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62826

diff --git a/reactos/dll/directx/wine/dinput8/dinput8.idl b/reactos/dll/directx/wine/dinput8/dinput8.idl
index 4e988f4..2f9d3e8 100644 (file)
--- a/reactos/dll/directx/wine/dinput8/dinput8.idl
+++ b/reactos/dll/directx/wine/dinput8/dinput8.idl
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#pragma makedep register
+

 [
     helpstring("DirectInput8 Object"),
     threading(both),
 [
     helpstring("DirectInput8 Object"),
     threading(both),

diff --git a/reactos/dll/directx/wine/dinput8/dinput8_main.c b/reactos/dll/directx/wine/dinput8/dinput8_main.c
index 121dbfb..eb545ed 100644 (file)
--- a/reactos/dll/directx/wine/dinput8/dinput8_main.c
+++ b/reactos/dll/directx/wine/dinput8/dinput8_main.c
@@ -61,7 +61,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVer
     IDirectInputA *pDI;
     HRESULT hr, hrCo;
 
     IDirectInputA *pDI;
     HRESULT hr, hrCo;
 

-    TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter);
+    TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p)\n", hinst, dwVersion, debugstr_guid(riid), punkOuter);

 
     if (!ppDI)
         return E_POINTER;
 
     if (!ppDI)
         return E_POINTER;

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index efcc136..ea7bcd6 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -36,7 +36,7 @@ reactos/dll/directx/wine/d3dxof         # Synced to Wine-1.7.17
 reactos/dll/directx/wine/ddraw          # Synced to Wine-1.7.17
 reactos/dll/directx/wine/devenum        # Synced to Wine-1.7.17
 reactos/dll/directx/wine/dinput         # Synced to Wine-1.7.17
 reactos/dll/directx/wine/ddraw          # Synced to Wine-1.7.17
 reactos/dll/directx/wine/devenum        # Synced to Wine-1.7.17
 reactos/dll/directx/wine/dinput         # Synced to Wine-1.7.17

-reactos/dll/directx/wine/dinput8        # Synced to Wine-1.7.1
+reactos/dll/directx/wine/dinput8        # Synced to Wine-1.7.17

 reactos/dll/directx/wine/dmusic         # Synced to Wine-1.7.1
 reactos/dll/directx/wine/dplay          # Synced to Wine-1.7.1
 reactos/dll/directx/wine/dplayx         # Synced to Wine-1.7.1
 reactos/dll/directx/wine/dmusic         # Synced to Wine-1.7.1
 reactos/dll/directx/wine/dplay          # Synced to Wine-1.7.1
 reactos/dll/directx/wine/dplayx         # Synced to Wine-1.7.1