Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[cgutman] 54240: [VIDEOPRT] - Store the slot number we find in the device extension by legacy detection

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Oct 23 04:04:17 2011 New Revision: 54240 URL: http://svn.reactos.org/svn/reactos?rev=54240&view=rev Log: [VIDEOPRT] - Store the slot number we find in the device extension by legacy detection Modified: trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Sun Oct 23 04:04:17 2011 @@ -679,6 +679,7 @@ return Status; } DeviceExtension->AllocatedResources = AllocatedResources; + DeviceExtension->SystemIoSlotNumber = PciSlotNumber.u.AsULONG; } } else

12 years, 11 months

[cgutman] 54239: [VIDEOPRT] - Support passing a resource requirements list to VideoPortGetAccessRanges

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Oct 23 03:55:35 2011 New Revision: 54239 URL: http://svn.reactos.org/svn/reactos?rev=54239&view=rev Log: [VIDEOPRT] - Support passing a resource requirements list to VideoPortGetAccessRanges Modified: trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Sun Oct 23 03:55:35 2011 @@ -559,210 +559,241 @@ IN PVOID DeviceId, OUT PULONG Slot) { - PCI_SLOT_NUMBER PciSlotNumber; - ULONG DeviceNumber; - ULONG FunctionNumber; - PCI_COMMON_CONFIG Config; - PCM_RESOURCE_LIST AllocatedResources; - NTSTATUS Status; - UINT AssignedCount; - CM_FULL_RESOURCE_DESCRIPTOR *FullList; - CM_PARTIAL_RESOURCE_DESCRIPTOR *Descriptor; - PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; - USHORT VendorIdToFind; - USHORT DeviceIdToFind; - ULONG ReturnedLength; - PVIDEO_ACCESS_RANGE LegacyAccessRanges; - ULONG LegacyAccessRangeCount; - PDRIVER_OBJECT DriverObject; - BOOLEAN DeviceAndVendorFound = FALSE; - - TRACE_(VIDEOPRT, "VideoPortGetAccessRanges\n"); - - DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); - DriverObject = DeviceExtension->DriverObject; - DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); - - if (NumRequestedResources == 0) - { - AllocatedResources = DeviceExtension->AllocatedResources; - if (AllocatedResources == NULL && - DeviceExtension->AdapterInterfaceType == PCIBus) - { - if (DeviceExtension->PhysicalDeviceObject != NULL) - { - PciSlotNumber.u.AsULONG = DeviceExtension->SystemIoSlotNumber; - - ReturnedLength = HalGetBusData( - PCIConfiguration, - DeviceExtension->SystemIoBusNumber, - PciSlotNumber.u.AsULONG, - &Config, - sizeof(PCI_COMMON_CONFIG)); - - if (ReturnedLength != sizeof(PCI_COMMON_CONFIG)) + PCI_SLOT_NUMBER PciSlotNumber; + ULONG DeviceNumber; + ULONG FunctionNumber; + PCI_COMMON_CONFIG Config; + PCM_RESOURCE_LIST AllocatedResources; + NTSTATUS Status; + UINT AssignedCount; + CM_FULL_RESOURCE_DESCRIPTOR *FullList; + CM_PARTIAL_RESOURCE_DESCRIPTOR *Descriptor; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; + USHORT VendorIdToFind; + USHORT DeviceIdToFind; + ULONG ReturnedLength; + PVIDEO_ACCESS_RANGE LegacyAccessRanges; + ULONG LegacyAccessRangeCount; + PDRIVER_OBJECT DriverObject; + ULONG ListSize; + PIO_RESOURCE_REQUIREMENTS_LIST ResReqList; + BOOLEAN DeviceAndVendorFound = FALSE; + + TRACE_(VIDEOPRT, "VideoPortGetAccessRanges\n"); + + DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); + DriverObject = DeviceExtension->DriverObject; + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + + if (NumRequestedResources == 0) + { + AllocatedResources = DeviceExtension->AllocatedResources; + if (AllocatedResources == NULL && + DeviceExtension->AdapterInterfaceType == PCIBus) + { + if (DeviceExtension->PhysicalDeviceObject != NULL) { - return ERROR_NOT_ENOUGH_MEMORY; + PciSlotNumber.u.AsULONG = DeviceExtension->SystemIoSlotNumber; + + ReturnedLength = HalGetBusData(PCIConfiguration, + DeviceExtension->SystemIoBusNumber, + PciSlotNumber.u.AsULONG, + &Config, + sizeof(PCI_COMMON_CONFIG)); + + if (ReturnedLength != sizeof(PCI_COMMON_CONFIG)) + { + return ERROR_NOT_ENOUGH_MEMORY; + } } - } - else - { - VendorIdToFind = VendorId != NULL ? *(PUSHORT)VendorId : 0; - DeviceIdToFind = DeviceId != NULL ? *(PUSHORT)DeviceId : 0; - - if (VendorIdToFind == 0 && DeviceIdToFind == 0) + else { - /* We're screwed */ - return ERROR_DEV_NOT_EXIST; + VendorIdToFind = VendorId != NULL ? *(PUSHORT)VendorId : 0; + DeviceIdToFind = DeviceId != NULL ? *(PUSHORT)DeviceId : 0; + + if (VendorIdToFind == 0 && DeviceIdToFind == 0) + { + /* We're screwed */ + return ERROR_DEV_NOT_EXIST; + } + + INFO_(VIDEOPRT, "Looking for VendorId 0x%04x DeviceId 0x%04x\n", + VendorIdToFind, DeviceIdToFind); + + /* + * Search for the device id and vendor id on this bus. + */ + for (DeviceNumber = 0; DeviceNumber < PCI_MAX_DEVICES; DeviceNumber++) + { + PciSlotNumber.u.bits.DeviceNumber = DeviceNumber; + for (FunctionNumber = 0; FunctionNumber < PCI_MAX_FUNCTION; FunctionNumber++) + { + INFO_(VIDEOPRT, "- Function number: %d\n", FunctionNumber); + PciSlotNumber.u.bits.FunctionNumber = FunctionNumber; + ReturnedLength = HalGetBusData(PCIConfiguration, + DeviceExtension->SystemIoBusNumber, + PciSlotNumber.u.AsULONG, + &Config, + sizeof(PCI_COMMON_CONFIG)); + INFO_(VIDEOPRT, "- Length of data: %x\n", ReturnedLength); + if (ReturnedLength == sizeof(PCI_COMMON_CONFIG)) + { + INFO_(VIDEOPRT, "- Slot 0x%02x (Device %d Function %d) VendorId 0x%04x " + "DeviceId 0x%04x\n", + PciSlotNumber.u.AsULONG, + PciSlotNumber.u.bits.DeviceNumber, + PciSlotNumber.u.bits.FunctionNumber, + Config.VendorID, + Config.DeviceID); + + if ((VendorIdToFind == 0 || Config.VendorID == VendorIdToFind) && + (DeviceIdToFind == 0 || Config.DeviceID == DeviceIdToFind)) + { + DeviceAndVendorFound = TRUE; + break; + } + } + } + if (DeviceAndVendorFound) break; + } + if (FunctionNumber == PCI_MAX_FUNCTION) + { + WARN_(VIDEOPRT, "Didn't find device.\n"); + return ERROR_DEV_NOT_EXIST; + } } - - INFO_(VIDEOPRT, "Looking for VendorId 0x%04x DeviceId 0x%04x\n", - VendorIdToFind, DeviceIdToFind); - - /* - * Search for the device id and vendor id on this bus. - */ - for (DeviceNumber = 0; DeviceNumber < PCI_MAX_DEVICES; DeviceNumber++) + + Status = HalAssignSlotResources(&DeviceExtension->RegistryPath, + NULL, + DeviceExtension->DriverObject, + DeviceExtension->DriverObject->DeviceObject, + DeviceExtension->AdapterInterfaceType, + DeviceExtension->SystemIoBusNumber, + PciSlotNumber.u.AsULONG, + &AllocatedResources); + + if (!NT_SUCCESS(Status)) { - PciSlotNumber.u.bits.DeviceNumber = DeviceNumber; - for (FunctionNumber = 0; FunctionNumber < PCI_MAX_FUNCTION; FunctionNumber++) - { - INFO_(VIDEOPRT, "- Function number: %d\n", FunctionNumber); - PciSlotNumber.u.bits.FunctionNumber = FunctionNumber; - ReturnedLength = HalGetBusData( - PCIConfiguration, - DeviceExtension->SystemIoBusNumber, - PciSlotNumber.u.AsULONG, - &Config, - sizeof(PCI_COMMON_CONFIG)); - INFO_(VIDEOPRT, "- Length of data: %x\n", ReturnedLength); - if (ReturnedLength == sizeof(PCI_COMMON_CONFIG)) - { - INFO_(VIDEOPRT, "- Slot 0x%02x (Device %d Function %d) VendorId 0x%04x " - "DeviceId 0x%04x\n", - PciSlotNumber.u.AsULONG, - PciSlotNumber.u.bits.DeviceNumber, - PciSlotNumber.u.bits.FunctionNumber, - Config.VendorID, - Config.DeviceID); - - if ((VendorIdToFind == 0 || Config.VendorID == VendorIdToFind) && - (DeviceIdToFind == 0 || Config.DeviceID == DeviceIdToFind)) - { - DeviceAndVendorFound = TRUE; - break; - } - } - } - if (DeviceAndVendorFound) break; + WARN_(VIDEOPRT, "HalAssignSlotResources failed with status %x.\n",Status); + return Status; } - if (FunctionNumber == PCI_MAX_FUNCTION) - { - WARN_(VIDEOPRT, "Didn't find device.\n"); - return ERROR_DEV_NOT_EXIST; - } - } - - Status = HalAssignSlotResources( - &DeviceExtension->RegistryPath, - NULL, - DeviceExtension->DriverObject, - DeviceExtension->DriverObject->DeviceObject, - DeviceExtension->AdapterInterfaceType, - DeviceExtension->SystemIoBusNumber, - PciSlotNumber.u.AsULONG, - &AllocatedResources); - - if (!NT_SUCCESS(Status)) - { - WARN_(VIDEOPRT, "HalAssignSlotResources failed with status %x.\n",Status); + DeviceExtension->AllocatedResources = AllocatedResources; + } + } + else + { + ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + (NumRequestedResources - 1) * sizeof(IO_RESOURCE_DESCRIPTOR); + ResReqList = ExAllocatePool(NonPagedPool, ListSize); + if (!ResReqList) return ERROR_NOT_ENOUGH_MEMORY; + + ResReqList->ListSize = ListSize; + ResReqList->InterfaceType = DeviceExtension->AdapterInterfaceType; + ResReqList->BusNumber = DeviceExtension->SystemIoBusNumber; + ResReqList->SlotNumber = DeviceExtension->SystemIoSlotNumber; + ResReqList->AlternativeLists = 1; + ResReqList->List[0].Version = 1; + ResReqList->List[0].Revision = 1; + ResReqList->List[0].Count = NumRequestedResources; + + /* Copy in the caller's resource list */ + RtlCopyMemory(ResReqList->List[0].Descriptors, + RequestedResources, + NumRequestedResources * sizeof(IO_RESOURCE_DESCRIPTOR)); + + Status = IoAssignResources(&DeviceExtension->RegistryPath, + NULL, + DeviceExtension->DriverObject, + DeviceExtension->PhysicalDeviceObject ? + DeviceExtension->PhysicalDeviceObject : + DeviceExtension->DriverObject->DeviceObject, + ResReqList, + &AllocatedResources); + + if (!NT_SUCCESS(Status)) return Status; - } - DeviceExtension->AllocatedResources = AllocatedResources; - - /* Return the slot number if the caller wants it */ - if (Slot != NULL) *Slot = PciSlotNumber.u.AsULONG; - - } - if (AllocatedResources == NULL) - return ERROR_NOT_ENOUGH_MEMORY; - Status = IntVideoPortGetLegacyResources(DriverExtension, DeviceExtension, - &LegacyAccessRanges, &LegacyAccessRangeCount); - if (!NT_SUCCESS(Status)) - return ERROR_DEV_NOT_EXIST; - if (NumAccessRanges < LegacyAccessRangeCount) - return ERROR_NOT_ENOUGH_MEMORY; - RtlCopyMemory(AccessRanges, LegacyAccessRanges, LegacyAccessRangeCount * sizeof(VIDEO_ACCESS_RANGE)); - AssignedCount = LegacyAccessRangeCount; - for (FullList = AllocatedResources->List; - FullList < AllocatedResources->List + AllocatedResources->Count; - FullList++) - { - INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n", - FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision); - - ASSERT(FullList->InterfaceType == PCIBus); - ASSERT(FullList->BusNumber == DeviceExtension->SystemIoBusNumber); - ASSERT(1 == FullList->PartialResourceList.Version); - ASSERT(1 == FullList->PartialResourceList.Revision); - for (Descriptor = FullList->PartialResourceList.PartialDescriptors; - Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count; - Descriptor++) - { + + if (!DeviceExtension->AllocatedResources) + DeviceExtension->AllocatedResources = AllocatedResources; + } + + if (AllocatedResources == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + /* Return the slot number if the caller wants it */ + if (Slot != NULL) *Slot = DeviceExtension->SystemIoBusNumber; + + Status = IntVideoPortGetLegacyResources(DriverExtension, DeviceExtension, + &LegacyAccessRanges, &LegacyAccessRangeCount); + if (!NT_SUCCESS(Status)) + return ERROR_DEV_NOT_EXIST; + if (NumAccessRanges < LegacyAccessRangeCount) + return ERROR_NOT_ENOUGH_MEMORY; + RtlCopyMemory(AccessRanges, LegacyAccessRanges, LegacyAccessRangeCount * sizeof(VIDEO_ACCESS_RANGE)); + AssignedCount = LegacyAccessRangeCount; + for (FullList = AllocatedResources->List; + FullList < AllocatedResources->List + AllocatedResources->Count; + FullList++) + { + INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n", + FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision); + + ASSERT(FullList->InterfaceType == PCIBus); + ASSERT(FullList->BusNumber == DeviceExtension->SystemIoBusNumber); + ASSERT(1 == FullList->PartialResourceList.Version); + ASSERT(1 == FullList->PartialResourceList.Revision); + for (Descriptor = FullList->PartialResourceList.PartialDescriptors; + Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count; + Descriptor++) + { if ((Descriptor->Type == CmResourceTypeMemory || Descriptor->Type == CmResourceTypePort) && AssignedCount >= NumAccessRanges) { - WARN_(VIDEOPRT, "Too many access ranges found\n"); - return ERROR_NOT_ENOUGH_MEMORY; + WARN_(VIDEOPRT, "Too many access ranges found\n"); + return ERROR_NOT_ENOUGH_MEMORY; } if (Descriptor->Type == CmResourceTypeMemory) { - INFO_(VIDEOPRT, "Memory range starting at 0x%08x length 0x%08x\n", + INFO_(VIDEOPRT, "Memory range starting at 0x%08x length 0x%08x\n", Descriptor->u.Memory.Start.u.LowPart, Descriptor->u.Memory.Length); - AccessRanges[AssignedCount].RangeStart = Descriptor->u.Memory.Start; - AccessRanges[AssignedCount].RangeLength = Descriptor->u.Memory.Length; - AccessRanges[AssignedCount].RangeInIoSpace = 0; - AccessRanges[AssignedCount].RangeVisible = 0; /* FIXME: Just guessing */ - AccessRanges[AssignedCount].RangeShareable = - (Descriptor->ShareDisposition == CmResourceShareShared); - AccessRanges[AssignedCount].RangePassive = 0; - AssignedCount++; + AccessRanges[AssignedCount].RangeStart = Descriptor->u.Memory.Start; + AccessRanges[AssignedCount].RangeLength = Descriptor->u.Memory.Length; + AccessRanges[AssignedCount].RangeInIoSpace = 0; + AccessRanges[AssignedCount].RangeVisible = 0; /* FIXME: Just guessing */ + AccessRanges[AssignedCount].RangeShareable = + (Descriptor->ShareDisposition == CmResourceShareShared); + AccessRanges[AssignedCount].RangePassive = 0; + AssignedCount++; } else if (Descriptor->Type == CmResourceTypePort) { - INFO_(VIDEOPRT, "Port range starting at 0x%04x length %d\n", + INFO_(VIDEOPRT, "Port range starting at 0x%04x length %d\n", Descriptor->u.Port.Start.u.LowPart, Descriptor->u.Port.Length); - AccessRanges[AssignedCount].RangeStart = Descriptor->u.Port.Start; - AccessRanges[AssignedCount].RangeLength = Descriptor->u.Port.Length; - AccessRanges[AssignedCount].RangeInIoSpace = 1; - AccessRanges[AssignedCount].RangeVisible = 0; /* FIXME: Just guessing */ - AccessRanges[AssignedCount].RangeShareable = - (Descriptor->ShareDisposition == CmResourceShareShared); - AccessRanges[AssignedCount].RangePassive = 0; - if (Descriptor->Flags & CM_RESOURCE_PORT_10_BIT_DECODE) - AccessRanges[AssignedCount].RangePassive |= VIDEO_RANGE_10_BIT_DECODE; - if (Descriptor->Flags & CM_RESOURCE_PORT_PASSIVE_DECODE) - AccessRanges[AssignedCount].RangePassive |= VIDEO_RANGE_PASSIVE_DECODE; - AssignedCount++; + AccessRanges[AssignedCount].RangeStart = Descriptor->u.Port.Start; + AccessRanges[AssignedCount].RangeLength = Descriptor->u.Port.Length; + AccessRanges[AssignedCount].RangeInIoSpace = 1; + AccessRanges[AssignedCount].RangeVisible = 0; /* FIXME: Just guessing */ + AccessRanges[AssignedCount].RangeShareable = + (Descriptor->ShareDisposition == CmResourceShareShared); + AccessRanges[AssignedCount].RangePassive = 0; + if (Descriptor->Flags & CM_RESOURCE_PORT_10_BIT_DECODE) + AccessRanges[AssignedCount].RangePassive |= VIDEO_RANGE_10_BIT_DECODE; + if (Descriptor->Flags & CM_RESOURCE_PORT_PASSIVE_DECODE) + AccessRanges[AssignedCount].RangePassive |= VIDEO_RANGE_PASSIVE_DECODE; + AssignedCount++; } else if (Descriptor->Type == CmResourceTypeInterrupt) { - DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level; - DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector; - if (Descriptor->ShareDisposition == CmResourceShareShared) - DeviceExtension->InterruptShared = TRUE; - else - DeviceExtension->InterruptShared = FALSE; + DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level; + DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector; + if (Descriptor->ShareDisposition == CmResourceShareShared) + DeviceExtension->InterruptShared = TRUE; + else + DeviceExtension->InterruptShared = FALSE; } - } - } - } - else - { - UNIMPLEMENTED - } + } + } return NO_ERROR; }

12 years, 11 months

[cgutman] 54238: [NTOSKRNL] - Fix a major off-by-one bug in resource conflict checking - Respect requested alignment when checking for valid port/memory ranges

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Oct 23 03:06:23 2011 New Revision: 54238 URL: http://svn.reactos.org/svn/reactos?rev=54238&view=rev Log: [NTOSKRNL] - Fix a major off-by-one bug in resource conflict checking - Respect requested alignment when checking for valid port/memory ranges Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sun Oct 23 03:06:23 2011 @@ -47,7 +47,7 @@ ASSERT(IoDesc->Type == CmResourceTypeBusNumber); for (Start = IoDesc->u.BusNumber.MinBusNumber; - Start < IoDesc->u.BusNumber.MaxBusNumber; + Start <= IoDesc->u.BusNumber.MaxBusNumber; Start++) { CmDesc->u.BusNumber.Length = IoDesc->u.BusNumber.Length; @@ -78,9 +78,12 @@ ASSERT(IoDesc->Type == CmDesc->Type); ASSERT(IoDesc->Type == CmResourceTypeMemory); + /* HACK */ + if (IoDesc->u.Memory.Alignment == 0) IoDesc->u.Memory.Alignment = 1; + for (Start = IoDesc->u.Memory.MinimumAddress.QuadPart; - Start < IoDesc->u.Memory.MaximumAddress.QuadPart; - Start++) + Start <= IoDesc->u.Memory.MaximumAddress.QuadPart; + Start += IoDesc->u.Memory.Alignment) { CmDesc->u.Memory.Length = IoDesc->u.Memory.Length; CmDesc->u.Memory.Start.QuadPart = Start; @@ -110,10 +113,13 @@ ASSERT(IoDesc->Type == CmDesc->Type); ASSERT(IoDesc->Type == CmResourceTypePort); + + /* HACK */ + if (IoDesc->u.Port.Alignment == 0) IoDesc->u.Port.Alignment = 1; for (Start = IoDesc->u.Port.MinimumAddress.QuadPart; - Start < IoDesc->u.Port.MaximumAddress.QuadPart; - Start++) + Start <= IoDesc->u.Port.MaximumAddress.QuadPart; + Start += IoDesc->u.Port.Alignment) { CmDesc->u.Port.Length = IoDesc->u.Port.Length; CmDesc->u.Port.Start.QuadPart = Start; @@ -143,7 +149,7 @@ ASSERT(IoDesc->Type == CmResourceTypeDma); for (Channel = IoDesc->u.Dma.MinimumChannel; - Channel < IoDesc->u.Dma.MaximumChannel; + Channel <= IoDesc->u.Dma.MaximumChannel; Channel++) { CmDesc->u.Dma.Channel = Channel; @@ -168,7 +174,7 @@ ASSERT(IoDesc->Type == CmResourceTypeInterrupt); for (Vector = IoDesc->u.Interrupt.MinimumVector; - Vector < IoDesc->u.Interrupt.MaximumVector; + Vector <= IoDesc->u.Interrupt.MaximumVector; Vector++) { CmDesc->u.Interrupt.Vector = Vector;

