September 2021 - Wine-Commits

Rémi Bernon : dinput: Return correct errors from HID joystick IDirectInputDevice8_SetProperty.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 78f04ca082070b77d2b2252b208bc4f8a93daf43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78f04ca082070b77d2b2252b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 09:52:47 2021 +0200 dinput: Return correct errors from HID joystick IDirectInputDevice8_SetProperty. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 12 ++++++++++++ dlls/dinput8/tests/hid.c | 7 ------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 9cacda6b02b..35a85f0f3d3 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -582,6 +582,18 @@ static HRESULT WINAPI hid_joystick_SetProperty( IDirectInputDevice8W *iface, con if (header->dwSize != sizeof(DIPROPRANGE)) return DIERR_INVALIDPARAM; enum_value_objects( impl, header, DIDFT_AXIS, set_property_prop_range, (void *)header ); return DI_OK; + case (DWORD_PTR)DIPROP_FFLOAD: + case (DWORD_PTR)DIPROP_GRANULARITY: + case (DWORD_PTR)DIPROP_VIDPID: + if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; + return DIERR_READONLY; + case (DWORD_PTR)DIPROP_TYPENAME: + case (DWORD_PTR)DIPROP_USERNAME: + if (header->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; + return DIERR_READONLY; + case (DWORD_PTR)DIPROP_GUIDANDPATH: + if (header->dwSize != sizeof(DIPROPGUIDANDPATH)) return DIERR_INVALIDPARAM; + return DIERR_READONLY; default: return IDirectInputDevice2WImpl_SetProperty( iface, guid, header ); } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index a290072f660..cf4762ec86b 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4337,17 +4337,14 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, NULL ); ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_string.diph ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - todo_wine ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_VIDPID returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); - todo_wine ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); prop_string.diph.dwHow = DIPH_DEVICE; @@ -4367,16 +4364,12 @@ static void test_simple_joystick(void) debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_TYPENAME, &prop_string.diph ); - todo_wine ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_TYPENAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_USERNAME, &prop_string.diph ); - todo_wine ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_USERNAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); - todo_wine ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); - todo_wine ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_GRANULARITY returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_JOYSTICKID, &prop_dword.diph );

1 0

Rémi Bernon : winebus.sys: Remove the bogus SDL "unknown" HID report constant.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 059764e87ea32b0c0bb32c84d5f4749558c874f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=059764e87ea32b0c0bb32c84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 08:36:39 2021 +0200 winebus.sys: Remove the bogus SDL "unknown" HID report constant. It was used for XInput compatibility and is not needed anymore. 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 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index b7734b4016e..bf36830b817 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -424,8 +424,7 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) ext->hat_bit_offs = CONTROLLER_NUM_BUTTONS; ext->buffer_length = (BUTTON_BIT_COUNT + 7) / 8 - + CONTROLLER_NUM_AXES * sizeof(WORD) - + 2/* unknown constant*/; + + CONTROLLER_NUM_AXES * sizeof(WORD); TRACE("Report will be %i bytes\n", ext->buffer_length); @@ -457,10 +456,6 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) return STATUS_NO_MEMORY; } - /* unknown constant */ - if (!hid_descriptor_add_padding(&ext->desc, 16)) - return STATUS_NO_MEMORY; - if (!descriptor_add_haptic(ext)) return STATUS_NO_MEMORY; @@ -475,10 +470,6 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) set_hat_value(ext, 0, compose_dpad_value(ext->sdl_controller)); - /* unknown constant */ - ext->report_buffer[14] = 0x89; - ext->report_buffer[15] = 0xc5; - return STATUS_SUCCESS; failed:

1 0

