Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HIDUSB]

Browse source 
- Unconfigure device, and don't leak memory

... okay, enough HID for now.

svn path=/trunk/; revision=59012
This commit is contained in:
Thomas Faber 2013-05-12 19:03:02 +00:00
parent 2f252b01ea
commit 5bd23c2e51
1 changed files with 93 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
reactos/drivers/hid/hidusb/hidusb.c
View file

@ -1286,6 +1286,90 @@ Hid_SelectConfiguration(
return Status;
}
NTSTATUS
Hid_DisableConfiguration(
IN PDEVICE_OBJECT DeviceObject)
{
PHID_DEVICE_EXTENSION DeviceExtension;
PHID_USB_DEVICE_EXTENSION HidDeviceExtension;
NTSTATUS Status;
PURB Urb;
//
// get device extension
//
DeviceExtension = DeviceObject->DeviceExtension;
HidDeviceExtension = DeviceExtension->MiniDeviceExtension;
//
// build urb
//
Urb = ExAllocatePoolWithTag(NonPagedPool,
sizeof(struct _URB_SELECT_CONFIGURATION),
HIDUSB_URB_TAG);
if (!Urb)
{
//
// no memory
//
return STATUS_INSUFFICIENT_RESOURCES;
}
//
// format urb
//
UsbBuildSelectConfigurationRequest(Urb,
sizeof(struct _URB_SELECT_CONFIGURATION),
NULL);
//
// dispatch request
//
Status = Hid_DispatchUrb(DeviceObject, Urb);
if (!NT_SUCCESS(Status))
{
DPRINT1("[HIDUSB] Dispatching unconfigure URB failed with %lx\n", Status);
}
else if (!USBD_SUCCESS(Urb->UrbHeader.Status))
{
DPRINT("[HIDUSB] Unconfigure URB failed with %lx\n", Status);
}
//
// free urb
//
ExFreePoolWithTag(Urb, HIDUSB_URB_TAG);
//
// free resources
//
HidDeviceExtension->ConfigurationHandle = NULL;
if (HidDeviceExtension->InterfaceInfo)
{
ExFreePoolWithTag(HidDeviceExtension->InterfaceInfo, HIDUSB_TAG);
HidDeviceExtension->InterfaceInfo = NULL;
}
if (HidDeviceExtension->ConfigurationDescriptor)
{
ExFreePoolWithTag(HidDeviceExtension->ConfigurationDescriptor, HIDUSB_TAG);
HidDeviceExtension->ConfigurationDescriptor = NULL;
HidDeviceExtension->HidDescriptor = NULL;
}
if (HidDeviceExtension->DeviceDescriptor)
{
ExFreePoolWithTag(HidDeviceExtension->DeviceDescriptor, HIDUSB_TAG);
HidDeviceExtension->DeviceDescriptor = NULL;
}
//
// done
//
return Status;
}
NTSTATUS
Hid_SetIdle(
IN PDEVICE_OBJECT DeviceObject)
@ -1645,21 +1729,19 @@ HidPnp(
{
case IRP_MN_REMOVE_DEVICE:
{
//
// unconfigure device
// FIXME: Call this on IRP_MN_SURPRISE_REMOVAL, but don't send URBs
// FIXME: Don't call this after we've already seen a surprise removal or stop
//
Hid_DisableConfiguration(DeviceObject);
//
// pass request onto lower driver
//
IoSkipCurrentIrpStackLocation(Irp);
Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp);
//
// free resources
//
if (HidDeviceExtension->ConfigurationDescriptor)
{
ExFreePoolWithTag(HidDeviceExtension->ConfigurationDescriptor, HIDUSB_TAG);
HidDeviceExtension->ConfigurationDescriptor = NULL;
}
return Status;
}
case IRP_MN_QUERY_PNP_DEVICE_STATE:
@ -1702,8 +1784,9 @@ HidPnp(
case IRP_MN_STOP_DEVICE:
{
//
// FIXME: unconfigure the device
// unconfigure device
//
Hid_DisableConfiguration(DeviceObject);
//
// prepare irp