wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Rémi Bernon : dinput: Look for the PID set constant force output report.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: 25a86e46682ef0ae42e2f477e070e577605bc418 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25a86e46682ef0ae42e2f477… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 09:50:27 2021 +0200 dinput: Look for the PID set constant force output report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index d2fed77ef62..9369f3d8873 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -136,6 +136,13 @@ struct pid_set_condition struct hid_value_caps *dead_band_caps; }; +struct pid_set_constant_force +{ + BYTE id; + ULONG collection; + struct hid_value_caps *magnitude_caps; +}; + #define DEVICE_STATE_MAX_SIZE 1024 struct hid_joystick @@ -171,6 +178,7 @@ struct hid_joystick struct pid_set_periodic pid_set_periodic; struct pid_set_envelope pid_set_envelope; struct pid_set_condition pid_set_condition; + struct pid_set_constant_force pid_set_constant_force; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -191,6 +199,7 @@ struct hid_joystick_effect DWORD axes[6]; LONG directions[6]; + DICONSTANTFORCE constant_force; DICONDITION condition[2]; DIENVELOPE envelope; DIPERIODIC periodic; @@ -1910,6 +1919,7 @@ static BOOL init_data_format( struct hid_joystick *impl, struct hid_value_caps * static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { + struct pid_set_constant_force *set_constant_force = &impl->pid_set_constant_force; struct pid_control_report *device_control = &impl->pid_device_control; struct pid_control_report *effect_control = &impl->pid_effect_control; struct pid_effect_update *effect_update = &impl->pid_effect_update; @@ -1944,6 +1954,7 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps * case PID_USAGE_SET_PERIODIC_REPORT: SET_COLLECTION( set_periodic ); break; case PID_USAGE_SET_ENVELOPE_REPORT: SET_COLLECTION( set_envelope ); break; case PID_USAGE_SET_CONDITION_REPORT: SET_COLLECTION( set_condition ); break; + case PID_USAGE_SET_CONSTANT_FORCE_REPORT: SET_COLLECTION( set_constant_force ); break; case PID_USAGE_DEVICE_CONTROL: SET_SUB_COLLECTION( device_control, control_coll ); break; case PID_USAGE_EFFECT_OPERATION: SET_SUB_COLLECTION( effect_control, control_coll ); break; @@ -1965,6 +1976,7 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps * static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { + struct pid_set_constant_force *set_constant_force = &impl->pid_set_constant_force; struct pid_control_report *device_control = &impl->pid_device_control; struct pid_control_report *effect_control = &impl->pid_effect_control; struct pid_effect_update *effect_update = &impl->pid_effect_update; @@ -2111,6 +2123,16 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap set_condition->dead_band_caps = caps; } } + if (instance->wCollectionNumber == set_constant_force->collection) + { + SET_REPORT_ID( set_constant_force ); + if (instance->wUsage == PID_USAGE_MAGNITUDE) + { + caps->physical_min = -10000; + caps->physical_max = 10000; + set_constant_force->magnitude_caps = caps; + } + } #undef SET_REPORT_ID @@ -2220,6 +2242,8 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID TRACE( "set periodic id %u, coll %u\n", impl->pid_set_periodic.id, impl->pid_set_periodic.collection ); TRACE( "set envelope id %u, coll %u\n", impl->pid_set_envelope.id, impl->pid_set_envelope.collection ); TRACE( "set condition id %u, coll %u\n", impl->pid_set_condition.id, impl->pid_set_condition.collection ); + TRACE( "set constant force id %u, coll %u\n", impl->pid_set_constant_force.id, + impl->pid_set_constant_force.collection ); if (impl->pid_device_control.id) { @@ -2377,6 +2401,13 @@ static HRESULT WINAPI hid_joystick_effect_Initialize( IDirectInputEffect *iface, 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, + impl->type_specific_buf[0], report_len ); + if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; + status = HidP_InitializeReportForID( HidP_Output, joystick->pid_set_envelope.id, joystick->preparsed, + impl->type_specific_buf[1], report_len ); + if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; + break; case PID_USAGE_ET_RAMP: case PID_USAGE_ET_CUSTOM_FORCE_DATA: FIXME( "effect type %#x not implemented!\n", type ); @@ -2526,6 +2557,10 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa memcpy( params->lpvTypeSpecificParams, impl->condition, params->cbTypeSpecificParams ); break; case PID_USAGE_ET_CONSTANT_FORCE: + if (!params->lpvTypeSpecificParams) return E_POINTER; + if (params->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) return DIERR_INVALIDPARAM; + memcpy( params->lpvTypeSpecificParams, &impl->constant_force, sizeof(DICONSTANTFORCE) ); + break; case PID_USAGE_ET_RAMP: case PID_USAGE_ET_CUSTOM_FORCE_DATA: FIXME( "DIEP_TYPESPECIFICPARAMS not implemented!\n" ); @@ -2684,6 +2719,13 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa } break; case PID_USAGE_ET_CONSTANT_FORCE: + if (!params->lpvTypeSpecificParams) return E_POINTER; + if (params->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) return DIERR_INVALIDPARAM; + if (memcmp( &impl->constant_force, params->lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) )) + impl->modified = TRUE; + memcpy( &impl->constant_force, params->lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) ); + impl->params.cbTypeSpecificParams = sizeof(DICONSTANTFORCE); + break; case PID_USAGE_ET_RAMP: case PID_USAGE_ET_CUSTOM_FORCE_DATA: FIXME( "DIEP_TYPESPECIFICPARAMS not implemented!\n" ); @@ -2890,6 +2932,7 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) { static const DWORD complete_mask = DIEP_AXES | DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS; struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); + struct pid_set_constant_force *set_constant_force = &impl->joystick->pid_set_constant_force; struct pid_effect_update *effect_update = &impl->joystick->pid_effect_update; struct pid_set_condition *set_condition = &impl->joystick->pid_set_condition; struct pid_set_periodic *set_periodic = &impl->joystick->pid_set_periodic; @@ -2981,6 +3024,25 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) else hr = DIERR_INPUTLOST; } break; + case PID_USAGE_ET_CONSTANT_FORCE: + set_parameter_value( impl, impl->type_specific_buf[0], set_constant_force->magnitude_caps, + impl->constant_force.lMagnitude ); + + if (WriteFile( device, impl->type_specific_buf[0], report_len, NULL, NULL )) hr = DI_OK; + else hr = DIERR_INPUTLOST; + + set_parameter_value( impl, impl->type_specific_buf[1], set_envelope->attack_level_caps, + impl->envelope.dwAttackLevel ); + set_parameter_value_us( impl, impl->type_specific_buf[1], set_envelope->attack_time_caps, + impl->envelope.dwAttackTime ); + set_parameter_value( impl, impl->type_specific_buf[1], set_envelope->fade_level_caps, + impl->envelope.dwFadeLevel ); + set_parameter_value_us( impl, impl->type_specific_buf[1], set_envelope->fade_time_caps, + impl->envelope.dwFadeTime ); + + if (WriteFile( device, impl->type_specific_buf[1], report_len, NULL, NULL )) hr = DI_OK; + else hr = DIERR_INPUTLOST; + break; } set_parameter_value_us( impl, impl->effect_update_buf, effect_update->duration_caps,