Rémi Bernon : dinput: Return correct errors from HID joystick IDirectInputDevice8_Poll.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 54b2fc355327a46709f124bfff330ae6b92887e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54b2fc355327a46709f124bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 09:52:49 2021 +0200 dinput: Return correct errors from HID joystick IDirectInputDevice8_Poll. 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 | 1 - 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 45e75588aed..f7107733d26 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -704,6 +704,18 @@ static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, D return S_OK; } +static HRESULT WINAPI hid_joystick_Poll( IDirectInputDevice8W *iface ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + HRESULT hr = DI_NOEFFECT; + + EnterCriticalSection( &impl->base.crit ); + if (!impl->base.acquired) hr = DIERR_NOTACQUIRED; + LeaveCriticalSection( &impl->base.crit ); + + return hr; +} + static HRESULT WINAPI hid_joystick_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, const WCHAR *username, DWORD flags ) { @@ -756,7 +768,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_SendForceFeedbackCommand, IDirectInputDevice2WImpl_EnumCreatedEffectObjects, IDirectInputDevice2WImpl_Escape, - IDirectInputDevice2WImpl_Poll, + hid_joystick_Poll, IDirectInputDevice2WImpl_SendDeviceData, /*** IDirectInputDevice7 methods ***/ IDirectInputDevice7WImpl_EnumEffectsInFile, diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index f24acfbf70d..b4aad6b7d5a 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4102,7 +4102,6 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); hr = IDirectInputDevice8_Poll( device ); - todo_wine ok( hr == DI_NOEFFECT, "IDirectInputDevice8_Poll returned: %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2) + 1, &state );

1 0

Rémi Bernon : dinput: Return correct errors from HID joystick IDirectInputDevice8_GetDeviceState.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: aa43d24cd8ef7cfc89193a3c896a37caf3dc9051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa43d24cd8ef7cfc89193a3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 09:52:48 2021 +0200 dinput: Return correct errors from HID joystick IDirectInputDevice8_GetDeviceState. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 9 +++++++-- dlls/dinput8/tests/hid.c | 2 -- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 35a85f0f3d3..45e75588aed 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -638,12 +638,17 @@ static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + HRESULT hr = DI_OK; if (!ptr) return DIERR_INVALIDPARAM; + if (len != impl->base.data_format.user_df->dwDataSize) return DIERR_INVALIDPARAM; - fill_DataFormat( ptr, len, &impl->state, &impl->base.data_format ); + EnterCriticalSection( &impl->base.crit ); + if (!impl->base.acquired) hr = DIERR_NOTACQUIRED; + else fill_DataFormat( ptr, len, &impl->state, &impl->base.data_format ); + LeaveCriticalSection( &impl->base.crit ); - return DI_OK; + return hr; } static BOOL get_object_info( struct hid_joystick *impl, struct hid_caps *caps, diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cf4762ec86b..f24acfbf70d 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4093,7 +4093,6 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); - todo_wine ok( hr == DIERR_NOTACQUIRED, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); hr = IDirectInputDevice8_Poll( device ); @@ -4107,7 +4106,6 @@ static void test_simple_joystick(void) ok( hr == DI_NOEFFECT, "IDirectInputDevice8_Poll returned: %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2) + 1, &state ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); for (i = 0; i < ARRAY_SIZE(injected_input); ++i)

1 0

Rémi Bernon : winebus.sys: Simplify SDL controller report descriptor creation.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 837575395223f15851d8dc2e2735b9c0553f6f9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=837575395223f15851d8dc2e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 08:36:44 2021 +0200 winebus.sys: Simplify SDL controller report descriptor creation. Now that we have xinput.sys for translation there's no need to keep this compatible. 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 | 99 +++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 62 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index bfa95387afe..9f6596f5c7d 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -152,10 +152,6 @@ static struct platform_private *find_device_from_id(SDL_JoystickID id) return NULL; } -#define CONTROLLER_NUM_BUTTONS 11 -#define CONTROLLER_NUM_AXES 6 -#define CONTROLLER_NUM_HATSWITCHES 1 - static void set_button_value(struct platform_private *ext, int index, int value) { int byte_index = ext->button_start + index / 8; @@ -173,14 +169,10 @@ static void set_button_value(struct platform_private *ext, int index, int value) } } -static void set_axis_value(struct platform_private *ext, int index, short value, BOOL controller) +static void set_axis_value(struct platform_private *ext, int index, short value) { DWORD *report = (DWORD *)(ext->report_buffer + ext->axis_start); - - if (controller && (index == SDL_CONTROLLER_AXIS_TRIGGERLEFT || index == SDL_CONTROLLER_AXIS_TRIGGERRIGHT)) - report[index] = LE_DWORD(value); - else - report[index] = LE_DWORD(value) + 32768; + report[index] = LE_DWORD(value); } static void set_ball_value(struct platform_private *ext, int index, int value1, int value2) @@ -316,7 +308,7 @@ static NTSTATUS build_joystick_report_descriptor(struct platform_private *ext) /* Initialize axis in the report */ for (i = 0; i < axis_count; i++) - set_axis_value(ext, i, pSDL_JoystickGetAxis(ext->sdl_joystick, i), FALSE); + set_axis_value(ext, i, pSDL_JoystickGetAxis(ext->sdl_joystick, i)); for (i = 0; i < hat_count; i++) set_hat_value(ext, i, pSDL_JoystickGetHat(ext->sdl_joystick, i)); @@ -355,22 +347,18 @@ static SHORT compose_dpad_value(SDL_GameController *joystick) return SDL_HAT_CENTERED; } -static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) +static NTSTATUS build_controller_report_descriptor(struct platform_private *ext) { static const USAGE left_axis_usages[] = {HID_USAGE_GENERIC_X, HID_USAGE_GENERIC_Y}; static const USAGE right_axis_usages[] = {HID_USAGE_GENERIC_RX, HID_USAGE_GENERIC_RY}; static const USAGE trigger_axis_usages[] = {HID_USAGE_GENERIC_Z, HID_USAGE_GENERIC_RZ}; - INT i; - - static const int BUTTON_BIT_COUNT = CONTROLLER_NUM_BUTTONS; + ULONG i, button_count = SDL_CONTROLLER_BUTTON_MAX - 1; + C_ASSERT(SDL_CONTROLLER_AXIS_MAX == 6); ext->axis_start = 0; - ext->hat_start = CONTROLLER_NUM_AXES * sizeof(DWORD); - ext->button_start = ext->hat_start + CONTROLLER_NUM_HATSWITCHES; - - ext->buffer_length = (BUTTON_BIT_COUNT + 7) / 8 - + CONTROLLER_NUM_HATSWITCHES - + CONTROLLER_NUM_AXES * sizeof(DWORD); + ext->hat_start = SDL_CONTROLLER_AXIS_MAX * sizeof(DWORD); + ext->button_start = ext->hat_start + 1; + ext->buffer_length = ext->button_start + (button_count + 7) / 8; TRACE("Report will be %i bytes\n", ext->buffer_length); @@ -378,21 +366,21 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) return STATUS_NO_MEMORY; if (!hid_descriptor_add_axes(&ext->desc, 2, HID_USAGE_PAGE_GENERIC, left_axis_usages, - FALSE, 0, 0xffff)) + FALSE, -32768, 32767)) return STATUS_NO_MEMORY; if (!hid_descriptor_add_axes(&ext->desc, 2, HID_USAGE_PAGE_GENERIC, right_axis_usages, - FALSE, 0, 0xffff)) + FALSE, -32768, 32767)) return STATUS_NO_MEMORY; if (!hid_descriptor_add_axes(&ext->desc, 2, HID_USAGE_PAGE_GENERIC, trigger_axis_usages, - FALSE, 0, 0x7fff)) + FALSE, 0, 32767)) return STATUS_NO_MEMORY; - if (!hid_descriptor_add_hatswitch(&ext->desc, CONTROLLER_NUM_HATSWITCHES)) + if (!hid_descriptor_add_hatswitch(&ext->desc, 1)) return STATUS_NO_MEMORY; - if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, CONTROLLER_NUM_BUTTONS)) + if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, button_count)) return STATUS_NO_MEMORY; if (!descriptor_add_haptic(ext)) @@ -405,8 +393,7 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) /* Initialize axis in the report */ for (i = SDL_CONTROLLER_AXIS_LEFTX; i < SDL_CONTROLLER_AXIS_MAX; i++) - set_axis_value(ext, i, pSDL_GameControllerGetAxis(ext->sdl_controller, i), TRUE); - + set_axis_value(ext, i, pSDL_GameControllerGetAxis(ext->sdl_controller, i)); set_hat_value(ext, 0, compose_dpad_value(ext->sdl_controller)); return STATUS_SUCCESS; @@ -424,7 +411,7 @@ static void sdl_device_destroy(struct unix_device *iface) static NTSTATUS sdl_device_start(struct unix_device *iface) { struct platform_private *ext = impl_from_unix_device(iface); - if (ext->sdl_controller) return build_mapped_report_descriptor(ext); + if (ext->sdl_controller) return build_controller_report_descriptor(ext); return build_joystick_report_descriptor(ext); } @@ -547,7 +534,7 @@ static BOOL set_report_from_joystick_event(struct platform_private *device, SDL_ if (ie->axis < 6) { - set_axis_value(device, ie->axis, ie->value, FALSE); + set_axis_value(device, ie->axis, ie->value); bus_event_queue_input_report(&event_queue, iface, device->report_buffer, device->buffer_length); } break; @@ -574,7 +561,7 @@ static BOOL set_report_from_joystick_event(struct platform_private *device, SDL_ return FALSE; } -static BOOL set_mapped_report_from_event(struct platform_private *device, SDL_Event *event) +static BOOL set_report_from_controller_event(struct platform_private *device, SDL_Event *event) { struct unix_device *iface = &device->unix_device; @@ -583,47 +570,35 @@ static BOOL set_mapped_report_from_event(struct platform_private *device, SDL_Ev case SDL_CONTROLLERBUTTONDOWN: case SDL_CONTROLLERBUTTONUP: { - int usage = -1; SDL_ControllerButtonEvent *ie = &event->cbutton; + int button; - switch (ie->button) + switch ((button = ie->button)) { - case SDL_CONTROLLER_BUTTON_A: usage = 0; break; - case SDL_CONTROLLER_BUTTON_B: usage = 1; break; - case SDL_CONTROLLER_BUTTON_X: usage = 2; break; - case SDL_CONTROLLER_BUTTON_Y: usage = 3; break; - case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: usage = 4; break; - case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: usage = 5; break; - case SDL_CONTROLLER_BUTTON_BACK: usage = 6; break; - case SDL_CONTROLLER_BUTTON_START: usage = 7; break; - case SDL_CONTROLLER_BUTTON_LEFTSTICK: usage = 8; break; - case SDL_CONTROLLER_BUTTON_RIGHTSTICK: usage = 9; break; - case SDL_CONTROLLER_BUTTON_GUIDE: usage = 10; break; - - case SDL_CONTROLLER_BUTTON_DPAD_UP: - case SDL_CONTROLLER_BUTTON_DPAD_DOWN: - case SDL_CONTROLLER_BUTTON_DPAD_LEFT: - case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: - set_hat_value(device, 0, compose_dpad_value(device->sdl_controller)); - bus_event_queue_input_report(&event_queue, iface, device->report_buffer, device->buffer_length); - break; - - default: - ERR("Unknown Button %i\n",ie->button); + case SDL_CONTROLLER_BUTTON_DPAD_UP: + case SDL_CONTROLLER_BUTTON_DPAD_DOWN: + case SDL_CONTROLLER_BUTTON_DPAD_LEFT: + case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: + set_hat_value(device, 0, compose_dpad_value(device->sdl_controller)); + break; + case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: button = 4; break; + case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: button = 5; break; + case SDL_CONTROLLER_BUTTON_BACK: button = 6; break; + case SDL_CONTROLLER_BUTTON_START: button = 7; break; + case SDL_CONTROLLER_BUTTON_LEFTSTICK: button = 8; break; + case SDL_CONTROLLER_BUTTON_RIGHTSTICK: button = 9; break; + case SDL_CONTROLLER_BUTTON_GUIDE: button = 10; break; } - if (usage >= 0) - { - set_button_value(device, usage, ie->state); - bus_event_queue_input_report(&event_queue, iface, device->report_buffer, device->buffer_length); - } + set_button_value(device, button, ie->state); + bus_event_queue_input_report(&event_queue, iface, device->report_buffer, device->buffer_length); break; } case SDL_CONTROLLERAXISMOTION: { SDL_ControllerAxisEvent *ie = &event->caxis; - set_axis_value(device, ie->axis, ie->value, TRUE); + set_axis_value(device, ie->axis, ie->value); bus_event_queue_input_report(&event_queue, iface, device->report_buffer, device->buffer_length); break; } @@ -727,7 +702,7 @@ static void process_device_event(SDL_Event *event) { id = ((SDL_ControllerButtonEvent *)event)->which; device = find_device_from_id(id); - if (device) set_mapped_report_from_event(device, event); + if (device) set_report_from_controller_event(device, event); else WARN("failed to find device with id %d\n", id); }

1 0

Rémi Bernon : winebus.sys: Simplify SDL joystick report descriptor creation.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 4a15cc9eb9665a44c8948f51d2035f2aa3ac2791 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a15cc9eb9665a44c8948f51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 08:36:43 2021 +0200 winebus.sys: Simplify SDL joystick report descriptor creation. 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 | 73 +++++++++++++--------------------------------- 1 file changed, 21 insertions(+), 52 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index bebe2eeb0f2..bfa95387afe 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -241,13 +241,10 @@ static BOOL descriptor_add_haptic(struct platform_private *ext) return TRUE; } -static NTSTATUS build_report_descriptor(struct platform_private *ext) +static NTSTATUS build_joystick_report_descriptor(struct platform_private *ext) { - INT i; - INT report_size; - INT button_count, axis_count, ball_count, hat_count; - static const USAGE device_usage[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD}; - static const USAGE controller_usages[] = { + static const USAGE joystick_usages[] = + { HID_USAGE_GENERIC_X, HID_USAGE_GENERIC_Y, HID_USAGE_GENERIC_Z, @@ -256,19 +253,11 @@ static NTSTATUS build_report_descriptor(struct platform_private *ext) HID_USAGE_GENERIC_RZ, HID_USAGE_GENERIC_SLIDER, HID_USAGE_GENERIC_DIAL, - HID_USAGE_GENERIC_WHEEL}; - static const USAGE joystick_usages[] = { - HID_USAGE_GENERIC_X, - HID_USAGE_GENERIC_Y, - HID_USAGE_GENERIC_Z, - HID_USAGE_GENERIC_RZ, - HID_USAGE_GENERIC_RX, - HID_USAGE_GENERIC_RY, - HID_USAGE_GENERIC_SLIDER, - HID_USAGE_GENERIC_DIAL, - HID_USAGE_GENERIC_WHEEL}; + HID_USAGE_GENERIC_WHEEL + }; - report_size = 0; + int i, report_size = 1; + int button_count, axis_count, ball_count, hat_count; axis_count = pSDL_JoystickNumAxes(ext->sdl_joystick); if (axis_count > 6) @@ -276,24 +265,17 @@ static NTSTATUS build_report_descriptor(struct platform_private *ext) FIXME("Clamping joystick to 6 axis\n"); axis_count = 6; } - ext->axis_start = report_size; - if (axis_count) - { - report_size += (sizeof(DWORD) * axis_count); - } + report_size += (sizeof(DWORD) * axis_count); ball_count = pSDL_JoystickNumBalls(ext->sdl_joystick); - ext->ball_start = report_size; - if (ball_count) + if (axis_count + ball_count * 2 > ARRAY_SIZE(joystick_usages)) { - if ((ball_count*2) + axis_count > 9) - { - FIXME("Capping ball + axis at 9\n"); - ball_count = (9-axis_count)/2; - } - report_size += (sizeof(DWORD) * 2 * ball_count); + FIXME("Capping ball + axis at 9\n"); + ball_count = (ARRAY_SIZE(joystick_usages) - axis_count) / 2; } + ext->ball_start = report_size; + report_size += (sizeof(DWORD) * 2 * ball_count); hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); ext->hat_start = report_size; @@ -306,21 +288,12 @@ static NTSTATUS build_report_descriptor(struct platform_private *ext) TRACE("Report will be %i bytes\n", report_size); - if (!hid_descriptor_begin(&ext->desc, device_usage[0], device_usage[1])) + if (!hid_descriptor_begin(&ext->desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_JOYSTICK)) return STATUS_NO_MEMORY; - if (axis_count == 6 && button_count >= 14) - { - if (!hid_descriptor_add_axes(&ext->desc, axis_count, HID_USAGE_PAGE_GENERIC, - controller_usages, FALSE, 0, 0xffff)) - return STATUS_NO_MEMORY; - } - else if (axis_count) - { - if (!hid_descriptor_add_axes(&ext->desc, axis_count, HID_USAGE_PAGE_GENERIC, - joystick_usages, FALSE, 0, 0xffff)) - return STATUS_NO_MEMORY; - } + if (axis_count && !hid_descriptor_add_axes(&ext->desc, axis_count, HID_USAGE_PAGE_GENERIC, + joystick_usages, FALSE, -32768, 32767)) + return STATUS_NO_MEMORY; if (ball_count && !hid_descriptor_add_axes(&ext->desc, ball_count * 2, HID_USAGE_PAGE_GENERIC, &joystick_usages[axis_count], TRUE, INT32_MIN, INT32_MAX)) @@ -452,7 +425,7 @@ static NTSTATUS sdl_device_start(struct unix_device *iface) { struct platform_private *ext = impl_from_unix_device(iface); if (ext->sdl_controller) return build_mapped_report_descriptor(ext); - return build_report_descriptor(ext); + return build_joystick_report_descriptor(ext); } static void sdl_device_stop(struct unix_device *iface) @@ -550,15 +523,11 @@ static const struct unix_device_vtbl sdl_device_vtbl = sdl_device_set_feature_report, }; -static BOOL set_report_from_event(struct platform_private *device, SDL_Event *event) +static BOOL set_report_from_joystick_event(struct platform_private *device, SDL_Event *event) { struct unix_device *iface = &device->unix_device; - if (device->sdl_controller) - { - /* We want mapped events */ - return TRUE; - } + if (device->sdl_controller) return TRUE; /* use controller events instead */ switch(event->type) { @@ -751,7 +720,7 @@ static void process_device_event(SDL_Event *event) { id = ((SDL_JoyButtonEvent *)event)->which; device = find_device_from_id(id); - if (device) set_report_from_event(device, event); + if (device) set_report_from_joystick_event(device, event); else WARN("failed to find device with id %d\n", id); } else if (event->type >= SDL_CONTROLLERAXISMOTION && event->type <= SDL_CONTROLLERBUTTONUP)

1 0

Rémi Bernon : winebus.sys: Move hats before buttons and use one byte each.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 593c4d51493c95b6ffa87c0572f893b42233d803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=593c4d51493c95b6ffa87c05… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 08:36:41 2021 +0200 winebus.sys: Move hats before buttons and use one byte each. 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 | 57 ++++++++++++++------------------------------- dlls/winebus.sys/bus_udev.c | 34 +++++++++++++-------------- dlls/winebus.sys/hid.c | 2 +- 3 files changed, 35 insertions(+), 58 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index a589814ee26..c83276aa873 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -126,7 +126,7 @@ struct platform_private int button_start; int axis_start; int ball_start; - int hat_bit_offs; /* hatswitches are reported in the same bytes as buttons */ + int hat_start; struct hid_descriptor desc; @@ -193,26 +193,8 @@ static void set_ball_value(struct platform_private *ext, int index, int value1, static void set_hat_value(struct platform_private *ext, int index, int value) { - int byte = ext->button_start + (ext->hat_bit_offs + 4 * index) / 8; - int bit_offs = (ext->hat_bit_offs + 4 * index) % 8; - int num_low_bits, num_high_bits; - unsigned char val, low_mask, high_mask; - - /* 4-bit hatswitch value is packed into button bytes */ - if (bit_offs <= 4) - { - num_low_bits = 4; - num_high_bits = 0; - low_mask = 0xf; - high_mask = 0; - } - else - { - num_low_bits = 8 - bit_offs; - num_high_bits = 4 - num_low_bits; - low_mask = (1 << num_low_bits) - 1; - high_mask = (1 << num_high_bits) - 1; - } + int byte = ext->hat_start + index; + unsigned char val; switch (value) { @@ -231,13 +213,7 @@ static void set_hat_value(struct platform_private *ext, int index, int value) default: return; } - ext->report_buffer[byte] &= ~(low_mask << bit_offs); - ext->report_buffer[byte] |= (val & low_mask) << bit_offs; - if (high_mask) - { - ext->report_buffer[byte + 1] &= ~high_mask; - ext->report_buffer[byte + 1] |= val & high_mask; - } + ext->report_buffer[byte] = val; } static BOOL descriptor_add_haptic(struct platform_private *ext) @@ -319,14 +295,14 @@ static NTSTATUS build_report_descriptor(struct platform_private *ext) report_size += (sizeof(DWORD) * 2 * ball_count); } + hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); + ext->hat_start = report_size; + report_size += hat_count; + /* For now lump all buttons just into incremental usages, Ignore Keys */ button_count = pSDL_JoystickNumButtons(ext->sdl_joystick); ext->button_start = report_size; - - hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); - ext->hat_bit_offs = button_count; - - report_size += (button_count + hat_count * 4 + 7) / 8; + report_size += (button_count + 7) / 8; TRACE("Report will be %i bytes\n", report_size); @@ -350,10 +326,10 @@ static NTSTATUS build_report_descriptor(struct platform_private *ext) &joystick_usages[axis_count], TRUE, INT32_MIN, INT32_MAX)) return STATUS_NO_MEMORY; - if (button_count && !hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, button_count)) + if (hat_count && !hid_descriptor_add_hatswitch(&ext->desc, hat_count)) return STATUS_NO_MEMORY; - if (hat_count && !hid_descriptor_add_hatswitch(&ext->desc, hat_count)) + if (button_count && !hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, button_count)) return STATUS_NO_MEMORY; if (!descriptor_add_haptic(ext)) @@ -413,13 +389,14 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) static const USAGE trigger_axis_usages[] = {HID_USAGE_GENERIC_Z, HID_USAGE_GENERIC_RZ}; INT i; - static const int BUTTON_BIT_COUNT = CONTROLLER_NUM_BUTTONS + CONTROLLER_NUM_HATSWITCHES * 4; + static const int BUTTON_BIT_COUNT = CONTROLLER_NUM_BUTTONS; ext->axis_start = 0; - ext->button_start = CONTROLLER_NUM_AXES * sizeof(DWORD); - ext->hat_bit_offs = CONTROLLER_NUM_BUTTONS; + ext->hat_start = CONTROLLER_NUM_AXES * sizeof(DWORD); + ext->button_start = ext->hat_start + CONTROLLER_NUM_HATSWITCHES; ext->buffer_length = (BUTTON_BIT_COUNT + 7) / 8 + + CONTROLLER_NUM_HATSWITCHES + CONTROLLER_NUM_AXES * sizeof(DWORD); TRACE("Report will be %i bytes\n", ext->buffer_length); @@ -439,10 +416,10 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) FALSE, 0, 0x7fff)) return STATUS_NO_MEMORY; - if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, CONTROLLER_NUM_BUTTONS)) + if (!hid_descriptor_add_hatswitch(&ext->desc, CONTROLLER_NUM_HATSWITCHES)) return STATUS_NO_MEMORY; - if (!hid_descriptor_add_hatswitch(&ext->desc, 1)) + if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, CONTROLLER_NUM_BUTTONS)) return STATUS_NO_MEMORY; if (BUTTON_BIT_COUNT % 8 != 0) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index e62c8c2eda1..00c64829172 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -496,6 +496,23 @@ static NTSTATUS build_report_descriptor(struct wine_input_private *ext, struct u rel_count++; } + hat_count = 0; + for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) + { + if (!test_bit(absbits, i)) continue; + ext->hat_map[i - ABS_HAT0X] = report_size; + ext->hat_values[i - ABS_HAT0X] = 0; + ext->hat_values[i - ABS_HAT0X + 1] = 0; + report_size++; + hat_count++; + } + + if (hat_count) + { + if (!hid_descriptor_add_hatswitch(&ext->desc, hat_count)) + return STATUS_NO_MEMORY; + } + /* For now lump all buttons just into incremental usages, Ignore Keys */ ext->button_start = report_size; button_count = count_buttons(ext->base.device_fd, ext->button_map); @@ -514,23 +531,6 @@ static NTSTATUS build_report_descriptor(struct wine_input_private *ext, struct u report_size += (button_count + 7) / 8; } - hat_count = 0; - for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) - { - if (!test_bit(absbits, i)) continue; - ext->hat_map[i - ABS_HAT0X] = report_size; - ext->hat_values[i - ABS_HAT0X] = 0; - ext->hat_values[i - ABS_HAT0X + 1] = 0; - report_size++; - hat_count++; - } - - if (hat_count) - { - if (!hid_descriptor_add_hatswitch(&ext->desc, hat_count)) - return STATUS_NO_MEMORY; - } - if (!hid_descriptor_end(&ext->desc)) return STATUS_NO_MEMORY; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index feff8aec013..ba9fa4ba12d 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -138,7 +138,7 @@ BOOL hid_descriptor_add_hatswitch(struct hid_descriptor *desc, INT count) LOGICAL_MAXIMUM(1, 8), PHYSICAL_MINIMUM(1, 0), PHYSICAL_MAXIMUM(2, 8), - REPORT_SIZE(1, 4), + REPORT_SIZE(1, 8), REPORT_COUNT(4, count), UNIT(1, 0x0e /* none */), INPUT(1, Data|Var|Abs|Null),