12 years, 11 months

[cgutman] 54237: [VIDEOPRT] - Report legacy resources to the PnP manager via IRP_MN_FILTER_RESOURCE_REQUIREMENTS - Report legacy access ranges in response to VideoPortGetAccessRanges - TODO: Handle...

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Oct 23 02:45:09 2011 New Revision: 54237 URL: http://svn.reactos.org/svn/reactos?rev=54237&view=rev Log: [VIDEOPRT] - Report legacy resources to the PnP manager via IRP_MN_FILTER_RESOURCE_REQUIREMENTS - Report legacy access ranges in response to VideoPortGetAccessRanges - TODO: Handle an optional resource requirements list in VideoPortGetAccessRanges Modified: trunk/reactos/drivers/video/videoprt/dispatch.c trunk/reactos/drivers/video/videoprt/resource.c trunk/reactos/drivers/video/videoprt/videoprt.h Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] Sun Oct 23 02:45:09 2011 @@ -304,7 +304,6 @@ return nErrCode; } - NTSTATUS NTAPI IntVideoPortPnPStartDevice( @@ -456,6 +455,14 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); break; + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) + Status = IntVideoPortFilterResourceRequirements(DeviceObject, Irp); + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; case IRP_MN_REMOVE_DEVICE: case IRP_MN_QUERY_REMOVE_DEVICE: Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Sun Oct 23 02:45:09 2011 @@ -22,6 +22,166 @@ #include "videoprt.h" /* PRIVATE FUNCTIONS **********************************************************/ + +NTSTATUS NTAPI +IntVideoPortGetLegacyResources( + IN PVIDEO_PORT_DRIVER_EXTENSION DriverExtension, + IN PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension, + OUT PVIDEO_ACCESS_RANGE *AccessRanges, + OUT PULONG AccessRangeCount) +{ + PCI_COMMON_CONFIG PciConfig; + ULONG ReadLength; + + if (!DriverExtension->InitializationData.HwGetLegacyResources && + !DriverExtension->InitializationData.HwLegacyResourceCount) + { + /* No legacy resources to report */ + *AccessRangeCount = 0; + return STATUS_SUCCESS; + } + + if (DriverExtension->InitializationData.HwGetLegacyResources) + { + ReadLength = HalGetBusData(PCIConfiguration, + DeviceExtension->SystemIoBusNumber, + DeviceExtension->SystemIoSlotNumber, + &PciConfig, + sizeof(PciConfig)); + if (ReadLength != sizeof(PciConfig)) + { + /* This device doesn't exist */ + return STATUS_NO_SUCH_DEVICE; + } + + DriverExtension->InitializationData.HwGetLegacyResources(PciConfig.VendorID, + PciConfig.DeviceID, + AccessRanges, + AccessRangeCount); + } + else + { + *AccessRanges = DriverExtension->InitializationData.HwLegacyResourceList; + *AccessRangeCount = DriverExtension->InitializationData.HwLegacyResourceCount; + } + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +IntVideoPortFilterResourceRequirements( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDRIVER_OBJECT DriverObject; + PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + PVIDEO_ACCESS_RANGE AccessRanges; + ULONG AccessRangeCount, ListSize, i; + PIO_RESOURCE_REQUIREMENTS_LIST ResList, OldResList = (PVOID)Irp->IoStatus.Information; + PIO_RESOURCE_DESCRIPTOR CurrentDescriptor; + NTSTATUS Status; + + DriverObject = DeviceObject->DriverObject; + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + Status = IntVideoPortGetLegacyResources(DriverExtension, DeviceExtension, &AccessRanges, &AccessRangeCount); + if (!NT_SUCCESS(Status)) + return Status; + if (!AccessRangeCount) + { + /* No legacy resources to report */ + return Irp->IoStatus.Information; + } + + /* OK, we've got the access ranges now. Let's set up the resource requirements list */ + + if (OldResList) + { + /* Already one there so let's add to it */ + ListSize = OldResList->ListSize + sizeof(IO_RESOURCE_DESCRIPTOR) * AccessRangeCount; + ResList = ExAllocatePool(NonPagedPool, + ListSize); + if (!ResList) return STATUS_NO_MEMORY; + + RtlCopyMemory(ResList, OldResList, OldResList->ListSize); + + ASSERT(ResList->AlternativeLists == 1); + + ResList->ListSize = ListSize; + ResList->List[0].Count += AccessRangeCount; + + CurrentDescriptor = (PIO_RESOURCE_DESCRIPTOR)((PUCHAR)ResList + OldResList->ListSize); + + ExFreePool(OldResList); + Irp->IoStatus.Information = 0; + } + else + { + /* We need to make a new one */ + ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + sizeof(IO_RESOURCE_DESCRIPTOR) * (AccessRangeCount - 1); + ResList = ExAllocatePool(NonPagedPool, + ListSize); + if (!ResList) return STATUS_NO_MEMORY; + + RtlZeroMemory(ResList, ListSize); + + /* We need to initialize some fields */ + ResList->ListSize = ListSize; + ResList->InterfaceType = DeviceExtension->AdapterInterfaceType; + ResList->BusNumber = DeviceExtension->SystemIoBusNumber; + ResList->SlotNumber = DeviceExtension->SystemIoSlotNumber; + ResList->AlternativeLists = 1; + ResList->List[0].Version = 1; + ResList->List[0].Revision = 1; + ResList->List[0].Count = AccessRangeCount; + + CurrentDescriptor = ResList->List[0].Descriptors; + } + + for (i = 0; i < AccessRangeCount; i++) + { + /* This is a required resource */ + CurrentDescriptor->Option = 0; + + if (AccessRanges[i].RangeInIoSpace) + CurrentDescriptor->Type = CmResourceTypePort; + else + CurrentDescriptor->Type = CmResourceTypeMemory; + + CurrentDescriptor->ShareDisposition = + (AccessRanges[i].RangeShareable ? CmResourceShareShared : CmResourceShareDeviceExclusive); + + CurrentDescriptor->Flags = 0; + + if (CurrentDescriptor->Type == CmResourceTypePort) + { + CurrentDescriptor->u.Port.Length = AccessRanges[i].RangeLength; + CurrentDescriptor->u.Port.MinimumAddress = + CurrentDescriptor->u.Port.MaximumAddress = AccessRanges[i].RangeStart; + CurrentDescriptor->u.Port.Alignment = 1; + if (AccessRanges[i].RangePassive & VIDEO_RANGE_PASSIVE_DECODE) + CurrentDescriptor->Flags |= CM_RESOURCE_PORT_PASSIVE_DECODE; + if (AccessRanges[i].RangePassive & VIDEO_RANGE_10_BIT_DECODE) + CurrentDescriptor->Flags |= CM_RESOURCE_PORT_10_BIT_DECODE; + } + else + { + CurrentDescriptor->u.Memory.Length = AccessRanges[i].RangeLength; + CurrentDescriptor->u.Memory.MinimumAddress = + CurrentDescriptor->u.Memory.MaximumAddress = AccessRanges[i].RangeStart; + CurrentDescriptor->u.Memory.Alignment = 1; + CurrentDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + } + + CurrentDescriptor++; + } + + Irp->IoStatus.Information = (ULONG_PTR)ResList; + + return STATUS_SUCCESS; +} NTSTATUS NTAPI IntVideoPortMapPhysicalMemory( @@ -409,14 +569,20 @@ CM_FULL_RESOURCE_DESCRIPTOR *FullList; CM_PARTIAL_RESOURCE_DESCRIPTOR *Descriptor; PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; USHORT VendorIdToFind; USHORT DeviceIdToFind; ULONG ReturnedLength; + PVIDEO_ACCESS_RANGE LegacyAccessRanges; + ULONG LegacyAccessRangeCount; + PDRIVER_OBJECT DriverObject; BOOLEAN DeviceAndVendorFound = FALSE; TRACE_(VIDEOPRT, "VideoPortGetAccessRanges\n"); DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); + DriverObject = DeviceExtension->DriverObject; + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); if (NumRequestedResources == 0) { @@ -521,7 +687,14 @@ } if (AllocatedResources == NULL) return ERROR_NOT_ENOUGH_MEMORY; - AssignedCount = 0; + Status = IntVideoPortGetLegacyResources(DriverExtension, DeviceExtension, + &LegacyAccessRanges, &LegacyAccessRangeCount); + if (!NT_SUCCESS(Status)) + return ERROR_DEV_NOT_EXIST; + if (NumAccessRanges < LegacyAccessRangeCount) + return ERROR_NOT_ENOUGH_MEMORY; + RtlCopyMemory(AccessRanges, LegacyAccessRanges, LegacyAccessRangeCount * sizeof(VIDEO_ACCESS_RANGE)); + AssignedCount = LegacyAccessRangeCount; for (FullList = AllocatedResources->List; FullList < AllocatedResources->List + AllocatedResources->Count; FullList++) Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] Sun Oct 23 02:45:09 2011 @@ -198,6 +198,11 @@ /* resource.c */ NTSTATUS NTAPI +IntVideoPortFilterResourceRequirements( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS NTAPI IntVideoPortMapPhysicalMemory( IN HANDLE Process, IN PHYSICAL_ADDRESS PhysicalAddress,

