[PATCH 5/5] winebus.sys: Use HID descriptor helpers in bus_sdl.c.
Rémi Bernon
rbernon at codeweavers.com
Thu Aug 12 03:26:58 CDT 2021
And remove old helpers.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
dlls/winebus.sys/bus.h | 29 ++++
dlls/winebus.sys/bus_sdl.c | 315 ++++++++++------------------------
dlls/winebus.sys/bus_udev.c | 1 -
dlls/winebus.sys/controller.h | 145 ----------------
dlls/winebus.sys/hid.c | 38 +++-
dlls/winebus.sys/main.c | 1 -
dlls/xinput1_3/tests/xinput.c | 13 +-
7 files changed, 157 insertions(+), 385 deletions(-)
delete mode 100644 dlls/winebus.sys/controller.h
diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h
index a157f576ef9..bf2e157af4d 100644
--- a/dlls/winebus.sys/bus.h
+++ b/dlls/winebus.sys/bus.h
@@ -16,6 +16,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include <stdarg.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <winternl.h>
+#include <ddk/wdm.h>
+#include <hidusage.h>
+
typedef int(*enum_func)(DEVICE_OBJECT *device, void *context);
/* Buses */
@@ -57,3 +65,24 @@ BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN;
extern HANDLE driver_key DECLSPEC_HIDDEN;
extern DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN;
+
+struct hid_descriptor
+{
+ BYTE *data;
+ SIZE_T size;
+ SIZE_T max_size;
+};
+
+extern BOOL hid_descriptor_append(struct hid_descriptor *desc, const BYTE *buffer, SIZE_T size) DECLSPEC_HIDDEN;
+extern BOOL hid_descriptor_begin(struct hid_descriptor *desc, USAGE usage_page, USAGE usage) DECLSPEC_HIDDEN;
+extern BOOL hid_descriptor_end(struct hid_descriptor *desc) DECLSPEC_HIDDEN;
+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, INT size, LONG min, LONG max) DECLSPEC_HIDDEN;
+
+extern BOOL hid_descriptor_add_haptics(struct hid_descriptor *desc) DECLSPEC_HIDDEN;
diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index 1580ba5ef92..572b46b4114 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -43,7 +43,6 @@
#include "wine/debug.h"
#include "wine/unicode.h"
#include "hidusage.h"
-#include "controller.h"
#ifdef WORDS_BIGENDIAN
# define LE_WORD(x) RtlUshortByteSwap(x)
@@ -121,8 +120,7 @@ struct platform_private
int ball_start;
int hat_bit_offs; /* hatswitches are reported in the same bytes as buttons */
- int report_descriptor_size;
- BYTE *report_descriptor;
+ struct hid_descriptor desc;
int buffer_length;
BYTE *report_buffer;
@@ -136,116 +134,10 @@ static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *de
return (struct platform_private *)get_platform_private(device);
}
-#include "psh_hid_macros.h"
-
-static const BYTE REPORT_AXIS_TAIL[] = {
- LOGICAL_MINIMUM(4, 0x00000000),
- LOGICAL_MAXIMUM(4, 0x0000ffff),
- PHYSICAL_MINIMUM(4, 0x00000000),
- PHYSICAL_MAXIMUM(4, 0x0000ffff),
- REPORT_SIZE(1, 16),
- REPORT_COUNT(1, /* placeholder */ 0),
- INPUT(1, Data|Var|Abs),
-};
-#define IDX_ABS_AXIS_COUNT 23
-
#define CONTROLLER_NUM_BUTTONS 11
-
-static const BYTE CONTROLLER_BUTTONS[] = {
- USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON),
- USAGE_MINIMUM(1, 1),
- USAGE_MAXIMUM(1, CONTROLLER_NUM_BUTTONS),
- LOGICAL_MINIMUM(1, 0),
- LOGICAL_MAXIMUM(1, 1),
- PHYSICAL_MINIMUM(1, 0),
- PHYSICAL_MAXIMUM(1, 1),
- REPORT_COUNT(1, CONTROLLER_NUM_BUTTONS),
- REPORT_SIZE(1, 1),
- INPUT(1, Data|Var|Abs),
-};
-
-static const BYTE CONTROLLER_AXIS [] = {
- USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC),
- USAGE(1, HID_USAGE_GENERIC_X),
- USAGE(1, HID_USAGE_GENERIC_Y),
- USAGE(1, HID_USAGE_GENERIC_RX),
- USAGE(1, HID_USAGE_GENERIC_RY),
- LOGICAL_MINIMUM(4, 0x00000000),
- LOGICAL_MAXIMUM(4, 0x0000ffff),
- PHYSICAL_MINIMUM(4, 0x00000000),
- PHYSICAL_MAXIMUM(4, 0x0000ffff),
- REPORT_SIZE(1, 16),
- REPORT_COUNT(1, 4),
- INPUT(1, Data|Var|Abs),
-};
-
-static const BYTE CONTROLLER_TRIGGERS [] = {
- USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC),
- USAGE(1, HID_USAGE_GENERIC_Z),
- USAGE(1, HID_USAGE_GENERIC_RZ),
- LOGICAL_MINIMUM(2, 0x0000),
- LOGICAL_MAXIMUM(2, 0x7fff),
- PHYSICAL_MINIMUM(2, 0x0000),
- PHYSICAL_MAXIMUM(2, 0x7fff),
- REPORT_SIZE(1, 16),
- REPORT_COUNT(1, 2),
- INPUT(1, Data|Var|Abs),
-};
-
#define CONTROLLER_NUM_AXES 6
-
#define CONTROLLER_NUM_HATSWITCHES 1
-static const BYTE HAPTIC_RUMBLE[] = {
- USAGE_PAGE(2, HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN),
- USAGE(1, 0x01),
- /* padding */
- REPORT_COUNT(1, 0x02),
- REPORT_SIZE(1, 0x08),
- OUTPUT(1, Data|Var|Abs),
- /* actuators */
- LOGICAL_MINIMUM(1, 0x00),
- LOGICAL_MAXIMUM(1, 0xff),
- PHYSICAL_MINIMUM(1, 0x00),
- PHYSICAL_MAXIMUM(1, 0xff),
- REPORT_SIZE(1, 0x08),
- REPORT_COUNT(1, 0x02),
- OUTPUT(1, Data|Var|Abs),
- /* padding */
- REPORT_COUNT(1, 0x02),
- REPORT_SIZE(1, 0x08),
- OUTPUT(1, Data|Var|Abs),
-};
-
-#include "pop_hid_macros.h"
-
-static BYTE *add_axis_block(BYTE *report_ptr, BYTE count, BYTE page, const BYTE *usages, BOOL absolute)
-{
- int i;
- memcpy(report_ptr, REPORT_AXIS_HEADER, sizeof(REPORT_AXIS_HEADER));
- report_ptr[IDX_AXIS_PAGE] = page;
- report_ptr += sizeof(REPORT_AXIS_HEADER);
- for (i = 0; i < count; i++)
- {
- memcpy(report_ptr, REPORT_AXIS_USAGE, sizeof(REPORT_AXIS_USAGE));
- report_ptr[IDX_AXIS_USAGE] = usages[i];
- report_ptr += sizeof(REPORT_AXIS_USAGE);
- }
- if (absolute)
- {
- memcpy(report_ptr, REPORT_AXIS_TAIL, sizeof(REPORT_AXIS_TAIL));
- report_ptr[IDX_ABS_AXIS_COUNT] = count;
- report_ptr += sizeof(REPORT_AXIS_TAIL);
- }
- else
- {
- memcpy(report_ptr, REPORT_REL_AXIS_TAIL, sizeof(REPORT_REL_AXIS_TAIL));
- report_ptr[IDX_REL_AXIS_COUNT] = count;
- report_ptr += sizeof(REPORT_REL_AXIS_TAIL);
- }
- return report_ptr;
-}
-
static void set_button_value(struct platform_private *ext, int index, int value)
{
int byte_index = ext->button_start + index / 8;
@@ -334,9 +226,8 @@ static void set_hat_value(struct platform_private *ext, int index, int value)
}
}
-static int test_haptic(struct platform_private *ext)
+static BOOL descriptor_add_haptic(struct platform_private *ext)
{
- int rc = 0;
if (pSDL_JoystickIsHaptic(ext->sdl_joystick))
{
ext->sdl_haptic = pSDL_HapticOpenFromJoystick(ext->sdl_joystick);
@@ -346,7 +237,8 @@ static int test_haptic(struct platform_private *ext)
{
pSDL_HapticStopAll(ext->sdl_haptic);
pSDL_HapticRumbleInit(ext->sdl_haptic);
- rc = sizeof(HAPTIC_RUMBLE);
+ if (!hid_descriptor_add_haptics(&ext->desc))
+ return FALSE;
ext->haptic_effect_id = -1;
}
else
@@ -355,27 +247,17 @@ static int test_haptic(struct platform_private *ext)
ext->sdl_haptic = NULL;
}
}
- return rc;
-}
-static int build_haptic(struct platform_private *ext, BYTE *report_ptr)
-{
- if (ext->sdl_haptic)
- {
- memcpy(report_ptr, HAPTIC_RUMBLE, sizeof(HAPTIC_RUMBLE));
- return (sizeof(HAPTIC_RUMBLE));
- }
- return 0;
+ return TRUE;
}
static BOOL build_report_descriptor(struct platform_private *ext)
{
- BYTE *report_ptr;
- INT i, descript_size;
+ INT i;
INT report_size;
INT button_count, axis_count, ball_count, hat_count;
- static const BYTE device_usage[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD};
- static const BYTE controller_usages[] = {
+ static const USAGE device_usage[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD};
+ static const USAGE controller_usages[] = {
HID_USAGE_GENERIC_X,
HID_USAGE_GENERIC_Y,
HID_USAGE_GENERIC_Z,
@@ -385,7 +267,7 @@ static BOOL build_report_descriptor(struct platform_private *ext)
HID_USAGE_GENERIC_SLIDER,
HID_USAGE_GENERIC_DIAL,
HID_USAGE_GENERIC_WHEEL};
- static const BYTE joystick_usages[] = {
+ static const USAGE joystick_usages[] = {
HID_USAGE_GENERIC_X,
HID_USAGE_GENERIC_Y,
HID_USAGE_GENERIC_Z,
@@ -396,7 +278,6 @@ static BOOL build_report_descriptor(struct platform_private *ext)
HID_USAGE_GENERIC_DIAL,
HID_USAGE_GENERIC_WHEEL};
- descript_size = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL);
report_size = 0;
axis_count = pSDL_JoystickNumAxes(ext->sdl_joystick);
@@ -409,9 +290,6 @@ static BOOL build_report_descriptor(struct platform_private *ext)
ext->axis_start = report_size;
if (axis_count)
{
- descript_size += sizeof(REPORT_AXIS_HEADER);
- descript_size += (sizeof(REPORT_AXIS_USAGE) * axis_count);
- descript_size += sizeof(REPORT_AXIS_TAIL);
report_size += (sizeof(WORD) * axis_count);
}
@@ -424,77 +302,55 @@ static BOOL build_report_descriptor(struct platform_private *ext)
FIXME("Capping ball + axis at 9\n");
ball_count = (9-axis_count)/2;
}
- descript_size += sizeof(REPORT_AXIS_HEADER);
- descript_size += (sizeof(REPORT_AXIS_USAGE) * ball_count * 2);
- descript_size += sizeof(REPORT_REL_AXIS_TAIL);
report_size += (sizeof(WORD) * 2 * ball_count);
}
/* For now lump all buttons just into incremental usages, Ignore Keys */
button_count = pSDL_JoystickNumButtons(ext->sdl_joystick);
ext->button_start = report_size;
- if (button_count)
- {
- descript_size += sizeof(REPORT_BUTTONS);
- }
hat_count = pSDL_JoystickNumHats(ext->sdl_joystick);
ext->hat_bit_offs = button_count;
- if (hat_count)
- {
- descript_size += sizeof(REPORT_HATSWITCH);
- }
report_size += (button_count + hat_count * 4 + 7) / 8;
- descript_size += test_haptic(ext);
-
- TRACE("Report Descriptor will be %i bytes\n", descript_size);
TRACE("Report will be %i bytes\n", report_size);
- ext->report_descriptor = HeapAlloc(GetProcessHeap(), 0, descript_size);
- if (!ext->report_descriptor)
- {
- ERR("Failed to alloc report descriptor\n");
+ if (!hid_descriptor_begin(&ext->desc, device_usage[0], device_usage[1]))
return FALSE;
- }
- report_ptr = ext->report_descriptor;
-
- memcpy(report_ptr, REPORT_HEADER, sizeof(REPORT_HEADER));
- report_ptr[IDX_HEADER_PAGE] = device_usage[0];
- report_ptr[IDX_HEADER_USAGE] = device_usage[1];
- report_ptr += sizeof(REPORT_HEADER);
- if (axis_count)
- {
- if (axis_count == 6 && button_count >= 14)
- report_ptr = add_axis_block(report_ptr, axis_count, HID_USAGE_PAGE_GENERIC, controller_usages, TRUE);
- else
- report_ptr = add_axis_block(report_ptr, axis_count, HID_USAGE_PAGE_GENERIC, joystick_usages, TRUE);
- }
- if (ball_count)
+ if (axis_count == 6 && button_count >= 14)
{
- report_ptr = add_axis_block(report_ptr, ball_count * 2, HID_USAGE_PAGE_GENERIC, &joystick_usages[axis_count], FALSE);
+ if (!hid_descriptor_add_axes(&ext->desc, axis_count, HID_USAGE_PAGE_GENERIC,
+ controller_usages, FALSE, 16, 0, 0xffff))
+ return FALSE;
}
- if (button_count)
+ else if (axis_count)
{
- report_ptr = add_button_block(report_ptr, 1, button_count);
+ if (!hid_descriptor_add_axes(&ext->desc, axis_count, HID_USAGE_PAGE_GENERIC,
+ joystick_usages, FALSE, 16, 0, 0xffff))
+ return FALSE;
}
- if (hat_count)
- report_ptr = add_hatswitch(report_ptr, hat_count);
- report_ptr += build_haptic(ext, report_ptr);
- memcpy(report_ptr, REPORT_TAIL, sizeof(REPORT_TAIL));
+ if (ball_count && !hid_descriptor_add_axes(&ext->desc, ball_count * 2, HID_USAGE_PAGE_GENERIC,
+ &joystick_usages[axis_count], TRUE, 8, 0x81, 0x7f))
+ return FALSE;
- ext->report_descriptor_size = descript_size;
- ext->buffer_length = report_size;
- ext->report_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, report_size);
- if (ext->report_buffer == NULL)
- {
- ERR("Failed to alloc report buffer\n");
- HeapFree(GetProcessHeap(), 0, ext->report_descriptor);
+ if (button_count && !hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, button_count))
+ return FALSE;
+
+ if (hat_count && !hid_descriptor_add_hatswitch(&ext->desc, hat_count))
return FALSE;
- }
+
+ if (!descriptor_add_haptic(ext))
+ return FALSE;
+
+ if (!hid_descriptor_end(&ext->desc))
+ return FALSE;
+
+ ext->buffer_length = report_size;
+ if (!(ext->report_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, report_size)))
+ goto failed;
/* Initialize axis in the report */
for (i = 0; i < axis_count; i++)
@@ -503,6 +359,11 @@ static BOOL build_report_descriptor(struct platform_private *ext)
set_hat_value(ext, i, pSDL_JoystickGetHat(ext->sdl_joystick, i));
return TRUE;
+
+failed:
+ HeapFree(GetProcessHeap(), 0, ext->report_buffer);
+ hid_descriptor_free(&ext->desc);
+ return FALSE;
}
static SHORT compose_dpad_value(SDL_GameController *joystick)
@@ -534,21 +395,13 @@ static SHORT compose_dpad_value(SDL_GameController *joystick)
static BOOL build_mapped_report_descriptor(struct platform_private *ext)
{
- BYTE *report_ptr;
- INT i, descript_size;
+ 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 + CONTROLLER_NUM_HATSWITCHES * 4;
- descript_size = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL);
- descript_size += sizeof(CONTROLLER_AXIS);
- descript_size += sizeof(CONTROLLER_TRIGGERS);
- descript_size += sizeof(CONTROLLER_BUTTONS);
- descript_size += sizeof(REPORT_HATSWITCH);
- descript_size += sizeof(REPORT_PADDING);
- if (BUTTON_BIT_COUNT % 8 != 0)
- descript_size += sizeof(REPORT_PADDING);
- descript_size += test_haptic(ext);
-
ext->axis_start = 0;
ext->button_start = CONTROLLER_NUM_AXES * sizeof(WORD);
ext->hat_bit_offs = CONTROLLER_NUM_BUTTONS;
@@ -557,43 +410,49 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext)
+ CONTROLLER_NUM_AXES * sizeof(WORD)
+ 2/* unknown constant*/;
- TRACE("Report Descriptor will be %i bytes\n", descript_size);
TRACE("Report will be %i bytes\n", ext->buffer_length);
- ext->report_descriptor = HeapAlloc(GetProcessHeap(), 0, descript_size);
- if (!ext->report_descriptor)
- {
- ERR("Failed to alloc report descriptor\n");
+ if (!hid_descriptor_begin(&ext->desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD))
return FALSE;
- }
- report_ptr = ext->report_descriptor;
-
- memcpy(report_ptr, REPORT_HEADER, sizeof(REPORT_HEADER));
- report_ptr[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC;
- report_ptr[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_GAMEPAD;
- report_ptr += sizeof(REPORT_HEADER);
- memcpy(report_ptr, CONTROLLER_AXIS, sizeof(CONTROLLER_AXIS));
- report_ptr += sizeof(CONTROLLER_AXIS);
- memcpy(report_ptr, CONTROLLER_TRIGGERS, sizeof(CONTROLLER_TRIGGERS));
- report_ptr += sizeof(CONTROLLER_TRIGGERS);
- memcpy(report_ptr, CONTROLLER_BUTTONS, sizeof(CONTROLLER_BUTTONS));
- report_ptr += sizeof(CONTROLLER_BUTTONS);
- report_ptr = add_hatswitch(report_ptr, 1);
+
+ if (!hid_descriptor_add_axes(&ext->desc, 2, HID_USAGE_PAGE_GENERIC, left_axis_usages,
+ FALSE, 16, 0, 0xffff))
+ return FALSE;
+
+ if (!hid_descriptor_add_axes(&ext->desc, 2, HID_USAGE_PAGE_GENERIC, right_axis_usages,
+ FALSE, 16, 0, 0xffff))
+ return FALSE;
+
+ if (!hid_descriptor_add_axes(&ext->desc, 2, HID_USAGE_PAGE_GENERIC, trigger_axis_usages,
+ FALSE, 16, 0, 0x7fff))
+ return FALSE;
+
+ if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, CONTROLLER_NUM_BUTTONS))
+ return FALSE;
+
+ if (!hid_descriptor_add_hatswitch(&ext->desc, 1))
+ return FALSE;
+
if (BUTTON_BIT_COUNT % 8 != 0)
- report_ptr = add_padding_block(report_ptr, 8 - (BUTTON_BIT_COUNT % 8));/* unused bits between hatswitch and following constant */
- report_ptr = add_padding_block(report_ptr, 16);/* unknown constant */
- report_ptr += build_haptic(ext, report_ptr);
- memcpy(report_ptr, REPORT_TAIL, sizeof(REPORT_TAIL));
-
- ext->report_descriptor_size = descript_size;
- ext->report_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ext->buffer_length);
- if (ext->report_buffer == NULL)
{
- ERR("Failed to alloc report buffer\n");
- HeapFree(GetProcessHeap(), 0, ext->report_descriptor);
- return FALSE;
+ /* unused bits between hatswitch and following constant */
+ if (!hid_descriptor_add_padding(&ext->desc, 8 - (BUTTON_BIT_COUNT % 8)))
+ return FALSE;
}
+ /* unknown constant */
+ if (!hid_descriptor_add_padding(&ext->desc, 16))
+ return FALSE;
+
+ if (!descriptor_add_haptic(ext))
+ return FALSE;
+
+ if (!hid_descriptor_end(&ext->desc))
+ return FALSE;
+
+ if (!(ext->report_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ext->buffer_length)))
+ goto failed;
+
/* 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);
@@ -605,6 +464,11 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext)
ext->report_buffer[15] = 0xc5;
return TRUE;
+
+failed:
+ HeapFree(GetProcessHeap(), 0, ext->report_buffer);
+ hid_descriptor_free(&ext->desc);
+ return FALSE;
}
static void free_device(DEVICE_OBJECT *device)
@@ -629,13 +493,10 @@ static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD
{
struct platform_private *ext = impl_from_DEVICE_OBJECT(device);
- *out_length = ext->report_descriptor_size;
-
- if (length < ext->report_descriptor_size)
- return STATUS_BUFFER_TOO_SMALL;
-
- memcpy(buffer, ext->report_descriptor, ext->report_descriptor_size);
+ *out_length = ext->desc.size;
+ if (length < ext->desc.size) return STATUS_BUFFER_TOO_SMALL;
+ memcpy(buffer, ext->desc.data, ext->desc.size);
return STATUS_SUCCESS;
}
diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c
index f9469399202..c411e9e3929 100644
--- a/dlls/winebus.sys/bus_udev.c
+++ b/dlls/winebus.sys/bus_udev.c
@@ -78,7 +78,6 @@
#define LE_DWORD(x) (x)
#endif
-#include "controller.h"
#include "bus.h"
WINE_DEFAULT_DEBUG_CHANNEL(plugplay);
diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h
deleted file mode 100644
index b03338841e8..00000000000
--- a/dlls/winebus.sys/controller.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Common controller functions and structures
- *
- * Copyright 2018 Aric Stewart
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <hidusage.h>
-
-struct hid_descriptor
-{
- BYTE *data;
- SIZE_T size;
- SIZE_T max_size;
-};
-
-extern BOOL hid_descriptor_append(struct hid_descriptor *desc, const BYTE *buffer, SIZE_T size) DECLSPEC_HIDDEN;
-extern BOOL hid_descriptor_begin(struct hid_descriptor *desc, USAGE usage_page, USAGE usage) DECLSPEC_HIDDEN;
-extern BOOL hid_descriptor_end(struct hid_descriptor *desc) DECLSPEC_HIDDEN;
-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, INT size, LONG min, LONG max) DECLSPEC_HIDDEN;
-
-/* Blocks of data for building HID device descriptions */
-
-#include "psh_hid_macros.h"
-
-static const BYTE REPORT_HEADER[] = {
- USAGE_PAGE(1, /* placeholder */ HID_USAGE_PAGE_GENERIC),
- USAGE(1, 0),
- COLLECTION(1, Application),
- USAGE(1, /* placeholder */ HID_USAGE_GENERIC_POINTER),
- COLLECTION(1, Physical),
-};
-#define IDX_HEADER_PAGE 1
-#define IDX_HEADER_USAGE 3
-
-static const BYTE REPORT_BUTTONS[] = {
- USAGE_PAGE(1, /* placeholder */ HID_USAGE_PAGE_BUTTON),
- USAGE_MINIMUM(1, /* placeholder */ 1),
- USAGE_MAXIMUM(1, /* placeholder */ 3),
- LOGICAL_MINIMUM(1, 0),
- LOGICAL_MAXIMUM(1, 1),
- PHYSICAL_MINIMUM(1, 0),
- PHYSICAL_MAXIMUM(1, 1),
- REPORT_COUNT(1, /* placeholder */ 3),
- REPORT_SIZE(1, 1),
- INPUT(1, Data|Var|Abs),
-};
-#define IDX_BUTTON_USAGE_PAGE 1
-#define IDX_BUTTON_MIN_USAGE 3
-#define IDX_BUTTON_MAX_USAGE 5
-#define IDX_BUTTON_COUNT 15
-
-static const BYTE REPORT_PADDING[] = {
- REPORT_COUNT(1, /* placeholder */ 3),
- REPORT_SIZE(1, 1),
- INPUT(1, Cnst|Var|Abs),
-};
-#define IDX_PADDING_BIT_COUNT 1
-
-static const BYTE REPORT_AXIS_HEADER[] = {
- USAGE_PAGE(1, /* placeholder */ HID_USAGE_PAGE_GENERIC),
-};
-#define IDX_AXIS_PAGE 1
-
-static const BYTE REPORT_AXIS_USAGE[] = {
- USAGE(1, /* placeholder */ HID_USAGE_GENERIC_X),
-};
-#define IDX_AXIS_USAGE 1
-
-static const BYTE REPORT_REL_AXIS_TAIL[] = {
- LOGICAL_MINIMUM(1, 0x81),
- LOGICAL_MAXIMUM(1, 0x7f),
- REPORT_SIZE(1, 8),
- REPORT_COUNT(1, /* placeholder */ 2),
- INPUT(1, Data|Var|Rel),
-};
-#define IDX_REL_AXIS_COUNT 7
-
-static const BYTE REPORT_HATSWITCH[] = {
- USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC),
- USAGE(1, HID_USAGE_GENERIC_HATSWITCH),
- LOGICAL_MINIMUM(1, 1),
- LOGICAL_MAXIMUM(1, 8),
- PHYSICAL_MINIMUM(1, 0),
- PHYSICAL_MAXIMUM(1, 8),
- REPORT_SIZE(1, 4),
- REPORT_COUNT(1, /* placeholder */ 1),
- INPUT(1, Data|Var|Abs),
-};
-#define IDX_HATSWITCH_COUNT 15
-
-static const BYTE REPORT_TAIL[] = {
- END_COLLECTION,
- END_COLLECTION,
-};
-
-#include "pop_hid_macros.h"
-
-static inline BYTE *add_button_block(BYTE* report_ptr, BYTE usage_min, BYTE usage_max)
-{
- memcpy(report_ptr, REPORT_BUTTONS, sizeof(REPORT_BUTTONS));
- report_ptr[IDX_BUTTON_MIN_USAGE] = usage_min;
- report_ptr[IDX_BUTTON_MAX_USAGE] = usage_max;
- report_ptr[IDX_BUTTON_COUNT] = (usage_max - usage_min) + 1;
- return report_ptr + sizeof(REPORT_BUTTONS);
-}
-
-
-static inline BYTE *add_padding_block(BYTE *report_ptr, BYTE bitcount)
-{
- memcpy(report_ptr, REPORT_PADDING, sizeof(REPORT_PADDING));
- report_ptr[IDX_PADDING_BIT_COUNT] = bitcount;
- return report_ptr + sizeof(REPORT_PADDING);
-}
-
-static inline BYTE *add_hatswitch(BYTE *report_ptr, INT count)
-{
- memcpy(report_ptr, REPORT_HATSWITCH, sizeof(REPORT_HATSWITCH));
- report_ptr[IDX_HATSWITCH_COUNT] = count;
- return report_ptr + sizeof(REPORT_HATSWITCH);
-}
diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c
index 86c27d3eded..1a245031d4d 100644
--- a/dlls/winebus.sys/hid.c
+++ b/dlls/winebus.sys/hid.c
@@ -18,7 +18,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "controller.h"
+#include <stdarg.h>
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "winternl.h"
+#include "winioctl.h"
+#include "hidusage.h"
+#include "ddk/wdm.h"
+
+#include "bus.h"
BOOL hid_descriptor_append(struct hid_descriptor *desc, const BYTE *buffer, SIZE_T size)
{
@@ -209,4 +218,31 @@ BOOL hid_descriptor_add_axes(struct hid_descriptor *desc, BYTE count, USAGE usag
return TRUE;
}
+BOOL hid_descriptor_add_haptics(struct hid_descriptor *desc)
+{
+ static const BYTE template[] =
+ {
+ USAGE_PAGE(2, HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN),
+ USAGE(1, 0x01),
+ /* padding */
+ REPORT_COUNT(1, 0x02),
+ REPORT_SIZE(1, 0x08),
+ OUTPUT(1, Data|Var|Abs),
+ /* actuators */
+ LOGICAL_MINIMUM(1, 0x00),
+ LOGICAL_MAXIMUM(1, 0xff),
+ PHYSICAL_MINIMUM(1, 0x00),
+ PHYSICAL_MAXIMUM(1, 0xff),
+ REPORT_SIZE(1, 0x08),
+ REPORT_COUNT(1, 0x02),
+ OUTPUT(1, Data|Var|Abs),
+ /* padding */
+ REPORT_COUNT(1, 0x02),
+ REPORT_SIZE(1, 0x08),
+ OUTPUT(1, Data|Var|Abs),
+ };
+
+ return hid_descriptor_append(desc, template, sizeof(template));
+}
+
#include "pop_hid_macros.h"
diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c
index 84885bdcce9..001f775e230 100644
--- a/dlls/winebus.sys/main.c
+++ b/dlls/winebus.sys/main.c
@@ -34,7 +34,6 @@
#include "wine/list.h"
#include "bus.h"
-#include "controller.h"
WINE_DEFAULT_DEBUG_CHANNEL(plugplay);
WINE_DECLARE_DEBUG_CHANNEL(hid_report);
diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c
index 0c94bfed982..272a41c690c 100644
--- a/dlls/xinput1_3/tests/xinput.c
+++ b/dlls/xinput1_3/tests/xinput.c
@@ -460,7 +460,6 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre
todo_wine_if(xi_caps.Flags & XINPUT_CAPS_FFB_SUPPORTED)
check_member(*hid_caps, expect_hid_caps, "%d", OutputReportByteLength);
check_member(*hid_caps, expect_hid_caps, "%d", FeatureReportByteLength);
- todo_wine
check_member(*hid_caps, expect_hid_caps, "%d", NumberLinkCollectionNodes);
check_member(*hid_caps, expect_hid_caps, "%d", NumberInputButtonCaps);
todo_wine
@@ -479,20 +478,16 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre
length = hid_caps->NumberLinkCollectionNodes;
status = HidP_GetLinkCollectionNodes(collections, &length, preparsed);
ok(status == HIDP_STATUS_SUCCESS, "HidP_GetLinkCollectionNodes returned %#x\n", status);
- todo_wine
ok(length == ARRAY_SIZE(expect_collections), "got %d collections\n", length);
for (i = 0; i < min(length, ARRAY_SIZE(expect_collections)); ++i)
{
winetest_push_context("collections[%d]", i);
- todo_wine_if(i == 1)
check_member(collections[i], expect_collections[i], "%04x", LinkUsage);
check_member(collections[i], expect_collections[i], "%04x", LinkUsagePage);
check_member(collections[i], expect_collections[i], "%d", Parent);
- todo_wine_if(i == 0)
check_member(collections[i], expect_collections[i], "%d", NumberOfChildren);
check_member(collections[i], expect_collections[i], "%d", NextSibling);
- todo_wine_if(i == 0)
check_member(collections[i], expect_collections[i], "%d", FirstChild);
check_member(collections[i], expect_collections[i], "%d", CollectionType);
check_member(collections[i], expect_collections[i], "%d", IsAlias);
@@ -511,9 +506,7 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre
check_member(button_caps[i], expect_button_caps[i], "%d", ReportID);
check_member(button_caps[i], expect_button_caps[i], "%d", IsAlias);
check_member(button_caps[i], expect_button_caps[i], "%d", BitField);
- todo_wine
check_member(button_caps[i], expect_button_caps[i], "%d", LinkCollection);
- todo_wine
check_member(button_caps[i], expect_button_caps[i], "%04x", LinkUsage);
check_member(button_caps[i], expect_button_caps[i], "%04x", LinkUsagePage);
check_member(button_caps[i], expect_button_caps[i], "%d", IsRange);
@@ -569,9 +562,9 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre
check_member(value_caps[i], expect_value_caps[i], "%d", IsAlias);
todo_wine_if(i == 5)
check_member(value_caps[i], expect_value_caps[i], "%d", BitField);
- todo_wine_if(i >= 2)
+ todo_wine_if(i == 5)
check_member(value_caps[i], expect_value_caps[i], "%d", LinkCollection);
- todo_wine
+ todo_wine_if(i == 5)
check_member(value_caps[i], expect_value_caps[i], "%d", LinkUsage);
check_member(value_caps[i], expect_value_caps[i], "%d", LinkUsagePage);
check_member(value_caps[i], expect_value_caps[i], "%d", IsRange);
@@ -597,7 +590,7 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre
if (!value_caps[i].IsRange && !expect_value_caps[i].IsRange)
{
- todo_wine
+ todo_wine_if(i >= 4)
check_member(value_caps[i], expect_value_caps[i], "%04x", NotRange.Usage);
todo_wine_if(i == 5)
check_member(value_caps[i], expect_value_caps[i], "%d", NotRange.DataIndex);
--
2.32.0
More information about the wine-devel
mailing list