Aric Stewart : winebus.sys: Implement IOCTL_HID_GET_STRING for hidraw.
Alexandre Julliard
julliard at winehq.org
Fri Oct 14 13:46:55 CDT 2016
Module: wine
Branch: master
Commit: f45cec07ff70488aef5b1a598aaa9fdac9e18e28
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45cec07ff70488aef5b1a598aaa9fdac9e18e28
Author: Aric Stewart <aric at codeweavers.com>
Date: Fri Oct 14 08:54:52 2016 +0200
winebus.sys: Implement IOCTL_HID_GET_STRING for hidraw.
Signed-off-by: Aric Stewart <aric at codeweavers.com>
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winebus.sys/bus.h | 1 +
dlls/winebus.sys/bus_udev.c | 73 +++++++++++++++++++++++++++++++++++++++++++++
dlls/winebus.sys/main.c | 11 +++++++
3 files changed, 85 insertions(+)
diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h
index 9ab242c..7ce54bf 100644
--- a/dlls/winebus.sys/bus.h
+++ b/dlls/winebus.sys/bus.h
@@ -24,6 +24,7 @@ typedef struct
{
int (*compare_platform_device)(DEVICE_OBJECT *device, void *platform_dev);
NTSTATUS (*get_reportdescriptor)(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length);
+ NTSTATUS (*get_string)(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length);
} platform_vtbl;
void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN;
diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c
index fd5de70..243aabb 100644
--- a/dlls/winebus.sys/bus_udev.c
+++ b/dlls/winebus.sys/bus_udev.c
@@ -51,7 +51,9 @@
#include "winnls.h"
#include "winternl.h"
#include "ddk/wdm.h"
+#include "ddk/hidtypes.h"
#include "wine/debug.h"
+#include "wine/unicode.h"
#include "bus.h"
@@ -150,10 +152,81 @@ static NTSTATUS hidraw_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer,
#endif
}
+static NTSTATUS hidraw_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length)
+{
+ struct udev_device *usbdev;
+ struct platform_private *private = impl_from_DEVICE_OBJECT(device);
+ WCHAR *str = NULL;
+
+ usbdev = udev_device_get_parent_with_subsystem_devtype(private->udev_device, "usb", "usb_device");
+ if (usbdev)
+ {
+ switch (index)
+ {
+ case HID_STRING_ID_IPRODUCT:
+ str = get_sysattr_string(usbdev, "product");
+ break;
+ case HID_STRING_ID_IMANUFACTURER:
+ str = get_sysattr_string(usbdev, "manufacturer");
+ break;
+ case HID_STRING_ID_ISERIALNUMBER:
+ str = get_sysattr_string(usbdev, "serial");
+ break;
+ default:
+ ERR("Unhandled string index %08x\n", index);
+ return STATUS_NOT_IMPLEMENTED;
+ }
+ }
+ else
+ {
+#ifdef HAVE_LINUX_HIDRAW_H
+ switch (index)
+ {
+ case HID_STRING_ID_IPRODUCT:
+ {
+ char buf[MAX_PATH];
+ if (ioctl(private->device_fd, HIDIOCGRAWNAME(MAX_PATH), buf) == -1)
+ WARN("ioctl(HIDIOCGRAWNAME) failed: %d %s\n", errno, strerror(errno));
+ else
+ str = strdupAtoW(buf);
+ break;
+ }
+ case HID_STRING_ID_IMANUFACTURER:
+ break;
+ case HID_STRING_ID_ISERIALNUMBER:
+ break;
+ default:
+ ERR("Unhandled string index %08x\n", index);
+ return STATUS_NOT_IMPLEMENTED;
+ }
+#else
+ return STATUS_NOT_IMPLEMENTED;
+#endif
+ }
+
+ if (!str)
+ {
+ if (!length) return STATUS_BUFFER_TOO_SMALL;
+ buffer[0] = 0;
+ return STATUS_SUCCESS;
+ }
+
+ if (length <= strlenW(str))
+ {
+ HeapFree(GetProcessHeap(), 0, str);
+ return STATUS_BUFFER_TOO_SMALL;
+ }
+
+ strcpyW(buffer, str);
+ HeapFree(GetProcessHeap(), 0, str);
+ return STATUS_SUCCESS;
+}
+
static const platform_vtbl hidraw_vtbl =
{
compare_platform_device,
hidraw_get_reportdescriptor,
+ hidraw_get_string,
};
static void try_add_device(struct udev_device *dev)
diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c
index ad09ec1..86adbf5 100644
--- a/dlls/winebus.sys/main.c
+++ b/dlls/winebus.sys/main.c
@@ -421,6 +421,17 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
irp->IoStatus.Information = length;
break;
}
+ case IOCTL_HID_GET_STRING:
+ {
+ DWORD length = irpsp->Parameters.DeviceIoControl.OutputBufferLength / sizeof(WCHAR);
+ DWORD index = (ULONG_PTR)irpsp->Parameters.DeviceIoControl.Type3InputBuffer;
+ TRACE("IOCTL_HID_GET_STRING[%08x]\n", index);
+
+ irp->IoStatus.u.Status = status = ext->vtbl->get_string(device, index, (WCHAR *)irp->UserBuffer, length);
+ if (status == STATUS_SUCCESS)
+ irp->IoStatus.Information = (strlenW((WCHAR *)irp->UserBuffer) + 1) * sizeof(WCHAR);
+ break;
+ }
default:
{
ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;
More information about the wine-cvs
mailing list