1 0

Rémi Bernon : dinput: Fix HID joystick DIPH_BYUSAGE object enumeration.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 0daf8417127067b1c107cc6bca61c535897e72fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=0daf8417127067b1c107cc6b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 09:52:45 2021 +0200 dinput: Fix HID joystick DIPH_BYUSAGE object enumeration. This adds some todo_wine because we now get the correct object, but it has incorrect offset and instance number. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 3 ++- dlls/dinput8/tests/hid.c | 12 +++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a9ca6fe6cc6..fb0d769d85f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -209,7 +209,8 @@ static BOOL enum_object( struct hid_joystick *impl, const DIPROPHEADER *filter, if ((filter->dwObj & 0x00ffffff) != (instance->dwType & 0x00ffffff)) return DIENUM_CONTINUE; return callback( impl, caps, instance, data ); case DIPH_BYUSAGE: - if (LOWORD(filter->dwObj) != instance->wUsagePage || HIWORD(filter->dwObj) != instance->wUsage) return DIENUM_CONTINUE; + if (HIWORD( filter->dwObj ) != instance->wUsagePage) return DIENUM_CONTINUE; + if (LOWORD( filter->dwObj ) != instance->wUsage) return DIENUM_CONTINUE; return callback( impl, caps, instance, data ); default: FIXME( "unimplemented filter dwHow %#x dwObj %#x\n", filter->dwHow, filter->dwObj ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index e5e1bfde79d..1afb2916d4d 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3919,9 +3919,7 @@ static void test_simple_joystick(void) prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); - todo_wine ok( prop_range.lMin == 0, "got %d expected %d\n", prop_range.lMin, 0 ); - todo_wine ok( prop_range.lMax == 65535, "got %d expected %d\n", prop_range.lMax, 65535 ); prop_pointer.diph.dwHow = DIPH_BYUSAGE; @@ -3962,9 +3960,10 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); check_member( objinst, expect_objects[1], "%u", dwSize ); - todo_wine check_member_guid( objinst, expect_objects[1], guidType ); + todo_wine check_member( objinst, expect_objects[1], "%#x", dwOfs ); + todo_wine check_member( objinst, expect_objects[1], "%#x", dwType ); check_member( objinst, expect_objects[1], "%#x", dwFlags ); if (!localized) todo_wine check_member_wstr( objinst, expect_objects[1], tszName ); @@ -3974,7 +3973,6 @@ static void test_simple_joystick(void) check_member( objinst, expect_objects[1], "%u", wCollectionNumber ); check_member( objinst, expect_objects[1], "%u", wDesignatorIndex ); check_member( objinst, expect_objects[1], "%#04x", wUsagePage ); - todo_wine check_member( objinst, expect_objects[1], "%#04x", wUsage ); check_member( objinst, expect_objects[1], "%#04x", dwDimension ); check_member( objinst, expect_objects[1], "%#04x", wExponent ); @@ -4310,9 +4308,7 @@ static void test_simple_joystick(void) prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); - todo_wine ok( prop_range.lMin == -14000, "got %d expected %d\n", prop_range.lMin, -14000 ); - todo_wine ok( prop_range.lMax == -4000, "got %d expected %d\n", prop_range.lMax, -4000 ); prop_range.diph.dwHow = DIPH_BYUSAGE; prop_range.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_Y, HID_USAGE_PAGE_GENERIC ); @@ -4320,9 +4316,7 @@ static void test_simple_joystick(void) prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); - todo_wine ok( prop_range.lMin == 1000, "got %d expected %d\n", prop_range.lMin, 1000 ); - todo_wine ok( prop_range.lMax == 51000, "got %d expected %d\n", prop_range.lMax, 51000 ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); @@ -4478,7 +4472,7 @@ static void test_simple_joystick(void) if (broken( state.lX == -10750 )) win_skip( "Ignoring 32-bit rounding\n" ); else { - todo_wine + todo_wine_if( i != 2 ) check_member( state, expect_state_abs[i], "%d", lX ); todo_wine_if( i != 2 ) check_member( state, expect_state_abs[i], "%d", lY );

1 0

Rémi Bernon : dinput8/tests: Don't check device object data sequence numbers.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: af58bbb0c4d2878bf5aac5320e08cf10f3dc6592 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af58bbb0c4d2878bf5aac532… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 09:52:44 2021 +0200 dinput8/tests: Don't check device object data sequence numbers. We usually have them wrong but sometimes right. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index b02cdf1aa30..e5e1bfde79d 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4214,8 +4214,6 @@ static void test_simple_joystick(void) ok( res == 1, "got %u expected %u\n", res, 1 ); check_member( objdata[0], expect_objdata[0], "%#x", dwOfs ); check_member( objdata[0], expect_objdata[0], "%#x", dwData ); - todo_wine - check_member( objdata[0], expect_objdata[0], "%#x", dwSequence ); ok( objdata[0].uAppData == -1, "got %p, expected %p\n", (void *)objdata[0].uAppData, (void *)-1 ); res = 4; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); @@ -4226,8 +4224,6 @@ static void test_simple_joystick(void) winetest_push_context( "objdata[%d]", i ); check_member( objdata[i], expect_objdata[1 + i], "%#x", dwOfs ); check_member( objdata[i], expect_objdata[1 + i], "%#x", dwData ); - todo_wine - check_member( objdata[i], expect_objdata[1 + i], "%#x", dwSequence ); ok( objdata[i].uAppData == -1, "got %p, expected %p\n", (void *)objdata[i].uAppData, (void *)-1 ); winetest_pop_context(); }

