dinput/tests: Move tests from dinput8/tests.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

configure

@@ -21820,7 +21820,6 @@ wine_fn_config_makefile dlls/difxapi enable_difxapi
 wine_fn_config_makefile dlls/dinput enable_dinput
 wine_fn_config_makefile dlls/dinput/tests enable_tests
 wine_fn_config_makefile dlls/dinput8 enable_dinput8
-wine_fn_config_makefile dlls/dinput8/tests enable_tests
 wine_fn_config_makefile dlls/directmanipulation enable_directmanipulation
 wine_fn_config_makefile dlls/directmanipulation/tests enable_tests
 wine_fn_config_makefile dlls/dispdib.dll16 enable_win16

configure.ac

@@ -2743,7 +2743,6 @@ WINE_CONFIG_MAKEFILE(dlls/difxapi)
 WINE_CONFIG_MAKEFILE(dlls/dinput)
 WINE_CONFIG_MAKEFILE(dlls/dinput/tests)
 WINE_CONFIG_MAKEFILE(dlls/dinput8)
-WINE_CONFIG_MAKEFILE(dlls/dinput8/tests)
 WINE_CONFIG_MAKEFILE(dlls/directmanipulation)
 WINE_CONFIG_MAKEFILE(dlls/directmanipulation/tests)
 WINE_CONFIG_MAKEFILE(dlls/dispdib.dll16,enable_win16)

dlls/dinput/tests/Makefile.in

@@ -1,9 +1,17 @@
 TESTDLL   = dinput.dll
-IMPORTS   = dinput ole32 version user32
+IMPORTS   = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm
 
-C_SRCS = \
+driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass
+driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
+
+SOURCES = \
 	device.c \
+	device8.c \
 	dinput.c \
+	dinput8.c \
+	driver_hid.c \
+	driver_hid.spec \
+	hid.c \
 	joystick.c \
 	keyboard.c \
 	mouse.c

dlls/dinput/tests/device8.c

@@ -1836,7 +1836,7 @@ static void test_keyboard_info(void)
     ok( ref == 0, "Release returned %d\n", ref );
 }
 
-START_TEST(device)
+START_TEST(device8)
 {
     instance = GetModuleHandleW( NULL );
 

dlls/dinput/tests/dinput.c

@@ -19,8 +19,10 @@
 #define DIRECTINPUT_VERSION 0x0700
 
 #define COBJMACROS
-#include <initguid.h>
 #include <windows.h>
+#include "objbase.h"
+
+#include <initguid.h>
 #include <dinput.h>
 #include <dinputd.h>
 

dlls/dinput/tests/dinput8.c

@@ -22,13 +22,12 @@
 #include <windows.h>
 #include <objidl.h>
 
-#include <initguid.h>
 #include <dinput.h>
 #include <dinputd.h>
 
 #include "wine/test.h"
 
-HINSTANCE hInstance;
+static HINSTANCE hInstance;
 
 static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context)
 {
@@ -711,7 +710,7 @@ static void test_Initialize(void)
     IDirectInput8_Release(pDI);
 }
 
-START_TEST(dinput)
+START_TEST(dinput8)
 {
     hInstance = GetModuleHandleA(NULL);
 

dlls/dinput8/tests/Makefile.in

@@ -1,12 +0,0 @@
-TESTDLL   = dinput8.dll
-IMPORTS   = dinput8 dinput ole32 user32 hid advapi32 uuid crypt32 newdev setupapi wintrust winmm
-
-driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass
-driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
-
-SOURCES = \
-	device.c \
-	dinput.c \
-	driver_hid.c \
-	driver_hid.spec \
-	hid.c