From b648dac7e12f593589661d03449e0f092b363f87 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 8 Jul 2008 17:49:03 +0200 Subject: [PATCH] dinput: Don't depend on the dxerr8 static library in the tests. --- dlls/dinput/tests/Makefile.in | 2 +- dlls/dinput/tests/device.c | 27 +++++----- dlls/dinput/tests/joystick.c | 95 ++++++++++++++--------------------- dlls/dinput/tests/keyboard.c | 39 +++++++------- dlls/dinput/tests/mouse.c | 27 +++++----- 5 files changed, 83 insertions(+), 107 deletions(-) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index ce6326e6c9c..a64056e90b9 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = dinput.dll -IMPORTS = dxerr8 dinput ole32 version user32 kernel32 +IMPORTS = dinput ole32 version user32 kernel32 CTESTS = \ device.c \ diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index f5a2212e023..e59d8c315a6 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -25,7 +25,6 @@ #include "windef.h" #include "initguid.h" #include "dinput.h" -#include "dxerr8.h" static const DIOBJECTDATAFORMAT obj_data_format[] = { { &GUID_YAxis, 16, DIDFT_OPTIONAL|DIDFT_AXIS |DIDFT_MAKEINSTANCE(1), 0}, @@ -74,13 +73,13 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) int cnt = 0, cnt1 = 0; hr = IDirectInputDevice_EnumObjects(device, enum_callback, &cnt, DIDFT_ALL); - ok(SUCCEEDED(hr), "EnumObjects() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "EnumObjects() failed: %08x\n", hr); hr = IDirectInputDevice_SetDataFormat(device, &data_format); - ok(SUCCEEDED(hr), "SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "SetDataFormat() failed: %08x\n", hr); hr = IDirectInputDevice_EnumObjects(device, enum_callback, &cnt1, DIDFT_ALL); - ok(SUCCEEDED(hr), "EnumObjects() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "EnumObjects() failed: %08x\n", hr); if (0) /* fails for joystick only */ ok(cnt == cnt1, "Enum count changed from %d to %d\n", cnt, cnt1); @@ -97,19 +96,19 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) dp.diph.dwObj = 16; dp.dwData = DIPROPAXISMODE_ABS; hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); - ok(hr == DIERR_UNSUPPORTED, "SetProperty() returned: %s\n", DXGetErrorString8(hr)); + ok(hr == DIERR_UNSUPPORTED, "SetProperty() returned: %08x\n", hr); dp.diph.dwHow = DIPH_DEVICE; hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); - ok(hr == DIERR_INVALIDPARAM, "SetProperty() returned: %s\n", DXGetErrorString8(hr)); + ok(hr == DIERR_INVALIDPARAM, "SetProperty() returned: %08x\n", hr); dp.diph.dwObj = 0; hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); - ok(hr == DI_OK, "SetProperty() failed: %s\n", DXGetErrorString8(hr)); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); /* Cannot change mode while acquired */ hr = IDirectInputDevice_Acquire(device); - ok(hr == DI_OK, "Acquire() failed: %s\n", DXGetErrorString8(hr)); + ok(hr == DI_OK, "Acquire() failed: %08x\n", hr); hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); - ok(hr == DIERR_ACQUIRED, "SetProperty() returned: %s\n", DXGetErrorString8(hr)); + ok(hr == DIERR_ACQUIRED, "SetProperty() returned: %08x\n", hr); } } @@ -126,12 +125,12 @@ static BOOL CALLBACK enum_devices(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef) HRESULT hr; hr = IDirectInput_GetDeviceStatus(data->pDI, &lpddi->guidInstance); - ok(hr == DI_OK, "IDirectInput_GetDeviceStatus() failed: %s\n", DXGetErrorString8(hr)); + ok(hr == DI_OK, "IDirectInput_GetDeviceStatus() failed: %08x\n", hr); if (hr == DI_OK) { hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, &device, NULL); - ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); trace("Testing device \"%s\"\n", lpddi->tszInstanceName); test_object_info(device, data->hwnd); IUnknown_Release(device); @@ -153,7 +152,7 @@ static void device_tests(void) skip("Tests require a newer dinput version\n"); return; } - ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "DirectInputCreate() failed: %08x\n", hr); if (FAILED(hr)) return; hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, @@ -166,7 +165,7 @@ static void device_tests(void) data.pDI = pDI; data.hwnd = hwnd; hr = IDirectInput_EnumDevices(pDI, 0, enum_devices, &data, DIEDFL_ALLDEVICES); - ok(SUCCEEDED(hr), "IDirectInput_EnumDevices() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInput_EnumDevices() failed: %08x\n", hr); /* If GetDeviceStatus returns DI_OK the device must exist */ @@ -176,7 +175,7 @@ static void device_tests(void) LPDIRECTINPUTDEVICE device = NULL; hr = IDirectInput_CreateDevice(pDI, &GUID_Joystick, &device, NULL); - ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); if (device) IUnknown_Release(device); } diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 567dad076d1..9bafd303e78 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -29,7 +29,6 @@ #include "windef.h" #include "wingdi.h" #include "dinput.h" -#include "dxerr8.h" #include "dinput_test.h" #define numObjects(x) (sizeof(x) / sizeof(x[0])) @@ -121,7 +120,7 @@ static BOOL CALLBACK EnumAxes( dipdw.diph.dwObj = pdidoi->dwType; hr = IDirectInputDevice_GetProperty(info->pJoystick, DIPROP_RANGE, &diprg.diph); - ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() failed: %08x\n", hr); ok(info->lMin == diprg.lMin && info->lMax == diprg.lMax, "Min/Max range invalid: " "expected %d..%d got %d..%d\n", info->lMin, info->lMax, diprg.lMin, diprg.lMax); @@ -130,21 +129,21 @@ static BOOL CALLBACK EnumAxes( hr = IDirectInputDevice_SetProperty(info->pJoystick, DIPROP_RANGE, NULL); ok(hr==E_INVALIDARG,"IDirectInputDevice_SetProperty() should have returned " - "E_INVALIDARG, returned: %s\n", DXGetErrorString8(hr)); + "E_INVALIDARG, returned: %08x\n", hr); hr = IDirectInputDevice_SetProperty(info->pJoystick, DIPROP_RANGE, &diprg.diph); - ok(hr==DI_OK,"IDirectInputDevice_SetProperty() failed: %s\n", DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_SetProperty() failed: %08x\n", hr); /* dead zone */ hr = IDirectInputDevice_GetProperty(info->pJoystick, DIPROP_DEADZONE, &dipdw.diph); - ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() failed: %08x\n", hr); ok(info->dZone == dipdw.dwData, "deadzone invalid: expected %d got %d\n", info->dZone, dipdw.dwData); dipdw.dwData = 123; hr = IDirectInputDevice_SetProperty(info->pJoystick, DIPROP_DEADZONE, &dipdw.diph); - ok(hr==DI_OK,"IDirectInputDevice_SetProperty() failed: %s\n", DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_SetProperty() failed: %08x\n", hr); info->axis++; } else if (IsEqualIID(&pdidoi->guidType, &GUID_POV)) @@ -189,20 +188,19 @@ static BOOL CALLBACK EnumJoysticks( hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, NULL, NULL); ok(hr==E_POINTER,"IDirectInput_CreateDevice() should have returned " - "E_POINTER, returned: %s\n", DXGetErrorString8(hr)); + "E_POINTER, returned: %08x\n", hr); hr = IDirectInput_CreateDevice(data->pDI, NULL, &pJoystick, NULL); ok(hr==E_POINTER,"IDirectInput_CreateDevice() should have returned " - "E_POINTER, returned: %s\n", DXGetErrorString8(hr)); + "E_POINTER, returned: %08x\n", hr); hr = IDirectInput_CreateDevice(data->pDI, NULL, NULL, NULL); ok(hr==E_POINTER,"IDirectInput_CreateDevice() should have returned " - "E_POINTER, returned: %s\n", DXGetErrorString8(hr)); + "E_POINTER, returned: %08x\n", hr); hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, &pJoystick, NULL); - ok(hr==DI_OK,"IDirectInput_CreateDevice() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInput_CreateDevice() failed: %08x\n", hr); if (hr!=DI_OK) goto DONE; @@ -210,65 +208,57 @@ static BOOL CALLBACK EnumJoysticks( hr = IDirectInputDevice_SetDataFormat(pJoystick, NULL); ok(hr==E_POINTER,"IDirectInputDevice_SetDataFormat() should have returned " - "E_POINTER, returned: %s\n", DXGetErrorString8(hr)); + "E_POINTER, returned: %08x\n", hr); ZeroMemory(&format, sizeof(format)); hr = IDirectInputDevice_SetDataFormat(pJoystick, &format); ok(hr==DIERR_INVALIDPARAM,"IDirectInputDevice_SetDataFormat() should have " - "returned DIERR_INVALIDPARAM, returned: %s\n", DXGetErrorString8(hr)); + "returned DIERR_INVALIDPARAM, returned: %08x\n", hr); /* try the default formats */ hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystick); - ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystick2); - ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); /* try an alternate format */ hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystickTest); - ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystick2); - ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); if (hr != DI_OK) goto RELEASE; for (i=0; i<16; i++) { hr = IDirectInputDevice_SetCooperativeLevel(pJoystick, NULL, i); - ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %s\n", i, DXGetErrorString8(hr)); + ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %08x\n", i, hr); } for (i=0; i<16; i++) { hr = IDirectInputDevice_SetCooperativeLevel(pJoystick, hWnd, i); - ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %s\n", i, DXGetErrorString8(hr)); + ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); } hr = IDirectInputDevice_SetCooperativeLevel(pJoystick, hWnd, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND); - ok(hr==DI_OK,"IDirectInputDevice_SetCooperativeLevel() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_SetCooperativeLevel() failed: %08x\n", hr); /* get capabilities */ hr = IDirectInputDevice_GetCapabilities(pJoystick, NULL); ok(hr==E_POINTER,"IDirectInputDevice_GetCapabilities() " - "should have returned E_POINTER, returned: %s\n", - DXGetErrorString8(hr)); + "should have returned E_POINTER, returned: %08x\n", hr); ZeroMemory(&caps, sizeof(caps)); hr = IDirectInputDevice_GetCapabilities(pJoystick, &caps); ok(hr==DIERR_INVALIDPARAM,"IDirectInputDevice_GetCapabilities() " - "should have returned DIERR_INVALIDPARAM, returned: %s\n", - DXGetErrorString8(hr)); + "should have returned DIERR_INVALIDPARAM, returned: %08x\n", hr); caps.dwSize = sizeof(caps); hr = IDirectInputDevice_GetCapabilities(pJoystick, &caps); - ok(hr==DI_OK,"IDirectInputDevice_GetCapabilities() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_GetCapabilities() failed: %08x\n", hr); ZeroMemory(&info, sizeof(info)); info.pJoystick = pJoystick; @@ -278,8 +268,7 @@ static BOOL CALLBACK EnumJoysticks( info.lMax = 0xffff; /* enumerate objects */ hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, (VOID*)&info, DIDFT_ALL); - ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %08x\n", hr); ok(caps.dwAxes == info.axis, "Number of enumerated axes (%d) doesn't match capabilities (%d)\n", info.axis, caps.dwAxes); ok(caps.dwButtons == info.button, "Number of enumerated buttons (%d) doesn't match capabilities (%d)\n", info.button, caps.dwButtons); @@ -287,54 +276,47 @@ static BOOL CALLBACK EnumJoysticks( /* Set format and check limits again */ hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystick2); - ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); info.lMin = -2000; info.lMax = +2000; info.dZone= 123; hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, (VOID*)&info, DIDFT_ALL); - ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %s\n", DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %08x\n", hr); hr = IDirectInputDevice_GetDeviceInfo(pJoystick, 0); ok(hr==E_POINTER, "IDirectInputDevice_GetDeviceInfo() " - "should have returned E_POINTER, returned: %s\n", - DXGetErrorString8(hr)); + "should have returned E_POINTER, returned: %08x\n", hr); ZeroMemory(&inst, sizeof(inst)); ZeroMemory(&inst3, sizeof(inst3)); hr = IDirectInputDevice_GetDeviceInfo(pJoystick, &inst); ok(hr==DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceInfo() " - "should have returned DIERR_INVALIDPARAM, returned: %s\n", - DXGetErrorString8(hr)); + "should have returned DIERR_INVALIDPARAM, returned: %08x\n", hr); inst.dwSize = sizeof(inst); hr = IDirectInputDevice_GetDeviceInfo(pJoystick, &inst); - ok(hr==DI_OK,"IDirectInputDevice_GetDeviceInfo() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_GetDeviceInfo() failed: %08x\n", hr); inst3.dwSize = sizeof(inst3); hr = IDirectInputDevice_GetDeviceInfo(pJoystick, (LPDIDEVICEINSTANCE)&inst3); - ok(hr==DI_OK,"IDirectInputDevice_GetDeviceInfo() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_GetDeviceInfo() failed: %08x\n", hr); hr = IDirectInputDevice_Unacquire(pJoystick); - ok(hr == S_FALSE, "IDirectInputDevice_Unacquire() should have returned S_FALSE, got: %s\n", - DXGetErrorString8(hr)); + ok(hr == S_FALSE, "IDirectInputDevice_Unacquire() should have returned S_FALSE, got: %08x\n", hr); hr = IDirectInputDevice_Acquire(pJoystick); - ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); if (hr != DI_OK) goto RELEASE; hr = IDirectInputDevice_Acquire(pJoystick); - ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have returned S_FALSE, got: %s\n", - DXGetErrorString8(hr)); + ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have returned S_FALSE, got: %08x\n", hr); if (info.pov < 4) { hr = IDirectInputDevice_GetDeviceState(pJoystick, sizeof(DIJOYSTATE2), &js); - ok(hr == DI_OK, "IDirectInputDevice_GetDeviceState() failed: %s\n", DXGetErrorString8(hr)); + ok(hr == DI_OK, "IDirectInputDevice_GetDeviceState() failed: %08x\n", hr); ok(js.rgdwPOV[3] == -1, "Default for unassigned POV should be -1 not: %d\n", js.rgdwPOV[3]); } @@ -364,7 +346,7 @@ static BOOL CALLBACK EnumJoysticks( hr = IDirectInputDevice2_CreateEffect((LPDIRECTINPUTDEVICE2)pJoystick, &GUID_ConstantForce, &eff, &effect, NULL); - ok(hr == DI_OK, "IDirectInputDevice_CreateEffect() failed: %s\n", DXGetErrorString8(hr)); + ok(hr == DI_OK, "IDirectInputDevice_CreateEffect() failed: %08x\n", hr); cnt2 = get_refcount((IUnknown*)pJoystick); ok(cnt1 == cnt2, "Ref count is wrong %d != %d\n", cnt1, cnt2); @@ -387,8 +369,7 @@ static BOOL CALLBACK EnumJoysticks( oldstate[0]='\0'; for (i = 0; i < count; i++) { hr = IDirectInputDevice_GetDeviceState(pJoystick, sizeof(DIJOYSTATE2), &js); - ok(hr==DI_OK,"IDirectInputDevice_GetDeviceState() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_GetDeviceState() failed: %08x\n", hr); if (hr != DI_OK) break; sprintf(curstate, "X%5d Y%5d Z%5d Rx%5d Ry%5d Rz%5d " @@ -411,8 +392,7 @@ static BOOL CALLBACK EnumJoysticks( trace("\n"); hr = IDirectInputDevice_Unacquire(pJoystick); - ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %08x\n", hr); RELEASE: ref = IDirectInputDevice_Release(pJoystick); @@ -432,15 +412,14 @@ static void joystick_tests(DWORD version) trace("-- Testing Direct Input Version 0x%04x --\n", version); hr = DirectInputCreate(hInstance, version, &pDI, NULL); ok(hr==DI_OK||hr==DIERR_OLDDIRECTINPUTVERSION, - "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); + "DirectInputCreate() failed: %08x\n", hr); if (hr==DI_OK && pDI!=0) { UserData data; data.pDI = pDI; data.version = version; hr = IDirectInput_EnumDevices(pDI, DIDEVTYPE_JOYSTICK, EnumJoysticks, &data, DIEDFL_ALLDEVICES); - ok(hr==DI_OK,"IDirectInput_EnumDevices() failed: %s\n", - DXGetErrorString8(hr)); + ok(hr==DI_OK,"IDirectInput_EnumDevices() failed: %08x\n", hr); ref = IDirectInput_Release(pDI); ok(ref==0,"IDirectInput_Release() reference count = %d\n", ref); } else if (hr==DIERR_OLDDIRECTINPUTVERSION) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index baac4db7bc2..d427e6550c9 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -29,7 +29,6 @@ #include "windef.h" #include "wingdi.h" #include "dinput.h" -#include "dxerr8.h" #include "dinput_test.h" const char * get_file_version(const char * file_name) @@ -89,37 +88,37 @@ static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) df.rgodf = dodf; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); - ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); if (FAILED(hr)) return; hr = IDirectInputDevice_SetDataFormat(pKeyboard, &c_dfDIKeyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, NULL, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND); - ok(SUCCEEDED(hr), "IDirectInputDevice_SetCooperativeLevel() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetCooperativeLevel() failed: %08x\n", hr); hr = IDirectInputDevice_GetDeviceState(pKeyboard, 10, kbd_state); - ok(hr == DIERR_NOTACQUIRED, "IDirectInputDevice_GetDeviceState(10,) should have failed: %s\n", DXGetErrorString8(hr)); + ok(hr == DIERR_NOTACQUIRED, "IDirectInputDevice_GetDeviceState(10,) should have failed: %08x\n", hr); hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); - ok(hr == DIERR_NOTACQUIRED, "IDirectInputDevice_GetDeviceState() should have failed: %s\n", DXGetErrorString8(hr)); + ok(hr == DIERR_NOTACQUIRED, "IDirectInputDevice_GetDeviceState() should have failed: %08x\n", hr); hr = IDirectInputDevice_Unacquire(pKeyboard); - ok(hr == S_FALSE, "IDirectInputDevice_Unacquire() should have failed: %s\n", DXGetErrorString8(hr)); + ok(hr == S_FALSE, "IDirectInputDevice_Unacquire() should have failed: %08x\n", hr); hr = IDirectInputDevice_Acquire(pKeyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); hr = IDirectInputDevice_Acquire(pKeyboard); - ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have failed: %s\n", DXGetErrorString8(hr)); + ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have failed: %08x\n", hr); hr = IDirectInputDevice_GetDeviceState(pKeyboard, 10, kbd_state); - ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(10,) should have failed: %s\n", DXGetErrorString8(hr)); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(10,) should have failed: %08x\n", hr); hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); - ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %08x\n", hr); hr = IDirectInputDevice_Unacquire(pKeyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_Uncquire() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_Uncquire() failed: %08x\n", hr); hr = IDirectInputDevice_SetDataFormat( pKeyboard , &df ); - ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); hr = IDirectInputDevice_Acquire(pKeyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); - ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState(4,) failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState(4,) failed: %08x\n", hr); hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); - ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(256,) should have failed: %s\n", DXGetErrorString8(hr)); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(256,) should have failed: %08x\n", hr); if (pKeyboard) IUnknown_Release(pKeyboard); } @@ -143,18 +142,18 @@ static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) int i; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); - ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); if (FAILED(hr)) return; for (i=0; i<16; i++) { hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, NULL, i); - ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %s\n", i, DXGetErrorString8(hr)); + ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %08x\n", i, hr); } for (i=0; i<16; i++) { hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, hwnd, i); - ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %s\n", i, DXGetErrorString8(hr)); + ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); } if (pKeyboard) IUnknown_Release(pKeyboard); @@ -174,7 +173,7 @@ static void keyboard_tests(DWORD version) skip("Tests require a newer dinput version\n"); return; } - ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "DirectInputCreate() failed: %08x\n", hr); if (FAILED(hr)) return; hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 8860457b836..42e59827001 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -29,7 +29,6 @@ #include "windef.h" #include "wingdi.h" #include "dinput.h" -#include "dxerr8.h" #include "dinput_test.h" static const HRESULT SetCoop_null_window[16] = { @@ -51,18 +50,18 @@ static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) int i; hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); - ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); if (FAILED(hr)) return; for (i=0; i<16; i++) { hr = IDirectInputDevice_SetCooperativeLevel(pMouse, NULL, i); - ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %s\n", i, DXGetErrorString8(hr)); + ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %08x\n", i, hr); } for (i=0; i<16; i++) { hr = IDirectInputDevice_SetCooperativeLevel(pMouse, hwnd, i); - ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %s\n", i, DXGetErrorString8(hr)); + ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); } if (pMouse) IUnknown_Release(pMouse); @@ -75,36 +74,36 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) DIMOUSESTATE m_state; hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); - ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); if (FAILED(hr)) return; hr = IDirectInputDevice_SetCooperativeLevel(pMouse, hwnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND); - ok(hr == S_OK, "SetCooperativeLevel: %s\n", DXGetErrorString8(hr)); + ok(hr == S_OK, "SetCooperativeLevel: %08x\n", hr); hr = IDirectInputDevice_SetDataFormat(pMouse, &c_dfDIMouse); - ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); hr = IDirectInputDevice_Unacquire(pMouse); - ok(hr == S_FALSE, "IDirectInputDevice_Unacquire() should have failed: %s\n", DXGetErrorString8(hr)); + ok(hr == S_FALSE, "IDirectInputDevice_Unacquire() should have failed: %08x\n", hr); hr = IDirectInputDevice_Acquire(pMouse); - ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); hr = IDirectInputDevice_Acquire(pMouse); - ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have failed: %s\n", DXGetErrorString8(hr)); + ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have failed: %08x\n", hr); /* Foreground coop level requires window to have focus */ /* This should make dinput loose mouse input */ SetActiveWindow( 0 ); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); - ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %s\n", DXGetErrorString8(hr)); + ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr); /* Workaround so we can test other things. Remove when Wine is fixed */ IDirectInputDevice_Unacquire(pMouse); hr = IDirectInputDevice_Acquire(pMouse); - ok(hr == DIERR_OTHERAPPHASPRIO, "Acquire() should have failed: %s\n", DXGetErrorString8(hr)); + ok(hr == DIERR_OTHERAPPHASPRIO, "Acquire() should have failed: %08x\n", hr); SetActiveWindow( hwnd ); hr = IDirectInputDevice_Acquire(pMouse); - ok(hr == S_OK, "Acquire() failed: %s\n", DXGetErrorString8(hr)); + ok(hr == S_OK, "Acquire() failed: %08x\n", hr); if (pMouse) IUnknown_Release(pMouse); } @@ -123,7 +122,7 @@ static void mouse_tests(void) skip("Tests require a newer dinput version\n"); return; } - ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); + ok(SUCCEEDED(hr), "DirectInputCreate() failed: %08x\n", hr); if (FAILED(hr)) return; hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW,