[DINPUT_WINETEST] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 8 Mar 2018 12:34:24 +0000 (13:34 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 8 Mar 2018 12:34:24 +0000 (13:34 +0100)
modules/rostests/winetests/dinput/device.c
modules/rostests/winetests/dinput/dinput.c
modules/rostests/winetests/dinput/joystick.c
modules/rostests/winetests/dinput/keyboard.c
modules/rostests/winetests/dinput/mouse.c
modules/rostests/winetests/dinput/precomp.h

index 605b091..7494024 100644 (file)
  * 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},
index b4f3640..a5f7c0c 100644 (file)
  * 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
index 6649023..b4ffba5 100644 (file)
  * 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]))
 
index 6df1028..e51e332 100644 (file)
  * 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)
 {
index 791300d..7f71b6e 100644 (file)
  * 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,
index 131fdab..103761a 100644 (file)
@@ -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_ */