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

hidclass.sys: Use a local NTSTATUS variable to keep IRP status. 

So we can handle pending asynchronous calls to minidriver more easily.

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 2022-04-26 13:10:42 +02:00 committed by Alexandre Julliard
parent ab8c00afbb
commit 313453de29
1 changed files with 40 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,7 +417,7 @@ static const WCHAR *find_device_string( const WCHAR *device_id, ULONG index )
return NULL; return NULL;
} }
static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) static NTSTATUS hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp )
{ {
IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp );
ULONG offset = 0, report_len = 0, buffer_len = 0; ULONG offset = 0, report_len = 0, buffer_len = 0;
@ -442,11 +442,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP
buffer = irp->AssociatedIrp.SystemBuffer; buffer = irp->AssociatedIrp.SystemBuffer;
break; break;
} }
if (!buffer || !buffer_len) if (!buffer || !buffer_len) return STATUS_INVALID_USER_BUFFER;
{
irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER;
return;
}
switch (code) switch (code)
{ {
@ -465,12 +461,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP
if (report) report_len = report->FeatureLength; if (report) report_len = report->FeatureLength;
break; break;
} }
if (!report || buffer_len < report_len) return STATUS_INVALID_PARAMETER;
if (!report || buffer_len < report_len)
{
irp->IoStatus.Status = STATUS_INVALID_PARAMETER;
return;
}
if (!report->ReportID) offset = 1; if (!report->ReportID) offset = 1;
packet.reportId = report->ReportID; packet.reportId = report->ReportID;
@ -491,6 +482,8 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP
if (code == IOCTL_HID_WRITE_REPORT && packet.reportId) irp->IoStatus.Information--; if (code == IOCTL_HID_WRITE_REPORT && packet.reportId) irp->IoStatus.Information--;
break; break;
} }
return irp->IoStatus.Status;
} }
NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp)
@ -498,9 +491,9 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp)
struct hid_queue *queue = irp->Tail.Overlay.OriginalFileObject->FsContext; struct hid_queue *queue = irp->Tail.Overlay.OriginalFileObject->FsContext;
IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp );
BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension;
NTSTATUS status = irp->IoStatus.Status;
ULONG code, index; ULONG code, index;
const WCHAR *str; const WCHAR *str;
NTSTATUS status;
BOOL removed; BOOL removed;
KIRQL irql; KIRQL irql;
@ -522,29 +515,26 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp)
switch ((code = irpsp->Parameters.DeviceIoControl.IoControlCode)) switch ((code = irpsp->Parameters.DeviceIoControl.IoControlCode))
{ {
case IOCTL_HID_GET_POLL_FREQUENCY_MSEC: case IOCTL_HID_GET_POLL_FREQUENCY_MSEC:
TRACE("IOCTL_HID_GET_POLL_FREQUENCY_MSEC\n");
if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG))
status = STATUS_BUFFER_OVERFLOW;
else
{ {
irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.poll_interval;
irp->IoStatus.Information = 0; irp->IoStatus.Information = sizeof(ULONG);
break; status = STATUS_SUCCESS;
} }
*(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.poll_interval;
irp->IoStatus.Information = sizeof(ULONG);
irp->IoStatus.Status = STATUS_SUCCESS;
break; break;
case IOCTL_HID_SET_POLL_FREQUENCY_MSEC: case IOCTL_HID_SET_POLL_FREQUENCY_MSEC:
{ {
ULONG poll_interval; ULONG poll_interval;
TRACE("IOCTL_HID_SET_POLL_FREQUENCY_MSEC\n");
if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(ULONG)) if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(ULONG))
status = STATUS_BUFFER_TOO_SMALL;
else
{ {
irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; poll_interval = *(ULONG *)irp->AssociatedIrp.SystemBuffer;
break; if (poll_interval) ext->u.pdo.poll_interval = min( poll_interval, MAX_POLL_INTERVAL_MSEC );
status = STATUS_SUCCESS;
} }
poll_interval = *(ULONG *)irp->AssociatedIrp.SystemBuffer;
if (poll_interval) ext->u.pdo.poll_interval = min(poll_interval, MAX_POLL_INTERVAL_MSEC);
irp->IoStatus.Status = STATUS_SUCCESS;
break; break;
} }
case IOCTL_HID_GET_PRODUCT_STRING: case IOCTL_HID_GET_PRODUCT_STRING:
@ -562,29 +552,30 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp)
{ {
irp->IoStatus.Information = (wcslen( str ) + 1) * sizeof(WCHAR); irp->IoStatus.Information = (wcslen( str ) + 1) * sizeof(WCHAR);
if (irp->IoStatus.Information > output_len) if (irp->IoStatus.Information > output_len)
irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; status = STATUS_BUFFER_TOO_SMALL;
else else
{ {
memcpy( output_buf, str, irp->IoStatus.Information ); memcpy( output_buf, str, irp->IoStatus.Information );
irp->IoStatus.Status = STATUS_SUCCESS; status = STATUS_SUCCESS;
} }
break; break;
} }
call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ), call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ),
sizeof(index), output_buf, output_len, &irp->IoStatus ); sizeof(index), output_buf, output_len, &irp->IoStatus );
status = irp->IoStatus.Status;
break; break;
} }
case IOCTL_HID_GET_COLLECTION_INFORMATION: case IOCTL_HID_GET_COLLECTION_INFORMATION:
{ {
irp->IoStatus.Information = sizeof(HID_COLLECTION_INFORMATION); irp->IoStatus.Information = sizeof(HID_COLLECTION_INFORMATION);
if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HID_COLLECTION_INFORMATION)) if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HID_COLLECTION_INFORMATION))
irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; status = STATUS_BUFFER_OVERFLOW;
else else
{ {
memcpy( irp->AssociatedIrp.SystemBuffer, &ext->u.pdo.information, memcpy( irp->AssociatedIrp.SystemBuffer, &ext->u.pdo.information,
sizeof(HID_COLLECTION_INFORMATION) ); sizeof(HID_COLLECTION_INFORMATION) );
irp->IoStatus.Status = STATUS_SUCCESS; status = STATUS_SUCCESS;
} }
break; break;
} }
@ -594,36 +585,31 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp)
irp->IoStatus.Information = desc->PreparsedDataLength; irp->IoStatus.Information = desc->PreparsedDataLength;
if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < desc->PreparsedDataLength) if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < desc->PreparsedDataLength)
irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; status = STATUS_INVALID_BUFFER_SIZE;
else else
{ {
memcpy( irp->UserBuffer, desc->PreparsedData, desc->PreparsedDataLength ); memcpy( irp->UserBuffer, desc->PreparsedData, desc->PreparsedDataLength );
irp->IoStatus.Status = STATUS_SUCCESS; status = STATUS_SUCCESS;
} }
break; break;
} }
case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS: case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS:
{ {
irp->IoStatus.Information = 0;
if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(ULONG)) if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(ULONG))
irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; status = STATUS_BUFFER_OVERFLOW;
else else
irp->IoStatus.Status = hid_queue_resize( queue, *(ULONG *)irp->AssociatedIrp.SystemBuffer ); status = hid_queue_resize( queue, *(ULONG *)irp->AssociatedIrp.SystemBuffer );
break; break;
} }
case IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS: case IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS:
{ {
if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG))
{ status = STATUS_BUFFER_TOO_SMALL;
irp->IoStatus.Information = 0;
irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL;
}
else else
{ {
*(ULONG *)irp->AssociatedIrp.SystemBuffer = queue->length; *(ULONG *)irp->AssociatedIrp.SystemBuffer = queue->length;
irp->IoStatus.Information = sizeof(ULONG); irp->IoStatus.Information = sizeof(ULONG);
irp->IoStatus.Status = STATUS_SUCCESS; status = STATUS_SUCCESS;
} }
break; break;
} }
@ -631,20 +617,23 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp)
case IOCTL_HID_SET_FEATURE: case IOCTL_HID_SET_FEATURE:
case IOCTL_HID_GET_INPUT_REPORT: case IOCTL_HID_GET_INPUT_REPORT:
case IOCTL_HID_SET_OUTPUT_REPORT: case IOCTL_HID_SET_OUTPUT_REPORT:
hid_device_xfer_report( ext, code, irp ); status = hid_device_xfer_report( ext, code, irp );
break; break;
default: default:
{ {
ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;
FIXME( "Unsupported ioctl %#lx (device=%lx access=%lx func=%lx method=%lx)\n", code, FIXME( "Unsupported ioctl %#lx (device=%lx access=%lx func=%lx method=%lx)\n", code,
code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3 ); code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3 );
irp->IoStatus.Status = STATUS_NOT_SUPPORTED; status = STATUS_NOT_SUPPORTED;
break; break;
} }
} }
status = irp->IoStatus.Status; if (status != STATUS_PENDING)
if (status != STATUS_PENDING) IoCompleteRequest( irp, IO_NO_INCREMENT ); {
irp->IoStatus.Status = status;
IoCompleteRequest( irp, IO_NO_INCREMENT );
}
return status; return status;
} }
@ -695,12 +684,12 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp)
NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp) NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp)
{ {
BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension;
NTSTATUS status; NTSTATUS status = hid_device_xfer_report( ext, IOCTL_HID_WRITE_REPORT, irp );
if (status != STATUS_PENDING)
hid_device_xfer_report( ext, IOCTL_HID_WRITE_REPORT, irp ); {
irp->IoStatus.Status = status;
status = irp->IoStatus.Status; IoCompleteRequest( irp, IO_NO_INCREMENT );
IoCompleteRequest( irp, IO_NO_INCREMENT ); }
return status; return status;
} }