Ros-diffs

ros-diffs@reactos.org

81390 discussions

[vmikayelyan] 72382: usb: hub: FDO: Removed dublicated functions and fields FDO_QueryInterface() is unuseful beacuse we have more generic QueryInterface() function which is able to replace all func...
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:29:16 2016 New Revision: 72382 URL: http://svn.reactos.org/svn/reactos?rev=72382&view=rev Log: usb: hub: FDO: Removed dublicated functions and fields FDO_QueryInterface() is unuseful beacuse we have more generic QueryInterface() function which is able to replace all functionality which provides FDO_QueryInterface(). Also we do not need to have two "USB_BUS_INTERFACE_USBDI_V2" fields in "HUB_DEVICE_EXTENSION". FDO_QueryInterface() was added in svn-rev 55983, and on review of that commit I have found some copypasta issues and also tricks which was not documented and marked by me as wrong. For example changing if buscontext which was fixed in previous commits of this commit set. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c branches/GSoC_2016/USB/drivers/usb/usbhub/misc.c branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:29:16 2016 @@ -1889,8 +1889,6 @@ HubDeviceExtension->ConfigurationHandle = ConfigUrb->UrbSelectConfiguration.ConfigurationHandle; HubDeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; DPRINT("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); - - FDO_QueryInterface(DeviceObject, &HubDeviceExtension->DeviceInterface); // check if function is available if (HubDeviceExtension->UsbDInterface.IsDeviceHighSpeed) Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/misc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/misc.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/misc.c [iso-8859-1] Fri Aug 19 16:29:16 2016 @@ -211,84 +211,3 @@ return Status; } - -NTSTATUS -NTAPI -FDO_QueryInterfaceCompletionRoutine( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - /* Set event */ - KeSetEvent((PRKEVENT)Context, 0, FALSE); - - /* Completion is done in the HidClassFDO_QueryCapabilities routine */ - return STATUS_MORE_PROCESSING_REQUIRED; -} - -NTSTATUS -FDO_QueryInterface( - IN PDEVICE_OBJECT DeviceObject, - IN OUT PUSB_BUS_INTERFACE_USBDI_V2 Interface) -{ - PIRP Irp; - KEVENT Event; - NTSTATUS Status; - PIO_STACK_LOCATION IoStack; - PHUB_DEVICE_EXTENSION HubDeviceExtension; - - /* Get device extension */ - HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(HubDeviceExtension->Common.IsFDO); - - /* Init event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* Now allocte the irp */ - Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) - { - /* No memory */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Get next stack location */ - IoStack = IoGetNextIrpStackLocation(Irp); - - /* Init stack location */ - IoStack->MajorFunction = IRP_MJ_PNP; - IoStack->MinorFunction = IRP_MN_QUERY_INTERFACE; - IoStack->Parameters.QueryInterface.Interface = (PINTERFACE)Interface; - IoStack->Parameters.QueryInterface.InterfaceType = &USB_BUS_INTERFACE_USBDI_GUID; - IoStack->Parameters.QueryInterface.Version = USB_BUSIF_USBDI_VERSION_2; - IoStack->Parameters.QueryInterface.Size = sizeof(USB_BUS_INTERFACE_USBDI_V2); - - - /* Set completion routine */ - IoSetCompletionRoutine(Irp, - FDO_QueryInterfaceCompletionRoutine, - (PVOID)&Event, - TRUE, - TRUE, - TRUE); - - /* Pnp irps have default completion code */ - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - - /* Call lower device */ - Status = IoCallDriver(HubDeviceExtension->LowerDeviceObject, Irp); - if (Status == STATUS_PENDING) - { - /* Wait for completion */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - } - - /* Get status */ - Status = Irp->IoStatus.Status; - - /* Complete request */ - IoFreeIrp(Irp); - - /* Done */ - return Status; -} Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h [iso-8859-1] Fri Aug 19 16:29:16 2016 @@ -95,7 +95,6 @@ USBD_CONFIGURATION_HANDLE ConfigurationHandle; USBD_PIPE_HANDLE PipeHandle; PVOID RootHubHandle; - USB_BUS_INTERFACE_USBDI_V2 DeviceInterface; UNICODE_STRING SymbolicLinkName; ULONG InstanceCount;

1 0

[vmikayelyan] 72381: usb: hub: FDO: Fix USBHUB_FdoStartDevice() Done fixes in cleanup also refactored code to be more readable and error safe.
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:27:37 2016 New Revision: 72381 URL: http://svn.reactos.org/svn/reactos?rev=72381&view=rev Log: usb: hub: FDO: Fix USBHUB_FdoStartDevice() Done fixes in cleanup also refactored code to be more readable and error safe. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:27:37 2016 @@ -1581,7 +1581,8 @@ if (!Urb) { // no memory - return STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; } // zero urb @@ -1596,8 +1597,7 @@ { // failed to obtain hub pdo DPRINT1("IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO failed with %x\n", Status); - ExFreePool(Urb); - return Status; + goto cleanup; } // sanity checks @@ -1614,8 +1614,7 @@ { // failed to start pdo DPRINT1("Failed to start the RootHub PDO\n"); - ExFreePool(Urb); - return Status; + goto cleanup; } // Get the current number of hubs @@ -1626,8 +1625,7 @@ { // failed to get number of hubs DPRINT1("IOCTL_INTERNAL_USB_GET_HUB_COUNT failed with %x\n", Status); - ExFreePool(Urb); - return Status; + goto cleanup; } // Get the Hub Interface @@ -1641,8 +1639,7 @@ { // failed to get root hub interface DPRINT1("Failed to get HUB_GUID interface with status 0x%08lx\n", Status); - ExFreePool(Urb); - return Status; + goto cleanup; } HubInterfaceBusContext = HubDeviceExtension->HubInterface.BusContext; @@ -1658,8 +1655,7 @@ { // failed to get usbdi interface DPRINT1("Failed to get USBDI_GUID interface with status 0x%08lx\n", Status); - ExFreePool(Urb); - return Status; + goto cleanup; } // Get Root Hub Device Handle @@ -1672,8 +1668,7 @@ { // failed DPRINT1("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE failed with status 0x%08lx\n", Status); - ExFreePool(Urb); - return Status; + goto cleanup; } // @@ -1717,8 +1712,7 @@ { // failed to get device descriptor of hub DPRINT1("Failed to get HubDeviceDescriptor!\n"); - ExFreePool(Urb); - return Status; + goto cleanup; } // build configuration request @@ -1745,8 +1739,7 @@ { // failed to get configuration descriptor DPRINT1("Failed to get RootHub Configuration with status %x\n", Status); - ExFreePool(Urb); - return Status; + goto cleanup; } // sanity checks @@ -1772,16 +1765,15 @@ { // failed to get hub information DPRINT1("Failed to extended hub information. Unable to determine the number of ports!\n"); - ExFreePool(Urb); - return Status; + goto cleanup; } if (!HubDeviceExtension->UsbExtHubInfo.NumberOfPorts) { // bogus port driver DPRINT1("Failed to retrieve the number of ports\n"); - ExFreePool(Urb); - return STATUS_UNSUCCESSFUL; + Status = STATUS_UNSUCCESSFUL; + goto cleanup; } DPRINT("HubDeviceExtension->UsbExtHubInfo.NumberOfPorts %x\n", HubDeviceExtension->UsbExtHubInfo.NumberOfPorts); @@ -1812,8 +1804,8 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get Hub Descriptor!\n"); - ExFreePool(Urb); - return STATUS_UNSUCCESSFUL; + Status = STATUS_UNSUCCESSFUL; + goto cleanup; } // sanity checks @@ -1841,14 +1833,21 @@ { // failed to get hub status DPRINT1("Failed to get Hub Status!\n"); - ExFreePool(Urb); - return STATUS_UNSUCCESSFUL; + Status = STATUS_UNSUCCESSFUL; + goto cleanup; } // Allocate memory for PortStatusChange to hold 2 USHORTs for each port on hub HubDeviceExtension->PortStatusChange = ExAllocatePoolWithTag(NonPagedPool, sizeof(ULONG) * HubDeviceExtension->UsbExtHubInfo.NumberOfPorts, USB_HUB_TAG); + + if (!HubDeviceExtension->PortStatusChange) + { + DPRINT1("Failed to allocate pool for PortStatusChange!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } // Get the first Configuration Descriptor Pid = USBD_ParseConfigurationDescriptorEx(&HubDeviceExtension->HubConfigDescriptor, @@ -1858,8 +1857,8 @@ { // failed parse hub descriptor DPRINT1("Failed to parse configuration descriptor\n"); - ExFreePool(Urb); - return STATUS_UNSUCCESSFUL; + Status = STATUS_UNSUCCESSFUL; + goto cleanup; } // create configuration request @@ -1870,8 +1869,8 @@ { // failed to build urb DPRINT1("Failed to allocate urb\n"); - ExFreePool(Urb); - return STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; } // send request @@ -1883,9 +1882,7 @@ { // failed to select configuration DPRINT1("Failed to select configuration with %x\n", Status); - ExFreePool(Urb); - ExFreePool(ConfigUrb); - return Status; + goto cleanup; } // store configuration & pipe handle @@ -1895,10 +1892,6 @@ FDO_QueryInterface(DeviceObject, &HubDeviceExtension->DeviceInterface); - - // free urb - ExFreePool(ConfigUrb); - // check if function is available if (HubDeviceExtension->UsbDInterface.IsDeviceHighSpeed) { @@ -1938,8 +1931,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to set callback\n"); - ExFreePool(Urb); - return Status; + goto cleanup; } } else @@ -1991,7 +1983,29 @@ // free urb ExFreePool(Urb); + // free ConfigUrb + ExFreePool(ConfigUrb); + // done + return Status; + +cleanup: + if (Urb) + ExFreePool(Urb); + + // Dereference interfaces + if (HubDeviceExtension->HubInterface.Size) + HubDeviceExtension->HubInterface.InterfaceDereference(HubDeviceExtension->HubInterface.BusContext); + + if (HubDeviceExtension->UsbDInterface.Size) + HubDeviceExtension->UsbDInterface.InterfaceDereference(HubDeviceExtension->UsbDInterface.BusContext); + + if (HubDeviceExtension->PortStatusChange) + ExFreePool(HubDeviceExtension->PortStatusChange); + + if (ConfigUrb) + ExFreePool(ConfigUrb); + return Status; }

