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

winebus.sys: Use a local variable to store buffer len. 

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-08-12 09:47:01 +02:00 committed by Alexandre Julliard
parent 2d7fa05ce4
commit a446e0e57d
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -822,6 +822,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
NTSTATUS status = irp->IoStatus.u.Status; NTSTATUS status = irp->IoStatus.u.Status;
IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp);
struct device_extension *ext = (struct device_extension *)device->DeviceExtension; struct device_extension *ext = (struct device_extension *)device->DeviceExtension;
ULONG code, buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength;
TRACE("(%p, %p)\n", device, irp); TRACE("(%p, %p)\n", device, irp);
@ -841,14 +842,14 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
return STATUS_DELETE_PENDING; return STATUS_DELETE_PENDING;
} }
switch (irpsp->Parameters.DeviceIoControl.IoControlCode) switch ((code = irpsp->Parameters.DeviceIoControl.IoControlCode))
{ {
case IOCTL_HID_GET_DEVICE_ATTRIBUTES: case IOCTL_HID_GET_DEVICE_ATTRIBUTES:
{ {
HID_DEVICE_ATTRIBUTES *attr = (HID_DEVICE_ATTRIBUTES *)irp->UserBuffer; HID_DEVICE_ATTRIBUTES *attr = (HID_DEVICE_ATTRIBUTES *)irp->UserBuffer;
TRACE("IOCTL_HID_GET_DEVICE_ATTRIBUTES\n"); TRACE("IOCTL_HID_GET_DEVICE_ATTRIBUTES\n");
if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(*attr)) if (buffer_len < sizeof(*attr))
{ {
irp->IoStatus.u.Status = status = STATUS_BUFFER_TOO_SMALL; irp->IoStatus.u.Status = status = STATUS_BUFFER_TOO_SMALL;
break; break;
@ -870,7 +871,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
DWORD length; DWORD length;
TRACE("IOCTL_HID_GET_DEVICE_DESCRIPTOR\n"); TRACE("IOCTL_HID_GET_DEVICE_DESCRIPTOR\n");
if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(*descriptor)) if (buffer_len < sizeof(*descriptor))
{ {
irp->IoStatus.u.Status = status = STATUS_BUFFER_TOO_SMALL; irp->IoStatus.u.Status = status = STATUS_BUFFER_TOO_SMALL;
break; break;
@ -898,23 +899,18 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
break; break;
} }
case IOCTL_HID_GET_REPORT_DESCRIPTOR: case IOCTL_HID_GET_REPORT_DESCRIPTOR:
{
DWORD length = irpsp->Parameters.DeviceIoControl.OutputBufferLength;
TRACE("IOCTL_HID_GET_REPORT_DESCRIPTOR\n"); TRACE("IOCTL_HID_GET_REPORT_DESCRIPTOR\n");
irp->IoStatus.u.Status = status = ext->vtbl->get_reportdescriptor(device, irp->UserBuffer, buffer_len, &buffer_len);
irp->IoStatus.u.Status = status = ext->vtbl->get_reportdescriptor(device, irp->UserBuffer, length, &length); irp->IoStatus.Information = buffer_len;
irp->IoStatus.Information = length;
break; break;
}
case IOCTL_HID_GET_STRING: case IOCTL_HID_GET_STRING:
{ {
DWORD length = irpsp->Parameters.DeviceIoControl.OutputBufferLength / sizeof(WCHAR);
DWORD index = (ULONG_PTR)irpsp->Parameters.DeviceIoControl.Type3InputBuffer; DWORD index = (ULONG_PTR)irpsp->Parameters.DeviceIoControl.Type3InputBuffer;
TRACE("IOCTL_HID_GET_STRING[%08x]\n", index); TRACE("IOCTL_HID_GET_STRING[%08x]\n", index);
irp->IoStatus.u.Status = status = hid_get_native_string(device, index, (WCHAR *)irp->UserBuffer, length); irp->IoStatus.u.Status = status = hid_get_native_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len / sizeof(WCHAR));
if (status != STATUS_SUCCESS) if (status != STATUS_SUCCESS)
irp->IoStatus.u.Status = status = ext->vtbl->get_string(device, index, (WCHAR *)irp->UserBuffer, length); irp->IoStatus.u.Status = status = ext->vtbl->get_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len / sizeof(WCHAR));
if (status == STATUS_SUCCESS) if (status == STATUS_SUCCESS)
irp->IoStatus.Information = (strlenW((WCHAR *)irp->UserBuffer) + 1) * sizeof(WCHAR); irp->IoStatus.Information = (strlenW((WCHAR *)irp->UserBuffer) + 1) * sizeof(WCHAR);
break; break;
@ -950,8 +946,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
if (!ext->last_report_read) if (!ext->last_report_read)
{ {
irp->IoStatus.u.Status = status = deliver_last_report(ext, irp->IoStatus.u.Status = status = deliver_last_report(ext,
irpsp->Parameters.DeviceIoControl.OutputBufferLength, buffer_len, irp->UserBuffer, &irp->IoStatus.Information);
irp->UserBuffer, &irp->IoStatus.Information);
ext->last_report_read = TRUE; ext->last_report_read = TRUE;
} }
else else
@ -991,12 +986,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
break; break;
} }
default: default:
{
ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;
FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n",
code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3);
break; break;
}
} }
LeaveCriticalSection(&ext->cs); LeaveCriticalSection(&ext->cs);