ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winebus.sys: Always add padding after button blocks. 

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-09-21 08:36:42 +02:00 committed by Alexandre Julliard
parent 593c4d5149
commit 8221229498
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/winebus.sys/bus_sdl.c
View File

@ -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)) if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, CONTROLLER_NUM_BUTTONS))
return STATUS_NO_MEMORY; 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)) if (!descriptor_add_haptic(ext))
return STATUS_NO_MEMORY; return STATUS_NO_MEMORY;

7
dlls/winebus.sys/bus_udev.c
View File

@ -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)) if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, button_count))
return STATUS_NO_MEMORY; 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; report_size += (button_count + 7) / 8;
} }

21
dlls/winebus.sys/hid.c
View File

@ -99,6 +99,7 @@ void hid_descriptor_free(struct hid_descriptor *desc)
BOOL hid_descriptor_add_buttons(struct hid_descriptor *desc, USAGE usage_page, BOOL hid_descriptor_add_buttons(struct hid_descriptor *desc, USAGE usage_page,
USAGE usage_min, USAGE usage_max) USAGE usage_min, USAGE usage_max)
{ {
const USHORT count = usage_max - usage_min + 1;
const BYTE template[] = const BYTE template[] =
{ {
USAGE_PAGE(2, usage_page), 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), LOGICAL_MAXIMUM(1, 1),
PHYSICAL_MINIMUM(1, 0), PHYSICAL_MINIMUM(1, 0),
PHYSICAL_MAXIMUM(1, 1), PHYSICAL_MAXIMUM(1, 1),
REPORT_COUNT(2, usage_max - usage_min + 1), REPORT_COUNT(2, count),
REPORT_SIZE(1, 1), REPORT_SIZE(1, 1),
INPUT(1, Data|Var|Abs), INPUT(1, Data|Var|Abs),
}; };
const BYTE template_pad[] =
return hid_descriptor_append(desc, template, sizeof(template));
}
BOOL hid_descriptor_add_padding(struct hid_descriptor *desc, BYTE bitcount)
{ {
const BYTE template[] = REPORT_COUNT(1, 8 - (count % 8)),
{
REPORT_COUNT(1, bitcount),
REPORT_SIZE(1, 1), REPORT_SIZE(1, 1),
INPUT(1, Cnst|Var|Abs), 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) BOOL hid_descriptor_add_hatswitch(struct hid_descriptor *desc, INT count)

1
dlls/winebus.sys/unix_private.h
View File

@ -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, extern BOOL hid_descriptor_add_buttons(struct hid_descriptor *desc, USAGE usage_page,
USAGE usage_min, USAGE usage_max) DECLSPEC_HIDDEN; 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_hatswitch(struct hid_descriptor *desc, INT count) DECLSPEC_HIDDEN;
extern BOOL hid_descriptor_add_axes(struct hid_descriptor *desc, BYTE count, USAGE usage_page, 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; const USAGE *usages, BOOL rel, LONG min, LONG max) DECLSPEC_HIDDEN;