01/01: [DINPUT_WINETEST] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

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

commit 32675648dc0abb7d508008fee51ca4b6daa1a69a
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Thu Mar 8 13:34:24 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Thu Mar 8 13:34:24 2018 +0100

    [DINPUT_WINETEST] Sync with Wine Staging 3.3. CORE-14434
---
 modules/rostests/winetests/dinput/device.c   |  9 ++++++++-
 modules/rostests/winetests/dinput/dinput.c   |  8 +++++++-
 modules/rostests/winetests/dinput/joystick.c | 13 +++++++++++--
 modules/rostests/winetests/dinput/keyboard.c | 14 +++++++++++++-
 modules/rostests/winetests/dinput/mouse.c    | 12 +++++++++++-
 modules/rostests/winetests/dinput/precomp.h  | 10 ++++------
 6 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/modules/rostests/winetests/dinput/device.c
b/modules/rostests/winetests/dinput/device.c
index 605b091480..74940248ff 100644
--- a/modules/rostests/winetests/dinput/device.c
+++ b/modules/rostests/winetests/dinput/device.c
@@ -16,7 +16,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "precomp.h"
+#define DIRECTINPUT_VERSION 0x0700
+
+#define COBJMACROS
+#include <windows.h>
+
+#include "wine/test.h"
+#include "windef.h"
+#include "dinput.h"
 
 static const DIOBJECTDATAFORMAT obj_data_format[] = {
   { &GUID_YAxis, 16, DIDFT_OPTIONAL|DIDFT_AXIS  |DIDFT_MAKEINSTANCE(1), 0},
diff --git a/modules/rostests/winetests/dinput/dinput.c
b/modules/rostests/winetests/dinput/dinput.c
index b4f36402d2..a5f7c0cfce 100644
--- a/modules/rostests/winetests/dinput/dinput.c
+++ b/modules/rostests/winetests/dinput/dinput.c
@@ -16,10 +16,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "precomp.h"
+#define DIRECTINPUT_VERSION 0x0700
 
+#define COBJMACROS
+#include <initguid.h>
+#include <windows.h>
+#include <dinput.h>
 #include <dinputd.h>
 
+#include "wine/test.h"
+
 HINSTANCE hInstance;
 
 enum directinput_versions
diff --git a/modules/rostests/winetests/dinput/joystick.c
b/modules/rostests/winetests/dinput/joystick.c
index 6649023056..b4ffba5c5d 100644
--- a/modules/rostests/winetests/dinput/joystick.c
+++ b/modules/rostests/winetests/dinput/joystick.c
@@ -16,10 +16,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "precomp.h"
+#define DIRECTINPUT_VERSION 0x0700
 
+#define COBJMACROS
+#include <windows.h>
+
+#include <math.h>
 #include <stdio.h>
-#include <winnls.h>
+#include <stdlib.h>
+
+#include "wine/test.h"
+#include "windef.h"
+#include "wingdi.h"
+#include "dinput.h"
 
 #define numObjects(x) (sizeof(x) / sizeof(x[0]))
 
diff --git a/modules/rostests/winetests/dinput/keyboard.c
b/modules/rostests/winetests/dinput/keyboard.c
index 6df1028a32..e51e332535 100644
--- a/modules/rostests/winetests/dinput/keyboard.c
+++ b/modules/rostests/winetests/dinput/keyboard.c
@@ -16,7 +16,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "precomp.h"
+#define DIRECTINPUT_VERSION 0x0700
+
+#define COBJMACROS
+#include <windows.h>
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "wine/test.h"
+#include "windef.h"
+#include "wingdi.h"
+#include "dinput.h"
 
 static void acquire_tests(IDirectInputA *pDI, HWND hwnd)
 {
diff --git a/modules/rostests/winetests/dinput/mouse.c
b/modules/rostests/winetests/dinput/mouse.c
index 791300db2d..7f71b6e6e7 100644
--- a/modules/rostests/winetests/dinput/mouse.c
+++ b/modules/rostests/winetests/dinput/mouse.c
@@ -17,8 +17,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "precomp.h"
+#define DIRECTINPUT_VERSION 0x0700
 
+#define COBJMACROS
+#include <windows.h>
+
+#include <math.h>
+#include <stdlib.h>
+
+#include "wine/test.h"
+#include "windef.h"
+#include "wingdi.h"
+#include "dinput.h"
 
 static const HRESULT SetCoop_null_window[16] =  {
     E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG,
diff --git a/modules/rostests/winetests/dinput/precomp.h
b/modules/rostests/winetests/dinput/precomp.h
index 131fdabfe8..103761a4ba 100644
--- a/modules/rostests/winetests/dinput/precomp.h
+++ b/modules/rostests/winetests/dinput/precomp.h
@@ -1,17 +1,15 @@
+
 #ifndef _DINPUT_WINETEST_PRECOMP_H_
 #define _DINPUT_WINETEST_PRECOMP_H_
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define DIRECTINPUT_VERSION 0x0700
 
+#define WIN32_NO_STATUS
 #define COBJMACROS
 
-#include <wine/test.h>
-
 #include <initguid.h>
+#include <windows.h>
+#include <wine/test.h>
 #include <dinput.h>
 
 #endif /* !_DINPUT_WINETEST_PRECOMP_H_ */