[ros-diffs] 01/01: [DINPUT8] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8c6acd13de30cdffe456…

commit e8c6acd13de30cdffe4564ad6fa84dec266f3557
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Thu Mar 8 13:35:22 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Thu Mar 8 13:35:22 2018 +0100

    [DINPUT8] Sync with Wine Staging 3.3. CORE-14434
---
 dll/directx/wine/dinput8/dinput8_main.c | 27 ++++++++++++---------------
 dll/directx/wine/dinput8/version.rc     |  2 +-
 media/doc/README.WINE                   |  2 +-
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/dll/directx/wine/dinput8/dinput8_main.c
b/dll/directx/wine/dinput8/dinput8_main.c
index 7eef166b78..9824c76446 100644
--- a/dll/directx/wine/dinput8/dinput8_main.c
+++ b/dll/directx/wine/dinput8/dinput8_main.c
@@ -18,23 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/config.h>
-//#include <assert.h>
-//#include <stdarg.h>
-//#include <string.h>
+#include "config.h"
+#include <assert.h>
+#include <stdarg.h>
+#include <string.h>
 
 #define COBJMACROS
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winerror.h"
-#include <objbase.h>
-#include <rpcproxy.h>
-#include <dinput.h>
+
+#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "objbase.h"
+#include "rpcproxy.h"
+#include "dinput.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
diff --git a/dll/directx/wine/dinput8/version.rc b/dll/directx/wine/dinput8/version.rc
index b319f29768..e986b7ceba 100644
--- a/dll/directx/wine/dinput8/version.rc
+++ b/dll/directx/wine/dinput8/version.rc
@@ -25,4 +25,4 @@
 #define WINE_PRODUCTVERSION 5,1,2600,881
 #define WINE_PRODUCTVERSION_STR "5.1"
 
-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index ef1c4aca21..0c6dba68ad 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -31,7 +31,7 @@ reactos/dll/directx/wine/d3dxof         # Synced to WineStaging-3.3
 reactos/dll/directx/wine/ddraw          # Synced to WineStaging-3.3
 reactos/dll/directx/wine/devenum        # Synced to WineStaging-3.3
 reactos/dll/directx/wine/dinput         # Synced to WineStaging-3.3
-reactos/dll/directx/wine/dinput8        # Synced to WineStaging-2.9
+reactos/dll/directx/wine/dinput8        # Synced to WineStaging-3.3
 reactos/dll/directx/wine/dmusic         # Synced to WineStaging-2.9
 reactos/dll/directx/wine/dplay          # Synced to WineStaging-2.9
 reactos/dll/directx/wine/dplayx         # Synced to WineStaging-2.16