1 0

[vmikayelyan] 72380: usb: libusb: hub: Refernce interface before passing up Added InterfaceReference() calls before passing interface to upper layer.
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:24:25 2016 New Revision: 72380 URL: http://svn.reactos.org/svn/reactos?rev=72380&view=rev Log: usb: libusb: hub: Refernce interface before passing up Added InterfaceReference() calls before passing interface to upper layer. Modified: branches/GSoC_2016/USB/sdk/lib/drivers/libusb/hub_controller.cpp Modified: branches/GSoC_2016/USB/sdk/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/sdk/lib/drivers/l… ============================================================================== --- branches/GSoC_2016/USB/sdk/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ branches/GSoC_2016/USB/sdk/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Fri Aug 19 16:24:25 2016 @@ -3745,6 +3745,7 @@ InterfaceHub->SetDeviceHandleData = USBHI_SetDeviceHandleData; } + InterfaceHub->InterfaceReference(InterfaceHub->BusContext); // // request completed // @@ -3799,6 +3800,7 @@ InterfaceDI->EnumLogEntry = USBDI_EnumLogEntry; } + InterfaceDI->InterfaceReference(InterfaceDI->BusContext); // // request completed //

1 0

[vmikayelyan] 72379: usb: hub: FDO: Fix CreateUsbChildDeviceObject() There were code dublication on copy device interface, also after copying interface, we should call InterfaceReference() routine ...
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:22:18 2016 New Revision: 72379 URL: http://svn.reactos.org/svn/reactos?rev=72379&view=rev Log: usb: hub: FDO: Fix CreateUsbChildDeviceObject() There were code dublication on copy device interface, also after copying interface, we should call InterfaceReference() routine of interface, to prevent interface provider deleiton. I have moved RtlCopyMemory() and InterfaceReference() to the end of this function to siplify cleanup part, because otherwise we should call InterfaceDereference() in cleanup part. The changing of interface context seems wrong for me, let me give just one example. When we are changing only buscontext, then when upper layer calls interfaceDereference(), which is "thinking" that works with it's buscontext, and tries to work with it using it's buscontext pointer. So changing of buscontext is completely wrong. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:22:18 2016 @@ -1232,10 +1232,6 @@ UsbChildExtension->ParentDeviceObject = UsbHubDeviceObject; UsbChildExtension->PortNumber = PortId; - // copy device interface - RtlCopyMemory(&UsbChildExtension->DeviceInterface, &HubDeviceExtension->DeviceInterface, sizeof(USB_BUS_INTERFACE_USBDI_V2)); - - // // Create the UsbDeviceObject // @@ -1249,12 +1245,6 @@ DPRINT1("USBHUB: CreateUsbDevice failed with status %x\n", Status); goto Cleanup; } - - // copy device interface - RtlCopyMemory(&UsbChildExtension->DeviceInterface, &HubDeviceExtension->DeviceInterface, sizeof(USB_BUS_INTERFACE_USBDI_V2)); - - // FIXME replace buscontext - UsbChildExtension->DeviceInterface.BusContext = UsbChildExtension->UsbDeviceHandle; // // Initialize UsbDevice @@ -1344,6 +1334,10 @@ DPRINT1("Failed to create strings needed to describe device to PNP.\n"); goto Cleanup; } + + // copy device interface + RtlCopyMemory(&UsbChildExtension->DeviceInterface, &HubDeviceExtension->UsbDInterface, sizeof(USB_BUS_INTERFACE_USBDI_V2)); + UsbChildExtension->DeviceInterface.InterfaceReference(UsbChildExtension->DeviceInterface.BusContext); UsbChildExtension->IsRemovePending = FALSE;

1 0

[vmikayelyan] 72378: usb: libusb: hub_controller: Fix PnP handler In some cases our driver was changing IRP status in places where it shouldn't.
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:20:32 2016 New Revision: 72378 URL: http://svn.reactos.org/svn/reactos?rev=72378&view=rev Log: usb: libusb: hub_controller: Fix PnP handler In some cases our driver was changing IRP status in places where it shouldn't. Modified: branches/GSoC_2016/USB/sdk/lib/drivers/libusb/hub_controller.cpp Modified: branches/GSoC_2016/USB/sdk/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/sdk/lib/drivers/l… ============================================================================== --- branches/GSoC_2016/USB/sdk/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ branches/GSoC_2016/USB/sdk/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Fri Aug 19 16:20:32 2016 @@ -568,7 +568,8 @@ break; } } - Status = STATUS_SUCCESS; + // Here we should leave Status as is. + Status = Irp->IoStatus.Status; break; } case IRP_MN_QUERY_CAPABILITIES: @@ -611,6 +612,14 @@ // handle device interface requests // Status = HandleQueryInterface(IoStack); + + // + // If a bus driver does not export the requested interface, it + // should leave Status as is. + // + if (Status == STATUS_NOT_SUPPORTED) + Status = Irp->IoStatus.Status; + break; } case IRP_MN_REMOVE_DEVICE:

1 0

[vmikayelyan] 72377: usb: hub: Fix in USBHUB_DispatchPower In case of FDO it should pass IRP down.
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:18:59 2016 New Revision: 72377 URL: http://svn.reactos.org/svn/reactos?rev=72377&view=rev Log: usb: hub: Fix in USBHUB_DispatchPower In case of FDO it should pass IRP down. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] Fri Aug 19 16:18:59 2016 @@ -188,9 +188,18 @@ PIRP Irp) { PIO_STACK_LOCATION IoStack; + PHUB_DEVICE_EXTENSION DeviceExtension; IoStack = IoGetCurrentIrpStackLocation(Irp); + DeviceExtension = DeviceObject->DeviceExtension; DPRINT1("Power Function %x\n", IoStack->MinorFunction); + + if (DeviceExtension->Common.IsFDO) + { + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->LowerDeviceObject, Irp); + } if (IoStack->MinorFunction == IRP_MN_SET_POWER) {

1 0

[vmikayelyan] 72376: usb: hub: PDO: Fix in IRP_MN_QUERY_DEVICE_RELATIONS handler I don't see the reason for allocation from NonPagedPool, also the information field writing was wrong.
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:15:31 2016 New Revision: 72376 URL: http://svn.reactos.org/svn/reactos?rev=72376&view=rev Log: usb: hub: PDO: Fix in IRP_MN_QUERY_DEVICE_RELATIONS handler I don't see the reason for allocation from NonPagedPool, also the information field writing was wrong. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Aug 19 16:15:31 2016 @@ -716,7 +716,7 @@ } /* allocate device relations */ - DeviceRelation = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS)); + DeviceRelation = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS)); if (!DeviceRelation) { /* no memory */ @@ -730,7 +730,7 @@ ObReferenceObject(DeviceRelation->Objects[0]); /* store result */ - Irp->IoStatus.Information = (ULONG_PTR)DeviceRelation; + Information = (ULONG_PTR)DeviceRelation; Status = STATUS_SUCCESS; break; }