1 0

Rémi Bernon : winebus.sys: Add a PID set constant force output report.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: 4a2db9f29e3957e94d1b409ac8a720c5b72b6852 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a2db9f29e3957e94d1b409a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 09:50:26 2021 +0200 winebus.sys: Add a PID set constant force output report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 15 ++++++++++- dlls/winebus.sys/bus_udev.c | 8 +++++- dlls/winebus.sys/hid.c | 56 +++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/unix_private.h | 7 ++++++ 4 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 36efd5cc850..14546467863 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -212,6 +212,7 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) if (impl->effect_support & SDL_HAPTIC_DAMPER) usages[count++] = PID_USAGE_ET_DAMPER; if (impl->effect_support & SDL_HAPTIC_INERTIA) usages[count++] = PID_USAGE_ET_INERTIA; if (impl->effect_support & SDL_HAPTIC_FRICTION) usages[count++] = PID_USAGE_ET_FRICTION; + if (impl->effect_support & SDL_HAPTIC_CONSTANT) usages[count++] = PID_USAGE_ET_CONSTANT_FORCE; if (!hid_device_add_physical(&impl->unix_device, usages, count)) return FALSE; @@ -594,8 +595,20 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT break; case PID_USAGE_ET_CONSTANT_FORCE: - FIXME("not implemented!"); + effect.constant.length = params->duration; + effect.constant.delay = params->start_delay; + effect.constant.button = params->trigger_button; + effect.constant.interval = params->trigger_repeat_interval; + effect.constant.direction.type = SDL_HAPTIC_SPHERICAL; + effect.constant.direction.dir[0] = params->direction[0] * 36000 / 256; + effect.constant.direction.dir[1] = params->direction[1] * 36000 / 256; + effect.constant.level = params->constant_force.magnitude; + effect.constant.attack_length = params->envelope.attack_time; + effect.constant.attack_level = params->envelope.attack_level; + effect.constant.fade_length = params->envelope.fade_time; + effect.constant.fade_level = params->envelope.fade_level; break; + case PID_USAGE_ET_RAMP: FIXME("not implemented!"); break; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 251c74574af..6067500117c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -676,6 +676,7 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d if (test_bit(ffbits, FF_DAMPER)) usages[count++] = PID_USAGE_ET_DAMPER; if (test_bit(ffbits, FF_INERTIA)) usages[count++] = PID_USAGE_ET_INERTIA; if (test_bit(ffbits, FF_FRICTION)) usages[count++] = PID_USAGE_ET_FRICTION; + if (test_bit(ffbits, FF_CONSTANT)) usages[count++] = PID_USAGE_ET_CONSTANT_FORCE; if (!hid_device_add_physical(iface, usages, count)) return STATUS_NO_MEMORY; @@ -1039,8 +1040,13 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B break; case PID_USAGE_ET_CONSTANT_FORCE: - FIXME("not implemented!"); + effect.u.constant.level = params->constant_force.magnitude; + effect.u.constant.envelope.attack_length = params->envelope.attack_time; + effect.u.constant.envelope.attack_level = params->envelope.attack_level; + effect.u.constant.envelope.fade_length = params->envelope.fade_time; + effect.u.constant.envelope.fade_level = params->envelope.fade_level; break; + case PID_USAGE_ET_RAMP: FIXME("not implemented!"); break; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 1cd9cf82d68..4c55367e78d 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -470,6 +470,13 @@ struct pid_set_condition BYTE negative_saturation; BYTE dead_band; }; + +struct pid_set_constant_force +{ + BYTE index; + UINT16 magnitude; +}; + #include "poppack.h" static BOOL hid_descriptor_add_set_periodic(struct unix_device *iface) @@ -635,6 +642,39 @@ static BOOL hid_descriptor_add_set_condition(struct unix_device *iface) return hid_report_descriptor_append(desc, template, sizeof(template)); } +static BOOL hid_descriptor_add_set_constant_force(struct unix_device *iface) +{ + struct hid_report_descriptor *desc = &iface->hid_report_descriptor; + const BYTE report_id = ++desc->next_report_id[HidP_Output]; + const BYTE template[] = + { + /* Constant Force Report Definition */ + USAGE(1, PID_USAGE_SET_CONSTANT_FORCE_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, report_id), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MAXIMUM(1, 0x7f), + LOGICAL_MINIMUM(1, 0x00), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_MAGNITUDE), + LOGICAL_MINIMUM(2, 0xff01), + LOGICAL_MAXIMUM(2, 0x00ff), + PHYSICAL_MINIMUM(2, -1000), + PHYSICAL_MAXIMUM(2, 1000), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + }; + + iface->hid_physical.set_constant_force_report = report_id; + return hid_report_descriptor_append(desc, template, sizeof(template)); +} + BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT count) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; @@ -788,6 +828,7 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co BOOL periodic = FALSE; BOOL envelope = FALSE; BOOL condition = FALSE; + BOOL constant_force = FALSE; ULONG i; if (!hid_report_descriptor_append(desc, device_control_header, sizeof(device_control_header))) @@ -833,6 +874,8 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co usages[i] == PID_USAGE_ET_INERTIA || usages[i] == PID_USAGE_ET_FRICTION) condition = TRUE; + if (usages[i] == PID_USAGE_ET_CONSTANT_FORCE) + envelope = constant_force = TRUE; } if (periodic && !hid_descriptor_add_set_periodic(iface)) @@ -841,6 +884,8 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co return FALSE; if (condition && !hid_descriptor_add_set_condition(iface)) return FALSE; + if (constant_force && !hid_descriptor_add_set_constant_force(iface)) + return FALSE; /* HID nary collection indexes start at 1 */ memcpy(iface->hid_physical.effect_types + 1, usages, count * sizeof(*usages)); @@ -1026,6 +1071,17 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC condition->dead_band = report->dead_band; } } + else if (packet->reportId == physical->set_constant_force_report) + { + struct pid_set_constant_force *report = (struct pid_set_constant_force *)(packet->reportBuffer + 1); + struct effect_params *params = iface->hid_physical.effect_params + report->index; + + io->Information = sizeof(*report) + 1; + if (packet->reportBufferLen < io->Information) + io->Status = STATUS_BUFFER_TOO_SMALL; + else + params->constant_force.magnitude = report->magnitude; + } else { io->Information = 0; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index f8c27a73b73..bd0e3272593 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -55,6 +55,11 @@ struct effect_condition BYTE dead_band; }; +struct effect_constant_force +{ + UINT16 magnitude; +}; + struct effect_params { USAGE effect_type; @@ -74,6 +79,7 @@ struct effect_params { struct effect_periodic periodic; struct effect_condition condition[2]; + struct effect_constant_force constant_force; }; }; @@ -149,6 +155,7 @@ struct hid_physical BYTE set_periodic_report; BYTE set_envelope_report; BYTE set_condition_report; + BYTE set_constant_force_report; }; struct hid_device_state

1 0

Rémi Bernon : dinput: Implement support for the PID effect set condition report.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: a971b48b323f7659f5b31a24d82dd61456a877ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=a971b48b323f7659f5b31a24… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 09:50:25 2021 +0200 dinput: Implement support for the PID effect set condition report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 148 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput8/tests/hid.c | 5 -- 2 files changed, 148 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a971b48b323f7659f5b3…

1 0

Rémi Bernon : winebus.sys: Add a PID set condition output report.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: c263fea14fa13273763a1518f48561157f30b880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c263fea14fa13273763a1518… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 09:50:24 2021 +0200 winebus.sys: Add a PID set condition output report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 30 +++++++++++++- dlls/winebus.sys/bus_udev.c | 23 ++++++++++- dlls/winebus.sys/hid.c | 91 +++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/unix_private.h | 13 ++++++ 4 files changed, 155 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c263fea14fa13273763a…

1 0

Rémi Bernon : dinput8/tests: Add some DIEFT_CONDITION HID joystick effect tests.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: d224e8e842b4512ed906ecb5e637093cc91d9e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d224e8e842b4512ed906ecb5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 09:50:23 2021 +0200 dinput8/tests: Add some DIEFT_CONDITION HID joystick effect 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 | 578 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 534 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d224e8e842b4512ed906…

