wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Rémi Bernon : dinput: Fill the HID joystick object instance exponent and dimension.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 4ce7ae4af16bdf36c9ba82aa12e5e7ddd0b69cf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ce7ae4af16bdf36c9ba82aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:22:00 2021 +0200 dinput: Fill the HID joystick object instance exponent and dimension. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 10 ++++++++++ dlls/dinput8/tests/hid.c | 42 ------------------------------------------ 2 files changed, 10 insertions(+), 42 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 1c7c54e20c9..2ef01ac6ace 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -348,6 +348,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps->report_id; instance.wCollectionNumber = caps->link_collection; + instance.dwDimension = caps->units; + instance.wExponent = caps->units_exp; check_pid_effect_axis_caps( impl, &instance ); ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; @@ -384,6 +386,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps->report_id; instance.wCollectionNumber = caps->link_collection; + instance.dwDimension = caps->units; + instance.wExponent = caps->units_exp; ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; @@ -417,6 +421,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = GUID_Unknown; instance.wReportId = nary->report_id; instance.wCollectionNumber = nary->link_collection; + instance.dwDimension = caps->units; + instance.wExponent = caps->units_exp; ret = enum_object( impl, &filter, flags, callback, nary, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; @@ -434,6 +440,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = GUID_Unknown; instance.wReportId = caps->report_id; instance.wCollectionNumber = caps->link_collection; + instance.dwDimension = caps->units; + instance.wExponent = caps->units_exp; ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; @@ -458,6 +466,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = 0; instance.wCollectionNumber = node->parent; + instance.dwDimension = 0; + instance.wExponent = 0; ret = enum_object( impl, &filter, flags, callback, NULL, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index df0a07546fb..e55adb0aa56 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3292,18 +3292,11 @@ static BOOL CALLBACK find_test_device( const DIDEVICEINSTANCEW *devinst, void *c return DIENUM_CONTINUE; } -struct check_objects_todos -{ - BOOL dimension; - BOOL exponent; -}; - struct check_objects_params { UINT index; UINT expect_count; const DIDEVICEOBJECTINSTANCEW *expect_objs; - const struct check_objects_todos *todo_objs; }; static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *args ) @@ -3311,7 +3304,6 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar static const DIDEVICEOBJECTINSTANCEW unexpected_obj = {0}; struct check_objects_params *params = args; const DIDEVICEOBJECTINSTANCEW *exp = params->expect_objs + params->index; - const struct check_objects_todos *todo = params->todo_objs + params->index; winetest_push_context( "obj[%d]", params->index ); @@ -3330,9 +3322,7 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar check_member( *obj, *exp, "%u", wDesignatorIndex ); check_member( *obj, *exp, "%#04x", wUsagePage ); check_member( *obj, *exp, "%#04x", wUsage ); - todo_wine_if( todo->dimension ) check_member( *obj, *exp, "%#04x", dwDimension ); - todo_wine_if( todo->exponent ) check_member( *obj, *exp, "%#04x", wExponent ); check_member( *obj, *exp, "%u", wReportId ); @@ -3652,14 +3642,12 @@ static void test_simple_joystick(void) .wUsage = HID_USAGE_GENERIC_JOYSTICK, }, }; - const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] = {}; const DIEFFECTINFOW expect_effects[] = {}; struct check_objects_params check_objects_params = { .expect_count = ARRAY_SIZE(expect_objects), .expect_objs = expect_objects, - .todo_objs = objects_todos, }; struct check_effects_params check_effects_params = { @@ -6386,35 +6374,6 @@ static void test_force_feedback_joystick( void ) .wUsage = PID_USAGE_SET_ENVELOPE_REPORT, }, }; - const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] = - { - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {.dimension = TRUE, .exponent = TRUE}, - {.dimension = TRUE, .exponent = TRUE}, - {}, - {}, - {}, - {}, - {.dimension = TRUE, .exponent = TRUE}, - {.dimension = TRUE, .exponent = TRUE}, - }; const DIEFFECTINFOW expect_effects[] = { { @@ -6443,7 +6402,6 @@ static void test_force_feedback_joystick( void ) { .expect_count = ARRAY_SIZE(expect_objects), .expect_objs = expect_objects, - .todo_objs = objects_todos, }; struct check_effects_params check_effects_params = {

1 0

Rémi Bernon : dinput: Add DIDFT_FFEFFECTTRIGGER flag on trigger buttons.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 489c62f9ebe114e9abb718351d31fcdf74700d5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=489c62f9ebe114e9abb71835… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:59 2021 +0200 dinput: Add DIDFT_FFEFFECTTRIGGER flag on trigger buttons. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 9 ++++++++- dlls/dinput8/tests/hid.c | 8 ++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 846d4095391..1c7c54e20c9 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -285,7 +285,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, i, j; struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; - struct hid_value_caps *caps, *caps_end, *nary, *nary_end; + struct hid_value_caps *caps, *caps_end, *nary, *nary_end, *effect_caps; DIDATAFORMAT *format = impl->base.data_format.wine_df; int *offsets = impl->base.data_format.offsets; struct hid_collection_node *node, *node_end; @@ -356,6 +356,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, } } + effect_caps = impl->pid_effect_update.trigger_button_caps; + for (caps = HID_INPUT_VALUE_CAPS( preparsed ), caps_end = caps + preparsed->input_caps_count; caps != caps_end; ++caps) { @@ -372,6 +374,11 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.dwOfs = button_ofs; instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( button++ ); instance.dwFlags = 0; + if (effect_caps && effect_caps->logical_min <= j && effect_caps->logical_max >= j) + { + instance.dwType |= DIDFT_FFEFFECTTRIGGER; + instance.dwFlags |= DIDOI_FFEFFECTTRIGGER; + } instance.wUsagePage = caps->usage_page; instance.wUsage = j; instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index aad23ad4c61..df0a07546fb 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3294,8 +3294,6 @@ static BOOL CALLBACK find_test_device( const DIDEVICEINSTANCEW *devinst, void *c struct check_objects_todos { - BOOL type; - BOOL flags; BOOL dimension; BOOL exponent; }; @@ -3323,9 +3321,7 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar check_member( *obj, *exp, "%u", dwSize ); check_member_guid( *obj, *exp, guidType ); check_member( *obj, *exp, "%#x", dwOfs ); - todo_wine_if( todo->type ) check_member( *obj, *exp, "%#x", dwType ); - todo_wine_if( todo->flags ) check_member( *obj, *exp, "%#x", dwFlags ); if (!localized) todo_wine check_member_wstr( *obj, *exp, tszName ); check_member( *obj, *exp, "%u", dwFFMaxForce ); @@ -6395,8 +6391,8 @@ static void test_force_feedback_joystick( void ) {}, {}, {}, - {.type = TRUE, .flags = TRUE}, - {.type = TRUE, .flags = TRUE}, + {}, + {}, {}, {}, {},

1 0

Rémi Bernon : dinput: Add DIDFT_FFACTUATOR flag on PID effect axes.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 1285bbfa43c6db32dba3cafedb3bc3ca99046a85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1285bbfa43c6db32dba3cafe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:58 2021 +0200 dinput: Add DIDFT_FFACTUATOR flag on PID effect axes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 18 ++++++++++++++++++ dlls/dinput8/tests/hid.c | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 1a22c7c8baa..846d4095391 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -255,6 +255,23 @@ static BOOL enum_object( struct hid_joystick *impl, const DIPROPHEADER *filter, return DIENUM_CONTINUE; } +static void check_pid_effect_axis_caps( struct hid_joystick *impl, DIDEVICEOBJECTINSTANCEW *instance ) +{ + struct pid_effect_update *effect_update = &impl->pid_effect_update; + ULONG i; + + for (i = 0; i < effect_update->axis_count; ++i) + { + if (effect_update->axis_caps[i]->usage_page != instance->wUsagePage) continue; + if (effect_update->axis_caps[i]->usage_min > instance->wUsage) continue; + if (effect_update->axis_caps[i]->usage_max >= instance->wUsage) break; + } + + if (i == effect_update->axis_count) return; + instance->dwType |= DIDFT_FFACTUATOR; + instance->dwFlags |= DIDOI_FFACTUATOR; +} + static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD i, DWORD *count ) { if (!seen[i]) instance->dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( i ); @@ -331,6 +348,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps->report_id; instance.wCollectionNumber = caps->link_collection; + check_pid_effect_axis_caps( impl, &instance ); ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; value_ofs += sizeof(LONG); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 019e7b7ae87..aad23ad4c61 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -6392,9 +6392,9 @@ static void test_force_feedback_joystick( void ) }; const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] = { - {.type = TRUE, .flags = TRUE}, - {.type = TRUE, .flags = TRUE}, - {.type = TRUE, .flags = TRUE}, + {}, + {}, + {}, {.type = TRUE, .flags = TRUE}, {.type = TRUE, .flags = TRUE}, {},

1 0

Rémi Bernon : dinput8/tests: Add more force-feedback effects PID reports and caps.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: e9539722d1537b9fd35cae708f517c360cec9803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9539722d1537b9fd35cae70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:57 2021 +0200 dinput8/tests: Add more force-feedback effects PID reports and caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 227 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 208 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9539722d1537b9fd35c…

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputEffect_SetParameters tests.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 39763c8bfd728851e42329926fe8189590123f23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39763c8bfd728851e4232992… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:56 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputEffect_SetParameters tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 364 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 364 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39763c8bfd728851e423…

1 0

Rémi Bernon : dinput8/tests: Add Y and Z axes as force-feedback capable axes.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 02f9306f0b3aa14c05a1cd8d273223c9fa92e829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02f9306f0b3aa14c05a1cd8d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:55 2021 +0200 dinput8/tests: Add Y and Z axes as force-feedback capable axes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 110 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 75 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02f9306f0b3aa14c05a1…

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputEffect_GetParameters tests.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 7255718bb43f0e9f0e8d5c27c9e4f66457f09ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7255718bb43f0e9f0e8d5c27… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:54 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputEffect_GetParameters tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 192 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 6f97f17108f..f4f1a4d282b 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5096,10 +5096,29 @@ static BOOL test_device_types(void) static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) { + struct hid_expect expect_dc_reset = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 1, + .report_len = 2, + .report_buf = {1, 0x01}, + }; + static const DWORD expect_axes_init[2] = {0}; + static const DIEFFECT expect_desc_init = + { + .dwSize = sizeof(DIEFFECT), + .dwTriggerButton = -1, + .rgdwAxes = (void *)expect_axes_init, + }; struct check_created_effect_params check_params = {0}; IDirectInputEffect *effect; + DIPERIODIC periodic = {0}; + DIENVELOPE envelope = {0}; + LONG directions[4] = {0}; + DIEFFECT desc = {0}; + DWORD axes[4] = {0}; + ULONG ref, flags; HRESULT hr; - ULONG ref; GUID guid; hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, NULL, NULL ); @@ -5152,6 +5171,178 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ok( IsEqualGUID( &guid, &GUID_Square ), "got guid %s, expected %s\n", debugstr_guid( &guid ), debugstr_guid( &GUID_Square ) ); + hr = IDirectInputEffect_GetParameters( effect, NULL, 0 ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, NULL, DIEP_DURATION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, &desc, 0 ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + desc.dwSize = sizeof(DIEFFECT); + hr = IDirectInputEffect_GetParameters( effect, &desc, 0 ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DURATION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + desc.dwDuration = 0xdeadbeef; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DURATION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwDuration ); + memset( &desc, 0xcd, sizeof(desc) ); + desc.dwSize = sizeof(DIEFFECT); + desc.dwFlags = 0; + flags = DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_STARTDELAY | DIEP_TRIGGERREPEATINTERVAL; + hr = IDirectInputEffect_GetParameters( effect, &desc, flags ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwSamplePeriod ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwGain ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwStartDelay ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwTriggerRepeatInterval ); + + memset( &desc, 0xcd, sizeof(desc) ); + desc.dwSize = sizeof(DIEFFECT); + desc.dwFlags = 0; + desc.lpEnvelope = NULL; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ENVELOPE ); + todo_wine + ok( hr == E_POINTER, "GetParameters returned %#x\n", hr ); + desc.lpEnvelope = &envelope; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ENVELOPE ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + envelope.dwSize = sizeof(DIENVELOPE); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ENVELOPE ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + + desc.dwFlags = 0; + desc.cAxes = 0; + desc.rgdwAxes = NULL; + desc.rglDirection = NULL; + desc.lpEnvelope = NULL; + desc.cbTypeSpecificParams = 0; + desc.lpvTypeSpecificParams = NULL; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ALLPARAMS ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_TRIGGERBUTTON ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_AXES ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + desc.dwFlags = DIEFF_OBJECTOFFSETS; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_TRIGGERBUTTON ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%#x", dwTriggerButton ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_AXES ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + check_member( desc, expect_desc_init, "%u", cAxes ); + desc.dwFlags = DIEFF_OBJECTIDS; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_TRIGGERBUTTON ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%#x", dwTriggerButton ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_AXES ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + check_member( desc, expect_desc_init, "%u", cAxes ); + desc.dwFlags |= DIEFF_CARTESIAN; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + ok( desc.dwFlags == DIEFF_OBJECTIDS, "got flags %#x, expected %#x\n", desc.dwFlags, DIEFF_OBJECTIDS ); + desc.dwFlags |= DIEFF_POLAR; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + todo_wine + ok( desc.dwFlags == DIEFF_OBJECTIDS, "got flags %#x, expected %#x\n", desc.dwFlags, DIEFF_OBJECTIDS ); + desc.dwFlags |= DIEFF_SPHERICAL; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + check_member( desc, expect_desc_init, "%u", cAxes ); + todo_wine + ok( desc.dwFlags == DIEFF_OBJECTIDS, "got flags %#x, expected %#x\n", desc.dwFlags, DIEFF_OBJECTIDS ); + + desc.dwFlags |= DIEFF_SPHERICAL; + desc.cAxes = 2; + desc.rgdwAxes = axes; + desc.rglDirection = directions; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_AXES | DIEP_DIRECTION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%u", cAxes ); + check_member( desc, expect_desc_init, "%u", rgdwAxes[0] ); + check_member( desc, expect_desc_init, "%u", rgdwAxes[1] ); + todo_wine + check_member( desc, expect_desc_init, "%p", rglDirection ); + todo_wine + ok( desc.dwFlags == DIEFF_OBJECTIDS, "got flags %#x, expected %#x\n", desc.dwFlags, DIEFF_OBJECTIDS ); + + desc.dwFlags |= DIEFF_SPHERICAL; + desc.lpEnvelope = &envelope; + desc.cbTypeSpecificParams = sizeof(periodic); + desc.lpvTypeSpecificParams = &periodic; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ALLPARAMS ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwDuration ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwSamplePeriod ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwGain ); + todo_wine + check_member( desc, expect_desc_init, "%#x", dwTriggerButton ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwTriggerRepeatInterval ); + todo_wine + check_member( desc, expect_desc_init, "%u", cAxes ); + check_member( desc, expect_desc_init, "%u", rgdwAxes[0] ); + check_member( desc, expect_desc_init, "%u", rgdwAxes[1] ); + todo_wine + check_member( desc, expect_desc_init, "%p", rglDirection ); + todo_wine + check_member( desc, expect_desc_init, "%p", lpEnvelope ); + todo_wine + check_member( desc, expect_desc_init, "%u", cbTypeSpecificParams ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwStartDelay ); + ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); }

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputEffect_Initialize tests.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: d86451aaee72b5f58cfbef9a12f5439dfd34ea0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86451aaee72b5f58cfbef9a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:53 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputEffect_Initialize tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 76 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 71159fb66be..6f97f17108f 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5100,6 +5100,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) IDirectInputEffect *effect; HRESULT hr; ULONG ref; + GUID guid; hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, NULL, NULL ); ok( hr == E_POINTER, "CreateEffect returned %#x\n", hr ); @@ -5123,6 +5124,34 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ok( hr == DI_OK, "EnumCreatedEffectObjects returned %#x\n", hr ); ok( check_params.count == 1, "got count %u, expected 1\n", check_params.count ); + hr = IDirectInputEffect_Initialize( effect, NULL, DIRECTINPUT_VERSION, &GUID_Sine ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr ); + hr = IDirectInputEffect_Initialize( effect, instance, 0, &GUID_Sine ); + todo_wine + ok( hr == DIERR_NOTINITIALIZED, "Initialize returned %#x\n", hr ); + hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, NULL ); + todo_wine + ok( hr == E_POINTER, "Initialize returned %#x\n", hr ); + + hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, &GUID_NULL ); + todo_wine + ok( hr == DIERR_DEVICENOTREG, "Initialize returned %#x\n", hr ); + hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, &GUID_Sine ); + ok( hr == DI_OK, "Initialize returned %#x\n", hr ); + hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, &GUID_Square ); + ok( hr == DI_OK, "Initialize returned %#x\n", hr ); + + hr = IDirectInputEffect_GetEffectGuid( effect, NULL ); + todo_wine + ok( hr == E_POINTER, "GetEffectGuid returned %#x\n", hr ); + hr = IDirectInputEffect_GetEffectGuid( effect, &guid ); + todo_wine + ok( hr == DI_OK, "GetEffectGuid returned %#x\n", hr ); + todo_wine + ok( IsEqualGUID( &guid, &GUID_Square ), "got guid %s, expected %s\n", debugstr_guid( &guid ), + debugstr_guid( &GUID_Square ) ); + ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); } @@ -5238,11 +5267,12 @@ static void test_force_feedback_joystick( void ) USAGE(1, PID_USAGE_EFFECT_TYPE), COLLECTION(1, NamedArray), + USAGE(1, PID_USAGE_ET_SQUARE), USAGE(1, PID_USAGE_ET_SINE), LOGICAL_MINIMUM(1, 1), - LOGICAL_MAXIMUM(1, 1), + LOGICAL_MAXIMUM(1, 2), PHYSICAL_MINIMUM(1, 1), - PHYSICAL_MAXIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 2), REPORT_SIZE(1, 8), REPORT_COUNT(1, 1), OUTPUT(1, Data|Ary|Abs), @@ -5459,10 +5489,10 @@ static void test_force_feedback_joystick( void ) .dwOfs = 0x1e, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(11)|DIDFT_OUTPUT, .dwFlags = 0x80008000, - .tszName = L"ET Sine", + .tszName = L"ET Square", .wCollectionNumber = 8, .wUsagePage = HID_USAGE_PAGE_PID, - .wUsage = PID_USAGE_ET_SINE, + .wUsage = PID_USAGE_ET_SQUARE, .wReportId = 3, }, { @@ -5471,6 +5501,18 @@ static void test_force_feedback_joystick( void ) .dwOfs = 0x1f, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(12)|DIDFT_OUTPUT, .dwFlags = 0x80008000, + .tszName = L"ET Sine", + .wCollectionNumber = 8, + .wUsagePage = HID_USAGE_PAGE_PID, + .wUsage = PID_USAGE_ET_SINE, + .wReportId = 3, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwOfs = 0x20, + .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(13)|DIDFT_OUTPUT, + .dwFlags = 0x80008000, .tszName = L"X Axis", .wCollectionNumber = 9, .wUsagePage = HID_USAGE_PAGE_GENERIC, @@ -5480,8 +5522,8 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x20, - .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(13)|DIDFT_OUTPUT, + .dwOfs = 0x21, + .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(14)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Direction Enable", .wCollectionNumber = 7, @@ -5493,7 +5535,7 @@ static void test_force_feedback_joystick( void ) .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, .dwOfs = 0x14, - .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(14)|DIDFT_OUTPUT, + .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(15)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Magnitude", .wCollectionNumber = 10, @@ -5603,6 +5645,14 @@ static void test_force_feedback_joystick( void ) }; const DIEFFECTINFOW expect_effects[] = { + { + .dwSize = sizeof(DIEFFECTINFOW), + .guid = GUID_Square, + .dwEffType = DIEFT_PERIODIC, + .dwStaticParams = DIEP_AXES | DIEP_TYPESPECIFICPARAMS, + .dwDynamicParams = DIEP_AXES | DIEP_TYPESPECIFICPARAMS, + .tszName = L"GUID_Square", + }, { .dwSize = sizeof(DIEFFECTINFOW), .guid = GUID_Sine, @@ -5735,7 +5785,7 @@ static void test_force_feedback_joystick( void ) res = 0; hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, DIEFT_PERIODIC ); ok( hr == DI_OK, "EnumEffects returned %#x\n", hr ); - ok( res == 1, "got %u expected %u\n", res, 1 ); + ok( res == 2, "got %u expected %u\n", res, 2 ); hr = IDirectInputDevice8_EnumEffects( device, check_effects, &check_effects_params, DIEFT_ALL ); ok( hr == DI_OK, "EnumEffects returned %#x\n", hr ); ok( check_effects_params.index >= check_effects_params.expect_count, "missing %u effects\n", @@ -5744,11 +5794,11 @@ static void test_force_feedback_joystick( void ) effectinfo.dwSize = sizeof(DIEFFECTINFOW); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); ok( hr == DI_OK, "GetEffectInfo returned %#x\n", hr ); - check_member_guid( effectinfo, expect_effects[0], guid ); - check_member( effectinfo, expect_effects[0], "%#x", dwEffType ); - check_member( effectinfo, expect_effects[0], "%#x", dwStaticParams ); - check_member( effectinfo, expect_effects[0], "%#x", dwDynamicParams ); - check_member_wstr( effectinfo, expect_effects[0], tszName ); + check_member_guid( effectinfo, expect_effects[1], guid ); + check_member( effectinfo, expect_effects[1], "%#x", dwEffType ); + check_member( effectinfo, expect_effects[1], "%#x", dwStaticParams ); + check_member( effectinfo, expect_effects[1], "%#x", dwDynamicParams ); + check_member_wstr( effectinfo, expect_effects[1], tszName ); hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr );

1 0

Rémi Bernon : dinput8/tests: Reduce pnp_driver_start todo_wine verbosity.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 3864c98f1e0b0733bece31d2fc3e105b4b8817a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3864c98f1e0b0733bece31d2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:52 2021 +0200 dinput8/tests: Reduce pnp_driver_start todo_wine verbosity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51784 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 466331b326b..71159fb66be 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -499,11 +499,15 @@ static BOOL pnp_driver_start( const WCHAR *resource ) WCHAR path[MAX_PATH], filename[MAX_PATH]; SC_HANDLE manager, service; const CERT_CONTEXT *cert; + int old_mute_threshold; BOOL ret, need_reboot; HANDLE catalog; HDEVINFO set; FILE *f; + old_mute_threshold = winetest_mute_threshold; + winetest_mute_threshold = 1; + load_resource( resource, filename ); ret = MoveFileExW( filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING ); ok( ret, "failed to move file, error %u\n", GetLastError() ); @@ -536,6 +540,7 @@ static BOOL pnp_driver_start( const WCHAR *resource ) ok( ret, "Failed to delete file, error %u\n", GetLastError() ); ret = DeleteFileW( L"winetest.sys" ); ok( ret, "Failed to delete file, error %u\n", GetLastError() ); + winetest_mute_threshold = old_mute_threshold; return FALSE; } @@ -584,6 +589,8 @@ static BOOL pnp_driver_start( const WCHAR *resource ) CloseServiceHandle( service ); CloseServiceHandle( manager ); + + winetest_mute_threshold = old_mute_threshold; return ret || GetLastError() == ERROR_SERVICE_ALREADY_RUNNING; }

1 0

Rémi Bernon : dinput8/tests: Reduce test output verbosity.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 34b378fa9a9830183d5c48299d8f0a17939e2a18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34b378fa9a9830183d5c4829… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:51 2021 +0200 dinput8/tests: Reduce test output verbosity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51784 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 498 +++++++++++++++++++++++------------------------ 1 file changed, 249 insertions(+), 249 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34b378fa9a9830183d5c…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021