From 6086603664aae86522ca55ae7282e46ef2cc45f7 Mon Sep 17 00:00:00 2001 From: Sergey Khodych Date: Wed, 23 Apr 2008 00:27:01 +0300 Subject: Use a dinput8 in keyboard test. --- dlls/dinput/tests/Makefile.in | 2 +- dlls/dinput/tests/keyboard.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index d310494..16d5d43 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = dinput.dll IMPORTS = dinput ole32 version user32 kernel32 -EXTRALIBS = -ldxguid -luuid -ldxerr8 +EXTRALIBS = -ldxguid -luuid -ldxerr8 -ldinput8 CTESTS = \ device.c \ diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 440cd3c..f041119 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define DIRECTINPUT_VERSION 0x0700 +#define DIRECTINPUT_VERSION 0x0800 #define COBJMACROS #include @@ -171,7 +171,7 @@ static void keyboard_tests(DWORD version) HWND hwnd; ULONG ref = 0; - hr = DirectInputCreate(hInstance, version, &pDI, NULL); + hr = DirectInput8Create(hInstance, version, &IID_IDirectInput8, (LPVOID)&pDI, NULL); if (hr == DIERR_OLDDIRECTINPUTVERSION) { skip("Tests require a newer dinput version\n"); @@ -197,11 +197,7 @@ static void keyboard_tests(DWORD version) START_TEST(keyboard) { - CoInitialize(NULL); - trace("DLL Version: %s\n", get_file_version("dinput.dll")); - keyboard_tests(0x0700); - - CoUninitialize(); + keyboard_tests(DIRECTINPUT_VERSION); } -- 1.5.3.3