12 years, 11 months

[cgutman] 54236: [VIDEOPRT] - Check all PCI buses not just the first 8

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Oct 23 01:16:54 2011 New Revision: 54236 URL: http://svn.reactos.org/svn/reactos?rev=54236&view=rev Log: [VIDEOPRT] - Check all PCI buses not just the first 8 Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Sun Oct 23 01:16:54 2011 @@ -411,7 +411,7 @@ { ULONG BusNumber, MaxBuses; - MaxBuses = DeviceExtension->AdapterInterfaceType == PCIBus ? 8 : 1; + MaxBuses = DeviceExtension->AdapterInterfaceType == PCIBus ? PCI_MAX_BRIDGE_NUMBER : 1; for (BusNumber = 0; BusNumber < MaxBuses; BusNumber++) {

12 years, 11 months

[cgutman] 54235: [VIDEOPRT] - Slot is an output parameter not an input parameter. Treat it as such. - Don't use magic constants - Remove a duplicate check - Set RangeShareable for port resources ba...

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Oct 22 23:32:51 2011 New Revision: 54235 URL: http://svn.reactos.org/svn/reactos?rev=54235&view=rev Log: [VIDEOPRT] - Slot is an output parameter not an input parameter. Treat it as such. - Don't use magic constants - Remove a duplicate check - Set RangeShareable for port resources based on the resource descriptor - Initialize and set RangeShareable for memory and port access ranges instead of leaving garbage in there Modified: trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Sat Oct 22 23:32:51 2011 @@ -397,7 +397,7 @@ IN PVIDEO_ACCESS_RANGE AccessRanges, IN PVOID VendorId, IN PVOID DeviceId, - IN PULONG Slot) + OUT PULONG Slot) { PCI_SLOT_NUMBER PciSlotNumber; ULONG DeviceNumber; @@ -411,7 +411,6 @@ PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; USHORT VendorIdToFind; USHORT DeviceIdToFind; - ULONG SlotIdToFind; ULONG ReturnedLength; BOOLEAN DeviceAndVendorFound = FALSE; @@ -445,8 +444,12 @@ { VendorIdToFind = VendorId != NULL ? *(PUSHORT)VendorId : 0; DeviceIdToFind = DeviceId != NULL ? *(PUSHORT)DeviceId : 0; - SlotIdToFind = Slot != NULL ? *Slot : 0; - PciSlotNumber.u.AsULONG = SlotIdToFind; + + if (VendorIdToFind == 0 && DeviceIdToFind == 0) + { + /* We're screwed */ + return ERROR_DEV_NOT_EXIST; + } INFO_(VIDEOPRT, "Looking for VendorId 0x%04x DeviceId 0x%04x\n", VendorIdToFind, DeviceIdToFind); @@ -457,7 +460,7 @@ for (DeviceNumber = 0; DeviceNumber < PCI_MAX_DEVICES; DeviceNumber++) { PciSlotNumber.u.bits.DeviceNumber = DeviceNumber; - for (FunctionNumber = 0; FunctionNumber < 8; FunctionNumber++) + for (FunctionNumber = 0; FunctionNumber < PCI_MAX_FUNCTION; FunctionNumber++) { INFO_(VIDEOPRT, "- Function number: %d\n", FunctionNumber); PciSlotNumber.u.bits.FunctionNumber = FunctionNumber; @@ -488,7 +491,7 @@ } if (DeviceAndVendorFound) break; } - if (FunctionNumber == 8) + if (FunctionNumber == PCI_MAX_FUNCTION) { WARN_(VIDEOPRT, "Didn't find device.\n"); return ERROR_DEV_NOT_EXIST; @@ -511,6 +514,10 @@ return Status; } DeviceExtension->AllocatedResources = AllocatedResources; + + /* Return the slot number if the caller wants it */ + if (Slot != NULL) *Slot = PciSlotNumber.u.AsULONG; + } if (AllocatedResources == NULL) return ERROR_NOT_ENOUGH_MEMORY; @@ -539,11 +546,6 @@ } if (Descriptor->Type == CmResourceTypeMemory) { - if (NumAccessRanges <= AssignedCount) - { - WARN_(VIDEOPRT, "Too many access ranges found\n"); - return ERROR_NOT_ENOUGH_MEMORY; - } INFO_(VIDEOPRT, "Memory range starting at 0x%08x length 0x%08x\n", Descriptor->u.Memory.Start.u.LowPart, Descriptor->u.Memory.Length); AccessRanges[AssignedCount].RangeStart = Descriptor->u.Memory.Start; @@ -552,17 +554,24 @@ AccessRanges[AssignedCount].RangeVisible = 0; /* FIXME: Just guessing */ AccessRanges[AssignedCount].RangeShareable = (Descriptor->ShareDisposition == CmResourceShareShared); + AccessRanges[AssignedCount].RangePassive = 0; AssignedCount++; } else if (Descriptor->Type == CmResourceTypePort) { INFO_(VIDEOPRT, "Port range starting at 0x%04x length %d\n", - Descriptor->u.Memory.Start.u.LowPart, Descriptor->u.Memory.Length); + Descriptor->u.Port.Start.u.LowPart, Descriptor->u.Port.Length); AccessRanges[AssignedCount].RangeStart = Descriptor->u.Port.Start; AccessRanges[AssignedCount].RangeLength = Descriptor->u.Port.Length; AccessRanges[AssignedCount].RangeInIoSpace = 1; AccessRanges[AssignedCount].RangeVisible = 0; /* FIXME: Just guessing */ - AccessRanges[AssignedCount].RangeShareable = 0; + AccessRanges[AssignedCount].RangeShareable = + (Descriptor->ShareDisposition == CmResourceShareShared); + AccessRanges[AssignedCount].RangePassive = 0; + if (Descriptor->Flags & CM_RESOURCE_PORT_10_BIT_DECODE) + AccessRanges[AssignedCount].RangePassive |= VIDEO_RANGE_10_BIT_DECODE; + if (Descriptor->Flags & CM_RESOURCE_PORT_PASSIVE_DECODE) + AccessRanges[AssignedCount].RangePassive |= VIDEO_RANGE_PASSIVE_DECODE; AssignedCount++; } else if (Descriptor->Type == CmResourceTypeInterrupt)