1 0

Rémi Bernon : winebus.sys: Always add padding after button blocks.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 8221229498a119ec0af1d48e42d2eb83580956b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8221229498a119ec0af1d48e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 21 08:36:42 2021 +0200 winebus.sys: Always add padding after button blocks. 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 | 7 ------- dlls/winebus.sys/bus_udev.c | 7 ------- dlls/winebus.sys/hid.c | 21 +++++++++++---------- dlls/winebus.sys/unix_private.h | 1 - 4 files changed, 11 insertions(+), 25 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index c83276aa873..bebe2eeb0f2 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -422,13 +422,6 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, CONTROLLER_NUM_BUTTONS)) return STATUS_NO_MEMORY; - if (BUTTON_BIT_COUNT % 8 != 0) - { - /* unused bits between hatswitch and following constant */ - if (!hid_descriptor_add_padding(&ext->desc, 8 - (BUTTON_BIT_COUNT % 8))) - return STATUS_NO_MEMORY; - } - if (!descriptor_add_haptic(ext)) return STATUS_NO_MEMORY; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 00c64829172..b9e5c968d0c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -521,13 +521,6 @@ static NTSTATUS build_report_descriptor(struct wine_input_private *ext, struct u if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, button_count)) return STATUS_NO_MEMORY; - if (button_count % 8) - { - BYTE padding = 8 - (button_count % 8); - if (!hid_descriptor_add_padding(&ext->desc, padding)) - return STATUS_NO_MEMORY; - } - report_size += (button_count + 7) / 8; } diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index ba9fa4ba12d..d2dff7e5a24 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -99,6 +99,7 @@ void hid_descriptor_free(struct hid_descriptor *desc) BOOL hid_descriptor_add_buttons(struct hid_descriptor *desc, USAGE usage_page, USAGE usage_min, USAGE usage_max) { + const USHORT count = usage_max - usage_min + 1; const BYTE template[] = { USAGE_PAGE(2, usage_page), @@ -108,24 +109,24 @@ BOOL hid_descriptor_add_buttons(struct hid_descriptor *desc, USAGE usage_page, LOGICAL_MAXIMUM(1, 1), PHYSICAL_MINIMUM(1, 0), PHYSICAL_MAXIMUM(1, 1), - REPORT_COUNT(2, usage_max - usage_min + 1), + REPORT_COUNT(2, count), REPORT_SIZE(1, 1), INPUT(1, Data|Var|Abs), }; - - return hid_descriptor_append(desc, template, sizeof(template)); -} - -BOOL hid_descriptor_add_padding(struct hid_descriptor *desc, BYTE bitcount) -{ - const BYTE template[] = + const BYTE template_pad[] = { - REPORT_COUNT(1, bitcount), + REPORT_COUNT(1, 8 - (count % 8)), REPORT_SIZE(1, 1), INPUT(1, Cnst|Var|Abs), }; - return hid_descriptor_append(desc, template, sizeof(template)); + if (!hid_descriptor_append(desc, template, sizeof(template))) + return FALSE; + + if ((count % 8) && !hid_descriptor_append(desc, template_pad, sizeof(template_pad))) + return FALSE; + + return TRUE; } BOOL hid_descriptor_add_hatswitch(struct hid_descriptor *desc, INT count) diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 069b6a0964a..cfb56d2d83e 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -82,7 +82,6 @@ extern void hid_descriptor_free(struct hid_descriptor *desc) DECLSPEC_HIDDEN; extern BOOL hid_descriptor_add_buttons(struct hid_descriptor *desc, USAGE usage_page, USAGE usage_min, USAGE usage_max) DECLSPEC_HIDDEN; -extern BOOL hid_descriptor_add_padding(struct hid_descriptor *desc, BYTE bitcount) DECLSPEC_HIDDEN; extern BOOL hid_descriptor_add_hatswitch(struct hid_descriptor *desc, INT count) DECLSPEC_HIDDEN; extern BOOL hid_descriptor_add_axes(struct hid_descriptor *desc, BYTE count, USAGE usage_page, const USAGE *usages, BOOL rel, LONG min, LONG max) DECLSPEC_HIDDEN;

1 0