1 0

Rémi Bernon : dinput: Implement support for the PID effect set envelope report.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: c8b3e9b26296f122c905fe6c946aea12a3a1754e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8b3e9b26296f122c905fe6c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 09:50:22 2021 +0200 dinput: Implement support for the PID effect set envelope report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 73 +++++++++++++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/hid.c | 2 -- 2 files changed, 72 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c8b3e9b26296f122c905…

1 0

Rémi Bernon : winebus.sys: Add a PID set envelope output report.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: 4b653ae0431a54ef51948745650d265846510894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b653ae0431a54ef51948745… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 09:50:21 2021 +0200 winebus.sys: Add a PID set envelope output report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 5 ++- dlls/winebus.sys/bus_udev.c | 5 ++- dlls/winebus.sys/hid.c | 79 ++++++++++++++++++++++++++++++++++++++++- dlls/winebus.sys/unix_private.h | 11 ++++++ 4 files changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 1bec3661757..78de600fda6 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -541,7 +541,6 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT case PID_USAGE_ET_TRIANGLE: case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_DOWN: - FIXME("periodic effect semi-stub!"); effect.periodic.length = params->duration; effect.periodic.delay = params->start_delay; effect.periodic.button = params->trigger_button; @@ -553,6 +552,10 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT effect.periodic.magnitude = params->periodic.magnitude * 128; effect.periodic.offset = params->periodic.offset; effect.periodic.phase = params->periodic.phase; + effect.periodic.attack_length = params->envelope.attack_time; + effect.periodic.attack_level = params->envelope.attack_level; + effect.periodic.fade_length = params->envelope.fade_time; + effect.periodic.fade_level = params->envelope.fade_level; break; case PID_USAGE_ET_SPRING: diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index e60891c2244..8a47b232148 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1000,11 +1000,14 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B case PID_USAGE_ET_TRIANGLE: case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_DOWN: - FIXME("periodic effect semi-stub!"); effect.u.periodic.period = params->periodic.period; effect.u.periodic.magnitude = params->periodic.magnitude * 128; effect.u.periodic.offset = params->periodic.offset; effect.u.periodic.phase = params->periodic.phase; + effect.u.periodic.envelope.attack_length = params->envelope.attack_time; + effect.u.periodic.envelope.attack_level = params->envelope.attack_level; + effect.u.periodic.envelope.fade_length = params->envelope.fade_time; + effect.u.periodic.envelope.fade_level = params->envelope.fade_level; break; case PID_USAGE_ET_SPRING: diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 10e9316eb6c..c25558a5ac4 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -449,6 +449,15 @@ struct pid_set_periodic BYTE phase; UINT16 period; }; + +struct pid_set_envelope +{ + BYTE index; + BYTE attack_level; + BYTE fade_level; + UINT16 attack_time; + UINT16 fade_time; +}; #include "poppack.h" static BOOL hid_descriptor_add_set_periodic(struct unix_device *iface) @@ -519,6 +528,55 @@ static BOOL hid_descriptor_add_set_periodic(struct unix_device *iface) return hid_report_descriptor_append(desc, template, sizeof(template)); } +static BOOL hid_descriptor_add_set_envelope(struct unix_device *iface) +{ + struct hid_report_descriptor *desc = &iface->hid_report_descriptor; + const BYTE report_id = ++desc->next_report_id[HidP_Output]; + const BYTE template[] = + { + /* Envelope Report Definition */ + USAGE(1, PID_USAGE_SET_ENVELOPE_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, report_id), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MAXIMUM(1, 0x7f), + LOGICAL_MINIMUM(1, 0x00), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_ATTACK_LEVEL), + USAGE(1, PID_USAGE_FADE_LEVEL), + LOGICAL_MINIMUM(1, 0x00), + LOGICAL_MAXIMUM(2, 0x00ff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 10000), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 2), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_ATTACK_TIME), + USAGE(1, PID_USAGE_FADE_TIME), + UNIT(2, 0x1003), /* Eng Lin:Time */ + UNIT_EXPONENT(1, -3), + LOGICAL_MINIMUM(1, 0x00), + LOGICAL_MAXIMUM(2, 0x7fff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 0x7fff), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 2), + OUTPUT(1, Data|Var|Abs), + PHYSICAL_MAXIMUM(1, 0), + UNIT_EXPONENT(1, 0), + UNIT(1, 0), + END_COLLECTION, + }; + + iface->hid_physical.set_envelope_report = report_id; + return hid_report_descriptor_append(desc, template, sizeof(template)); +} + BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT count) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; @@ -670,6 +728,7 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co END_COLLECTION, }; BOOL periodic = FALSE; + BOOL envelope = FALSE; ULONG i; if (!hid_report_descriptor_append(desc, device_control_header, sizeof(device_control_header))) @@ -709,11 +768,13 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co usages[i] == PID_USAGE_ET_TRIANGLE || usages[i] == PID_USAGE_ET_SAWTOOTH_UP || usages[i] == PID_USAGE_ET_SAWTOOTH_DOWN) - periodic = TRUE; + periodic = envelope = TRUE; } if (periodic && !hid_descriptor_add_set_periodic(iface)) return FALSE; + if (envelope && !hid_descriptor_add_set_envelope(iface)) + return FALSE; /* HID nary collection indexes start at 1 */ memcpy(iface->hid_physical.effect_types + 1, usages, count * sizeof(*usages)); @@ -858,6 +919,22 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC params->periodic.period = report->period; } } + else if (packet->reportId == physical->set_envelope_report) + { + struct pid_set_envelope *report = (struct pid_set_envelope *)(packet->reportBuffer + 1); + struct effect_params *params = iface->hid_physical.effect_params + report->index; + + io->Information = sizeof(*report) + 1; + if (packet->reportBufferLen < io->Information) + io->Status = STATUS_BUFFER_TOO_SMALL; + else + { + params->envelope.attack_level = report->attack_level; + params->envelope.fade_level = report->fade_level; + params->envelope.attack_time = report->attack_time; + params->envelope.fade_time = report->fade_time; + } + } else { io->Information = 0; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 5962de7fb10..71e6716c7fa 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -37,6 +37,14 @@ struct effect_periodic UINT16 period; }; +struct effect_envelope +{ + BYTE attack_level; + BYTE fade_level; + UINT16 attack_time; + UINT16 fade_time; +}; + struct effect_params { USAGE effect_type; @@ -49,6 +57,8 @@ struct effect_params BOOL axis_enabled[2]; BOOL direction_enabled; BYTE direction[2]; + /* only for periodic, constant or ramp forces */ + struct effect_envelope envelope; union { struct effect_periodic periodic; @@ -125,6 +135,7 @@ struct hid_physical BYTE effect_control_report; BYTE effect_update_report; BYTE set_periodic_report; + BYTE set_envelope_report; }; struct hid_device_state

