wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Huw Davies : winebus.sys: Convert the product strings to Unicode on the Unix-side.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 43cd5d8a2d54fe6dc5f4c21e9e9e57b2c0ed255b URL: https://source.winehq.org/git/wine.git/?a=commit;h=43cd5d8a2d54fe6dc5f4c21e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 5 09:55:50 2021 +0100 winebus.sys: Convert the product strings to Unicode on the Unix-side. This avoids keeping two copies of each string. It also fixes a regression on macOS from commit 9d4b70473c147b that incorrectly treated a CFStringRef as a char ptr. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 17 ++++++++++++----- dlls/winebus.sys/bus_sdl.c | 15 ++++++++++----- dlls/winebus.sys/bus_udev.c | 38 +++++++++++++++++++++++++------------- dlls/winebus.sys/main.c | 24 ++++++++---------------- dlls/winebus.sys/unixlib.c | 12 ++++++------ dlls/winebus.sys/unixlib.h | 6 +++--- 6 files changed, 64 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43cd5d8a2d54fe6dc5f4…

1 0

Rémi Bernon : hidclass.sys: Add Sony controllers product string overrides.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: e9178864a7658471147c2ea71a7863c576a8eeac URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9178864a7658471147c2ea7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 09:11:55 2021 +0200 hidclass.sys: Add Sony controllers product string overrides. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 80cbcdae59a..29b9215aa22 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -412,6 +412,7 @@ struct device_strings static const struct device_strings device_strings[] = { + /* Microsoft controllers */ { .id = L"VID_045E&PID_028E", .product = L"Controller (XBOX 360 For Windows)" }, { .id = L"VID_045E&PID_028F", .product = L"Controller (XBOX 360 For Windows)" }, { .id = L"VID_045E&PID_02D1", .product = L"Controller (Xbox One For Windows)" }, @@ -424,6 +425,11 @@ static const struct device_strings device_strings[] = { .id = L"VID_045E&PID_0B05", .product = L"Controller (Xbox One For Windows)" }, { .id = L"VID_045E&PID_0B12", .product = L"Controller (Xbox One For Windows)" }, { .id = L"VID_045E&PID_0B13", .product = L"Controller (Xbox One For Windows)" }, + /* Sony controllers */ + { .id = L"VID_054C&PID_05C4", .product = L"Wireless Controller" }, + { .id = L"VID_054C&PID_09CC", .product = L"Wireless Controller" }, + { .id = L"VID_054C&PID_0BA0", .product = L"Wireless Controller" }, + { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, }; static const WCHAR *find_product_string( const WCHAR *device_id )

1 0

Rémi Bernon : hidclass.sys: Move product string overrides from winexinput.sys.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 60ef452922ddae15007764ae6450590d1abee6fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=60ef452922ddae15007764ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 09:11:54 2021 +0200 hidclass.sys: Move product string overrides from winexinput.sys. Some games expect the DS4 gamepads to be named like native drivers, and they aren't detected xinput-compatible when access through hidraw, so it's not possible to override their product string in winexinput.sys. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 52 ++++++++++++++++++++++++++++++++++++-- dlls/winexinput.sys/main.c | 63 ---------------------------------------------- 2 files changed, 50 insertions(+), 65 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 2e618df2927..80cbcdae59a 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -404,14 +404,62 @@ static void handle_IOCTL_HID_GET_COLLECTION_DESCRIPTOR( IRP *irp, BASE_DEVICE_EX } } +struct device_strings +{ + const WCHAR *id; + const WCHAR *product; +}; + +static const struct device_strings device_strings[] = +{ + { .id = L"VID_045E&PID_028E", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_028F", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_02D1", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02DD", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02E3", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02EA", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02FD", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_0719", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_0B00", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_0B05", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_0B12", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_0B13", .product = L"Controller (Xbox One For Windows)" }, +}; + +static const WCHAR *find_product_string( const WCHAR *device_id ) +{ + const WCHAR *match_id = wcsrchr( device_id, '\\' ) + 1; + DWORD i; + + for (i = 0; i < ARRAY_SIZE(device_strings); ++i) + if (!wcsnicmp( device_strings[i].id, match_id, 17 )) + return device_strings[i].product; + + return NULL; +} + static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, ULONG index ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); WCHAR *output_buf = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); ULONG output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; + const WCHAR *str = NULL; - call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ), - sizeof(index), output_buf, output_len, &irp->IoStatus ); + if (index == HID_STRING_ID_IPRODUCT) str = find_product_string( ext->device_id ); + + if (!str) call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ), + sizeof(index), output_buf, output_len, &irp->IoStatus ); + else + { + irp->IoStatus.Information = (wcslen( str ) + 1) * sizeof(WCHAR); + if (irp->IoStatus.Information > output_len) + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + else + { + memcpy( output_buf, str, irp->IoStatus.Information ); + irp->IoStatus.Status = STATUS_SUCCESS; + } + } } static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 8ea9e160fc9..d9a6fd5dd70 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -315,80 +315,17 @@ static NTSTATUS try_complete_pending_read(DEVICE_OBJECT *device, IRP *irp) return IoCallDriver(fdo->bus_device, xinput_irp); } -struct device_strings -{ - const WCHAR *id; - const WCHAR *product; -}; - -static const struct device_strings device_strings[] = -{ - { .id = L"VID_045E&PID_028E", .product = L"Controller (XBOX 360 For Windows)" }, - { .id = L"VID_045E&PID_028F", .product = L"Controller (XBOX 360 For Windows)" }, - { .id = L"VID_045E&PID_02D1", .product = L"Controller (Xbox One For Windows)" }, - { .id = L"VID_045E&PID_02DD", .product = L"Controller (Xbox One For Windows)" }, - { .id = L"VID_045E&PID_02E3", .product = L"Controller (Xbox One For Windows)" }, - { .id = L"VID_045E&PID_02EA", .product = L"Controller (Xbox One For Windows)" }, - { .id = L"VID_045E&PID_02FD", .product = L"Controller (Xbox One For Windows)" }, - { .id = L"VID_045E&PID_0719", .product = L"Controller (XBOX 360 For Windows)" }, - { .id = L"VID_045E&PID_0B00", .product = L"Controller (Xbox One For Windows)" }, - { .id = L"VID_045E&PID_0B05", .product = L"Controller (Xbox One For Windows)" }, - { .id = L"VID_045E&PID_0B12", .product = L"Controller (Xbox One For Windows)" }, - { .id = L"VID_045E&PID_0B13", .product = L"Controller (Xbox One For Windows)" }, -}; - -static const WCHAR *find_product_string(const WCHAR *device_id) -{ - const WCHAR *match_id = wcsrchr(device_id, '\\') + 1; - DWORD i; - - for (i = 0; i < ARRAY_SIZE(device_strings); ++i) - if (!wcsnicmp(device_strings[i].id, match_id, 17)) - return device_strings[i].product; - - return NULL; -} - static NTSTATUS WINAPI gamepad_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); ULONG output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); - struct device *impl = impl_from_DEVICE_OBJECT(device); - const WCHAR *str = NULL; TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); switch (code) { - case IOCTL_HID_GET_STRING: - switch ((ULONG_PTR)stack->Parameters.DeviceIoControl.Type3InputBuffer) - { - case HID_STRING_ID_IPRODUCT: - str = find_product_string(impl->device_id); - break; - } - - if (!str) - { - IoSkipCurrentIrpStackLocation(irp); - return IoCallDriver(fdo->bus_device, irp); - } - - irp->IoStatus.Information = (wcslen(str) + 1) * sizeof(WCHAR); - if (output_len < irp->IoStatus.Information) - { - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - IoCompleteRequest(irp, IO_NO_INCREMENT); - return STATUS_BUFFER_TOO_SMALL; - } - - wcscpy(irp->UserBuffer, str); - irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - case IOCTL_HID_GET_DEVICE_DESCRIPTOR: { HID_DESCRIPTOR *descriptor = (HID_DESCRIPTOR *)irp->UserBuffer;

1 0

Rémi Bernon : hidclass.sys: Pass output buffer directly in handle_minidriver_string.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: db3e59227039c5208d975962a6eab110f9d57be0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db3e59227039c5208d975962… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 09:11:53 2021 +0200 hidclass.sys: Pass output buffer directly in handle_minidriver_string. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index cebdc3e1e65..2e618df2927 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -404,25 +404,14 @@ static void handle_IOCTL_HID_GET_COLLECTION_DESCRIPTOR( IRP *irp, BASE_DEVICE_EX } } -static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, SHORT index ) +static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, ULONG index ) { - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - WCHAR buffer[127]; - ULONG InputBuffer; - - InputBuffer = MAKELONG(index, 0); - - call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( InputBuffer ), - sizeof(InputBuffer), buffer, sizeof(buffer), &irp->IoStatus ); + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + WCHAR *output_buf = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); + ULONG output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; - if (irp->IoStatus.Status == STATUS_SUCCESS) - { - WCHAR *out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); - int length = irpsp->Parameters.DeviceIoControl.OutputBufferLength/sizeof(WCHAR); - TRACE("got string %s from minidriver\n",debugstr_w(buffer)); - lstrcpynW(out_buffer, buffer, length); - irp->IoStatus.Information = (lstrlenW(buffer)+1) * sizeof(WCHAR); - } + call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ), + sizeof(index), output_buf, output_len, &irp->IoStatus ); } static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp )

1 0

Rémi Bernon : winebus.sys: Add more Xbox controllers product ids.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 0fc31aaf21aafb60e5864ff556c2f5a7e12539c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc31aaf21aafb60e5864ff5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 09:11:52 2021 +0200 winebus.sys: Add more Xbox controllers product ids. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/unixlib.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index c9d5fa5fd43..790becf4bc3 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -53,6 +53,10 @@ BOOL is_xbox_gamepad(WORD vid, WORD pid) if (pid == 0x02e6) return TRUE; /* Wireless XBox Controller Dongle */ if (pid == 0x02ea) return TRUE; /* Xbox One S Controller */ if (pid == 0x02fd) return TRUE; /* Xbox One S Controller (Firmware 2017) */ + if (pid == 0x0b00) return TRUE; /* Xbox Elite 2 */ + if (pid == 0x0b05) return TRUE; /* Xbox Elite 2 Wireless */ + if (pid == 0x0b12) return TRUE; /* Xbox Series */ + if (pid == 0x0b13) return TRUE; /* Xbox Series Wireless */ if (pid == 0x0719) return TRUE; /* Xbox 360 Wireless Adapter */ return FALSE; }

1 0

Rémi Bernon : winexinput.sys: Add more Xbox One product string overrides.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 4adc0f1e2af4893ffdadce5bd6ea5de502296203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4adc0f1e2af4893ffdadce5b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 09:11:51 2021 +0200 winexinput.sys: Add more Xbox One product string overrides. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 56d60f55570..8ea9e160fc9 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -331,6 +331,10 @@ static const struct device_strings device_strings[] = { .id = L"VID_045E&PID_02EA", .product = L"Controller (Xbox One For Windows)" }, { .id = L"VID_045E&PID_02FD", .product = L"Controller (Xbox One For Windows)" }, { .id = L"VID_045E&PID_0719", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_0B00", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_0B05", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_0B12", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_0B13", .product = L"Controller (Xbox One For Windows)" }, }; static const WCHAR *find_product_string(const WCHAR *device_id)

