November 2021 - Wine-commits

Paul Gofman : bcrypt: Validate secret size in BCryptGenerateSymmetricKey().
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 028837158a77bbe4c77e9e0ac0d439d25af53296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=028837158a77bbe4c77e9e0a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 12 17:09:46 2021 +0300 bcrypt: Validate secret size in BCryptGenerateSymmetricKey(). Fixes online connection error in Forza Horizon 5. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 22 +++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 19 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9e0d06e9cc7..542bd0756a0 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1521,9 +1521,10 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ UCHAR *object, ULONG object_len, UCHAR *secret, ULONG secret_len, ULONG flags ) { + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; struct algorithm *alg = algorithm; + ULONG block_size, size; struct key *key; - ULONG block_size; TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, secret, secret_len, flags ); @@ -1538,6 +1539,25 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!(block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; + if (!get_alg_property( alg, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size )) + { + if (secret_len > (size = key_lengths.dwMaxLength / 8)) + { + WARN( "secret_len %u exceeds key max length %u, setting to maximum.\n", secret_len, size ); + secret_len = size; + } + else if (secret_len < (size = key_lengths.dwMinLength / 8)) + { + WARN( "secret_len %u is less than minimum key length %u.\n", secret_len, size ); + return STATUS_INVALID_PARAMETER; + } + else if (key_lengths.dwIncrement && (secret_len * 8 - key_lengths.dwMinLength) % key_lengths.dwIncrement) + { + WARN( "secret_len %u is not a valid key length.\n", secret_len ); + return STATUS_INVALID_PARAMETER; + } + } + if (!(key = heap_alloc_zero( sizeof(*key) ))) return STATUS_NO_MEMORY; InitializeCriticalSection( &key->u.s.cs ); key->hdr.magic = MAGIC_KEY; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index fb5ac03b039..4dd0f4195aa 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -731,6 +731,17 @@ static void test_BCryptGenerateSymmetricKey(void) key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + + key = (BCRYPT_KEY_HANDLE)0xdeadbeef; + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, 1, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(key == (HANDLE)0xdeadbeef, "got unexpected key %p.\n", key); + + key = (BCRYPT_KEY_HANDLE)0xdeadbeef; + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret) + 1, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(key == (HANDLE)0xdeadbeef, "got unexpected key %p.\n", key); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); @@ -1101,8 +1112,16 @@ static void test_BCryptEncrypt(void) /* 256 bit key */ buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret256, sizeof(secret256), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* Key generations succeeds if the key size exceeds maximum and uses maximum key length + * from secret. */ + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret256, sizeof(secret256) + 1, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); size = 0; memcpy(ivbuf, iv, sizeof(iv));

1 0

Ivo Ivanov : dinput: Stop calling SendForceFeedbackCommand on device destroy.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: dbb735efd150f2e7834c07e7d65dbf697cbf9d42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb735efd150f2e7834c07e7… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:37 2021 +0100 dinput: Stop calling SendForceFeedbackCommand on device destroy. It is only relevant for FFB devices, and is already being called by hid_joystick_unacquire(). Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a0fc47ec05b..12670a46564 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -741,8 +741,6 @@ void dinput_device_destroy( IDirectInputDevice8W *iface ) TRACE( "iface %p.\n", iface ); IDirectInputDevice_Unacquire(iface); - /* Reset the FF state, free all effects, etc */ - IDirectInputDevice8_SendForceFeedbackCommand(iface, DISFFC_RESET); free( This->data_queue );

1 0

Ivo Ivanov : dinput: Unacquire device when last public reference is released.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 99fc12f9a337876e3ba916cd20a5ee242acb6fe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99fc12f9a337876e3ba916cd… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:38 2021 +0100 dinput: Unacquire device when last public reference is released. Avoid crashing in dinput_device_destroy, calling Unacquire while device resources may be already freed up. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 12670a46564..898b1d10ed0 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -740,8 +740,6 @@ void dinput_device_destroy( IDirectInputDevice8W *iface ) TRACE( "iface %p.\n", iface ); - IDirectInputDevice_Unacquire(iface); - free( This->data_queue ); /* Free data format */ @@ -768,6 +766,7 @@ static ULONG WINAPI dinput_device_Release( IDirectInputDevice8W *iface ) if (!ref) { + IDirectInputDevice_Unacquire( iface ); if (impl->vtbl->release) impl->vtbl->release( iface ); else dinput_device_destroy( iface ); }