1 0

Rémi Bernon : dinput: Implement support for the PID effect set periodic report.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: 1b3e6b0239779e1558389057999f36d09a477f82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b3e6b0239779e1558389057… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 09:50:20 2021 +0200 dinput: Implement support for the PID effect set periodic report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput8/tests/hid.c | 1 - 2 files changed, 101 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b3e6b0239779e155838…

1 0

Rémi Bernon : winebus.sys: Add a PID set periodic output report.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: 6f2e66963ca5e2780a664a7bbc962a08b77585d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f2e66963ca5e2780a664a7b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 09:50:19 2021 +0200 winebus.sys: Add a PID set periodic output report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 4 ++ dlls/winebus.sys/bus_udev.c | 4 ++ dlls/winebus.sys/hid.c | 107 ++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/unix_private.h | 13 +++++ 4 files changed, 128 insertions(+) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 4eab51b5cb2..1bec3661757 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -549,6 +549,10 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT effect.periodic.direction.type = SDL_HAPTIC_SPHERICAL; effect.periodic.direction.dir[0] = params->direction[0] * 36000 / 256; effect.periodic.direction.dir[1] = params->direction[1] * 36000 / 256; + effect.periodic.period = params->periodic.period; + effect.periodic.magnitude = params->periodic.magnitude * 128; + effect.periodic.offset = params->periodic.offset; + effect.periodic.phase = params->periodic.phase; break; case PID_USAGE_ET_SPRING: diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index f780aac2785..e60891c2244 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1001,6 +1001,10 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_DOWN: FIXME("periodic effect semi-stub!"); + effect.u.periodic.period = params->periodic.period; + effect.u.periodic.magnitude = params->periodic.magnitude * 128; + effect.u.periodic.offset = params->periodic.offset; + effect.u.periodic.phase = params->periodic.phase; break; case PID_USAGE_ET_SPRING: diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 72d358e6ad7..10e9316eb6c 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -440,8 +440,85 @@ struct pid_effect_update BYTE enable_bits; BYTE direction[2]; }; + +struct pid_set_periodic +{ + BYTE index; + BYTE magnitude; + BYTE offset; + BYTE phase; + UINT16 period; +}; #include "poppack.h" +static BOOL hid_descriptor_add_set_periodic(struct unix_device *iface) +{ + struct hid_report_descriptor *desc = &iface->hid_report_descriptor; + const BYTE report_id = ++desc->next_report_id[HidP_Output]; + const BYTE template[] = + { + /* Periodic Report Definition */ + USAGE(1, PID_USAGE_SET_PERIODIC_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, report_id), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MAXIMUM(1, 0x7f), + LOGICAL_MINIMUM(1, 0x00), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_MAGNITUDE), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x00ff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 10000), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_OFFSET), + LOGICAL_MINIMUM(1, 0x80), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(2, -10000), + PHYSICAL_MAXIMUM(2, 10000), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_PHASE), + UNIT(1, 0x14), /* Eng Rot:Angular Pos */ + UNIT_EXPONENT(1, -2), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0xff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(4, 36000), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_PERIOD), + UNIT(2, 0x1003), /* Eng Lin:Time */ + UNIT_EXPONENT(1, -3), /* 10^-3 */ + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x7fff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 0x7fff), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + PHYSICAL_MAXIMUM(1, 0), + UNIT_EXPONENT(1, 0), + UNIT(1, 0), /* None */ + END_COLLECTION, + }; + + iface->hid_physical.set_periodic_report = report_id; + return hid_report_descriptor_append(desc, template, sizeof(template)); +} + BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT count) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; @@ -592,6 +669,7 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co UNIT(1, 0), /* None */ END_COLLECTION, }; + BOOL periodic = FALSE; ULONG i; if (!hid_report_descriptor_append(desc, device_control_header, sizeof(device_control_header))) @@ -624,6 +702,19 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co if (!hid_report_descriptor_append(desc, effect_update_footer, sizeof(effect_update_footer))) return FALSE; + for (i = 0; i < count; ++i) + { + if (usages[i] == PID_USAGE_ET_SINE || + usages[i] == PID_USAGE_ET_SQUARE || + usages[i] == PID_USAGE_ET_TRIANGLE || + usages[i] == PID_USAGE_ET_SAWTOOTH_UP || + usages[i] == PID_USAGE_ET_SAWTOOTH_DOWN) + periodic = TRUE; + } + + if (periodic && !hid_descriptor_add_set_periodic(iface)) + return FALSE; + /* HID nary collection indexes start at 1 */ memcpy(iface->hid_physical.effect_types + 1, usages, count * sizeof(*usages)); @@ -751,6 +842,22 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); } } + else if (packet->reportId == physical->set_periodic_report) + { + struct pid_set_periodic *report = (struct pid_set_periodic *)(packet->reportBuffer + 1); + struct effect_params *params = iface->hid_physical.effect_params + report->index; + + io->Information = sizeof(*report) + 1; + if (packet->reportBufferLen < io->Information) + io->Status = STATUS_BUFFER_TOO_SMALL; + else + { + params->periodic.magnitude = report->magnitude; + params->periodic.offset = report->offset; + params->periodic.phase = report->phase; + params->periodic.period = report->period; + } + } else { io->Information = 0; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 125ee600eb6..5962de7fb10 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -29,6 +29,14 @@ #include "wine/list.h" +struct effect_periodic +{ + BYTE magnitude; + BYTE offset; + BYTE phase; + UINT16 period; +}; + struct effect_params { USAGE effect_type; @@ -41,6 +49,10 @@ struct effect_params BOOL axis_enabled[2]; BOOL direction_enabled; BYTE direction[2]; + union + { + struct effect_periodic periodic; + }; }; struct raw_device_vtbl @@ -112,6 +124,7 @@ struct hid_physical BYTE device_control_report; BYTE effect_control_report; BYTE effect_update_report; + BYTE set_periodic_report; }; struct hid_device_state

