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

winebus.sys: Implement IOCTL_HID_GET_STRING for hidraw. 

Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Aric Stewart 2016-10-14 08:54:52 +02:00 committed by Alexandre Julliard
parent 66d70e38f5
commit f45cec07ff
3 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

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

@ -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)

11
dlls/winebus.sys/main.c
View File

@ -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;