1 0

Ivo Ivanov : dinput: Remove some extremely verbose traces, and fix typos.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: f2e3de00996670f560c9394def9ff56038b96099 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e3de00996670f560c9394d… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:39 2021 +0100 dinput: Remove some extremely verbose traces, and fix typos. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 +- dlls/dinput/joystick_hid.c | 34 ++-------------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 898b1d10ed0..b423337c9ce 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1480,7 +1480,7 @@ static HRESULT WINAPI dinput_device_SendForceFeedbackCommand( IDirectInputDevice struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); HRESULT hr; - TRACE( "iface %p, flags %x.\n", iface, command ); + TRACE( "iface %p, command %#x.\n", iface, command ); switch (command) { diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 5a3c46e2d9a..cb920adab06 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -52,25 +52,6 @@ DEFINE_GUID( GUID_DEVINTERFACE_WINEXINPUT,0x6c53d5fd,0x6480,0x440f,0xb6,0x18,0x4 DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); DEFINE_DEVPROPKEY( DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2 ); -static inline const char *debugstr_hid_value_caps( struct hid_value_caps *caps ) -{ - if (!caps) return "(null)"; - return wine_dbg_sprintf( "RId %d, Usg %02x:%02x-%02x Dat %02x-%02x, Str %d-%d, Des %d-%d, " - "Bits %02x Flags %#x, LCol %d LUsg %02x:%02x, BitSz %d, RCnt %d, Unit %x E%+d, Log %+d-%+d, Phy %+d-%+d", - caps->report_id, caps->usage_page, caps->usage_min, caps->usage_max, caps->data_index_min, caps->data_index_max, - caps->string_min, caps->string_max, caps->designator_min, caps->designator_max, caps->bit_field, caps->flags, - caps->link_collection, caps->link_usage_page, caps->link_usage, caps->bit_size, caps->report_count, - caps->units, caps->units_exp, caps->logical_min, caps->logical_max, caps->physical_min, caps->physical_max ); -} - -static inline const char *debugstr_hid_collection_node( struct hid_collection_node *node ) -{ - if (!node) return "(null)"; - return wine_dbg_sprintf( "Usg %02x:%02x, Parent %u, Next %u, NbChild %u, Child %u, Type %02x", - node->usage_page, node->usage, node->parent, node->next_sibling, - node->number_of_children, node->first_child, node->collection_type ); -} - struct extra_caps { LONG bit_size; @@ -418,15 +399,11 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, if (caps->usage_page == HID_USAGE_PAGE_PID) { - TRACE( "Ignoring input caps %s, PID specific.\n", debugstr_hid_value_caps( caps ) ); value_ofs += (caps->usage_max - caps->usage_min + 1) * sizeof(LONG); object += caps->usage_max - caps->usage_min + 1; } else if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) - { - TRACE( "Ignoring input value %s, vendor specific.\n", debugstr_hid_value_caps( caps ) ); value_ofs += (caps->usage_max - caps->usage_min + 1) * sizeof(LONG); - } else for (j = caps->usage_min; j <= caps->usage_max; ++j) { instance.dwOfs = value_ofs; @@ -498,15 +475,11 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, if (caps->usage_page == HID_USAGE_PAGE_PID) { - TRACE( "Ignoring input caps %s, PID specific.\n", debugstr_hid_value_caps( caps ) ); button_ofs += caps->usage_max - caps->usage_min + 1; object += caps->usage_max - caps->usage_min + 1; } else if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) - { - TRACE( "Ignoring input button %s, vendor specific.\n", debugstr_hid_value_caps( caps ) ); button_ofs += caps->usage_max - caps->usage_min + 1; - } else for (j = caps->usage_min; j <= caps->usage_max; ++j) { instance.dwOfs = button_ofs; @@ -538,7 +511,6 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) { - TRACE( "Ignoring output caps %s, vendor specific.\n", debugstr_hid_value_caps( caps ) ); if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) button_ofs += caps->usage_max - caps->usage_min + 1; else value_ofs += (caps->usage_max - caps->usage_min + 1) * sizeof(LONG); } @@ -593,9 +565,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, node != node_end; ++node) { if (!node->usage_page) continue; - if (node->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) - TRACE( "Ignoring collection %s, vendor specific.\n", debugstr_hid_collection_node( node ) ); - else + if (node->usage_page < HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) { instance.dwOfs = 0; instance.dwType = DIDFT_COLLECTION | DIDFT_MAKEINSTANCE( collection++ ) | DIDFT_NODATA; @@ -877,7 +847,7 @@ static HRESULT hid_joystick_get_effect_info( IDirectInputDevice8W *iface, DIEFFE usage, &button, &count, preparsed ); if (status != HIDP_STATUS_SUCCESS) { - WARN( "HidP_GetSpecificValueCaps %#x returned %#x\n", usage, status ); + WARN( "HidP_GetSpecificButtonCaps %#x returned %#x\n", usage, status ); return DIERR_DEVICENOTREG; } else if (!count)

1 0

Ivo Ivanov : dinput: Always return a valid string from effect_guid_to_string.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: eb2e52a9d5a244c8cb8d660815ea99565e33bd84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb2e52a9d5a244c8cb8d6608… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:40 2021 +0100 dinput: Always return a valid string from effect_guid_to_string. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index cb920adab06..fa3c01ec673 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -278,31 +278,19 @@ static inline const GUID *effect_usage_to_guid( USAGE usage ) static const WCHAR *effect_guid_to_string( const GUID *guid ) { - static const WCHAR guid_customforce_w[] = {'G','U','I','D','_','C','u','s','t','o','m','F','o','r','c','e',0}; - static const WCHAR guid_constantforce_w[] = {'G','U','I','D','_','C','o','n','s','t','a','n','t','F','o','r','c','e',0}; - static const WCHAR guid_rampforce_w[] = {'G','U','I','D','_','R','a','m','p','F','o','r','c','e',0}; - static const WCHAR guid_square_w[] = {'G','U','I','D','_','S','q','u','a','r','e',0}; - static const WCHAR guid_sine_w[] = {'G','U','I','D','_','S','i','n','e',0}; - static const WCHAR guid_triangle_w[] = {'G','U','I','D','_','T','r','i','a','n','g','l','e',0}; - static const WCHAR guid_sawtoothup_w[] = {'G','U','I','D','_','S','a','w','t','o','o','t','h','U','p',0}; - static const WCHAR guid_sawtoothdown_w[] = {'G','U','I','D','_','S','a','w','t','o','o','t','h','D','o','w','n',0}; - static const WCHAR guid_spring_w[] = {'G','U','I','D','_','S','p','r','i','n','g',0}; - static const WCHAR guid_damper_w[] = {'G','U','I','D','_','D','a','m','p','e','r',0}; - static const WCHAR guid_inertia_w[] = {'G','U','I','D','_','I','n','e','r','t','i','a',0}; - static const WCHAR guid_friction_w[] = {'G','U','I','D','_','F','r','i','c','t','i','o','n',0}; - if (IsEqualGUID( guid, &GUID_CustomForce )) return guid_customforce_w; - if (IsEqualGUID( guid, &GUID_ConstantForce )) return guid_constantforce_w; - if (IsEqualGUID( guid, &GUID_RampForce )) return guid_rampforce_w; - if (IsEqualGUID( guid, &GUID_Square )) return guid_square_w; - if (IsEqualGUID( guid, &GUID_Sine )) return guid_sine_w; - if (IsEqualGUID( guid, &GUID_Triangle )) return guid_triangle_w; - if (IsEqualGUID( guid, &GUID_SawtoothUp )) return guid_sawtoothup_w; - if (IsEqualGUID( guid, &GUID_SawtoothDown )) return guid_sawtoothdown_w; - if (IsEqualGUID( guid, &GUID_Spring )) return guid_spring_w; - if (IsEqualGUID( guid, &GUID_Damper )) return guid_damper_w; - if (IsEqualGUID( guid, &GUID_Inertia )) return guid_inertia_w; - if (IsEqualGUID( guid, &GUID_Friction )) return guid_friction_w; - return NULL; + if (IsEqualGUID( guid, &GUID_CustomForce )) return L"GUID_CustomForce"; + if (IsEqualGUID( guid, &GUID_ConstantForce )) return L"GUID_ConstantForce"; + if (IsEqualGUID( guid, &GUID_RampForce )) return L"GUID_RampForce"; + if (IsEqualGUID( guid, &GUID_Square )) return L"GUID_Square"; + if (IsEqualGUID( guid, &GUID_Sine )) return L"GUID_Sine"; + if (IsEqualGUID( guid, &GUID_Triangle )) return L"GUID_Triangle"; + if (IsEqualGUID( guid, &GUID_SawtoothUp )) return L"GUID_SawtoothUp"; + if (IsEqualGUID( guid, &GUID_SawtoothDown )) return L"GUID_SawtoothDown"; + if (IsEqualGUID( guid, &GUID_Spring )) return L"GUID_Spring"; + if (IsEqualGUID( guid, &GUID_Damper )) return L"GUID_Damper"; + if (IsEqualGUID( guid, &GUID_Inertia )) return L"GUID_Inertia"; + if (IsEqualGUID( guid, &GUID_Friction )) return L"GUID_Friction"; + return L"GUID_Unknown"; } static HRESULT find_next_effect_id( struct hid_joystick *impl, ULONG *index )

1 0

Ivo Ivanov : dinput: Fix HID joystick set_ramp_force end_caps lookup.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: fbd7356232c74b2193a5e2088356272e00b482b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbd7356232c74b2193a5e208… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:41 2021 +0100 dinput: Fix HID joystick set_ramp_force end_caps lookup. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index fa3c01ec673..b5b3c73d3de 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1679,7 +1679,7 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap { caps->physical_min = -10000; caps->physical_max = 10000; - set_ramp_force->start_caps = caps; + set_ramp_force->end_caps = caps; } }

1 0

Ivo Ivanov : dinput: Remove redundant check for DIEP_DIRECTION.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: f486811d5a92ee1c5ba5803afb2807431fa905c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f486811d5a92ee1c5ba5803a… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:42 2021 +0100 dinput: Remove redundant check for DIEP_DIRECTION. It is implied from the complete_mask check above. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index b5b3c73d3de..4fdf961a04d 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2698,24 +2698,21 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) set_parameter_value_us( impl, impl->effect_update_buf, effect_update->trigger_repeat_interval_caps, impl->params.dwTriggerRepeatInterval ); - if (impl->flags & DIEP_DIRECTION) - { - count = 1; - usage = PID_USAGE_DIRECTION_ENABLE; - status = HidP_SetUsages( HidP_Output, HID_USAGE_PAGE_PID, 0, &usage, &count, - impl->joystick->preparsed, impl->effect_update_buf, report_len ); - if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsages returned %#x\n", status ); + count = 1; + usage = PID_USAGE_DIRECTION_ENABLE; + status = HidP_SetUsages( HidP_Output, HID_USAGE_PAGE_PID, 0, &usage, &count, + impl->joystick->preparsed, impl->effect_update_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsages returned %#x\n", status ); - spherical.rglDirection = directions; - convert_directions_to_spherical( &impl->params, &spherical ); + spherical.rglDirection = directions; + convert_directions_to_spherical( &impl->params, &spherical ); - if (!effect_update->direction_count) WARN( "no PID effect direction caps found\n" ); - else for (i = 0; i < spherical.cAxes - 1; ++i) - { - tmp = directions[i] + (i == 0 ? 9000 : 0); - caps = effect_update->direction_caps[effect_update->direction_count - i - 1]; - set_parameter_value( impl, impl->effect_update_buf, caps, tmp % 36000 ); - } + if (!effect_update->direction_count) WARN( "no PID effect direction caps found\n" ); + else for (i = 0; i < spherical.cAxes - 1; ++i) + { + tmp = directions[i] + (i == 0 ? 9000 : 0); + caps = effect_update->direction_caps[effect_update->direction_count - i - 1]; + set_parameter_value( impl, impl->effect_update_buf, caps, tmp % 36000 ); } status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_TRIGGER_BUTTON,

1 0

Rémi Bernon : dinput: Support up to 6 effect conditions.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: ab4bed67750163d6a3c13e509fcde72312ed9c7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab4bed67750163d6a3c13e50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 12 09:49:43 2021 +0100 dinput: Support up to 6 effect conditions. As we support up to 6 force feedback axes and directions, the number of condition should match. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 4fdf961a04d..c49e840f845 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -188,7 +188,7 @@ struct hid_joystick_effect LONG directions[6]; DICONSTANTFORCE constant_force; DIRAMPFORCE ramp_force; - DICONDITION condition[2]; + DICONDITION condition[6]; DIENVELOPE envelope; DIPERIODIC periodic; DIEFFECT params; @@ -1878,6 +1878,9 @@ static HRESULT WINAPI hid_joystick_effect_Initialize( IDirectInputEffect *iface, joystick->preparsed, impl->effect_update_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; + impl->type_specific_buf[0][0] = 0; + impl->type_specific_buf[1][0] = 0; + switch (type) { case PID_USAGE_ET_SQUARE: @@ -1899,9 +1902,6 @@ static HRESULT WINAPI hid_joystick_effect_Initialize( IDirectInputEffect *iface, status = HidP_InitializeReportForID( HidP_Output, joystick->pid_set_condition.id, joystick->preparsed, impl->type_specific_buf[0], report_len ); if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; - status = HidP_InitializeReportForID( HidP_Output, joystick->pid_set_condition.id, joystick->preparsed, - impl->type_specific_buf[1], report_len ); - if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; break; case PID_USAGE_ET_CONSTANT_FORCE: status = HidP_InitializeReportForID( HidP_Output, joystick->pid_set_constant_force.id, joystick->preparsed, @@ -1921,8 +1921,6 @@ static HRESULT WINAPI hid_joystick_effect_Initialize( IDirectInputEffect *iface, break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: FIXME( "effect type %#x not implemented!\n", type ); - impl->type_specific_buf[0][0] = 0; - impl->type_specific_buf[1][0] = 0; break; } @@ -2626,22 +2624,22 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) case PID_USAGE_ET_DAMPER: case PID_USAGE_ET_INERTIA: case PID_USAGE_ET_FRICTION: - for (i = 0; i < min( 2, impl->params.cbTypeSpecificParams / sizeof(DICONDITION) ); ++i) + for (i = 0; i < impl->params.cbTypeSpecificParams / sizeof(DICONDITION); ++i) { - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->center_point_offset_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->center_point_offset_caps, impl->condition[i].lOffset ); - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->positive_coefficient_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->positive_coefficient_caps, impl->condition[i].lPositiveCoefficient ); - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->negative_coefficient_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->negative_coefficient_caps, impl->condition[i].lNegativeCoefficient ); - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->positive_saturation_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->positive_saturation_caps, impl->condition[i].dwPositiveSaturation ); - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->negative_saturation_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->negative_saturation_caps, impl->condition[i].dwNegativeSaturation ); - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->dead_band_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->dead_band_caps, impl->condition[i].lDeadBand ); - if (WriteFile( device, impl->type_specific_buf[i], report_len, NULL, NULL )) hr = DI_OK; + if (WriteFile( device, impl->type_specific_buf[0], report_len, NULL, NULL )) hr = DI_OK; else hr = DIERR_INPUTLOST; } break;

1 0

Ivo Ivanov : dinput: Set effect block index in the second type specific report.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 576bf9239f63fb61ecb04327808bb9753a5aeceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=576bf9239f63fb61ecb04327… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:44 2021 +0100 dinput: Set effect block index in the second type specific report. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index c49e840f845..500ae05d481 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2581,6 +2581,11 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) impl->index, impl->joystick->preparsed, impl->type_specific_buf[0], report_len ); if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsageValue returned %#x\n", status ); + if (!impl->type_specific_buf[1][0]) status = HIDP_STATUS_SUCCESS; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + impl->index, impl->joystick->preparsed, impl->type_specific_buf[1], report_len ); + if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsageValue returned %#x\n", status ); + status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, impl->index, impl->joystick->preparsed, impl->effect_update_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) hr = status;

1 0

Rémi Bernon : dinput: Use a specific buffer for set envelope output report.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 6501968dd8d5147124ecc6b5eeb802b89f7de7e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6501968dd8d5147124ecc6b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 12 09:49:45 2021 +0100 dinput: Use a specific buffer for set envelope output report. Instead of a generic type_specific_buf[1], and factor code for all effects that use an envelope. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 134 ++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6501968dd8d5147124ec…

1 0