October 2021 - Wine-Commits

Jacek Caban : win32u: Use syscall interface for brush functions.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: 33dddc84cf84f73d83635b3bb8cde105500c50e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33dddc84cf84f73d83635b3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 8 13:35:41 2021 +0200 win32u: Use syscall interface for brush functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/gdiobj.c | 4 --- dlls/win32u/syscall.c | 4 +++ dlls/win32u/win32u.spec | 8 ++--- dlls/win32u/win32u_private.h | 5 --- dlls/win32u/wrappers.c | 21 ------------ dlls/wow64win/Makefile.in | 1 + dlls/wow64win/gdi.c | 71 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.c | 7 ---- dlls/wow64win/syscall.h | 4 +++ dlls/wow64win/wow64win_private.h | 4 +++ 10 files changed, 88 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33dddc84cf84f73d8363…

1 0

Rémi Bernon : winebus.sys: Queue HID reports instead of overwritting the last one.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: c9003fab66dbe5311c81ab9198612d746f28f013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9003fab66dbe5311c81ab91… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 10:01:25 2021 +0200 winebus.sys: Queue HID reports instead of overwritting the last one. If the hidclass.sys read requests aren't done fast enough. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51824 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 100 ++++++++++++++++++------------------------------ 1 file changed, 38 insertions(+), 62 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 57a751655cc..16192977bef 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -54,6 +54,13 @@ static DEVICE_OBJECT *bus_fdo; static HANDLE driver_key; +struct hid_report +{ + struct list entry; + ULONG length; + BYTE buffer[1]; +}; + enum device_state { DEVICE_STATE_STOPPED, @@ -77,10 +84,7 @@ struct device_extension HIDP_DEVICE_DESC collection_desc; BYTE *last_reports[256]; - BYTE *last_report; - DWORD last_report_size; - BOOL last_report_read; - DWORD buffer_size; + struct list reports; IRP *pending_read; struct unix_device *unix_device; @@ -307,11 +311,8 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct uni ext->device = device; ext->desc = *desc; ext->index = get_device_index(desc); - ext->last_report = NULL; - ext->last_report_size = 0; - ext->last_report_read = TRUE; - ext->buffer_size = 0; ext->unix_device = unix_device; + list_init(&ext->reports); InitializeCriticalSection(&ext->cs); ext->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); @@ -397,63 +398,43 @@ static DWORD check_bus_option(const WCHAR *option, DWORD default_value) return default_value; } -static NTSTATUS deliver_last_report(struct device_extension *ext, DWORD buffer_length, BYTE* buffer, ULONG_PTR *out_length) +static BOOL deliver_next_report(struct device_extension *ext, IRP *irp) { - if (buffer_length < ext->last_report_size) - { - *out_length = 0; - return STATUS_BUFFER_TOO_SMALL; - } - else - { - if (ext->last_report) - memcpy(buffer, ext->last_report, ext->last_report_size); - *out_length = ext->last_report_size; - return STATUS_SUCCESS; - } + struct hid_report *report; + struct list *entry; + + if (!(entry = list_head(&ext->reports))) return FALSE; + report = LIST_ENTRY(entry, struct hid_report, entry); + list_remove(&report->entry); + + memcpy(irp->UserBuffer, report->buffer, report->length); + irp->IoStatus.Information = report->length; + irp->IoStatus.Status = STATUS_SUCCESS; + + RtlFreeHeap(GetProcessHeap(), 0, report); + return TRUE; } -static void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) +static void process_hid_report(DEVICE_OBJECT *device, BYTE *report_buf, DWORD report_len) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - IO_STACK_LOCATION *stack; - ULONG buffer_len; + ULONG size = offsetof(struct hid_report, buffer[report_len]); + struct hid_report *report; IRP *irp; - if (!length || !report) - return; + if (!(report = RtlAllocateHeap(GetProcessHeap(), 0, size))) return; + memcpy(report->buffer, report_buf, report_len); + report->length = report_len; RtlEnterCriticalSection(&ext->cs); - if (length > ext->buffer_size) - { - RtlFreeHeap(GetProcessHeap(), 0, ext->last_report); - ext->last_report = RtlAllocateHeap(GetProcessHeap(), 0, length); - if (!ext->last_report) - { - ERR_(hid_report)("Failed to alloc last report\n"); - ext->buffer_size = 0; - ext->last_report_size = 0; - ext->last_report_read = TRUE; - RtlLeaveCriticalSection(&ext->cs); - return; - } - else - ext->buffer_size = length; - } - - memcpy(ext->last_report, report, length); - ext->last_report_size = length; - ext->last_report_read = FALSE; + list_add_tail(&ext->reports, &report->entry); - if (!ext->collection_desc.ReportIDs[0].ReportID) memcpy(ext->last_reports[0], report, length); - else memcpy(ext->last_reports[report[0]], report, length); + if (!ext->collection_desc.ReportIDs[0].ReportID) memcpy(ext->last_reports[0], report_buf, report_len); + else memcpy(ext->last_reports[report_buf[0]], report_buf, report_len); if ((irp = pop_pending_read(ext))) { - stack = IoGetCurrentIrpStackLocation(irp); - buffer_len = stack->Parameters.DeviceIoControl.OutputBufferLength; - irp->IoStatus.Status = deliver_last_report(ext, buffer_len, irp->UserBuffer, &irp->IoStatus.Information); - ext->last_report_read = TRUE; + deliver_next_report(ext, irp); IoCompleteRequest(irp, IO_NO_INCREMENT); } RtlLeaveCriticalSection(&ext->cs); @@ -819,6 +800,7 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) struct device_extension *ext = device->DeviceExtension; NTSTATUS status = irp->IoStatus.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + struct hid_report *report, *next; HIDP_REPORT_IDS *reports; ULONG i, size; @@ -885,11 +867,12 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) ext->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&ext->cs); - RtlFreeHeap(GetProcessHeap(), 0, ext->last_report); - irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); + LIST_FOR_EACH_ENTRY_SAFE(report, next, &ext->reports, struct hid_report, entry) + RtlFreeHeap(GetProcessHeap(), 0, report); + reports = ext->collection_desc.ReportIDs; for (i = 0; i < ext->collection_desc.ReportIDsLength; ++i) { @@ -1046,14 +1029,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) } case IOCTL_HID_READ_REPORT: { - TRACE_(hid_report)("IOCTL_HID_READ_REPORT\n"); - if (!ext->last_report_read) - { - irp->IoStatus.Status = deliver_last_report(ext, - buffer_len, irp->UserBuffer, &irp->IoStatus.Information); - ext->last_report_read = TRUE; - } - else + if (!deliver_next_report(ext, irp)) { /* hidclass.sys should guarantee this */ assert(!ext->pending_read);

1 0

Rémi Bernon : dinput: Implement support for the PID effect set condition report.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

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 constant force output report.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

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 periodic report.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

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 Oct. 8, 2021

Oct. 8, 2021

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 Oct. 8, 2021

Oct. 8, 2021

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

Zebediah Figura : ws2_32: Close the new socket handle on CF_DEFER.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: 3d521bc7b9b8265b70206471cf5c9e40f791230f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d521bc7b9b8265b70206471… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 23:01:14 2021 -0500 ws2_32: Close the new socket handle on CF_DEFER. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9cbe7908226..b3dab22ae6e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3541,6 +3541,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen, status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_DEFER, &server_handle, sizeof(server_handle), NULL, 0 ); + closesocket( cs ); SetLastError( status ? RtlNtStatusToDosError( status ) : WSATRY_AGAIN ); return -1; }

1 0

Rémi Bernon : dinput8/tests: Add some DIEFT_CONDITION HID joystick effect tests.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

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

Zebediah Figura : server: Do not allocate a connect_req structure for nonblocking sockets (Valgrind).
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: 60dd202fbdcf5022a91720ac946531a2a0d12bf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60dd202fbdcf5022a91720ac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 23:01:12 2021 -0500 server: Do not allocate a connect_req structure for nonblocking sockets (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 7b00cb3f4f4..2b85b2889f0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2289,9 +2289,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (!send_len) return; } - if (!(req = mem_alloc( sizeof(*req) ))) - return; - sock->state = SOCK_CONNECTING; if (params->synchronous && sock->nonblocking) @@ -2301,6 +2298,9 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } + if (!(req = mem_alloc( sizeof(*req) ))) + return; + req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->sock = (struct sock *)grab_object( sock );

1 0