1 0

[vmikayelyan] 72375: usb: hub: FDO: Fix PnP handling issues. There is many cases where we should forward IRP instead of complete it.
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:13:09 2016 New Revision: 72375 URL: http://svn.reactos.org/svn/reactos?rev=72375&view=rev Log: usb: hub: FDO: Fix PnP handling issues. There is many cases where we should forward IRP instead of complete it. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:13:09 2016 @@ -2028,7 +2028,10 @@ { Status = USBHUB_ParentFDOStartDevice(DeviceObject, Irp); } - break; + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } case IRP_MN_QUERY_DEVICE_RELATIONS: @@ -2059,17 +2062,17 @@ Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; Irp->IoStatus.Status = Status; - return ForwardIrpAndForget(DeviceObject, Irp); + break; } case RemovalRelations: { DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); - return ForwardIrpAndForget(DeviceObject, Irp); + break; } default: DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); - return ForwardIrpAndForget(DeviceObject, Irp); + break; } break; } @@ -2078,10 +2081,11 @@ { DPRINT("IRP_MN_QUERY_STOP_DEVICE\n"); Irp->IoStatus.Status = STATUS_SUCCESS; - return ForwardIrpAndForget(DeviceObject, Irp); + break; } case IRP_MN_REMOVE_DEVICE: { + // Should be reworked later in this commits set DPRINT("IRP_MN_REMOVE_DEVICE\n"); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -2093,29 +2097,33 @@ } case IRP_MN_QUERY_BUS_INFORMATION: { + // Function drivers and filter drivers do not handle this IRP. DPRINT("IRP_MN_QUERY_BUS_INFORMATION\n"); break; } case IRP_MN_QUERY_ID: { DPRINT("IRP_MN_QUERY_ID\n"); + // Function drivers and filter drivers do not handle this IRP. break; } case IRP_MN_QUERY_CAPABILITIES: { + // + // If a function or filter driver does not handle this IRP, it + // should pass that down. + // DPRINT("IRP_MN_QUERY_CAPABILITIES\n"); break; } default: { DPRINT(" IRP_MJ_PNP / unknown minor function 0x%lx\n", Stack->MinorFunction); - return ForwardIrpAndForget(DeviceObject, Irp); - } - } - - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + break; + } + } + + return ForwardIrpAndForget(DeviceObject, Irp); } NTSTATUS

1 0

[vmikayelyan] 72374: usb: hub: FDO: Fix QueryInterface() The status block of an IRP must be initialized before calling driver.
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:08:48 2016 New Revision: 72374 URL: http://svn.reactos.org/svn/reactos?rev=72374&view=rev Log: usb: hub: FDO: Fix QueryInterface() The status block of an IRP must be initialized before calling driver. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:08:48 2016 @@ -568,6 +568,11 @@ Stack->Parameters.QueryInterface.Version = Version; Stack->Parameters.QueryInterface.Interface = Interface; Stack->Parameters.QueryInterface.InterfaceSpecificData = NULL; + + // + // Initialize the status block before sending the IRP + // + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Status = IoCallDriver(DeviceObject, Irp);

1 0

[vmikayelyan] 72373: usb: hub: PDO: Fix in IRP_MN_QUERY_DEVICE_RELATIONS Here we shouldn't modify information field of IRP, because for example in case of bus relations IRP must reach the stack's P...
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 15:50:18 2016 New Revision: 72373 URL: http://svn.reactos.org/svn/reactos?rev=72373&view=rev Log: usb: hub: PDO: Fix in IRP_MN_QUERY_DEVICE_RELATIONS Here we shouldn't modify information field of IRP, because for example in case of bus relations IRP must reach the stack's PDO collecting on its way all relations. This was the one of the causes of MS's usbccgp fail. usbccgp was not able to report to PnP manager about it's child devices. There is also another issues in usbuhci, which prevents usbccgp from normal operation. [THIS PATCH SHULD NOT BE MERGED WITH TRUNK UNTIL UHCI BUGS ARE NOT FIXED] Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Aug 19 15:50:18 2016 @@ -711,6 +711,7 @@ { /* not supported */ Status = Irp->IoStatus.Status; + Information = Irp->IoStatus.Information; break; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs