Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[cgutman] 55848: [USBOHCI] - Implement per-port power control

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Feb 25 02:20:15 2012 New Revision: 55848 URL: http://svn.reactos.org/svn/reactos?rev=55848&view=rev Log: [USBOHCI] - Implement per-port power control Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp trunk/reactos/drivers/usb/usbohci/hardware.h Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sat Feb 25 02:20:15 2012 @@ -517,7 +517,7 @@ NTSTATUS CUSBHardwareDevice::StartController(void) { - ULONG Control, Descriptor, FrameInterval, Periodic; + ULONG Control, Descriptor, FrameInterval, Periodic, Port; // // lets write physical address of dummy control endpoint descriptor @@ -530,7 +530,7 @@ WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_BULK_HEAD_ED_OFFSET), m_BulkEndpointDescriptor->PhysicalAddress.LowPart); // - // read descriptor + // read descriptor A // Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); @@ -552,18 +552,34 @@ Descriptor &= ~OHCI_RH_NO_POWER_SWITCHING; // - // control each port power independently (disabled until it's supported correctly) - // -#if 0 + // control each port power independently + // Descriptor |= OHCI_RH_POWER_SWITCHING_MODE; -#else - Descriptor &= ~OHCI_RH_POWER_SWITCHING_MODE; -#endif // // write the configuration back // + DPRINT1("Descriptor A: %x\n", Descriptor); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor); + + // + // read descriptor B + // + Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_B_OFFSET)); + + // + // set power power control for each port to use PPS + // + for (Port = 1; Port <= m_NumberOfPorts; Port++) + { + Descriptor |= (1 << (16 + Port)); + } + + // + // write the configuration back + // + DPRINT1("Descriptor B: %x\n", Descriptor); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_B_OFFSET), Descriptor); // // get frame interval @@ -634,11 +650,6 @@ ASSERT((Control & OHCI_HC_FUNCTIONAL_STATE_MASK) == OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST); DPRINT1("Control %x\n", Control); - - // - // enable power on all ports - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_STATUS_OFFSET), OHCI_RH_LOCAL_POWER_STATUS_CHANGE); // // done Modified: trunk/reactos/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.h [iso-8859-1] Sat Feb 25 02:20:15 2012 @@ -113,7 +113,7 @@ // Root Hub Descriptor B register (section 7.4.2) // -#define OHCI_RH_DESCRIPTOR_B 0x4c +#define OHCI_RH_DESCRIPTOR_B_OFFSET 0x4c // // Root Hub status register (section 7.4.3)

12 years, 10 months

[janderwald] 55847: [USBCCGP] - Formatting, no code changes

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Feb 25 00:35:40 2012 New Revision: 55847 URL: http://svn.reactos.org/svn/reactos?rev=55847&view=rev Log: [USBCCGP] - Formatting, no code changes Modified: trunk/reactos/drivers/usb/usbccgp/fdo.c trunk/reactos/drivers/usb/usbccgp/function.c trunk/reactos/drivers/usb/usbccgp/misc.c trunk/reactos/drivers/usb/usbccgp/usbccgp.c trunk/reactos/drivers/usb/usbccgp/usbccgp.h Modified: trunk/reactos/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/fdo.c [iso-8859-1] Sat Feb 25 00:35:40 2012 @@ -18,14 +18,10 @@ IN PIRP Irp, IN PVOID Context) { - // - // set event - // + /* Set event */ KeSetEvent((PRKEVENT)Context, 0, FALSE); - // - // completion is done in the HidClassFDO_QueryCapabilities routine - // + /* Completion is done in the HidClassFDO_QueryCapabilities routine */ return STATUS_MORE_PROCESSING_REQUIRED; } @@ -40,85 +36,62 @@ PIO_STACK_LOCATION IoStack; PFDO_DEVICE_EXTENSION FDODeviceExtension; - // - // get device extension - // + /* Get device extension */ FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); - // - // init event - // + /* Init event */ KeInitializeEvent(&Event, NotificationEvent, FALSE); - // - // now allocte the irp - // + /* Now allocte the irp */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); if (!Irp) { - // - // no memory - // + /* No memory */ return STATUS_INSUFFICIENT_RESOURCES; } - // - // get next stack location - // + /* Get next stack location */ IoStack = IoGetNextIrpStackLocation(Irp); - // - // init stack location - // + /* Init stack location */ IoStack->MajorFunction = IRP_MJ_PNP; IoStack->MinorFunction = IRP_MN_QUERY_CAPABILITIES; IoStack->Parameters.DeviceCapabilities.Capabilities = Capabilities; - // - // set completion routine - // - IoSetCompletionRoutine(Irp, FDO_QueryCapabilitiesCompletionRoutine, (PVOID)&Event, TRUE, TRUE, TRUE); - - // - // init capabilities - // + /* Set completion routine */ + IoSetCompletionRoutine(Irp, + FDO_QueryCapabilitiesCompletionRoutine, + (PVOID)&Event, + TRUE, + TRUE, + TRUE); + + /* Init capabilities */ RtlZeroMemory(Capabilities, sizeof(DEVICE_CAPABILITIES)); Capabilities->Size = sizeof(DEVICE_CAPABILITIES); Capabilities->Version = 1; // FIXME hardcoded constant Capabilities->Address = MAXULONG; Capabilities->UINumber = MAXULONG; - // - // pnp irps have default completion code - // + /* Pnp irps have default completion code */ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - // - // call lower device - // + /* Call lower device */ Status = IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); if (Status == STATUS_PENDING) { - // - // wait for completion - // + /* Wait for completion */ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } - // - // get status - // + /* Get status */ Status = Irp->IoStatus.Status; - // - // complete request - // + /* Complete request */ IoFreeIrp(Irp); - // - // done - // + /* Done */ return Status; } @@ -133,85 +106,58 @@ PIO_STACK_LOCATION IoStack; PFDO_DEVICE_EXTENSION FDODeviceExtension; - // - // get device extension - // - FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - // - // get current irp stack location - // + /* Get device extension */ + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* Get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - // - // check if relation type is BusRelations - // + /* Check if relation type is BusRelations */ if (IoStack->Parameters.QueryDeviceRelations.Type != BusRelations) { - // - // FDO always only handles bus relations - // + /* FDO always only handles bus relations */ return USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); } - // - // go through array and count device objects - // + /* Go through array and count device objects */ for(Index = 0; Index < FDODeviceExtension->FunctionDescriptorCount; Index++) { if (FDODeviceExtension->ChildPDO[Index]) { - // - // child pdo - // + /* Child pdo */ DeviceCount++; } } - // - // allocate device relations - // - DeviceRelations = (PDEVICE_RELATIONS)AllocateItem(PagedPool, sizeof(DEVICE_RELATIONS) + (DeviceCount > 1 ? (DeviceCount-1) * sizeof(PDEVICE_OBJECT) : 0)); + /* Allocate device relations */ + DeviceRelations = (PDEVICE_RELATIONS)AllocateItem(PagedPool, + sizeof(DEVICE_RELATIONS) + (DeviceCount > 1 ? (DeviceCount-1) * sizeof(PDEVICE_OBJECT) : 0)); if (!DeviceRelations) { - // - // no memory - // + /* No memory */ return STATUS_INSUFFICIENT_RESOURCES; } - // - // add device objects - // + /* Add device objects */ for(Index = 0; Index < FDODeviceExtension->FunctionDescriptorCount; Index++) { if (FDODeviceExtension->ChildPDO[Index]) { - // - // store child pdo - // + /* Store child pdo */ DeviceRelations->Objects[DeviceRelations->Count] = FDODeviceExtension->ChildPDO[Index]; - // - // add reference - // + /* Add reference */ ObReferenceObject(FDODeviceExtension->ChildPDO[Index]); - // - // increment count - // + /* Increment count */ DeviceRelations->Count++; } } - // - // store result - // + /* Store result */ Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; - // - // request completed successfully - // + /* Request completed successfully */ return STATUS_SUCCESS; } @@ -225,56 +171,45 @@ PFDO_DEVICE_EXTENSION FDODeviceExtension; ULONG Index; - // - // get device extension - // + /* Get device extension */ FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); - // - // lets create array for the child PDO - // - FDODeviceExtension->ChildPDO = AllocateItem(NonPagedPool, sizeof(PDEVICE_OBJECT) * FDODeviceExtension->FunctionDescriptorCount); + /* Lets create array for the child PDO */ + FDODeviceExtension->ChildPDO = AllocateItem(NonPagedPool, + sizeof(PDEVICE_OBJECT) * FDODeviceExtension->FunctionDescriptorCount); if (!FDODeviceExtension->ChildPDO) { - // - // no memory - // + /* No memory */ return STATUS_INSUFFICIENT_RESOURCES; } - // - // create pdo for each function - // + /* Create pdo for each function */ for(Index = 0; Index < FDODeviceExtension->FunctionDescriptorCount; Index++) { - // - // create the PDO - // - Status = IoCreateDevice(FDODeviceExtension->DriverObject, sizeof(PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_USB, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &PDODeviceObject); + /* Create the PDO */ + Status = IoCreateDevice(FDODeviceExtension->DriverObject, + sizeof(PDO_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_USB, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &PDODeviceObject); if (!NT_SUCCESS(Status)) { - // - // failed to create device object - // + /* Failed to create device object */ DPRINT1("IoCreateDevice failed with %x\n", Status); return Status; } - // - // store in array - // + /* Store in array */ FDODeviceExtension->ChildPDO[Index] = PDODeviceObject; - // - // get device extension - // + /* Get device extension */ PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; RtlZeroMemory(PDODeviceExtension, sizeof(PDO_DEVICE_EXTENSION)); - // - // init device extension - // + /* Init device extension */ PDODeviceExtension->Common.IsFDO = FALSE; PDODeviceExtension->FunctionDescriptor = &FDODeviceExtension->FunctionDescriptor[Index]; PDODeviceExtension->NextDeviceObject = DeviceObject; @@ -287,25 +222,17 @@ RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); RtlCopyMemory(&PDODeviceExtension->DeviceDescriptor, &FDODeviceExtension->DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); - // - // patch the stack size - // + /* Patch the stack size */ PDODeviceObject->StackSize = DeviceObject->StackSize + 1; - // - // set device flags - // + /* Set device flags */ PDODeviceObject->Flags |= DO_DIRECT_IO | DO_MAP_IO_BUFFER; - // - // device is initialized - // + /* Device is initialized */ PDODeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; } - // - // done - // + /* Done */ return STATUS_SUCCESS; } @@ -317,93 +244,81 @@ NTSTATUS Status; PFDO_DEVICE_EXTENSION FDODeviceExtension; - // - // get device extension - // + /* Get device extension */ FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); - // - // first start lower device - // + /* First start lower device */ Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); if (!NT_SUCCESS(Status)) { - // - // failed to start lower device - // + /* Failed to start lower device */ DPRINT1("FDO_StartDevice lower device failed to start with %x\n", Status); return Status; } - // get descriptors + /* Get descriptors */ Status = USBCCGP_GetDescriptors(DeviceObject); if (!NT_SUCCESS(Status)) { - // failed to start lower device + /* Failed to start lower device */ DPRINT1("FDO_StartDevice failed to get descriptors with %x\n", Status); return Status; } - // get capabilities - Status = FDO_QueryCapabilities(DeviceObject, &FDODeviceExtension->Capabilities); + /* Get capabilities */ + Status = FDO_QueryCapabilities(DeviceObject, + &FDODeviceExtension->Capabilities); if (!NT_SUCCESS(Status)) { - // failed to start lower device + /* Failed to start lower device */ DPRINT1("FDO_StartDevice failed to get capabilities with %x\n", Status); return Status; } - // now select the configuration + /* Now select the configuration */ Status = USBCCGP_SelectConfiguration(DeviceObject, FDODeviceExtension); if (!NT_SUCCESS(Status)) { - // failed to select interface + /* Failed to select interface */ DPRINT1("FDO_StartDevice failed to get capabilities with %x\n", Status); return Status; } - // query bus interface - USBCCGP_QueryInterface(FDODeviceExtension->NextDeviceObject, &FDODeviceExtension->BusInterface); - - // now enumerate the functions + /* Query bus interface */ + USBCCGP_QueryInterface(FDODeviceExtension->NextDeviceObject, + &FDODeviceExtension->BusInterface); + + /* Now enumerate the functions */ Status = USBCCGP_EnumerateFunctions(DeviceObject); if (!NT_SUCCESS(Status)) { - // failed to enumerate functions + /* Failed to enumerate functions */ DPRINT1("Failed to enumerate functions with %x\n", Status); return Status; } - // - // sanity checks - // + /* Sanity checks */ ASSERT(FDODeviceExtension->FunctionDescriptorCount); ASSERT(FDODeviceExtension->FunctionDescriptor); - DumpFunctionDescriptor(FDODeviceExtension->FunctionDescriptor, FDODeviceExtension->FunctionDescriptorCount); - - // - // now create the pdo - // + DumpFunctionDescriptor(FDODeviceExtension->FunctionDescriptor, + FDODeviceExtension->FunctionDescriptorCount); + + /* Now create the pdo */ Status = FDO_CreateChildPdo(DeviceObject); if (!NT_SUCCESS(Status)) { - // - // failed - // + /* Failed */ DPRINT1("FDO_CreateChildPdo failed with %x\n", Status); return Status; } - // - // inform pnp manager of new device objects - // - IoInvalidateDeviceRelations(FDODeviceExtension->PhysicalDeviceObject, BusRelations); - - // - // done - // + /* Inform pnp manager of new device objects */ + IoInvalidateDeviceRelations(FDODeviceExtension->PhysicalDeviceObject, + BusRelations); + + /* Done */ DPRINT("[USBCCGP] FDO initialized successfully\n"); return Status; } @@ -416,36 +331,27 @@ PURB Urb; PFDO_DEVICE_EXTENSION FDODeviceExtension; - // get device extension + /* Get device extension */ FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); - // - // now allocate the urb - // - Urb = USBD_CreateConfigurationRequestEx(FDODeviceExtension->ConfigurationDescriptor, FDODeviceExtension->InterfaceList); + /* Now allocate the urb */ + Urb = USBD_CreateConfigurationRequestEx(FDODeviceExtension->ConfigurationDescriptor, + FDODeviceExtension->InterfaceList); if (!Urb) { - // - // no memory - // + /* No memory */ return STATUS_INSUFFICIENT_RESOURCES; } - // - // clear configuration descriptor to make it an unconfigure request - // + /* Clear configuration descriptor to make it an unconfigure request */ Urb->UrbSelectConfiguration.ConfigurationDescriptor = NULL; - // - // submit urb - // + /* Submit urb */ Status = USBCCGP_SyncUrbRequest(FDODeviceExtension->NextDeviceObject, Urb); if (!NT_SUCCESS(Status)) { - // - // failed to set configuration - // + /* Failed to set configuration */ DPRINT1("USBCCGP_SyncUrbRequest failed to unconfigure device\n", Status); } @@ -463,72 +369,59 @@ NTSTATUS Status; PFDO_DEVICE_EXTENSION FDODeviceExtension; - // get device extension + /* Get device extension */ FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); - // get stack location + /* Get stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); DPRINT("[USBCCGP] PnP Minor %x\n", IoStack->MinorFunction); switch(IoStack->MinorFunction) { case IRP_MN_REMOVE_DEVICE: { - // - // unconfigure device - // + // Unconfigure device */ DPRINT1("[USBCCGP] FDO IRP_MN_REMOVE\n"); FDO_CloseConfiguration(DeviceObject); /* Send the IRP down the stack */ + Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, + Irp); + if (NT_SUCCESS(Status)) + { + /* Detach from the device stack */ + IoDetachDevice(FDODeviceExtension->NextDeviceObject); + + /* Delete the device object */ + IoDeleteDevice(DeviceObject); + } + + /* Request completed */ + break; + } + case IRP_MN_START_DEVICE: + { + /* Start the device */ + Status = FDO_StartDevice(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + /* Handle device relations */ + Status = FDO_DeviceRelations(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_CAPABILITIES: + { + /* Copy capabilities */ + RtlCopyMemory(IoStack->Parameters.DeviceCapabilities.Capabilities, + &FDODeviceExtension->Capabilities, + sizeof(DEVICE_CAPABILITIES)); Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); if (NT_SUCCESS(Status)) { - // - // Detach from the device stack - // - IoDetachDevice(FDODeviceExtension->NextDeviceObject); - - // - // Delete the device object - // - IoDeleteDevice(DeviceObject); - } - - // - // request completed - // - break; - } - case IRP_MN_START_DEVICE: - { - // - // start the device - // - Status = FDO_StartDevice(DeviceObject, Irp); - break; - } - case IRP_MN_QUERY_DEVICE_RELATIONS: - { - // - // handle device relations - // - Status = FDO_DeviceRelations(DeviceObject, Irp); - break; - } - case IRP_MN_QUERY_CAPABILITIES: - { - // - // copy capabilities - // - RtlCopyMemory(IoStack->Parameters.DeviceCapabilities.Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); - Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); - if (NT_SUCCESS(Status)) - { - // - // surprise removal ok - // + /* Surprise removal ok */ IoStack->Parameters.DeviceCapabilities.Capabilities->SurpriseRemovalOK = TRUE; } break; @@ -536,31 +429,23 @@ case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: { - // - // sure - // + /* Sure */ Irp->IoStatus.Status = STATUS_SUCCESS; - // - // forward irp to next device object - // + /* Forward irp to next device object */ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); } default: { - // - // forward irp to next device object - // + /* Forward irp to next device object */ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); } } - // - // complete request - // + /* Complete request */ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -580,86 +465,60 @@ PIRP ListIrp; KIRQL OldLevel; - // - // get device extension - // + /* Get device extension */ FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); - // get stack location + /* Get stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); DPRINT("FDO_HandleResetCyclePort IOCTL %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_RESET_PORT) { - // - // use reset port list - // + /* Use reset port list */ ListHead = &FDODeviceExtension->ResetPortListHead; ResetActive = &FDODeviceExtension->ResetPortActive; } else { - // - // use cycle port list - // + /* Use cycle port list */ ListHead = &FDODeviceExtension->CyclePortListHead; ResetActive = &FDODeviceExtension->CyclePortActive; } - // - // acquire lock - // + /* Acquire lock */ KeAcquireSpinLock(&FDODeviceExtension->Lock, &OldLevel); if (*ResetActive) { - // - // insert into pending list - // + /* Insert into pending list */ InsertTailList(ListHead, &Irp->Tail.Overlay.ListEntry); - // - // mark irp pending - // + /* Mark irp pending */ IoMarkIrpPending(Irp); Status = STATUS_PENDING; - // - // release lock - // + /* Release lock */ KeReleaseSpinLock(&FDODeviceExtension->Lock, OldLevel); } else { - // - // mark reset active - // + /* Mark reset active */ *ResetActive = TRUE; - // - // release lock - // + /* Release lock */ KeReleaseSpinLock(&FDODeviceExtension->Lock, OldLevel); - // - // forward request synchronized - // + /* Forward request synchronized */ USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); - // - // reacquire lock - // + /* Reacquire lock */ KeAcquireSpinLock(&FDODeviceExtension->Lock, &OldLevel); - // - // mark reset as completed - // + /* Mark reset as completed */ *ResetActive = FALSE; - // - // move all requests into temporary list - // + /* Move all requests into temporary list */ InitializeListHead(&TempList); while(!IsListEmpty(ListHead)) { @@ -667,29 +526,21 @@ InsertTailList(&TempList, Entry); } - // - // release lock - // + /* Release lock */ KeReleaseSpinLock(&FDODeviceExtension->Lock, OldLevel); - // - // complete pending irps - // + /* Complete pending irps */ while(!IsListEmpty(&TempList)) { Entry = RemoveHeadList(&TempList); ListIrp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); - // - // complete request with status success - // + /* Complete request with status success */ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); } - // - // status success - // + /* Status success */ Status = STATUS_SUCCESS; } @@ -707,37 +558,29 @@ NTSTATUS Status; PFDO_DEVICE_EXTENSION FDODeviceExtension; - // - // get device extension - // + /* Get device extension */ FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); - // get stack location + /* Get stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_RESET_PORT || IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_CYCLE_PORT) { - // - // handle reset / cycle ports - // + /* Handle reset / cycle ports */ Status = FDO_HandleResetCyclePort(DeviceObject, Irp); DPRINT("FDO_HandleResetCyclePort Status %x\n", Status); if (Status != STATUS_PENDING) { - // - // complete request - // + /* Complete request */ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); } return Status; } - // - // forward and forget request - // + /* Forward and forget request */ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); } @@ -750,7 +593,7 @@ PIO_STACK_LOCATION IoStack; NTSTATUS Status; - /* get stack location */ + /* Get stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); switch(IoStack->MajorFunction) @@ -768,5 +611,3 @@ } } - - Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] Sat Feb 25 00:35:40 2012 @@ -22,26 +22,18 @@ IO_STATUS_BLOCK IoStatus; PIO_STACK_LOCATION Stack; - // - // sanity checks - // + /* Sanity checks */ ASSERT(DeviceObject); - // - // initialize event - // + /* Initialize event */ KeInitializeEvent(&Event, NotificationEvent, FALSE); - // - // init interface - // + /* Init interface */ RtlZeroMemory(BusInterface, sizeof(USBC_DEVICE_CONFIGURATION_INTERFACE_V1)); BusInterface->Version = USBC_DEVICE_CONFIGURATION_INTERFACE_VERSION_1; BusInterface->Size = sizeof(USBC_DEVICE_CONFIGURATION_INTERFACE_V1); - // - // create irp - // + /* Create irp */ Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, DeviceObject, NULL, @@ -366,10 +358,10 @@ // get interface description // Status = USBCCGP_GetStringDescriptor(FDODeviceExtension->NextDeviceObject, - 100 * sizeof(WCHAR), - Descriptor->iFunction, - 0x0409, //FIXME - (PVOID*)&DescriptionBuffer); + 100 * sizeof(WCHAR), + Descriptor->iFunction, + 0x0409, //FIXME + (PVOID*)&DescriptionBuffer); if (!NT_SUCCESS(Status)) { // @@ -530,10 +522,10 @@ // get interface description // Status = USBCCGP_GetStringDescriptor(FDODeviceExtension->NextDeviceObject, - 100 * sizeof(WCHAR), - Descriptor->iInterface, - 0x0409, //FIXME - (PVOID*)&DescriptionBuffer); + 100 * sizeof(WCHAR), + Descriptor->iInterface, + 0x0409, //FIXME + (PVOID*)&DescriptionBuffer); if (!NT_SUCCESS(Status)) { // Modified: trunk/reactos/drivers/usb/usbccgp/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] Sat Feb 25 00:35:40 2012 @@ -11,9 +11,7 @@ #include "usbccgp.h" -// -// driver verifier -// +/* Driver verifier */ IO_COMPLETION_ROUTINE SyncForwardIrpCompletionRoutine; NTSTATUS @@ -39,46 +37,34 @@ KEVENT Event; NTSTATUS Status; - // - // initialize event - // + /* Initialize event */ KeInitializeEvent(&Event, NotificationEvent, FALSE); - // - // copy irp stack location - // + /* Copy irp stack location */ IoCopyCurrentIrpStackLocationToNext(Irp); - // - // set completion routine - // - IoSetCompletionRoutine(Irp, USBSTOR_SyncForwardIrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + /* Set completion routine */ + IoSetCompletionRoutine(Irp, + USBSTOR_SyncForwardIrpCompletionRoutine, + &Event, + TRUE, + TRUE, + TRUE); - - // - // call driver - // + /* Call driver */ Status = IoCallDriver(DeviceObject, Irp); - // - // check if pending - // + /* Check if pending */ if (Status == STATUS_PENDING) { - // - // wait for the request to finish - // + /* Wait for the request to finish */ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - // - // copy status code - // + /* Copy status code */ Status = Irp->IoStatus.Status; } - // - // done - // + /* Done */ return Status; } @@ -92,72 +78,52 @@ KEVENT Event; NTSTATUS Status; - // - // allocate irp - // + /* Allocate irp */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); if (!Irp) { - // - // no memory - // + /* No memory */ return STATUS_INSUFFICIENT_RESOURCES; } - // - // initialize event - // + /* Initialize event */ KeInitializeEvent(&Event, NotificationEvent, FALSE); - - // - // get next stack location - // + /* Get next stack location */ IoStack = IoGetNextIrpStackLocation(Irp); - // - // initialize stack location - // + /* Initialize stack location */ IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; IoStack->Parameters.Others.Argument1 = (PVOID)UrbRequest; IoStack->Parameters.DeviceIoControl.InputBufferLength = UrbRequest->UrbHeader.Length; Irp->IoStatus.Status = STATUS_SUCCESS; - // - // setup completion routine - // - IoSetCompletionRoutine(Irp, USBSTOR_SyncForwardIrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + /* Setup completion routine */ + IoSetCompletionRoutine(Irp, + USBSTOR_SyncForwardIrpCompletionRoutine, + &Event, + TRUE, + TRUE, + TRUE); - // - // call driver - // + /* Call driver */ Status = IoCallDriver(DeviceObject, Irp); - // - // check if request is pending - // + /* Check if request is pending */ if (Status == STATUS_PENDING) { - // - // wait for completion - // + /* Wait for completion */ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - // - // update status - // + /* Update status */ Status = Irp->IoStatus.Status; } - // - // free irp - // + /* Free irp */ IoFreeIrp(Irp); - // - // done - // + /* Done */ return Status; } @@ -166,22 +132,16 @@ IN POOL_TYPE PoolType, IN ULONG ItemSize) { - // - // allocate item - // + /* Allocate item */ PVOID Item = ExAllocatePoolWithTag(PoolType, ItemSize, USBCCPG_TAG); if (Item) { - // - // zero item - // + /* Zero item */ RtlZeroMemory(Item, ItemSize); } - // - // return element - // + /* Return element */ return Item; } @@ -189,9 +149,7 @@ FreeItem( IN PVOID Item) { - // - // free item - // + /* Free item */ ExFreePoolWithTag(Item, USBCCPG_TAG); } Modified: trunk/reactos/drivers/usb/usbccgp/usbccgp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/usbccg… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] Sat Feb 25 00:35:40 2012 @@ -11,9 +11,7 @@ #include "usbccgp.h" -// -// driver verifier -// +/* Driver verifier */ DRIVER_ADD_DEVICE USBCCGP_AddDevice; NTSTATUS @@ -26,19 +24,25 @@ PDEVICE_OBJECT DeviceObject; PFDO_DEVICE_EXTENSION FDODeviceExtension; - // lets create the device - Status = IoCreateDevice(DriverObject, sizeof(FDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_USB, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &DeviceObject); + /* Lets create the device */ + Status = IoCreateDevice(DriverObject, + sizeof(FDO_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_USB, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &DeviceObject); if (!NT_SUCCESS(Status)) { - // failed to create device + /* Failed to create device */ DPRINT1("USBCCGP_AddDevice failed to create device with %x\n", Status); return Status; } - // get device extension + /* Get device extension */ FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - // init device extension + /* Init device extension */ RtlZeroMemory(FDODeviceExtension, sizeof(FDO_DEVICE_EXTENSION)); FDODeviceExtension->Common.IsFDO = TRUE; FDODeviceExtension->DriverObject = DriverObject; @@ -47,22 +51,23 @@ InitializeListHead(&FDODeviceExtension->CyclePortListHead); KeInitializeSpinLock(&FDODeviceExtension->Lock); - FDODeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + FDODeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, + PhysicalDeviceObject); if (!FDODeviceExtension->NextDeviceObject) { - // failed to attach + /* Failed to attach */ DPRINT1("USBCCGP_AddDevice failed to attach device\n"); IoDeleteDevice(DeviceObject); return STATUS_DEVICE_REMOVED; } - // set device flags + /* Set device flags */ DeviceObject->Flags |= DO_BUFFERED_IO | DO_POWER_PAGABLE; - // device is initialized + /* Device is initialized */ DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - // device initialized + /* Device initialized */ return Status; } @@ -75,24 +80,24 @@ PCOMMON_DEVICE_EXTENSION DeviceExtension; PFDO_DEVICE_EXTENSION FDODeviceExtension; - // get common device extension + /* Get common device extension */ DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - // is it a fdo + /* Is it a fdo */ if (DeviceExtension->IsFDO) { - // forward and forget + /* Forward and forget */ IoSkipCurrentIrpStackLocation(Irp); - // get fdo + /* Get fdo */ FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - // call lower driver + /* Call lower driver */ return IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); } else { - // pdo not supported + /* Pdo not supported */ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_SUPPORTED; @@ -108,26 +113,26 @@ PCOMMON_DEVICE_EXTENSION DeviceExtension; PIO_STACK_LOCATION IoStack; - // get common device extension + /* Get common device extension */ DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - // get current stack location + /* Get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); if (IoStack->MajorFunction == IRP_MJ_CREATE || IoStack->MajorFunction == IRP_MJ_CLOSE) { - // dispatch to default handler + /* Dispatch to default handler */ return USBCCGP_CreateClose(DeviceObject, Irp); } if (DeviceExtension->IsFDO) { - // handle request for FDO + /* Handle request for FDO */ return FDO_Dispatch(DeviceObject, Irp); } else { - // handle request for PDO + /* Handle request for PDO */ return PDO_Dispatch(DeviceObject, Irp); } } @@ -139,7 +144,7 @@ PUNICODE_STRING RegistryPath) { - // initialize driver object + /* Initialize driver object */ DPRINT("[USBCCGP] DriverEntry\n"); DriverObject->DriverExtension->AddDevice = USBCCGP_AddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBCCGP_Dispatch; @@ -149,7 +154,7 @@ DriverObject->MajorFunction[IRP_MJ_POWER] = USBCCGP_Dispatch; DriverObject->MajorFunction[IRP_MJ_PNP] = USBCCGP_Dispatch; - // FIMXE query GenericCompositeUSBDeviceString + /* FIMXE query GenericCompositeUSBDeviceString */ return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/usbccg… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] Sat Feb 25 00:35:40 2012 @@ -10,17 +10,16 @@ #include <usbioctl.h> #include <usbdlib.h> -// -// FIXME: -// #include <usbprotocoldefs.h> -// +/* FIXME: +#include <usbprotocoldefs.h> */ + #include <usb.h> #include <stdio.h> #include <wdmguid.h> typedef struct { - BOOLEAN IsFDO; // is device a FDO or PDO + BOOLEAN IsFDO; // is device a FDO or PDO }COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; typedef struct @@ -60,10 +59,9 @@ USBD_CONFIGURATION_HANDLE ConfigurationHandle; // configuration handle PUSBD_INTERFACE_LIST_ENTRY InterfaceList; // interface list ULONG InterfaceListCount; // interface list count - PFDO_DEVICE_EXTENSION FDODeviceExtension; // pointer to fdo's pdo list + PFDO_DEVICE_EXTENSION FDODeviceExtension; // pointer to fdo's pdo list }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; -/* descriptor.c */ NTSTATUS USBCCGP_GetDescriptors(

12 years, 10 months

[cgutman] 55846: [INF] - Fix the Live CD regression (RBuild only - The irony is not lost on me) caused by r55555 - There is another regression that still prevents booting though

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Feb 25 00:34:48 2012 New Revision: 55846 URL: http://svn.reactos.org/svn/reactos?rev=55846&view=rev Log: [INF] - Fix the Live CD regression (RBuild only - The irony is not lost on me) caused by r55555 - There is another regression that still prevents booting though Modified: trunk/reactos/media/inf/inf.rbuild Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=5… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/inf/inf.rbuild [iso-8859-1] Sat Feb 25 00:34:48 2012 @@ -13,6 +13,7 @@ <installfile installbase="inf">font.inf</installfile> <installfile installbase="inf">hal.inf</installfile> <installfile installbase="inf">hdc.inf</installfile> + <installfile installbase="inf">input.inf</installfile> <installfile installbase="inf">intl.inf</installfile> <installfile installbase="inf">keyboard.inf</installfile> <installfile installbase="inf">ks.inf</installfile>

12 years, 10 months

[cgutman] 55845: [USBOHCI] - Fix a broken assertion and print out the alignment mask and HCCA pointer

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Feb 24 23:14:19 2012 New Revision: 55845 URL: http://svn.reactos.org/svn/reactos?rev=55845&view=rev Log: [USBOHCI] - Fix a broken assertion and print out the alignment mask and HCCA pointer Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Feb 24 23:14:19 2012 @@ -588,7 +588,8 @@ WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET), 0xFFFFFFFF); KeStallExecutionProcessor(10); Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET)); - ASSERT((m_HCCAPhysicalAddress.LowPart & Control) == Control); + ASSERT((m_HCCAPhysicalAddress.LowPart & Control) == m_HCCAPhysicalAddress.LowPart); + DPRINT1("HCCA: %x Alignment mask: %x\n", m_HCCAPhysicalAddress.LowPart, Control); // // write address of HCCA

12 years, 10 months

[cgutman] 55844: [USBOHCI] - Fix various initialization bugs

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Feb 24 23:05:22 2012 New Revision: 55844 URL: http://svn.reactos.org/svn/reactos?rev=55844&view=rev Log: [USBOHCI] - Fix various initialization bugs Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Feb 24 23:05:22 2012 @@ -517,7 +517,7 @@ NTSTATUS CUSBHardwareDevice::StartController(void) { - ULONG Control, NumberOfPorts, Index, Descriptor, FrameInterval, Periodic; + ULONG Control, Descriptor, FrameInterval, Periodic; // // lets write physical address of dummy control endpoint descriptor @@ -530,70 +530,16 @@ WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_BULK_HEAD_ED_OFFSET), m_BulkEndpointDescriptor->PhysicalAddress.LowPart); // - // get frame interval - // - FrameInterval = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)); - m_IntervalValue = OHCI_GET_INTERVAL_VALUE(FrameInterval); - - FrameInterval = ((FrameInterval & OHCI_FRAME_INTERVAL_TOGGLE) ^ OHCI_FRAME_INTERVAL_TOGGLE); - - DPRINT1("FrameInterval %x IntervalValue %x\n", FrameInterval, m_IntervalValue); - FrameInterval |= OHCI_FSMPS(m_IntervalValue) | m_IntervalValue; - DPRINT1("FrameInterval %x\n", FrameInterval); - - // - // write frame interval - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET), FrameInterval); - - // - // write address of HCCA - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET), m_HCCAPhysicalAddress.LowPart); - - // - // now enable the interrupts - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_NORMAL_INTERRUPTS | OHCI_MASTER_INTERRUPT_ENABLE); - - // - // enable all queues - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_ENABLE_LIST); - - // - // 90 % periodic - // - Periodic = OHCI_PERIODIC(m_IntervalValue); - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET), Periodic); - DPRINT("Periodic Start %x\n", Periodic); - - // - // start the controller - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_ENABLE_LIST | OHCI_CONTROL_BULK_RATIO_1_4 | OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); - - // - // wait a bit - // - KeStallExecutionProcessor(100); - - // - // is the controller started - // - Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); - - // - // assert that the controller has been started - // - ASSERT((Control & OHCI_HC_FUNCTIONAL_STATE_MASK) == OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); - ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST); - DPRINT1("Control %x\n", Control); - - // // read descriptor // Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); + + // + // get port count + // + m_NumberOfPorts = OHCI_RH_GET_PORT_COUNT(Descriptor); + DPRINT1("NumberOfPorts %lu\n", m_NumberOfPorts); + ASSERT(m_NumberOfPorts < OHCI_MAX_PORT_COUNT); // // no over current protection @@ -620,66 +566,83 @@ WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor); // + // get frame interval + // + FrameInterval = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)); + m_IntervalValue = OHCI_GET_INTERVAL_VALUE(FrameInterval); + + FrameInterval = ((FrameInterval & OHCI_FRAME_INTERVAL_TOGGLE) ^ OHCI_FRAME_INTERVAL_TOGGLE); + + DPRINT1("FrameInterval %x IntervalValue %x\n", FrameInterval, m_IntervalValue); + FrameInterval |= OHCI_FSMPS(m_IntervalValue) | m_IntervalValue; + DPRINT1("FrameInterval %x\n", FrameInterval); + + // + // write frame interval + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET), FrameInterval); + + // + // HCCA alignment check + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET), 0xFFFFFFFF); + KeStallExecutionProcessor(10); + Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET)); + ASSERT((m_HCCAPhysicalAddress.LowPart & Control) == Control); + + // + // write address of HCCA + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET), m_HCCAPhysicalAddress.LowPart); + + // + // now enable the interrupts + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_NORMAL_INTERRUPTS | OHCI_MASTER_INTERRUPT_ENABLE); + + // + // enable all queues + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_ENABLE_LIST); + + // + // 90 % periodic + // + Periodic = OHCI_PERIODIC(m_IntervalValue); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET), Periodic); + DPRINT("Periodic Start %x\n", Periodic); + + // + // start the controller + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_ENABLE_LIST | OHCI_CONTROL_BULK_RATIO_1_4 | OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); + + // + // wait a bit + // + KeStallExecutionProcessor(100); + + // + // is the controller started + // + Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); + + // + // assert that the controller has been started + // + ASSERT((Control & OHCI_HC_FUNCTIONAL_STATE_MASK) == OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); + ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST); + DPRINT1("Control %x\n", Control); + + // // enable power on all ports // WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_STATUS_OFFSET), OHCI_RH_LOCAL_POWER_STATUS_CHANGE); // - // wait a bit - // - KeStallExecutionProcessor(10); - - // - // write descriptor - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor); - - // - // retrieve number of ports - // - for(Index = 0; Index < 10; Index++) - { - // - // wait a bit - // - KeStallExecutionProcessor(10); - - // - // read descriptor - // - Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); - - // - // get number of ports - // - NumberOfPorts = OHCI_RH_GET_PORT_COUNT(Descriptor); - - // - // check if we have received the ports - // - if (NumberOfPorts) - break; - } - - // - // sanity check - // - ASSERT(NumberOfPorts < OHCI_MAX_PORT_COUNT); - - // - // store number of ports - // - m_NumberOfPorts = NumberOfPorts; - - // - // print out number ports - // - DPRINT1("NumberOfPorts %lu\n", m_NumberOfPorts); - - - // // done // + DPRINT1("OHCI controller is operational\n"); return STATUS_SUCCESS; } @@ -912,18 +875,10 @@ NTSTATUS CUSBHardwareDevice::StopController(void) { - ULONG Control, Reset, Status; + ULONG Control, Reset; ULONG Index, FrameInterval; // - // alignment check - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET), 0xFFFFFFFF); - Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET)); - //ASSERT((m_HCCAPhysicalAddress.QuadPart & Control) == Control); - - - // // check context // Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); @@ -931,14 +886,9 @@ 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); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET), OHCI_OWNERSHIP_CHANGE_REQUEST); for(Index = 0; Index < 100; Index++) { // @@ -1002,7 +952,7 @@ // check control register // Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK); - if (Control & OHCI_HC_FUNCTIONAL_STATE_RESUME) + if (Control == OHCI_HC_FUNCTIONAL_STATE_RESUME) { // // it has resumed @@ -1086,7 +1036,7 @@ // // reset time is 10ms // - for(Index = 0; Index < 10; Index++) + for(Index = 0; Index < 100; Index++) { // // wait a bit

12 years, 10 months

[janderwald] 55843: [USBUHCI] - Invert data toggle

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 24 17:58:55 2012 New Revision: 55843 URL: http://svn.reactos.org/svn/reactos?rev=55843&view=rev Log: [USBUHCI] - Invert data toggle Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Fri Feb 24 17:58:55 2012 @@ -1247,6 +1247,7 @@ { PUHCI_TRANSFER_DESCRIPTOR Descriptor, NextDescriptor; ULONG ErrorCount; + UCHAR DataToggle = 0; // // grab first transfer descriptor @@ -1254,6 +1255,9 @@ Descriptor = (PUHCI_TRANSFER_DESCRIPTOR)OutDescriptor->NextElementDescriptor; while(Descriptor) { + // get data toggle + DataToggle = (Descriptor->Token >> TD_TOKEN_DATA_TOGGLE_SHIFT) & 0x01; + if (Descriptor->Status & TD_ERROR_MASK) { // @@ -1344,6 +1348,12 @@ // m_DmaManager->Release(OutDescriptor, sizeof(UHCI_QUEUE_HEAD)); + // is there an endpoint descriptor + if (m_EndpointDescriptor) + { + // invert last data toggle + m_EndpointDescriptor->DataToggle = (DataToggle == 0); + } } VOID

12 years, 10 months

[gadamopoulos] 55842: [win32k] -remove unrelated and unused information from the WINSTATION_OBJECT

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Feb 24 15:32:13 2012 New Revision: 55842 URL: http://svn.reactos.org/svn/reactos?rev=55842&view=rev Log: [win32k] -remove unrelated and unused information from the WINSTATION_OBJECT Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Fri Feb 24 15:32:13 2012 @@ -25,23 +25,8 @@ LIST_ENTRY DesktopListHead; PRTL_ATOM_TABLE AtomTable; HANDLE SystemMenuTemplate; - UINT CaretBlinkRate; HANDLE ShellWindow; HANDLE ShellListView; - - /* Effects */ - BOOL FontSmoothing; /* Enable */ - UINT FontSmoothingType; /* 1:Standard,2:ClearType */ - /* FIXME: Big Icons (SPI_GETICONMETRICS?) */ - BOOL DropShadow; - BOOL DragFullWindows; - BOOL FlatMenu; - - /* ScreenSaver */ - BOOL ScreenSaverRunning; - UINT ScreenSaverTimeOut; - /* Should this be on each desktop ? */ - BOOL ScreenSaverActive; /* Wallpaper */ HANDLE hbmWallpaper; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Fri Feb 24 15:32:13 2012 @@ -424,8 +424,6 @@ Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); WindowStationObject->SystemMenuTemplate = (HANDLE)0; WindowStationObject->Name = WindowStationName; - WindowStationObject->ScreenSaverRunning = FALSE; - WindowStationObject->FlatMenu = FALSE; if (InputWindowStation == NULL) {

12 years, 10 months

[gadamopoulos] 55841: [win32k] - Properly create the WindowStations directory in NtUserInitialize. Now we take into account the fact that if we are not in session 0, it should be created in \Sessio...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Feb 24 15:22:11 2012 New Revision: 55841 URL: http://svn.reactos.org/svn/reactos?rev=55841&view=rev Log: [win32k] - Properly create the WindowStations directory in NtUserInitialize. Now we take into account the fact that if we are not in session 0, it should be created in \Sessions direcory - Clean up IntParseDesktopPath and make it use the correct WindowStations - Add some comments and cleanup - Remove the unused IntGetFullWindowStationName, IntGetWindowStationObject and IntGetWinStaObj Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -1,7 +1,7 @@ #pragma once -#define WINSTA_ROOT_NAME L"\\Windows\\WindowStations" -#define WINSTA_ROOT_NAME_LENGTH 23 +#define WINSTA_OBJ_DIR L"\\Windows\\WindowStations" +#define SESSION_DIR L"\\Sessions" /* Window Station Status Flags */ #define WSS_LOCKED (1) @@ -68,6 +68,7 @@ extern WINSTATION_OBJECT *InputWindowStation; extern PPROCESSINFO LogonProcess; extern HWND hwndSAS; +extern UNICODE_STRING gustrWindowStationsDir; #define WINSTA_READ STANDARD_RIGHTS_READ | \ WINSTA_ENUMDESKTOPS | \ @@ -99,16 +100,11 @@ NTSTATUS NTAPI InitWindowStationImpl(VOID); +NTSTATUS NTAPI UserCreateWinstaDirectoy(); -VOID APIENTRY -IntWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters); - -NTSTATUS -APIENTRY -IntWinStaObjectParse(PWIN32_PARSEMETHOD_PARAMETERS Parameters); - -NTSTATUS NTAPI -IntWinstaOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters); +VOID APIENTRY IntWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters); +NTSTATUS APIENTRY IntWinStaObjectParse(PWIN32_PARSEMETHOD_PARAMETERS Parameters); +NTSTATUS NTAPI IntWinstaOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters); NTSTATUS FASTCALL IntValidateWindowStationHandle( @@ -116,25 +112,8 @@ KPROCESSOR_MODE AccessMode, ACCESS_MASK DesiredAccess, PWINSTATION_OBJECT *Object); +BOOL FASTCALL UserSetProcessWindowStation(HWINSTA hWindowStation); -BOOL FASTCALL -IntGetWindowStationObject(PWINSTATION_OBJECT Object); - -BOOL FASTCALL -co_IntInitializeDesktopGraphics(VOID); - -VOID FASTCALL -IntEndDesktopGraphics(VOID); - -BOOL FASTCALL -IntGetFullWindowStationName( - OUT PUNICODE_STRING FullName, - IN PUNICODE_STRING WinStaName, - IN OPTIONAL PUNICODE_STRING DesktopName); - -PWINSTATION_OBJECT FASTCALL IntGetWinStaObj(VOID); - -BOOL FASTCALL -UserSetProcessWindowStation(HWINSTA hWindowStation); - +BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID); +VOID FASTCALL IntEndDesktopGraphics(VOID); /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -361,6 +361,7 @@ return STATUS_SUCCESS; error: + ERR_CH(UserThread,"UserCreateThreadInfo failed! Freeing pti 0x%x for TID %d\n", ptiCurrent, Thread->Cid.UniqueThread); UserDestroyThreadInfo(Thread); return Status; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -135,7 +135,7 @@ { PDESKTOP Desktop = (PDESKTOP)Parameters->Object; - TRACE("Deleting desktop (0x%X)\n", Desktop); + TRACE("Deleting desktop object 0x%x\n", Desktop); /* Remove the desktop from the window station's list of associcated desktops */ RemoveEntryList(&Desktop->ListEntry); @@ -216,112 +216,80 @@ HDESK *hDesktop) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING WinSta, Desktop, FullName; - BOOL DesktopPresent = FALSE; - BOOL WinStaPresent = FALSE; + UNICODE_STRING ObjectName; NTSTATUS Status; + WCHAR wstrWinstaFullName[MAX_PATH], *pwstrWinsta = NULL, *pwstrDesktop = NULL; ASSERT(hWinSta); + ASSERT(hDesktop); + ASSERT(DesktopPath); *hWinSta = NULL; - - if(hDesktop != NULL) - { - *hDesktop = NULL; - } - - RtlInitUnicodeString(&WinSta, NULL); - RtlInitUnicodeString(&Desktop, NULL); - - if(DesktopPath != NULL && DesktopPath->Buffer != NULL && DesktopPath->Length > sizeof(WCHAR)) - { - PWCHAR c = DesktopPath->Buffer; - USHORT wl = 0; - USHORT l = DesktopPath->Length; - + *hDesktop = NULL; + + if(DesktopPath->Buffer != NULL && DesktopPath->Length > sizeof(WCHAR)) + { /* * Parse the desktop path string which can be in the form "WinSta\Desktop" * or just "Desktop". In latter case WinSta0 will be used. */ - while(l > 0) + pwstrDesktop = wcschr(DesktopPath->Buffer, L'\\'); + if(pwstrDesktop != NULL) { - if(*c == L'\\') - { - wl = (ULONG_PTR)c - (ULONG_PTR)DesktopPath->Buffer; - break; - } - l -= sizeof(WCHAR); - c++; + *pwstrDesktop = 0; + pwstrDesktop++; + pwstrWinsta = DesktopPath->Buffer; } - - if(wl > 0) + else { - WinSta.Length = wl; - WinSta.MaximumLength = wl + sizeof(WCHAR); - WinSta.Buffer = DesktopPath->Buffer; - - WinStaPresent = TRUE; - c++; - } - - Desktop.Length = DesktopPath->Length - wl; - if(wl > 0) - { - Desktop.Length -= sizeof(WCHAR); - } - if(Desktop.Length > 0) - { - Desktop.MaximumLength = Desktop.Length + sizeof(WCHAR); - Desktop.Buffer = ((wl > 0) ? c : DesktopPath->Buffer); - DesktopPresent = TRUE; - } - } - - if(!WinStaPresent) - { + pwstrDesktop = DesktopPath->Buffer; + pwstrWinsta = NULL; + } + + TRACE("IntParseDesktopPath pwstrWinsta:%S pwstrDesktop:%S\n", pwstrWinsta, pwstrDesktop); + } + #if 0 - /* Search the process handle table for (inherited) window station - handles, use a more appropriate one than WinSta0 if possible. */ - if (!ObFindHandleForObject(Process, - NULL, - ExWindowStationObjectType, - NULL, - (PHANDLE)hWinSta)) + /* Search the process handle table for (inherited) window station + handles, use a more appropriate one than WinSta0 if possible. */ + if (!ObFindHandleForObject(Process, + NULL, + ExWindowStationObjectType, + NULL, + (PHANDLE)hWinSta)) #endif - { - /* We had no luck searching for opened handles, use WinSta0 now */ - RtlInitUnicodeString(&WinSta, L"WinSta0"); - } - } - - if(!DesktopPresent && hDesktop != NULL) - { + { + /* We had no luck searching for opened handles, use WinSta0 now */ + if(!pwstrWinsta) + pwstrWinsta = L"WinSta0"; + } + #if 0 - /* Search the process handle table for (inherited) desktop - handles, use a more appropriate one than Default if possible. */ - if (!ObFindHandleForObject(Process, - NULL, - ExDesktopObjectType, - NULL, - (PHANDLE)hDesktop)) + /* Search the process handle table for (inherited) desktop + handles, use a more appropriate one than Default if possible. */ + if (!ObFindHandleForObject(Process, + NULL, + ExDesktopObjectType, + NULL, + (PHANDLE)hDesktop)) #endif - { - /* We had no luck searching for opened handles, use Desktop now */ - RtlInitUnicodeString(&Desktop, L"Default"); - } - } - + { + /* We had no luck searching for opened handles, use Desktop now */ + if(!pwstrDesktop) + pwstrDesktop = L"Default"; + } + if(*hWinSta == NULL) { - if(!IntGetFullWindowStationName(&FullName, &WinSta, NULL)) - { - return STATUS_INSUFFICIENT_RESOURCES; - } + swprintf(wstrWinstaFullName, L"%wZ\\%ws", &gustrWindowStationsDir, pwstrWinsta); + RtlInitUnicodeString( &ObjectName, wstrWinstaFullName); + + TRACE("parsed initial winsta: %wZ\n", &ObjectName); /* Open the window station */ InitializeObjectAttributes(&ObjectAttributes, - &FullName, + &ObjectName, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -334,30 +302,25 @@ NULL, (HANDLE*)hWinSta); - ExFreePoolWithTag(FullName.Buffer, TAG_STRING); - if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - TRACE("Failed to reference window station %wZ PID: %d!\n", &WinSta, PsGetCurrentProcessId()); + ERR("Failed to reference window station %wZ PID: %d!\n", &ObjectName ); return Status; } } - if(hDesktop != NULL && *hDesktop == NULL) - { - if(!IntGetFullWindowStationName(&FullName, &WinSta, &Desktop)) - { - NtClose(*hWinSta); - *hWinSta = NULL; - return STATUS_INSUFFICIENT_RESOURCES; - } + if(*hDesktop == NULL) + { + RtlInitUnicodeString(&ObjectName, pwstrDesktop); + + TRACE("parsed initial desktop: %wZ\n", &ObjectName); /* Open the desktop object */ InitializeObjectAttributes(&ObjectAttributes, - &FullName, + &ObjectName, OBJ_CASE_INSENSITIVE, - NULL, + *hWinSta, NULL); Status = ObOpenObjectByName(&ObjectAttributes, @@ -368,19 +331,16 @@ NULL, (HANDLE*)hDesktop); - ExFreePoolWithTag(FullName.Buffer, TAG_STRING); - if(!NT_SUCCESS(Status)) { *hDesktop = NULL; NtClose(*hWinSta); *hWinSta = NULL; SetLastNtError(Status); - TRACE("Failed to reference desktop %wZ PID: %d!\n", &Desktop, PsGetCurrentProcessId()); + ERR("Failed to reference desktop %wZ PID: %d!\n", &ObjectName); return Status; } } - return STATUS_SUCCESS; } @@ -410,6 +370,9 @@ AccessMode, (PVOID*)Object, NULL); + + TRACE("IntValidateDesktopHandle: handle:0x%x obj:0x%x access:0x%x Status:0x%x\n", + Desktop, *Object, DesiredAccess, Status); if (!NT_SUCCESS(Status)) SetLastNtError(Status); @@ -860,8 +823,6 @@ * Try to open already existing desktop */ - TRACE("Trying to open desktop (%wZ)\n", &DesktopName); - Status = ObOpenObjectByName( ObjectAttributes, ExDesktopObjectType, @@ -875,7 +836,8 @@ /* In case the object was not created (eg if it existed), return now */ if (Context == FALSE) { - RETURN( Desktop); + TRACE("NtUserCreateDesktop opened desktop %wZ\n", ObjectAttributes->ObjectName); + RETURN( Desktop); } /* Capture desktop name */ @@ -905,7 +867,13 @@ KernelMode, (PVOID)&DesktopObject, NULL); - if (!NT_SUCCESS(Status)) RETURN(NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to reference desktop object\n"); + RETURN(NULL); + } + + TRACE("NtUserCreateDesktop created desktop 0x%x with name %wZ\n", DesktopObject, &DesktopName); DesktopObject->hsectionDesktop = NULL; DesktopObject->pheapDesktop = UserCreateHeap(&DesktopObject->hsectionDesktop, @@ -949,24 +917,9 @@ InitializeListHead(&DesktopObject->pDeskInfo->aphkStart[i]); } -//// Why is this here? -#if 0 - if (! NT_SUCCESS(Status)) - { - ERR("Failed to create desktop handle\n"); - SetLastNtError(Status); - RETURN( NULL); - } -#endif -//// /* * Create a handle for CSRSS and notify CSRSS for Creating Desktop Window. - * - * Honestly, I believe this is a cleverly written hack that allowed ReactOS - * to function at the beginning of the project by ramroding the GUI into - * operation and making the desktop window work from user space. - * (jt) */ Request.Type = MAKE_CSR_API(CREATE_DESKTOP, CSR_GUI); Status = CsrInsertObject(Desktop, @@ -1112,9 +1065,12 @@ if (!NT_SUCCESS(Status)) { + ERR("Failed to open desktop\n"); SetLastNtError(Status); return 0; } + + TRACE("Opened desktop %S with handle 0x%x\n", ObjectAttributes->ObjectName->Buffer, Desktop); return Desktop; } @@ -1147,56 +1103,41 @@ BOOL fInherit, ACCESS_MASK dwDesiredAccess) { - PDESKTOP Object; + PDESKTOP pdesk; NTSTATUS Status; - HDESK Desktop; - DECLARE_RETURN(HDESK); + HDESK hdesk; TRACE("Enter NtUserOpenInputDesktop\n"); - UserEnterExclusive(); - - TRACE("About to open input desktop\n"); /* Get a pointer to the desktop object */ - - Status = IntValidateDesktopHandle( - InputDesktopHandle, - UserMode, - 0, - &Object); - + Status = IntValidateDesktopHandle(InputDesktopHandle, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { TRACE("Validation of input desktop handle (0x%X) failed\n", InputDesktop); - RETURN((HDESK)0); + return NULL; } /* Create a new handle to the object */ - Status = ObOpenObjectByPointer( - Object, + pdesk, 0, NULL, dwDesiredAccess, ExDesktopObjectType, UserMode, - (HANDLE*)&Desktop); - - ObDereferenceObject(Object); - - if (NT_SUCCESS(Status)) - { - TRACE("Successfully opened input desktop\n"); - RETURN((HDESK)Desktop); - } - - SetLastNtError(Status); - RETURN((HDESK)0); - -CLEANUP: - TRACE("Leave NtUserOpenInputDesktop, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + &hdesk); + + ObDereferenceObject(pdesk); + + if (!NT_SUCCESS(Status)) + { + ERR("Failed to open input desktop object\n"); + SetLastNtError(Status); + return NULL; + } + + TRACE("NtUserOpenInputDesktop returning 0x%x\n",hdesk); + return hdesk; } /* @@ -1224,14 +1165,14 @@ BOOL APIENTRY NtUserCloseDesktop(HDESK hDesktop) { - PDESKTOP Object; + PDESKTOP pdesk; NTSTATUS Status; PTHREADINFO pti; DECLARE_RETURN(BOOL); pti = PsGetCurrentThreadWin32Thread(); - TRACE("Enter NtUserCloseDesktop\n"); + TRACE("NtUserCloseDesktop called (0x%x)\n", hDesktop); UserEnterExclusive(); if( hDesktop == pti->hdesk || hDesktop == pti->ppi->hdeskStartup) @@ -1241,27 +1182,19 @@ RETURN(FALSE); } - TRACE("About to close desktop handle (0x%X)\n", hDesktop); - - Status = IntValidateDesktopHandle( - hDesktop, - UserMode, - 0, - &Object); - + Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - TRACE("Validation of desktop handle (0x%X) failed\n", hDesktop); + ERR("Validation of desktop handle (0x%X) failed\n", hDesktop); RETURN(FALSE); } - ObDereferenceObject(Object); - - TRACE("Closing desktop handle (0x%X)\n", hDesktop); + ObDereferenceObject(pdesk); Status = ZwClose(hDesktop); if (!NT_SUCCESS(Status)) { + ERR("Failed to close desktop handle 0x%x\n", hDesktop); SetLastNtError(Status); RETURN(FALSE); } @@ -1529,26 +1462,19 @@ */ BOOL APIENTRY -NtUserSwitchDesktop(HDESK hDesktop) -{ - PDESKTOP DesktopObject; +NtUserSwitchDesktop(HDESK hdesk) +{ + PDESKTOP pdesk; NTSTATUS Status; DECLARE_RETURN(BOOL); UserEnterExclusive(); - TRACE("Enter NtUserSwitchDesktop\n"); - - TRACE("About to switch desktop (0x%X)\n", hDesktop); - - Status = IntValidateDesktopHandle( - hDesktop, - UserMode, - 0, - &DesktopObject); - + TRACE("Enter NtUserSwitchDesktop(0x%x)\n", hdesk); + + Status = IntValidateDesktopHandle( hdesk, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - TRACE("Validation of desktop handle (0x%X) failed\n", hDesktop); + ERR("Validation of desktop handle (0x%X) failed\n", hdesk); RETURN(FALSE); } @@ -1556,18 +1482,18 @@ * Don't allow applications switch the desktop if it's locked, unless the caller * is the logon application itself */ - if((DesktopObject->rpwinstaParent->Flags & WSS_LOCKED) && - LogonProcess != NULL && LogonProcess != PsGetCurrentProcessWin32Process()) - { - ObDereferenceObject(DesktopObject); - ERR("Switching desktop 0x%x denied because the work station is locked!\n", hDesktop); + if((pdesk->rpwinstaParent->Flags & WSS_LOCKED) && + LogonProcess != PsGetCurrentProcessWin32Process()) + { + ObDereferenceObject(pdesk); + ERR("Switching desktop 0x%x denied because the window station is locked!\n", hdesk); RETURN(FALSE); } - if(DesktopObject->rpwinstaParent != InputWindowStation) - { - ObDereferenceObject(DesktopObject); - ERR("Switching desktop 0x%x denied because desktop doesn't belong to the interactive winsta!\n", hDesktop); + if(pdesk->rpwinstaParent != InputWindowStation) + { + ObDereferenceObject(pdesk); + ERR("Switching desktop 0x%x denied because desktop doesn't belong to the interactive winsta!\n", hdesk); RETURN(FALSE); } @@ -1576,13 +1502,13 @@ /* FIXME: Connect to input device */ /* Set the active desktop in the desktop's window station. */ - InputWindowStation->ActiveDesktop = DesktopObject; + InputWindowStation->ActiveDesktop = pdesk; /* Set the global state. */ - InputDesktop = DesktopObject; - InputDesktopHandle = hDesktop; - - ObDereferenceObject(DesktopObject); + InputDesktop = pdesk; + InputDesktopHandle = hdesk; + + ObDereferenceObject(pdesk); RETURN(TRUE); @@ -1679,13 +1605,13 @@ } static NTSTATUS -IntUnmapDesktopView(IN PDESKTOP DesktopObject) +IntUnmapDesktopView(IN PDESKTOP pdesk) { PPROCESSINFO ppi; PW32HEAP_USER_MAPPING HeapMapping, *PrevLink; NTSTATUS Status = STATUS_SUCCESS; - TRACE("DO %p\n"); + TRACE("IntUnmapDesktopView called for desktop object %p\n", pdesk); ppi = PsGetCurrentProcessWin32Process(); PrevLink = &ppi->HeapMappings.Next; @@ -1694,16 +1620,17 @@ HeapMapping = *PrevLink; while (HeapMapping != NULL) { - if (HeapMapping->KernelMapping == (PVOID)DesktopObject->pheapDesktop) + if (HeapMapping->KernelMapping == (PVOID)pdesk->pheapDesktop) { if (--HeapMapping->Count == 0) { *PrevLink = HeapMapping->Next; + TRACE("ppi 0x%x unmapped heap of desktop 0x%x\n", ppi, pdesk); Status = MmUnmapViewOfSection(PsGetCurrentProcess(), HeapMapping->UserMapping); - ObDereferenceObject(DesktopObject); + ObDereferenceObject(pdesk); UserHeapFree(HeapMapping); break; @@ -1718,23 +1645,25 @@ } static NTSTATUS -IntMapDesktopView(IN PDESKTOP DesktopObject) -{ - PPROCESSINFO CurrentWin32Process; +IntMapDesktopView(IN PDESKTOP pdesk) +{ + PPROCESSINFO ppi; PW32HEAP_USER_MAPPING HeapMapping, *PrevLink; PVOID UserBase = NULL; SIZE_T ViewSize = 0; LARGE_INTEGER Offset; NTSTATUS Status; - CurrentWin32Process = PsGetCurrentProcessWin32Process(); - PrevLink = &CurrentWin32Process->HeapMappings.Next; + TRACE("IntMapDesktopView called for desktop object 0x%x\n", pdesk); + + ppi = PsGetCurrentProcessWin32Process(); + PrevLink = &ppi->HeapMappings.Next; /* Find out if another thread already mapped the desktop heap */ HeapMapping = *PrevLink; while (HeapMapping != NULL) { - if (HeapMapping->KernelMapping == (PVOID)DesktopObject->pheapDesktop) + if (HeapMapping->KernelMapping == (PVOID)pdesk->pheapDesktop) { HeapMapping->Count++; return STATUS_SUCCESS; @@ -1745,9 +1674,8 @@ } /* We're the first, map the heap */ - TRACE("Noone mapped the desktop heap %p yet, so - map it!\n", DesktopObject->pheapDesktop); Offset.QuadPart = 0; - Status = MmMapViewOfSection(DesktopObject->hsectionDesktop, + Status = MmMapViewOfSection(pdesk->hsectionDesktop, PsGetCurrentProcess(), &UserBase, 0, @@ -1763,24 +1691,25 @@ return Status; } + TRACE("ppi 0x%x mapped heap of desktop 0x%x\n", ppi, pdesk); + /* Add the mapping */ HeapMapping = UserHeapAlloc(sizeof(W32HEAP_USER_MAPPING)); if (HeapMapping == NULL) { - MmUnmapViewOfSection(PsGetCurrentProcess(), - UserBase); + MmUnmapViewOfSection(PsGetCurrentProcess(), UserBase); ERR("UserHeapAlloc() failed!\n"); return STATUS_NO_MEMORY; } HeapMapping->Next = NULL; - HeapMapping->KernelMapping = (PVOID)DesktopObject->pheapDesktop; + HeapMapping->KernelMapping = (PVOID)pdesk->pheapDesktop; HeapMapping->UserMapping = UserBase; HeapMapping->Limit = ViewSize; HeapMapping->Count = 1; *PrevLink = HeapMapping; - ObReferenceObject(DesktopObject); + ObReferenceObject(pdesk); return STATUS_SUCCESS; } @@ -1798,7 +1727,7 @@ ASSERT(NtCurrentTeb()); - TRACE("IntSetThreadDesktop() , FOF=%d\n", FreeOnFailure); + TRACE("IntSetThreadDesktop hDesktop:0x%x, FOF:%d\n",hDesktop, FreeOnFailure); pti = PsGetCurrentThreadWin32Thread(); pci = pti->pClientInfo; @@ -1807,12 +1736,7 @@ if(hDesktop != NULL) { /* Validate the new desktop. */ - Status = IntValidateDesktopHandle( - hDesktop, - UserMode, - 0, - &pdesk); - + Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { ERR("Validation of desktop handle (0x%X) failed\n", hDesktop); @@ -1875,7 +1799,7 @@ return FALSE; } } - + pdeskOld = pti->rpdesk; hdeskOld = pti->hdesk; pctiOld = pti->pcti; @@ -1928,6 +1852,8 @@ InsertTailList(&pdesk->PtiList, &pti->PtiLink); } + TRACE("IntSetThreadDesktop: pti 0x%x ppi 0x%x switched from object 0x%x to 0x%x\n", pti, pti->ppi, pdeskOld, pdesk); + return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -101,8 +101,10 @@ NTSTATUS Status; // Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA) -// Create Object Directory,,, Looks like create workstation. "\\Windows\\WindowStations" // Create Event for Diconnect Desktop. + + Status = UserCreateWinstaDirectoy(); + if (!NT_SUCCESS(Status)) return Status; /* Initialize Video. */ Status = InitVideo(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -27,7 +27,7 @@ #define REQ_INTERACTIVE_WINSTA(err) \ if ( GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ { \ - ERR("NtUserSystemParametersInfo requires interactive window station\n"); \ + ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", &GetW32ProcessInfo()->prpwinsta->Name); \ EngSetLastError(err); \ return 0; \ } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -20,6 +20,9 @@ /* Winlogon SAS window */ HWND hwndSAS = NULL; +/* Full path to WindowStations directory */ +UNICODE_STRING gustrWindowStationsDir; + /* INITALIZATION FUNCTIONS ****************************************************/ INIT_FUNCTION @@ -27,36 +30,61 @@ NTAPI InitWindowStationImpl(VOID) { - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE WindowStationsDirectory; - UNICODE_STRING UnicodeString; - NTSTATUS Status; GENERIC_MAPPING IntWindowStationMapping = { WINSTA_READ, WINSTA_WRITE, WINSTA_EXECUTE, WINSTA_ACCESS_ALL}; - /* - * Create the '\Windows\WindowStations' directory - */ - - RtlInitUnicodeString(&UnicodeString, WINSTA_ROOT_NAME); - InitializeObjectAttributes(&ObjectAttributes, &UnicodeString, 0, NULL, NULL); - Status = ZwCreateDirectoryObject(&WindowStationsDirectory, 0, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - TRACE("Could not create \\Windows\\WindowStations directory " - "(Status 0x%X)\n", Status); - return Status; - } - /* Set Winsta Object Attributes */ ExWindowStationObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(WINSTATION_OBJECT); ExWindowStationObjectType->TypeInfo.GenericMapping = IntWindowStationMapping; ExWindowStationObjectType->TypeInfo.ValidAccessMask = WINSTA_ACCESS_ALL; return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +UserCreateWinstaDirectoy() +{ + PPEB Peb; + NTSTATUS Status; + WCHAR wstrWindowStationsDir[MAX_PATH]; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hWinstaDir; + + /* Create the WindowStations directory and cache its path for later use */ + Peb = NtCurrentPeb(); + if(Peb->SessionId == 0) + { + RtlCreateUnicodeString(&gustrWindowStationsDir, WINSTA_OBJ_DIR); + } + else + { + swprintf(wstrWindowStationsDir, + L"%ws\\%ld%ws", + SESSION_DIR, + Peb->SessionId, + WINSTA_OBJ_DIR); + + RtlCreateUnicodeString( &gustrWindowStationsDir, wstrWindowStationsDir); + } + + InitializeObjectAttributes(&ObjectAttributes, + &gustrWindowStationsDir, + 0, + NULL, + NULL); + Status = ZwCreateDirectoryObject(&hWinstaDir, 0, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR("Could not create %wZ directory (Status 0x%X)\n", &gustrWindowStationsDir, Status); + return Status; + } + + TRACE("Created directory %wZ for session %d\n", &gustrWindowStationsDir, Peb->SessionId); + + return Status; } /* OBJECT CALLBACKS **********************************************************/ @@ -157,58 +185,6 @@ /* PRIVATE FUNCTIONS **********************************************************/ /* - * IntGetFullWindowStationName - * - * Get a full window station object name from a name specified in - * NtUserCreateWindowStation, NtUserOpenWindowStation, NtUserCreateDesktop - * or NtUserOpenDesktop. - * - * Return Value - * TRUE on success, FALSE on failure. - */ - -BOOL FASTCALL -IntGetFullWindowStationName( - OUT PUNICODE_STRING FullName, - IN PUNICODE_STRING WinStaName, - IN OPTIONAL PUNICODE_STRING DesktopName) -{ - PWCHAR Buffer; - - FullName->Length = WINSTA_ROOT_NAME_LENGTH * sizeof(WCHAR); - if (WinStaName != NULL) - FullName->Length += WinStaName->Length + sizeof(WCHAR); - if (DesktopName != NULL) - FullName->Length += DesktopName->Length + sizeof(WCHAR); - FullName->MaximumLength = FullName->Length; - FullName->Buffer = ExAllocatePoolWithTag(PagedPool, FullName->Length, TAG_STRING); - if (FullName->Buffer == NULL) - { - return FALSE; - } - - Buffer = FullName->Buffer; - memcpy(Buffer, WINSTA_ROOT_NAME, WINSTA_ROOT_NAME_LENGTH * sizeof(WCHAR)); - Buffer += WINSTA_ROOT_NAME_LENGTH; - if (WinStaName != NULL) - { - *Buffer = L'\\'; - Buffer ++; - memcpy(Buffer, WinStaName->Buffer, WinStaName->Length); - - if (DesktopName != NULL) - { - Buffer += WinStaName->Length / sizeof(WCHAR); - *Buffer = L'\\'; - Buffer ++; - memcpy(Buffer, DesktopName->Buffer, DesktopName->Length); - } - } - - return TRUE; -} - -/* * IntValidateWindowStationHandle * * Validates the window station handle. @@ -229,7 +205,7 @@ if (WindowStation == NULL) { - WARN("Invalid window station handle\n"); + ERR("Invalid window station handle\n"); EngSetLastError(ERROR_INVALID_HANDLE); return STATUS_INVALID_HANDLE; } @@ -247,21 +223,6 @@ return Status; } - -BOOL FASTCALL -IntGetWindowStationObject(PWINSTATION_OBJECT Object) -{ - NTSTATUS Status; - - Status = ObReferenceObjectByPointer( - Object, - KernelMode, - ExWindowStationObjectType, - 0); - - return NT_SUCCESS(Status); -} - BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID) @@ -378,6 +339,8 @@ HWINSTA WindowStation; NTSTATUS Status; + TRACE("NtUserCreateWindowStation called\n"); + Status = ObOpenObjectByName( ObjectAttributes, ExWindowStationObjectType, @@ -389,9 +352,9 @@ if (NT_SUCCESS(Status)) { - return (HWINSTA)WindowStation; - } - + TRACE("NtUserCreateWindowStation opened window station %wZ\n", ObjectAttributes->ObjectName); + return (HWINSTA)WindowStation; + } /* * No existing window station found, try to create new one @@ -430,6 +393,7 @@ if (!NT_SUCCESS(Status)) { + ERR("ObCreateObject failed for window station %wZ\n", &WindowStationName); ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); return 0; @@ -438,13 +402,14 @@ Status = ObInsertObject( (PVOID)WindowStationObject, NULL, - STANDARD_RIGHTS_REQUIRED, + dwDesiredAccess, 0, NULL, (PVOID*)&WindowStation); if (!NT_SUCCESS(Status)) { + ERR("ObInsertObject failed for window station %wZ\n", &WindowStationName); ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); ObDereferenceObject(WindowStationObject); @@ -464,11 +429,14 @@ if (InputWindowStation == NULL) { + TRACE("Initializeing input window station\n"); InputWindowStation = WindowStationObject; InitCursorImpl(); } + TRACE("NtUserCreateWindowStation created object 0x%x with name %wZ handle 0x%x\n", + WindowStation, &WindowStationObject->Name, WindowStation); return WindowStation; } @@ -501,7 +469,7 @@ POBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK dwDesiredAccess) { - HWINSTA WindowStation; + HWINSTA hwinsta; NTSTATUS Status; Status = ObOpenObjectByName( @@ -511,15 +479,18 @@ NULL, dwDesiredAccess, NULL, - (PVOID*)&WindowStation); + (PVOID*)&hwinsta); if (!NT_SUCCESS(Status)) { + ERR("NtUserOpenWindowStation failed\n"); SetLastNtError(Status); return 0; } - return WindowStation; + TRACE("Opened window station %wZ with handle 0x%x\n", ObjectAttributes->ObjectName, hwinsta); + + return hwinsta; } /* @@ -551,10 +522,11 @@ PWINSTATION_OBJECT Object; NTSTATUS Status; - TRACE("About to close window station handle (0x%X)\n", hWinSta); + TRACE("NtUserCloseWindowStation called (0x%x)\n", hWinSta); if (hWinSta == UserGetProcessWindowStation()) { + ERR("Attempted to close process window station"); return FALSE; } @@ -566,13 +538,13 @@ if (!NT_SUCCESS(Status)) { - TRACE("Validation of window station handle (0x%X) failed\n", hWinSta); + ERR("Validation of window station handle (0x%x) failed\n", hWinSta); return FALSE; } ObDereferenceObject(Object); - TRACE("Closing window station handle (0x%X)\n", hWinSta); + TRACE("Closing window station handle (0x%x)\n", hWinSta); Status = ObCloseHandle(hWinSta, UserMode); if (!NT_SUCCESS(Status)) @@ -797,8 +769,6 @@ { PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); - //ASSERT(ppi->hwinsta); - return ppi->hwinsta; } @@ -821,26 +791,6 @@ NtUserGetProcessWindowStation(VOID) { return UserGetProcessWindowStation(); -} - -PWINSTATION_OBJECT FASTCALL -IntGetWinStaObj(VOID) -{ - PWINSTATION_OBJECT WinStaObj; - NTSTATUS Status; - - Status = IntValidateWindowStationHandle( - UserGetProcessWindowStation(), - KernelMode, - 0, - &WinStaObj); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - - return WinStaObj; } BOOL FASTCALL @@ -1025,7 +975,6 @@ OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; HANDLE DirectoryHandle; - UNICODE_STRING DirectoryName = RTL_CONSTANT_STRING(WINSTA_ROOT_NAME); char InitialBuffer[256], *Buffer; ULONG Context, ReturnLength, BufferSize; DWORD EntryCount; @@ -1037,7 +986,7 @@ */ InitializeObjectAttributes( &ObjectAttributes, - &DirectoryName, + &gustrWindowStationsDir, OBJ_CASE_INSENSITIVE, NULL, NULL);

12 years, 10 months

[sginsberg] 55840: [NTOSKRNL] - Remove nasty hack to make Windows PCI driver load. This may not be required after the fixes that were committed after this hack. If it is still necessary then please...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Feb 24 13:51:52 2012 New Revision: 55840 URL: http://svn.reactos.org/svn/reactos?rev=55840&view=rev Log: [NTOSKRNL] - Remove nasty hack to make Windows PCI driver load. This may not be required after the fixes that were committed after this hack. If it is still necessary then please fix whatever issue makes the PCI driver crash instead of relying on a return from bugcheck call to work... [DDK] - Mark KeBugCheckEx as noreturn again. Should fix Prefast issues where it thought execution could return from the call and would warn about false issues. Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5584… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Fri Feb 24 13:51:52 2012 @@ -10206,7 +10206,7 @@ } #endif -//DECLSPEC_NORETURN +DECLSPEC_NORETURN NTKERNELAPI VOID NTAPI Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=5584… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Fri Feb 24 13:51:52 2012 @@ -1432,18 +1432,13 @@ IN ULONG_PTR BugCheckParameter3, IN ULONG_PTR BugCheckParameter4) { - /* Workaround for Windows Server 2003 Checked PCI Driver issue */ - if (!((BugCheckCode == PCI_BUS_DRIVER_INTERNAL) && - (BugCheckParameter1 == 0xDEAD0010))) - { - /* Call the internal API */ - KeBugCheckWithTf(BugCheckCode, - BugCheckParameter1, - BugCheckParameter2, - BugCheckParameter3, - BugCheckParameter4, - NULL); - } + /* Call the internal API */ + KeBugCheckWithTf(BugCheckCode, + BugCheckParameter1, + BugCheckParameter2, + BugCheckParameter3, + BugCheckParameter4, + NULL); } /*

12 years, 10 months

[arty] 55839: [NEWCC] Integrate september's speed improvements, which now work. Remove the flush hack when unpinning cache segments.

by arty＠svn.reactos.org

Author: arty Date: Fri Feb 24 11:33:23 2012 New Revision: 55839 URL: http://svn.reactos.org/svn/reactos?rev=55839&view=rev Log: [NEWCC] Integrate september's speed improvements, which now work. Remove the flush hack when unpinning cache segments. Modified: trunk/reactos/ntoskrnl/cache/pinsup.c trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/swapout.c Modified: trunk/reactos/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/pinsup.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] Fri Feb 24 11:33:23 2012 @@ -130,6 +130,14 @@ DPRINT("Firing work item for %x\n", Bcb->BaseAddress); + if (Dirty) { + CcpUnlock(); + Bcb->RefCount++; + MiFlushMappedSection(ToUnmap, &BaseOffset, &MappedSize, Dirty); + Bcb->RefCount--; + CcpLock(); + } + if (Immediate) { PROS_SECTION_OBJECT ToDeref = Bcb->SectionObject; @@ -143,8 +151,6 @@ RemoveEntryList(&Bcb->ThisFileList); CcpUnlock(); - if (Dirty) - MiFlushMappedSection(ToUnmap, &BaseOffset, &MappedSize, Dirty); MmUnmapCacheViewInSystemSpace(ToUnmap); ObDereferenceObject(ToDeref); CcpLock(); @@ -763,7 +769,6 @@ CcpUnlock(); if (!Released) { - MiFlushMappedSection(RealBcb->BaseAddress, &RealBcb->FileOffset, &RealBcb->Map->FileSizes.FileSize, RealBcb->Dirty); CcpLock(); CcpUnpinData(RealBcb, TRUE); CcpUnlock(); Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Fri Feb 24 11:33:23 2012 @@ -259,6 +259,7 @@ if (NT_SUCCESS(Status)) { MmLockAddressSpace(AddressSpace); MmSetCleanAllRmaps(Page); + MmSetPageProtect(MmGetAddressSpaceOwner(AddressSpace), (PVOID)PageAddress, PAGE_READONLY); MmLockSectionSegment(Segment); Entry = MmGetPageEntrySectionSegment(Segment, &FileOffset); if (Entry && !IS_SWAP_FROM_SSE(Entry) && PFN_FROM_SSE(Entry) == Page) @@ -663,6 +664,11 @@ Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + if (Page != 0 && PFN_FROM_SSE(Entry) == Page && Dirty) + { + DPRINT("Freeing section page %x:%x -> %x\n", Segment, Offset.LowPart, Entry); + MmSetPageEntrySectionSegment(Segment, &Offset, DIRTY_SSE(Entry)); + } if (Page) { DPRINT("Removing page %x:%x -> %x\n", Segment, Offset.LowPart, Entry); @@ -671,12 +677,7 @@ MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); MmReleasePageMemoryConsumer(MC_CACHE, Page); } - if (Page != 0 && PFN_FROM_SSE(Entry) == Page && Dirty) - { - DPRINT("Freeing section page %x:%x -> %x\n", Segment, Offset.LowPart, Entry); - MmSetPageEntrySectionSegment(Segment, &Offset, DIRTY_SSE(Entry)); - } - else if (SwapEntry != 0) + if (SwapEntry != 0) { MmFreeSwapPage(SwapEntry); } Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Fri Feb 24 11:33:23 2012 @@ -296,6 +296,7 @@ MmSetPageEntrySectionSegment(Segment, &Offset, DIRTY_SSE(Entry)); } MmSetPageProtect(Process, PAddress, PAGE_READWRITE); + MmSetDirtyPage(Process, PAddress); MmUnlockSectionSegment(Segment); DPRINT("Done\n"); return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Fri Feb 24 11:33:23 2012 @@ -184,11 +184,12 @@ (PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, PVOID Address, + BOOLEAN Dirty, PMM_REQUIRED_RESOURCES Required) { NTSTATUS Status = STATUS_SUCCESS; ULONG Entry; - BOOLEAN Dirty = FALSE; + PFN_NUMBER OurPage; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); LARGE_INTEGER TotalOffset; PMM_SECTION_SEGMENT Segment; @@ -202,24 +203,16 @@ MmLockSectionSegment(Segment); ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - Dirty = MmIsDirtyPageRmap(Required->Page[0]); Entry = MmGetPageEntrySectionSegment(Segment, &TotalOffset); - if (Dirty) - { - PFN_NUMBER OurPage; + if (Dirty) { + DPRINT("Dirty page: %p:%p segment %p offset %08x%08x\n", Process, Address, Segment, TotalOffset.HighPart, TotalOffset.LowPart); MmSetPageEntrySectionSegment(Segment, &TotalOffset, DIRTY_SSE(Entry)); - MmDeleteRmap(Required->Page[0], Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, &Dirty, &OurPage); - ASSERT(OurPage == Required->Page[0]); - } else { - /* Just unmap if the page wasn't dirty */ - PFN_NUMBER OurPage; - MmDeleteRmap(Required->Page[0], Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, &Dirty, &OurPage); - DPRINT("OurPage %x ThePage %x\n", OurPage, Required->Page[0]); - ASSERT(OurPage == Required->Page[0]); - } + } + + MmDeleteRmap(Required->Page[0], Process, Address); + MmDeleteVirtualMapping(Process, Address, FALSE, NULL, &OurPage); + ASSERT(OurPage == Required->Page[0]); if (NT_SUCCESS(Status)) { @@ -368,7 +361,7 @@ DPRINT("%x:%x, page %x %x\n", Process, Address, Page, Resources.Page[0]); Status = MmPageOutCacheSection - (AddressSpace, MemoryArea, Address, &Resources); + (AddressSpace, MemoryArea, Address, Dirty, &Resources); DPRINT("%x\n", Status); ASSERT(KeGetCurrentIrql() <= APC_LEVEL); @@ -398,7 +391,6 @@ MmLockAddressSpace(AddressSpace); } while (Status == STATUS_MM_RESTART_OPERATION); - Dirty |= Resources.State & 1; // Accumulate dirty MmUnlockAddressSpace(AddressSpace);

12 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012