1 0

Dmitry Timoshkov : vcruntime140_1: Fix compilation with clang.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: b0a61ee8b0227056a57f7a3abbd4125940e144b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0a61ee8b0227056a57f7a3a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 8 10:22:58 2021 +0300 vcruntime140_1: Fix compilation with clang. clang -c -o dlls/vcruntime140_1/except_x86_64.cross.o ../wine.src/dlls/vcruntime140_1/except_x86_64.c -Idlls/vcruntime140_1 \ -I../wine.src/dlls/vcruntime140_1 -Iinclude -I../wine.src/include -I../wine.src/include/msvcrt \ -D__WINESRC__ -D_UCRT -DWINE_CROSS_PE -Wall -target x86_64-windows -fno-strict-aliasing \ -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Winit-self -Wno-pragma-pack \ -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith -Wabsolute-value \ -Wno-format -Wnonnull -mcx16 -gdwarf-2 -gstrict-dwarf -g -O2 In file included from ../wine.src/dlls/vcruntime140_1/except_x86_64.c:25: In file included from ../wine.src/include/wine/exception.h:25: ../wine.src/include/winternl.h:4239:82: error: unknown type name 'va_list' NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*); Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 039da37d598..f50847d886d 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -20,6 +20,7 @@ #ifdef __x86_64__ +#include <stdarg.h> #include <stdlib.h> #include "wine/exception.h"

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