Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[cgutman] 55087: [USB-BRINGUP-TRUNK] - Don't send removal IRPs to device nodes already pending removal - USB device removal and reinsertion works now
by cgutman＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: cgutman Date: Mon Jan 23 00:50:25 2012 New Revision: 55087 URL: http://svn.reactos.org/svn/reactos?rev=55087&view=rev Log: [USB-BRINGUP-TRUNK] - Don't send removal IRPs to device nodes already pending removal - USB device removal and reinsertion works now Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/p… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Jan 23 00:50:25 2012 @@ -1824,13 +1824,10 @@ } } - if (!Found) + if (!Found && !(Child->Flags & DNF_WILL_BE_REMOVED)) { /* Send removal IRPs to all of its children */ IopPrepareDeviceForRemoval(Child->PhysicalDeviceObject, TRUE); - - /* Set the flag */ - Child->Flags |= DNF_WILL_BE_REMOVED; /* Send the surprise removal IRP */ IopSendSurpriseRemoval(Child->PhysicalDeviceObject); @@ -4166,6 +4163,7 @@ return Status; } + DeviceNode->Flags |= DNF_WILL_BE_REMOVED; if (DeviceRelations) IopSendRemoveDeviceRelations(DeviceRelations); IopSendRemoveChildDevices(DeviceNode); @@ -4186,7 +4184,6 @@ IopSendRemoveDevice(DeviceNode->PhysicalDeviceObject); IopQueueTargetDeviceEvent(&GUID_DEVICE_SAFE_REMOVAL, &DeviceNode->InstancePath); - DeviceNode->Flags |= DNF_WILL_BE_REMOVED; return STATUS_SUCCESS; }

1 0

[cgutman] 55086: [USB-BRINGUP-TRUNK] - Fix a broken check that resulted in freeing the same device object twice - Enable the IoDetachDevice call in usbstor now that the kernel bug is fixed
by cgutman＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: cgutman Date: Mon Jan 23 00:39:28 2012 New Revision: 55086 URL: http://svn.reactos.org/svn/reactos?rev=55086&view=rev Log: [USB-BRINGUP-TRUNK] - Fix a broken check that resulted in freeing the same device object twice - Enable the IoDetachDevice call in usbstor now that the kernel bug is fixed Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c branches/usb-bringup-trunk/ntoskrnl/io/iomgr/device.c Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] Mon Jan 23 00:39:28 2012 @@ -135,7 +135,7 @@ Status = IoCallDriver(DeviceExtension->LowerDeviceObject, Irp); /* Detach from the device stack */ - /* IoDetachDevice(DeviceExtension->LowerDeviceObject); */ //This crashes for some reason during unload + IoDetachDevice(DeviceExtension->LowerDeviceObject); /* Delete the device object */ IoDeleteDevice(DeviceObject); Modified: branches/usb-bringup-trunk/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/i… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/iomgr/device.c [iso-8859-1] Mon Jan 23 00:39:28 2012 @@ -420,10 +420,10 @@ /* * Check if we have an attached device and fail if we're attached - * and still have a reference count. + * or still have a reference count. */ AttachedDeviceObject = DeviceObject->AttachedDevice; - if ((AttachedDeviceObject) && (DeviceObject->ReferenceCount)) return; + if ((AttachedDeviceObject) || (DeviceObject->ReferenceCount)) return; /* Check if we have a Security Descriptor */ if (DeviceObject->SecurityDescriptor)

1 0

[janderwald] 55085: [USBOHCI] - Implement interrupt routing
by janderwald＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: janderwald Date: Mon Jan 23 00:36:00 2012 New Revision: 55085 URL: http://svn.reactos.org/svn/reactos?rev=55085&view=rev Log: [USBOHCI] - Implement interrupt routing Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon Jan 23 00:36:00 2012 @@ -879,7 +879,7 @@ NTSTATUS CUSBHardwareDevice::StopController(void) { - ULONG Control, Reset; + ULONG Control, Reset, Status; ULONG Index, FrameInterval; // @@ -892,10 +892,56 @@ // Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); - // - // FIXME: support routing - // - ASSERT((Control & OHCI_INTERRUPT_ROUTING) == 0); + + if ((Control & OHCI_INTERRUPT_ROUTING)) + { + // + // read command status + // + Status = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET)); + + // + // change ownership + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET), Status | OHCI_OWNERSHIP_CHANGE_REQUEST); + for(Index = 0; Index < 100; Index++) + { + // + // wait a bit + // + KeStallExecutionProcessor(100); + + // + // check control + // + Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); + if (!(Control & OHCI_INTERRUPT_ROUTING)) + { + // + // acquired ownership + // + break; + } + } + + // + // if the ownership is still not changed, perform reset + // + if (Control & OHCI_INTERRUPT_ROUTING) + { + DPRINT1("SMM not responding\n"); + // + // some controllers also depend on this + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_HC_FUNCTIONAL_STATE_RESET); + + // + // wait a bit + // + KeStallExecutionProcessor(100); + } + } + // // have a break

1 0

[tfaber] 55084: [USBHUB_NEW] - Fix another calling convention issue
by tfaber＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: tfaber Date: Mon Jan 23 00:27:30 2012 New Revision: 55084 URL: http://svn.reactos.org/svn/reactos?rev=55084&view=rev Log: [USBHUB_NEW] - Fix another calling convention issue Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Mon Jan 23 00:27:30 2012 @@ -465,7 +465,7 @@ } WorkItemData->Context = RealDeviceObject; DPRINT1("Initialize work item\n"); - ExInitializeWorkItem(&WorkItemData->WorkItem, (PWORKER_THREAD_ROUTINE)DeviceStatusChangeThread, (PVOID)WorkItemData); + ExInitializeWorkItem(&WorkItemData->WorkItem, DeviceStatusChangeThread, (PVOID)WorkItemData); // // Queue the work item to handle initializing the device @@ -1335,6 +1335,7 @@ } VOID +NTAPI RootHubInitCallbackFunction( PVOID Context) { @@ -1687,7 +1688,7 @@ { Status = HubDeviceExtension->HubInterface.RootHubInitNotification(HubInterfaceBusContext, DeviceObject, - (PRH_INIT_CALLBACK)RootHubInitCallbackFunction); + RootHubInitCallbackFunction); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to set callback\n");

1 0

[janderwald] 55083: [USBHUB_NEW] - Fix calling convention of completion routine
by janderwald＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: janderwald Date: Sun Jan 22 23:56:03 2012 New Revision: 55083 URL: http://svn.reactos.org/svn/reactos?rev=55083&view=rev Log: [USBHUB_NEW] - Fix calling convention of completion routine Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Sun Jan 22 23:56:03 2012 @@ -558,7 +558,7 @@ // Set the completion routine for when device is connected to root hub // IoSetCompletionRoutine(HubDeviceExtension->PendingSCEIrp, - (PIO_COMPLETION_ROUTINE) StatusChangeEndpointCompletion, + StatusChangeEndpointCompletion, DeviceObject, TRUE, TRUE, Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Sun Jan 22 23:56:03 2012 @@ -14,6 +14,7 @@ #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) NTSTATUS +NTAPI UrbCompletion( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -108,7 +109,7 @@ // Now set the completion routine for the new Irp. // IoSetCompletionRoutine(ForwardIrp, - (PIO_COMPLETION_ROUTINE)UrbCompletion, + UrbCompletion, Irp, TRUE, TRUE,

1 0

[janderwald] 55082: [USBHUB_NEW] - Fix calling convention of completion routine
by janderwald＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: janderwald Date: Sun Jan 22 23:25:33 2012 New Revision: 55082 URL: http://svn.reactos.org/svn/reactos?rev=55082&view=rev Log: [USBHUB_NEW] - Fix calling convention of completion routine Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Sun Jan 22 23:25:33 2012 @@ -435,6 +435,7 @@ } NTSTATUS +NTAPI StatusChangeEndpointCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp,

1 0

[gadamopoulos] 55081: [kernel32] - Fix IntReadConsoleOutputCharacter to copy the correct count of characters. Its 3rd parameter is a character count and not buffer size. - Should fix infinite loop ...
by gadamopoulos＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: gadamopoulos Date: Sun Jan 22 22:27:08 2012 New Revision: 55081 URL: http://svn.reactos.org/svn/reactos?rev=55081&view=rev Log: [kernel32] - Fix IntReadConsoleOutputCharacter to copy the correct count of characters. Its 3rd parameter is a character count and not buffer size. - Should fix infinite loop when kernel32:console test runs Modified: trunk/reactos/dll/win32/kernel32/client/file/console.c Modified: trunk/reactos/dll/win32/kernel32/client/file/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] Sun Jan 22 22:27:08 2012 @@ -2634,18 +2634,17 @@ PCSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; - ULONG nChars, SizeBytes, CharSize; + ULONG SizeBytes, CharSize; DWORD CharsRead = 0; CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); - nChars = min(nLength, CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR) / CharSize; - SizeBytes = nChars * CharSize; + nLength = min(nLength, CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR / CharSize); + SizeBytes = nLength * CharSize; Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR) - + min (nChars, CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR / CharSize) * CharSize)); + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR) + SizeBytes)); if (Request == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -2661,7 +2660,7 @@ Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle = hConsoleOutput; Request->Data.ReadConsoleOutputCharRequest.Unicode = bUnicode; - Request->Data.ReadConsoleOutputCharRequest.NumCharsToRead = min(nLength, nChars); + Request->Data.ReadConsoleOutputCharRequest.NumCharsToRead = nLength; SizeBytes = Request->Data.ReadConsoleOutputCharRequest.NumCharsToRead * CharSize; Status = CsrClientCallServer(Request,

1 0

[cgutman] 55080: [USB-BRINGUP-TRUNK] - Implement device disconnect indication for usbehci and usbohci - Implement device removal for FDOs and PDOs in usbstor and usbhub
by cgutman＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: cgutman Date: Sun Jan 22 21:58:06 2012 New Revision: 55080 URL: http://svn.reactos.org/svn/reactos?rev=55080&view=rev Log: [USB-BRINGUP-TRUNK] - Implement device disconnect indication for usbehci and usbohci - Implement device removal for FDOs and PDOs in usbstor and usbhub Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -1131,21 +1131,28 @@ This->m_PortStatus[i].PortStatus |= USB_PORT_STATUS_HIGH_SPEED; This->m_PortStatus[i].PortStatus |= USB_PORT_STATUS_CONNECT; This->m_PortStatus[i].PortChange |= USB_PORT_STATUS_CONNECT; - - // - // is there a status change callback - // - if (This->m_SCECallBack != NULL) - { - // - // queue work item for processing - // - ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); - } } else { DPRINT1("Device disconnected on port %d\n", i); + + // + // update port status flags + // + This->m_PortStatus[i].PortStatus &= ~USB_PORT_STATUS_HIGH_SPEED; + This->m_PortStatus[i].PortStatus &= ~USB_PORT_STATUS_CONNECT; + This->m_PortStatus[i].PortChange |= USB_PORT_STATUS_CONNECT; + } + + // + // is there a status change callback + // + if (This->m_SCECallBack != NULL) + { + // + // queue work item for processing + // + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); } // Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -20,6 +20,11 @@ IN PDEVICE_OBJECT UsbHubDeviceObject, IN LONG PortId, OUT PDEVICE_OBJECT *UsbChildDeviceObject); + +NTSTATUS +DestroyUsbChildDeviceObject( + IN PDEVICE_OBJECT UsbHubDeviceObject, + IN LONG PortId); NTSTATUS SubmitRequestToRootHub( @@ -304,9 +309,11 @@ { DPRINT1("Device disconnected from port %d\n", PortId); - // - // FIXME: Remove the device, and deallocate memory - // + Status = DestroyUsbChildDeviceObject(DeviceObject, PortId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to delete child device object after disconnect\n"); + } } else { @@ -997,6 +1004,51 @@ ExFreePool(UsbChildExtension->usInstanceId.Buffer); return Status; +} + +NTSTATUS +DestroyUsbChildDeviceObject( + IN PDEVICE_OBJECT UsbHubDeviceObject, + IN LONG PortId) +{ + PHUB_DEVICE_EXTENSION HubDeviceExtension = (PHUB_DEVICE_EXTENSION)UsbHubDeviceObject->DeviceExtension; + PHUB_CHILDDEVICE_EXTENSION UsbChildExtension = NULL; + PDEVICE_OBJECT ChildDeviceObject = NULL; + ULONG Index = 0; + + DPRINT1("Removing device on port %d (Child index: %d)\n", PortId, Index); + + for (Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index]) + { + UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)HubDeviceExtension->ChildDeviceObject[Index]->DeviceExtension; + + /* Check if it matches the port ID */ + if (UsbChildExtension->PortNumber == PortId) + { + /* We found it */ + ChildDeviceObject = HubDeviceExtension->ChildDeviceObject[Index]; + break; + } + } + } + + /* Fail the request if the device doesn't exist */ + if (!ChildDeviceObject) + { + DPRINT1("Removal request for non-existant device!\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Remove the device from the table */ + HubDeviceExtension->ChildDeviceObject[Index] = NULL; + + /* Invalidate device relations for the root hub */ + IoInvalidateDeviceRelations(HubDeviceExtension->RootHubPhysicalDeviceObject, BusRelations); + + /* The rest of the removal process takes place in IRP_MN_REMOVE_DEVICE handling for the PDO */ + return STATUS_SUCCESS; } NTSTATUS Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -582,11 +582,21 @@ } case IRP_MN_REMOVE_DEVICE: { - // - // FIXME - // - Status = STATUS_SUCCESS; - break; + PHUB_DEVICE_EXTENSION HubDeviceExtension = (PHUB_DEVICE_EXTENSION)UsbChildExtension->ParentDeviceObject->DeviceExtension; + PUSB_BUS_INTERFACE_HUB_V5 HubInterface = &HubDeviceExtension->HubInterface; + + DPRINT1("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); + + /* Remove the device */ + HubInterface->RemoveUsbDevice(HubDeviceExtension->UsbDInterface.BusContext, UsbChildExtension->UsbDeviceHandle, 0); + + /* Complete the IRP */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* Delete the device object */ + IoDeleteDevice(DeviceObject); + return STATUS_SUCCESS; } default: { Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -1447,17 +1447,6 @@ // This->m_PortStatus[Index].PortStatus |= USB_PORT_STATUS_LOW_SPEED; } - - // - // is there a status change callback - // - if (This->m_SCECallBack != NULL) - { - // - // queue work item for processing - // - ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); - } } else { @@ -1465,6 +1454,24 @@ // device disconnected // DPRINT1("Device disconnected at Port %x\n", Index); + + // + // update port status flags + // + This->m_PortStatus[Index].PortStatus &= ~USB_PORT_STATUS_LOW_SPEED; + This->m_PortStatus[Index].PortStatus &= ~USB_PORT_STATUS_CONNECT; + This->m_PortStatus[Index].PortChange |= USB_PORT_STATUS_CONNECT; + } + + // + // is there a status change callback + // + if (This->m_SCECallBack != NULL) + { + // + // queue work item for processing + // + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); } } } Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -119,6 +119,31 @@ } NTSTATUS +USBSTOR_FdoHandleRemoveDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PFDO_DEVICE_EXTENSION DeviceExtension, + IN OUT PIRP Irp) +{ + NTSTATUS Status; + + DPRINT1("Handling FDO removal\n"); + + /* We don't need to request removal of our children here */ + + /* Send the IRP down the stack */ + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceExtension->LowerDeviceObject, Irp); + + /* Detach from the device stack */ + /* IoDetachDevice(DeviceExtension->LowerDeviceObject); */ //This crashes for some reason during unload + + /* Delete the device object */ + IoDeleteDevice(DeviceObject); + + return Status; +} + +NTSTATUS USBSTOR_FdoHandleStartDevice( IN PDEVICE_OBJECT DeviceObject, IN PFDO_DEVICE_EXTENSION DeviceExtension, @@ -302,9 +327,11 @@ Status = STATUS_NOT_SUPPORTED; break; case IRP_MN_REMOVE_DEVICE: - DPRINT1("USBSTOR_FdoHandlePnp: IRP_MN_REMOVE_DEVICE unimplemented\n"); - Status = STATUS_NOT_SUPPORTED; - break; + { + DPRINT1("IRP_MN_REMOVE_DEVICE\n"); + + return USBSTOR_FdoHandleRemoveDevice(DeviceObject, DeviceExtension, Irp); + } case IRP_MN_QUERY_CAPABILITIES: { // Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -842,9 +842,18 @@ break; } case IRP_MN_REMOVE_DEVICE: - DPRINT1("USBSTOR_PdoHandlePnp: IRP_MN_REMOVE_DEVICE unimplemented\n"); - Status = STATUS_SUCCESS; - break; + { + DPRINT1("IRP_MN_REMOVE_DEVICE\n"); + + /* Complete the IRP */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* Delete the device object */ + IoDeleteDevice(DeviceObject); + + return STATUS_SUCCESS; + } case IRP_MN_QUERY_CAPABILITIES: { //

