From: Tomasz Pakuła tomasz.pakula.oficjalny@gmail.com
--- dlls/dinput/tests/force_feedback.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 7d38cd92541..f77b354a803 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -3659,7 +3659,7 @@ done: return device != NULL; }
-static void test_condition_effect_six_axes( IDirectInputDevice8W *device, HANDLE file, DWORD version ) +static void test_condition_effect_six_axes( IDirectInputDevice8W *device, HANDLE file ) { struct hid_expect expect_create[] = { @@ -3718,7 +3718,7 @@ static void test_condition_effect_six_axes( IDirectInputDevice8W *device, HANDLE }; const DIEFFECT expect_desc = { - .dwSize = version >= 0x700 ? sizeof(DIEFFECT_DX6) : sizeof(DIEFFECT_DX5), + .dwSize = sizeof(DIEFFECT_DX6), .dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTIDS, .dwDuration = 1000, .dwGain = 3000, @@ -3738,7 +3738,7 @@ static void test_condition_effect_six_axes( IDirectInputDevice8W *device, HANDLE DWORD axes[2] = {0}; DIEFFECT desc = { - .dwSize = version >= 0x700 ? sizeof(DIEFFECT_DX6) : sizeof(DIEFFECT_DX5), + .dwSize = sizeof(DIEFFECT_DX6), .dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTIDS, .cAxes = 2, .rgdwAxes = axes, @@ -3766,7 +3766,7 @@ static void test_condition_effect_six_axes( IDirectInputDevice8W *device, HANDLE ok( IsEqualGUID( &guid, &GUID_Spring ), "got guid %s, expected %s\n", debugstr_guid( &guid ), debugstr_guid( &GUID_Spring ) );
- hr = IDirectInputEffect_GetParameters( effect, &desc, version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5 ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ALLPARAMS); ok( hr == DI_OK, "GetParameters returned %#lx\n", hr ); check_member( desc, expect_desc, "%lu", cAxes ); check_member( desc, expect_desc, "%#lx", rgdwAxes[0] ); @@ -3780,7 +3780,7 @@ static void test_condition_effect_six_axes( IDirectInputDevice8W *device, HANDLE }
/* Test if we're getting just one axis in effects */ -static BOOL test_force_feedback_six_axes( DWORD version ) +static BOOL test_force_feedback_six_axes() { #include "psh_hid_macros.h" const unsigned char report_descriptor[] = @@ -4171,8 +4171,7 @@ static BOOL test_force_feedback_six_axes( DWORD version ) .dwSize = sizeof(DIDEVCAPS), .dwFlags = DIDC_FORCEFEEDBACK | DIDC_ATTACHED | DIDC_EMULATED | DIDC_STARTDELAY | DIDC_FFFADE | DIDC_FFATTACK | DIDC_DEADBAND | DIDC_SATURATION, - .dwDevType = version >= 0x800 ? DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK - : DIDEVTYPE_HID | (DIDEVTYPEJOYSTICK_UNKNOWN << 8) | DIDEVTYPE_JOYSTICK, + .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK .dwAxes = 6, .dwButtons = 2, .dwFFSamplePeriod = 1000000, @@ -4185,8 +4184,7 @@ static BOOL test_force_feedback_six_axes( DWORD version ) .dwSize = sizeof(DIDEVICEINSTANCEW), .guidInstance = expect_guid_product, .guidProduct = expect_guid_product, - .dwDevType = version >= 0x800 ? DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK - : DIDEVTYPE_HID | (DIDEVTYPEJOYSTICK_UNKNOWN << 8) | DIDEVTYPE_JOYSTICK, + .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK .tszInstanceName = L"Wine Test", .tszProductName = L"Wine Test", .guidFFDriver = IID_IDirectInputPIDDriver, @@ -7867,9 +7865,7 @@ START_TEST( force_feedback ) test_device_managed_effect(); test_windows_gaming_input();
- test_force_feedback_six_axes( 0x800 ); - test_force_feedback_six_axes( 0x500 ); - test_force_feedback_six_axes( 0x700 ); + test_force_feedback_six_axes(); }
done: