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

hidclass.sys: Improvements for IOCTL_HID_GET_FEATURE handling.

Browse Source 
Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Aric Stewart 2016-04-05 08:43:48 -05:00 committed by Alexandre Julliard
parent 1b62b7f3c9
commit be91fcd879
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/hidclass.sys/device.c
View File

@ -437,11 +437,11 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp)
HID_XFER_PACKET *packet; HID_XFER_PACKET *packet;
DWORD len; DWORD len;
NTSTATUS rc = STATUS_SUCCESS; NTSTATUS rc = STATUS_SUCCESS;
WCHAR *out_buffer; BYTE *out_buffer;
irp->IoStatus.Information = 0; irp->IoStatus.Information = 0;
out_buffer = (WCHAR*)(((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset); out_buffer = (((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset);
TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer);
len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength;
@ -452,16 +452,21 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp)
TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet->reportId, packet->reportBufferLen, packet->reportBuffer); TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet->reportId, packet->reportBufferLen, packet->reportBuffer);
rc = call_minidriver(IOCTL_HID_GET_FEATURE, device, NULL, 0, packet, len); rc = call_minidriver(IOCTL_HID_GET_FEATURE, device, NULL, 0, packet, sizeof(*packet));
irp->IoStatus.u.Status = rc; irp->IoStatus.u.Status = rc;
if (irp->IoStatus.u.Status == STATUS_SUCCESS) if (irp->IoStatus.u.Status == STATUS_SUCCESS)
irp->IoStatus.Information = irpsp->Parameters.DeviceIoControl.OutputBufferLength; {
irp->IoStatus.Information = packet->reportBufferLen;
memcpy(out_buffer, packet->reportBuffer, packet->reportBufferLen);
}
else else
irp->IoStatus.Information = 0; irp->IoStatus.Information = 0;
TRACE_(hid_report)("Result 0x%x get %li bytes\n", rc, irp->IoStatus.Information); TRACE_(hid_report)("Result 0x%x get %li bytes\n", rc, irp->IoStatus.Information);
HeapFree(GetProcessHeap(), 0, packet);
return rc; return rc;
} }