1 0

[cgutman] 55079: [USB-BRINGUP-TRUNK] - Send removal IRPs to children and removal relations before sending to the device itself
by cgutman＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: cgutman Date: Sun Jan 22 21:50:29 2012 New Revision: 55079 URL: http://svn.reactos.org/svn/reactos?rev=55079&view=rev Log: [USB-BRINGUP-TRUNK] - Send removal IRPs to children and removal relations before sending to the device itself Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/p… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Jan 22 21:50:29 2012 @@ -48,7 +48,7 @@ IopCancelPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject); NTSTATUS -IopPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject); +IopPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject, BOOLEAN Force); PDEVICE_NODE FASTCALL @@ -588,9 +588,9 @@ NewList = ExAllocatePool(PagedPool, NewSize); if (!NewList) { - /* Fail */ - ExFreePool(PnpBusTypeGuidList); - goto Quickie; + /* Fail */ + ExFreePool(PnpBusTypeGuidList); + goto Quickie; } /* Now copy them, decrease the size too */ @@ -620,7 +620,7 @@ /* * DESCRIPTION - * Creates a device node + * Creates a device node * * ARGUMENTS * ParentNode = Pointer to parent device node @@ -630,7 +630,7 @@ * DeviceNode = Pointer to storage for created device node * * RETURN VALUE - * Status + * Status */ NTSTATUS IopCreateDeviceNode(PDEVICE_NODE ParentNode, @@ -1369,11 +1369,11 @@ RtlInitUnicodeString(&ValueName, L"HardwareID"); Status = ZwSetValueKey(InstanceKey, - &ValueName, - 0, - REG_MULTI_SZ, - (PVOID)IoStatusBlock.Information, - (TotalLength + 1) * sizeof(WCHAR)); + &ValueName, + 0, + REG_MULTI_SZ, + (PVOID)IoStatusBlock.Information, + (TotalLength + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); @@ -1826,12 +1826,20 @@ if (!Found) { + /* Send removal IRPs to all of its children */ + IopPrepareDeviceForRemoval(Child->PhysicalDeviceObject, TRUE); + + /* Set the flag */ + Child->Flags |= DNF_WILL_BE_REMOVED; + + /* Send the surprise removal IRP */ IopSendSurpriseRemoval(Child->PhysicalDeviceObject); /* Tell the user-mode PnP manager that a device was removed */ IopQueueTargetDeviceEvent(&GUID_DEVICE_SURPRISE_REMOVAL, &Child->InstancePath); + /* Send the remove device IRP */ IopSendRemoveDevice(Child->PhysicalDeviceObject); } @@ -3899,7 +3907,7 @@ static NTSTATUS -IopQueryRemoveChildDevices(PDEVICE_NODE ParentDeviceNode) +IopQueryRemoveChildDevices(PDEVICE_NODE ParentDeviceNode, BOOLEAN Force) { PDEVICE_NODE ChildDeviceNode, NextDeviceNode, FailedRemoveDevice; NTSTATUS Status; @@ -3912,7 +3920,7 @@ NextDeviceNode = ChildDeviceNode->Sibling; KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); - Status = IopPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject); + Status = IopPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject, Force); if (!NT_SUCCESS(Status)) { FailedRemoveDevice = ChildDeviceNode; @@ -3998,7 +4006,7 @@ static NTSTATUS -IopQueryRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations) +IopQueryRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations, BOOLEAN Force) { /* This function DOES NOT dereference the device objects on SUCCESS * but it DOES dereference device objects on FAILURE */ @@ -4008,7 +4016,7 @@ for (i = 0; i < DeviceRelations->Count; i++) { - Status = IopPrepareDeviceForRemoval(DeviceRelations->Objects[i]); + Status = IopPrepareDeviceForRemoval(DeviceRelations->Objects[i], Force); if (!NT_SUCCESS(Status)) { j = i; @@ -4104,7 +4112,7 @@ } NTSTATUS -IopPrepareDeviceForRemoval(IN PDEVICE_OBJECT DeviceObject) +IopPrepareDeviceForRemoval(IN PDEVICE_OBJECT DeviceObject, BOOLEAN Force) { PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); IO_STACK_LOCATION Stack; @@ -4112,13 +4120,13 @@ PDEVICE_RELATIONS DeviceRelations; NTSTATUS Status; - if (DeviceNode->UserFlags & DNUF_NOT_DISABLEABLE) + if ((DeviceNode->UserFlags & DNUF_NOT_DISABLEABLE) && !Force) { DPRINT1("Removal not allowed for %wZ\n", &DeviceNode->InstancePath); return STATUS_UNSUCCESSFUL; } - if (IopQueryRemoveDevice(DeviceObject) != STATUS_SUCCESS) + if (!Force && IopQueryRemoveDevice(DeviceObject) != STATUS_SUCCESS) { DPRINT1("Removal vetoed by failing the query remove request\n"); @@ -4145,19 +4153,19 @@ if (DeviceRelations) { - Status = IopQueryRemoveDeviceRelations(DeviceRelations); + Status = IopQueryRemoveDeviceRelations(DeviceRelations, Force); if (!NT_SUCCESS(Status)) return Status; } - - Status = IopQueryRemoveChildDevices(DeviceNode); + + Status = IopQueryRemoveChildDevices(DeviceNode, Force); if (!NT_SUCCESS(Status)) { if (DeviceRelations) IopCancelRemoveDeviceRelations(DeviceRelations); return Status; } - + if (DeviceRelations) IopSendRemoveDeviceRelations(DeviceRelations); IopSendRemoveChildDevices(DeviceNode); @@ -4172,7 +4180,7 @@ DPRINT("Removing device: %wZ\n", &DeviceNode->InstancePath); - Status = IopPrepareDeviceForRemoval(DeviceNode->PhysicalDeviceObject); + Status = IopPrepareDeviceForRemoval(DeviceNode->PhysicalDeviceObject, FALSE); if (NT_SUCCESS(Status)) { IopSendRemoveDevice(DeviceNode->PhysicalDeviceObject); @@ -4225,12 +4233,12 @@ if (DeviceRelations) { - Status = IopQueryRemoveDeviceRelations(DeviceRelations); + Status = IopQueryRemoveDeviceRelations(DeviceRelations, FALSE); if (!NT_SUCCESS(Status)) goto cleanup; } - Status = IopQueryRemoveChildDevices(DeviceNode); + Status = IopQueryRemoveChildDevices(DeviceNode, FALSE); if (!NT_SUCCESS(Status)) { if (DeviceRelations) @@ -4238,7 +4246,7 @@ goto cleanup; } - if (IopPrepareDeviceForRemoval(PhysicalDeviceObject) != STATUS_SUCCESS) + if (IopPrepareDeviceForRemoval(PhysicalDeviceObject, FALSE) != STATUS_SUCCESS) { if (DeviceRelations) IopCancelRemoveDeviceRelations(DeviceRelations);

1 0

[tkreuzer] 55078: [PSDK} Add missing BYTE GAMMA_TABLES declaration
by tkreuzer＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: tkreuzer Date: Sun Jan 22 21:49:13 2012 New Revision: 55078 URL: http://svn.reactos.org/svn/reactos?rev=55078&view=rev Log: [PSDK} Add missing BYTE GAMMA_TABLES declaration Modified: trunk/reactos/include/psdk/winddi.h Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Sun Jan 22 21:49:13 2012 @@ -846,6 +846,8 @@ ULONG cCurves; } PATHOBJ; +typedef BYTE GAMMA_TABLES[2][256]; + typedef struct _GLYPHBITS { POINTL ptlOrigin; SIZEL sizlBitmap;

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2012