1 0

Rémi Bernon : winexinput.sys: Fix casing of "Xbox One for Windows" product string.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 90640da51fb8610a8f2dbe187bfef7b6524ee5b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90640da51fb8610a8f2dbe18… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 09:11:50 2021 +0200 winexinput.sys: Fix casing of "Xbox One for Windows" product string. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 79c566e7cc8..56d60f55570 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -325,11 +325,11 @@ static const struct device_strings device_strings[] = { { .id = L"VID_045E&PID_028E", .product = L"Controller (XBOX 360 For Windows)" }, { .id = L"VID_045E&PID_028F", .product = L"Controller (XBOX 360 For Windows)" }, - { .id = L"VID_045E&PID_02D1", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02DD", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02E3", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02EA", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02FD", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02D1", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02DD", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02E3", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02EA", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02FD", .product = L"Controller (Xbox One For Windows)" }, { .id = L"VID_045E&PID_0719", .product = L"Controller (XBOX 360 For Windows)" }, };

1 0

Rémi Bernon : dinput: Look for PID axes enable collection and set DIEP_AXES if found.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: b725ccbd65c04703b3318698fb56f9387f28d2a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b725ccbd65c04703b3318698… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 08:43:27 2021 +0200 dinput: Look for PID axes enable collection and set DIEP_AXES if found. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 14 ++++++++++++++ dlls/dinput8/tests/hid.c | 4 ---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 38b4e12b72c..1a22c7c8baa 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -90,6 +90,9 @@ struct pid_effect_update BYTE id; ULONG collection; ULONG type_coll; + ULONG axes_coll; + ULONG axis_count; + struct hid_value_caps *axis_caps[6]; struct hid_value_caps *duration_caps; struct hid_value_caps *gain_caps; struct hid_value_caps *sample_period_caps; @@ -1055,6 +1058,8 @@ static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, D if (!(collection = effect_update->collection)) return DIERR_DEVICENOTREG; + info->dwDynamicParams = DIEP_TYPESPECIFICPARAMS; + if (effect_update->axis_count) info->dwDynamicParams |= DIEP_AXES; if (effect_update->duration_caps) info->dwDynamicParams |= DIEP_DURATION; if (effect_update->gain_caps) info->dwDynamicParams |= DIEP_GAIN; if (effect_update->sample_period_caps) info->dwDynamicParams |= DIEP_SAMPLEPERIOD; @@ -1065,6 +1070,7 @@ static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, D } if (effect_update->trigger_button_caps) info->dwDynamicParams |= DIEP_TRIGGERBUTTON; if (effect_update->trigger_repeat_interval_caps) info->dwDynamicParams |= DIEP_TRIGGERREPEATINTERVAL; + if (effect_update->axes_coll) info->dwDynamicParams |= DIEP_AXES; if (!(collection = effect_update->type_coll)) return DIERR_DEVICENOTREG; else @@ -1756,6 +1762,7 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps * if (instance->wCollectionNumber == effect_update->collection) SET_SUB_COLLECTION( effect_update, type_coll ); break; + case PID_USAGE_AXES_ENABLE: SET_SUB_COLLECTION( effect_update, axes_coll ); break; } } @@ -1805,6 +1812,13 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap if (instance->wUsage == PID_USAGE_TRIGGER_REPEAT_INTERVAL) effect_update->trigger_repeat_interval_caps = caps; } + if (instance->wCollectionNumber == effect_update->axes_coll) + { + SET_REPORT_ID( effect_update ); + if (effect_update->axis_count >= 6) FIXME( "more than 6 PID axes detected\n" ); + else effect_update->axis_caps[effect_update->axis_count] = caps; + effect_update->axis_count++; + } #undef SET_REPORT_ID diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 59f5f6ff29d..f4e180a85f3 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3363,9 +3363,7 @@ static BOOL CALLBACK check_effects( const DIEFFECTINFOW *effect, void *args ) check_member( *effect, *exp, "%u", dwSize ); check_member_guid( *effect, *exp, guid ); check_member( *effect, *exp, "%#x", dwEffType ); - todo_wine check_member( *effect, *exp, "%#x", dwStaticParams ); - todo_wine check_member( *effect, *exp, "%#x", dwDynamicParams ); check_member_wstr( *effect, *exp, tszName ); @@ -5741,9 +5739,7 @@ static void test_force_feedback_joystick( void ) ok( hr == DI_OK, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); check_member_guid( effectinfo, expect_effects[0], guid ); check_member( effectinfo, expect_effects[0], "%#x", dwEffType ); - todo_wine check_member( effectinfo, expect_effects[0], "%#x", dwStaticParams ); - todo_wine check_member( effectinfo, expect_effects[0], "%#x", dwDynamicParams ); check_member_wstr( effectinfo, expect_effects[0], tszName );

1 0

Rémi Bernon : dinput: Implement more of HID joystick IDirectInputDevice8_GetEffectInfo.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 994fd9f761e4be11e77302bd26f4d160372261e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=994fd9f761e4be11e77302bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 08:43:26 2021 +0200 dinput: Implement more of HID joystick IDirectInputDevice8_GetEffectInfo. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 124 ++++++++++++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/hid.c | 8 +-- 2 files changed, 124 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index ba968ec516d..38b4e12b72c 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -175,6 +175,52 @@ static const GUID *object_usage_to_guid( USAGE usage_page, USAGE usage ) return &GUID_Unknown; } +static inline USAGE effect_guid_to_usage( const GUID *guid ) +{ + if (IsEqualGUID( guid, &GUID_CustomForce )) return PID_USAGE_ET_CUSTOM_FORCE_DATA; + if (IsEqualGUID( guid, &GUID_ConstantForce )) return PID_USAGE_ET_CONSTANT_FORCE; + if (IsEqualGUID( guid, &GUID_RampForce )) return PID_USAGE_ET_RAMP; + if (IsEqualGUID( guid, &GUID_Square )) return PID_USAGE_ET_SQUARE; + if (IsEqualGUID( guid, &GUID_Sine )) return PID_USAGE_ET_SINE; + if (IsEqualGUID( guid, &GUID_Triangle )) return PID_USAGE_ET_TRIANGLE; + if (IsEqualGUID( guid, &GUID_SawtoothUp )) return PID_USAGE_ET_SAWTOOTH_UP; + if (IsEqualGUID( guid, &GUID_SawtoothDown )) return PID_USAGE_ET_SAWTOOTH_DOWN; + if (IsEqualGUID( guid, &GUID_Spring )) return PID_USAGE_ET_SPRING; + if (IsEqualGUID( guid, &GUID_Damper )) return PID_USAGE_ET_DAMPER; + if (IsEqualGUID( guid, &GUID_Inertia )) return PID_USAGE_ET_INERTIA; + if (IsEqualGUID( guid, &GUID_Friction )) return PID_USAGE_ET_FRICTION; + return 0; +} + +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; +} + typedef BOOL (*enum_object_callback)( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ); @@ -964,12 +1010,86 @@ static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPD static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ) { - FIXME( "iface %p, info %p, guid %s stub!\n", iface, info, debugstr_guid( guid ) ); + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + struct pid_effect_update *effect_update = &impl->pid_effect_update; + PHIDP_PREPARSED_DATA preparsed = impl->preparsed; + HIDP_BUTTON_CAPS button; + ULONG type, collection; + NTSTATUS status; + USAGE usage = 0; + USHORT count; + + TRACE( "iface %p, info %p, guid %s.\n", iface, info, debugstr_guid( guid ) ); if (!info) return E_POINTER; if (info->dwSize != sizeof(DIEFFECTINFOW)) return DIERR_INVALIDPARAM; + if (!(impl->dev_caps.dwFlags & DIDC_FORCEFEEDBACK)) return DIERR_DEVICENOTREG; + + switch ((usage = effect_guid_to_usage( guid ))) + { + case PID_USAGE_ET_SQUARE: + case PID_USAGE_ET_SINE: + case PID_USAGE_ET_TRIANGLE: + case PID_USAGE_ET_SAWTOOTH_UP: + case PID_USAGE_ET_SAWTOOTH_DOWN: + type = DIEFT_PERIODIC; + break; + case PID_USAGE_ET_SPRING: + case PID_USAGE_ET_DAMPER: + case PID_USAGE_ET_INERTIA: + case PID_USAGE_ET_FRICTION: + type = DIEFT_CONDITION; + break; + case PID_USAGE_ET_CONSTANT_FORCE: + type = DIEFT_CONSTANTFORCE; + break; + case PID_USAGE_ET_RAMP: + type = DIEFT_RAMPFORCE; + break; + case PID_USAGE_ET_CUSTOM_FORCE_DATA: + type = DIEFT_CUSTOMFORCE; + break; + default: + return DIERR_DEVICENOTREG; + } + + if (!(collection = effect_update->collection)) return DIERR_DEVICENOTREG; + + if (effect_update->duration_caps) info->dwDynamicParams |= DIEP_DURATION; + if (effect_update->gain_caps) info->dwDynamicParams |= DIEP_GAIN; + if (effect_update->sample_period_caps) info->dwDynamicParams |= DIEP_SAMPLEPERIOD; + if (effect_update->start_delay_caps) + { + type |= DIEFT_STARTDELAY; + info->dwDynamicParams |= DIEP_STARTDELAY; + } + if (effect_update->trigger_button_caps) info->dwDynamicParams |= DIEP_TRIGGERBUTTON; + if (effect_update->trigger_repeat_interval_caps) info->dwDynamicParams |= DIEP_TRIGGERREPEATINTERVAL; + + if (!(collection = effect_update->type_coll)) return DIERR_DEVICENOTREG; + else + { + count = 1; + status = HidP_GetSpecificButtonCaps( HidP_Output, HID_USAGE_PAGE_PID, collection, + usage, &button, &count, preparsed ); + if (status != HIDP_STATUS_SUCCESS) + { + WARN( "HidP_GetSpecificValueCaps %#x returned %#x\n", usage, status ); + return DIERR_DEVICENOTREG; + } + else if (!count) + { + WARN( "effect usage %#x not found\n", usage ); + return DIERR_DEVICENOTREG; + } + } - return DIERR_DEVICENOTREG; + info->guid = *guid; + info->dwEffType = type; + info->dwStaticParams = info->dwDynamicParams; + lstrcpynW( info->tszName, effect_guid_to_string( guid ), MAX_PATH ); + + return DI_OK; } static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index ab70a7c7b76..59f5f6ff29d 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3363,7 +3363,9 @@ static BOOL CALLBACK check_effects( const DIEFFECTINFOW *effect, void *args ) check_member( *effect, *exp, "%u", dwSize ); check_member_guid( *effect, *exp, guid ); check_member( *effect, *exp, "%#x", dwEffType ); + todo_wine check_member( *effect, *exp, "%#x", dwStaticParams ); + todo_wine check_member( *effect, *exp, "%#x", dwDynamicParams ); check_member_wstr( *effect, *exp, tszName ); @@ -5728,27 +5730,21 @@ static void test_force_feedback_joystick( void ) res = 0; hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, DIEFT_PERIODIC ); ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); - todo_wine ok( res == 1, "got %u expected %u\n", res, 1 ); hr = IDirectInputDevice8_EnumEffects( device, check_effects, &check_effects_params, DIEFT_ALL ); ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); - todo_wine ok( check_effects_params.index >= check_effects_params.expect_count, "missing %u effects\n", check_effects_params.expect_count - check_effects_params.index ); effectinfo.dwSize = sizeof(DIEFFECTINFOW); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); - todo_wine ok( hr == DI_OK, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); - todo_wine check_member_guid( effectinfo, expect_effects[0], guid ); - todo_wine check_member( effectinfo, expect_effects[0], "%#x", dwEffType ); todo_wine check_member( effectinfo, expect_effects[0], "%#x", dwStaticParams ); todo_wine check_member( effectinfo, expect_effects[0], "%#x", dwDynamicParams ); - todo_wine check_member_wstr( effectinfo, expect_effects[0], tszName ); hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 );

1 0

Rémi Bernon : winebus.sys: Implement PID effect update for UDEV lnxev devices.
by Alexandre Julliard 05 Oct '21

05 Oct '21

Module: wine Branch: master Commit: 9132162266a1dd0accb30aaa204aba56090a9055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9132162266a1dd0accb30aaa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 08:43:25 2021 +0200 winebus.sys: Implement PID effect update for UDEV lnxev devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 103 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d63c9aab589..08ca8435d31 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -924,12 +924,111 @@ static NTSTATUS lnxev_device_physical_effect_control(struct unix_device *iface, return STATUS_SUCCESS; } +static NTSTATUS set_effect_type_from_usage(struct ff_effect *effect, USAGE type) +{ + switch (type) + { + case PID_USAGE_ET_SINE: + effect->type = FF_PERIODIC; + effect->u.periodic.waveform = FF_SINE; + return STATUS_SUCCESS; + case PID_USAGE_ET_SQUARE: + effect->type = FF_PERIODIC; + effect->u.periodic.waveform = FF_SQUARE; + return STATUS_SUCCESS; + case PID_USAGE_ET_TRIANGLE: + effect->type = FF_PERIODIC; + effect->u.periodic.waveform = FF_TRIANGLE; + return STATUS_SUCCESS; + case PID_USAGE_ET_SAWTOOTH_UP: + effect->type = FF_PERIODIC; + effect->u.periodic.waveform = FF_SAW_UP; + return STATUS_SUCCESS; + case PID_USAGE_ET_SAWTOOTH_DOWN: + effect->type = FF_PERIODIC; + effect->u.periodic.waveform = FF_SAW_DOWN; + return STATUS_SUCCESS; + case PID_USAGE_ET_SPRING: + effect->type = FF_SPRING; + return STATUS_SUCCESS; + case PID_USAGE_ET_DAMPER: + effect->type = FF_DAMPER; + return STATUS_SUCCESS; + case PID_USAGE_ET_INERTIA: + effect->type = FF_INERTIA; + return STATUS_SUCCESS; + case PID_USAGE_ET_FRICTION: + effect->type = FF_FRICTION; + return STATUS_SUCCESS; + case PID_USAGE_ET_CONSTANT_FORCE: + effect->type = FF_CONSTANT; + return STATUS_SUCCESS; + case PID_USAGE_ET_RAMP: + effect->type = FF_RAMP; + return STATUS_SUCCESS; + case PID_USAGE_ET_CUSTOM_FORCE_DATA: + effect->type = FF_CUSTOM; + return STATUS_SUCCESS; + default: + return STATUS_NOT_SUPPORTED; + } +} + static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, BYTE index, struct effect_params *params) { - FIXME("iface %p, index %u, params %p stub!\n", iface, index, params); + struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); + struct ff_effect effect = {.id = impl->effect_ids[index]}; + NTSTATUS status; - return STATUS_NOT_IMPLEMENTED; + TRACE("iface %p, index %u, params %p.\n", iface, index, params); + + if ((status = set_effect_type_from_usage(&effect, params->effect_type))) return status; + + effect.replay.length = params->duration; + effect.replay.delay = params->start_delay; + effect.trigger.button = params->trigger_button; + effect.trigger.interval = params->trigger_repeat_interval; + /* only supports polar with one direction angle */ + effect.direction = params->direction[0] * 256; + + switch (params->effect_type) + { + case PID_USAGE_ET_SINE: + case PID_USAGE_ET_SQUARE: + case PID_USAGE_ET_TRIANGLE: + case PID_USAGE_ET_SAWTOOTH_UP: + case PID_USAGE_ET_SAWTOOTH_DOWN: + FIXME("periodic effect semi-stub!"); + break; + + case PID_USAGE_ET_SPRING: + case PID_USAGE_ET_DAMPER: + case PID_USAGE_ET_INERTIA: + case PID_USAGE_ET_FRICTION: + FIXME("not implemented!"); + break; + + case PID_USAGE_ET_CONSTANT_FORCE: + FIXME("not implemented!"); + break; + case PID_USAGE_ET_RAMP: + FIXME("not implemented!"); + break; + case PID_USAGE_ET_CUSTOM_FORCE_DATA: + FIXME("not implemented!"); + break; + } + + if (ioctl(impl->base.device_fd, EVIOCSFF, &effect) != -1) + impl->effect_ids[index] = effect.id; + else + { + WARN("couldn't create effect, EVIOCSFF ioctl failed: %d %s\n", errno, strerror(errno)); + return STATUS_UNSUCCESSFUL; + } + + return STATUS_SUCCESS; } static const struct hid_device_vtbl lnxev_device_vtbl =

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