12 years, 11 months

[tfaber] 54234: [RICHED20] - Fix ME_CharFromPoint relying on Wine's incorrect behavior of GetTextExtentExPointW. Already sent upstream(TM) See issue #6196, 5784, 6037, 6095, 6187, 6513 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Oct 22 20:55:11 2011 New Revision: 54234 URL: http://svn.reactos.org/svn/reactos?rev=54234&view=rev Log: [RICHED20] - Fix ME_CharFromPoint relying on Wine's incorrect behavior of GetTextExtentExPointW. Already sent upstream(TM) See issue #6196,5784,6037,6095,6187,6513 for more details. Modified: trunk/reactos/dll/win32/riched20/run.c Modified: trunk/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/run.c?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/run.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/run.c [iso-8859-1] Sat Oct 22 20:55:11 2011 @@ -440,7 +440,7 @@ int fit = 0; HGDIOBJ hOldFont; SIZE sz; - if (!run->strText->nLen) + if (!run->strText->nLen || cx <= 0) return 0; if (run->nFlags & MERF_TAB || @@ -498,7 +498,7 @@ ME_Context c; HGDIOBJ hOldFont; SIZE sz, sz2, sz3; - if (!run->strText->nLen) + if (!run->strText->nLen || cx <= 0) return 0; if (run->nFlags & (MERF_TAB | MERF_ENDCELL))

12 years, 11 months

[ekohl] 54233: [DISKPART] Implement argument processing. Patch by Lee Schroeder. The original patch was modified to fix the following issues: - Indentation and coding style. - Remove obsolete code:...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 22 19:52:17 2011 New Revision: 54233 URL: http://svn.reactos.org/svn/reactos?rev=54233&view=rev Log: [DISKPART] Implement argument processing. Patch by Lee Schroeder. The original patch was modified to fix the following issues: - Indentation and coding style. - Remove obsolete code: 1. The if-statement around the for-loop is not needed. 2. The call to wcsicmp() is already case insensitive (it is the 'i' in wcsicmp). - Check the existence of a script file name and a timeout value before trying to process them. - Call run_script() after the argument list has been processed. This fixes the argument order issue. See issue #6552 for more details. Modified: trunk/reactos/base/system/diskpart/diskpart.c Modified: trunk/reactos/base/system/diskpart/diskpart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] Sat Oct 22 19:52:17 2011 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/diskpart/diskpart.c * PURPOSE: Manages all the partitions of the OS in - * an interactive way + * an interactive way * PROGRAMMERS: Lee Schroeder */ @@ -30,7 +30,8 @@ * opens the file, reads the contents, convert the text into readable * code for the computer, and then execute commands in order. */ -BOOL run_script(LPCWSTR filename) +BOOL +run_script(LPCWSTR filename) { FILE *script_file; WCHAR tmp_string[MAX_STRING_SIZE]; @@ -58,18 +59,20 @@ } /* - * main(): + * wmain(): * Main entry point of the application. */ int wmain(int argc, const WCHAR *argv[]) { - /* Gets the current name of the computer */ - WCHAR comp_name[MAX_STRING_SIZE]; //used to store the name of the computer */ - DWORD comp_size = MAX_STRING_SIZE; // used for the char size of comp_name */ - BOOL interpreter_running = TRUE; //used for the main program loop */ + WCHAR szComputerName[MAX_STRING_SIZE]; + DWORD comp_size = MAX_STRING_SIZE; + BOOL interpreter_running = TRUE; + LPCWSTR file_name = NULL; + int i; + int timeout = 0; /* Get the name of the computer for us and change the value of comp_name */ - GetComputerName(comp_name, &comp_size); + GetComputerName(szComputerName, &comp_size); /* TODO: Remove this section of code when program becomes stable enough for production use. */ wprintf(L"\n*WARNING*: This program is incomplete and may not work properly.\n"); @@ -77,30 +80,60 @@ /* Print the header information */ PrintResourceString(IDS_APP_HEADER, DISKPART_VERSION); PrintResourceString(IDS_APP_LICENSE); - PrintResourceString(IDS_APP_CURR_COMPUTER, comp_name); + PrintResourceString(IDS_APP_CURR_COMPUTER, szComputerName); - /* Find out if the user is loading a script */ - if (argc >= 2) + /* Process arguments */ + for (i = 1; i < argc; i++) { - /* if there are arguments when starting the program - determine if the script flag is enabled */ - if ((wcsicmp(argv[1], L"/s") == 0) || - (wcsicmp(argv[1], L"-s") == 0)) + if ((argv[i][0] == L'-') || (argv[i][0] == L'/')) { - /* see if the user has put anything after the script flag; if not, - then it doesn't run the run_script() command. */ - /* Alternative comment: Fail if the script name is missing */ - if (argc == 3) - return EXIT_FAILURE; + if (wcsicmp(&argv[i][1], L"s") == 0) + { + /* + * Get the file name only if there is at least one more + * argument and it is not another option + */ + if ((i + 1 < argc) && + (argv[i + 1][0] != L'-') && + (argv[i + 1][0] != L'/')) + { + /* Next argument */ + i++; - interpreter_running = run_script(argv[2]); + /* Get the file name */ + file_name = argv[i]; + } + } + else if (wcsicmp(&argv[i][1], L"t") == 0) + { + /* + * Get the timeout value only if there is at least one more + * argument and it is not another option + */ + if ((i + 1 < argc) && + (argv[i + 1][0] != L'-') && + (argv[i + 1][0] != L'/')) + { + /* Next argument */ + i++; + + /* Get the timeout value */ + timeout = _wtoi(argv[i]); + } + } } } - /* the main program loop */ - while (interpreter_running) + /* Run the script if we got a script name or call the interpreter otherwise */ + if (file_name != NULL) { - interpreter_running = interpret_main(); + if (run_script(file_name) == FALSE) + return EXIT_FAILURE; + } + else + { + while (interpreter_running) + interpreter_running = interpret_main(); } /* Let the user know the program is exiting */

12 years, 11 months

[rharabien] 54232: [WINLOGON] - Move playing log on sound to HandleLogon - Don't use HKEY_CURRENT_USER for accessing user registry key. This key points to settings of user which started Winlogon pr...

by rharabien＠svn.reactos.org

Author: rharabien Date: Sat Oct 22 18:28:05 2011 New Revision: 54232 URL: http://svn.reactos.org/svn/reactos?rev=54232&view=rev Log: [WINLOGON] - Move playing log on sound to HandleLogon - Don't use HKEY_CURRENT_USER for accessing user registry key. This key points to settings of user which started Winlogon process (SYSTEM) instead of logged user. Instead use HKU\SID. See issue #5436 for more details. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat Oct 22 18:28:05 2011 @@ -195,6 +195,192 @@ return ret; } +BOOL +PlaySoundRoutine( + IN LPCWSTR FileName, + IN UINT bLogon, + IN UINT Flags) +{ + typedef BOOL (WINAPI *PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); + typedef UINT (WINAPI *WAVEOUTGETNUMDEVS)(VOID); + PLAYSOUNDW Play; + WAVEOUTGETNUMDEVS waveOutGetNumDevs; + UINT NumDevs; + HMODULE hLibrary; + BOOL Ret = FALSE; + + hLibrary = LoadLibraryW(L"winmm.dll"); + if (hLibrary) + { + waveOutGetNumDevs = (WAVEOUTGETNUMDEVS)GetProcAddress(hLibrary, "waveOutGetNumDevs"); + if (waveOutGetNumDevs) + { + NumDevs = waveOutGetNumDevs(); + if (!NumDevs) + { + if (!bLogon) + { + Beep(500, 500); + } + FreeLibrary(hLibrary); + return FALSE; + } + } + + Play = (PLAYSOUNDW)GetProcAddress(hLibrary, "PlaySoundW"); + if (Play) + { + Ret = Play(FileName, NULL, Flags); + } + FreeLibrary(hLibrary); + } + + return Ret; +} + +DWORD +WINAPI +PlayLogonSoundThread( + IN LPVOID lpParameter) +{ + BYTE TokenUserBuffer[256]; + PTOKEN_USER pTokenUser = (TOKEN_USER*)TokenUserBuffer; + ULONG Length; + HKEY hKey; + WCHAR wszBuffer[MAX_PATH] = {0}; + WCHAR wszDest[MAX_PATH]; + DWORD dwSize = sizeof(wszBuffer), dwType; + SERVICE_STATUS_PROCESS Info; + UNICODE_STRING SidString; + NTSTATUS Status; + ULONG Index = 0; + SC_HANDLE hSCManager, hService; + + /* Get SID of current user */ + Status = NtQueryInformationToken((HANDLE)lpParameter, + TokenUser, + TokenUserBuffer, + sizeof(TokenUserBuffer), + &Length); + if (!NT_SUCCESS(Status)) + { + ERR("NtQueryInformationToken failed: %x!\n", Status); + return 0; + } + + /* Convert SID to string */ + RtlInitEmptyUnicodeString(&SidString, wszBuffer, sizeof(wszBuffer)); + Status = RtlConvertSidToUnicodeString(&SidString, pTokenUser->User.Sid, FALSE); + if (!NT_SUCCESS(Status)) + { + ERR("RtlConvertSidToUnicodeString failed: %x!\n", Status); + return 0; + } + + /* Build path to logon sound registry key. + Note: We can't use HKCU here, because Winlogon is owned by SYSTEM user */ + if (FAILED(StringCbCopyW(wszBuffer + SidString.Length/sizeof(WCHAR), + sizeof(wszBuffer) - SidString.Length, + L"\\AppEvents\\Schemes\\Apps\\.Default\\WindowsLogon\\.Current"))) + { + /* SID is too long. Should not happen. */ + ERR("StringCbCopyW failed!\n"); + return 0; + } + + /* Open registry key and query sound path */ + if (RegOpenKeyExW(HKEY_USERS, wszBuffer, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW(%ls) failed!\n", wszBuffer); + return 0; + } + + if (RegQueryValueExW(hKey, NULL, NULL, &dwType, + (LPBYTE)wszBuffer, &dwSize) != ERROR_SUCCESS || + (dwType != REG_SZ && dwType != REG_EXPAND_SZ)) + { + ERR("RegQueryValueExW failed!\n"); + RegCloseKey(hKey); + return 0; + } + + RegCloseKey(hKey); + + if (!wszBuffer[0]) + { + /* No sound has been set */ + ERR("No sound has been set\n"); + return 0; + } + + /* Expand environment variables */ + if (!ExpandEnvironmentStringsW(wszBuffer, wszDest, MAX_PATH)) + { + ERR("ExpandEnvironmentStringsW failed!\n"); + return 0; + } + + /* Open service manager */ + hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); + if (!hSCManager) + { + ERR("OpenSCManager failed (%x)\n", GetLastError()); + return 0; + } + + /* Open wdmaud service */ + hService = OpenServiceW(hSCManager, L"wdmaud", GENERIC_READ); + if (!hService) + { + /* Sound is not installed */ + TRACE("Failed to open wdmaud service (%x)\n", GetLastError()); + CloseServiceHandle(hSCManager); + return 0; + } + + /* Wait for wdmaud start */ + do + { + if (!QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&Info, sizeof(SERVICE_STATUS_PROCESS), &dwSize)) + { + TRACE("QueryServiceStatusEx failed (%x)\n", GetLastError()); + break; + } + + if (Info.dwCurrentState == SERVICE_RUNNING) + break; + + Sleep(1000); + + } while (Index++ < 20); + + CloseServiceHandle(hService); + CloseServiceHandle(hSCManager); + + /* If wdmaud is not running exit */ + if (Info.dwCurrentState != SERVICE_RUNNING) + { + WARN("wdmaud has not started!\n"); + return 0; + } + + /* Sound subsystem is running. Play logon sound. */ + TRACE("Playing logon sound: %ls\n", wszDest); + PlaySoundRoutine(wszDest, TRUE, SND_FILENAME); + return 0; +} + +static VOID +PlayLogonSound( + IN OUT PWLSESSION Session) +{ + HANDLE hThread; + + hThread = CreateThread(NULL, 0, PlayLogonSoundThread, (PVOID)Session->UserToken, 0, NULL); + if (hThread) + CloseHandle(hThread); +} + static BOOL HandleLogon( IN OUT PWLSESSION Session) @@ -265,6 +451,10 @@ WARN("WL: Failed to initialize screen saver\n"); Session->hProfileInfo = ProfileInfo.hProfile; + + /* Logon has successed. Play sound. */ + PlayLogonSound(Session); + ret = TRUE; cleanup: Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sat Oct 22 18:28:05 2011 @@ -22,125 +22,6 @@ PWLSESSION WLSession = NULL; /* FUNCTIONS *****************************************************************/ - -BOOL -PlaySoundRoutine( - IN LPCWSTR FileName, - IN UINT bLogon, - IN UINT Flags) -{ - typedef BOOL (WINAPI *PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); - typedef UINT (WINAPI *WAVEOUTGETNUMDEVS)(VOID); - PLAYSOUNDW Play; - WAVEOUTGETNUMDEVS waveOutGetNumDevs; - UINT NumDevs; - HMODULE hLibrary; - BOOL Ret = FALSE; - - hLibrary = LoadLibraryW(L"winmm.dll"); - if (hLibrary) - { - waveOutGetNumDevs = (WAVEOUTGETNUMDEVS)GetProcAddress(hLibrary, "waveOutGetNumDevs"); - if (waveOutGetNumDevs) - { - NumDevs = waveOutGetNumDevs(); - if (!NumDevs) - { - if (!bLogon) - { - Beep(500, 500); - } - FreeLibrary(hLibrary); - return FALSE; - } - } - - Play = (PLAYSOUNDW)GetProcAddress(hLibrary, "PlaySoundW"); - if (Play) - { - Ret = Play(FileName, NULL, Flags); - } - FreeLibrary(hLibrary); - } - - return Ret; -} - -DWORD -WINAPI -PlayLogonSoundThread( - IN LPVOID lpParameter) -{ - HKEY hKey; - WCHAR szBuffer[MAX_PATH] = {0}; - WCHAR szDest[MAX_PATH]; - DWORD dwSize = sizeof(szBuffer); - SERVICE_STATUS_PROCESS Info; - - ULONG Index = 0; - - if (RegOpenKeyExW(HKEY_CURRENT_USER, L"AppEvents\\Schemes\\Apps\\.Default\\WindowsLogon\\.Current", 0, KEY_READ, &hKey) != ERROR_SUCCESS) - { - ExitThread(0); - } - - if (RegQueryValueExW(hKey, NULL, NULL, NULL, (LPBYTE)szBuffer, &dwSize) != ERROR_SUCCESS) - { - RegCloseKey(hKey); - ExitThread(0); - } - - - RegCloseKey(hKey); - - if (!szBuffer[0]) - ExitThread(0); - - - szBuffer[MAX_PATH-1] = L'\0'; - if (ExpandEnvironmentStringsW(szBuffer, szDest, MAX_PATH)) - { - SC_HANDLE hSCManager, hService; - - hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); - if (!hSCManager) - ExitThread(0);; - - hService = OpenServiceW(hSCManager, L"wdmaud", GENERIC_READ); - if (!hService) - { - CloseServiceHandle(hSCManager); - TRACE("WL: failed to open sysaudio Status %x\n", GetLastError()); - ExitThread(0); - } - - do - { - if (!QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&Info, sizeof(SERVICE_STATUS_PROCESS), &dwSize)) - { - TRACE("WL: QueryServiceStatusEx failed %x\n", GetLastError()); - break; - } - - if (Info.dwCurrentState == SERVICE_RUNNING) - break; - - Sleep(1000); - - }while(Index++ < 20); - - CloseServiceHandle(hService); - CloseServiceHandle(hSCManager); - - if (Info.dwCurrentState != SERVICE_RUNNING) - ExitThread(0); - - PlaySoundRoutine(szDest, TRUE, SND_FILENAME); - } - ExitThread(0); -} - - static BOOL StartServicesManager(VOID) @@ -330,6 +211,7 @@ return bRet; } + BOOL DisplayStatusMessage( IN PWLSESSION Session, @@ -420,7 +302,6 @@ #endif ULONG HardErrorResponse; MSG Msg; - HANDLE hThread; UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpCmdLine); @@ -548,13 +429,6 @@ else PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_TIMEOUT, 0); - /* Play logon sound */ - hThread = CreateThread(NULL, 0, PlayLogonSoundThread, NULL, 0, NULL); - if (hThread) - { - CloseHandle(hThread); - } - /* Tell kernel that CurrentControlSet is good (needed * to support Last good known configuration boot) */ NtInitializeRegistry(CM_BOOT_FLAG_ACCEPTED | 1); Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sat Oct 22 18:28:05 2011 @@ -37,9 +37,11 @@ #include <rtlfuncs.h> #include <exfuncs.h> #include <setypes.h> +#include <sefuncs.h> #include <ntsecapi.h> #include <accctrl.h> #include <aclapi.h> +#include <strsafe.h> #include <reactos/undocuser.h> #include <reactos/winlogon.h>

12 years, 11 months

[tfaber] 54231: [EXPLORER_NEW] - Fix rectangle copypasta in ITrayWindowImpl_RegLoadSettings. Patch by Elton Chung

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Oct 22 15:27:29 2011 New Revision: 54231 URL: http://svn.reactos.org/svn/reactos?rev=54231&view=rev Log: [EXPLORER_NEW] - Fix rectangle copypasta in ITrayWindowImpl_RegLoadSettings. Patch by Elton Chung Modified: trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Sat Oct 22 15:27:29 2011 @@ -644,7 +644,7 @@ ITrayWindowImpl_ResizeWorkArea(IN OUT ITrayWindowImpl *This) { RECT rcTray,rcWorkArea; - + /* If monitor has changed then fix the previous monitors work area */ if(This->PreviousMonitor!=This->Monitor) { @@ -792,7 +792,7 @@ rcScreen.left = 0; rcScreen.top = 0; rcScreen.right = GetSystemMetrics(SM_CXSCREEN); - rcScreen.right = GetSystemMetrics(SM_CYSCREEN); + rcScreen.bottom = GetSystemMetrics(SM_CYSCREEN); ITrayWindowImpl_GetScreenRectFromRect(This, &rcScreen, MONITOR_DEFAULTTOPRIMARY);

12 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
37
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 October 2011