Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 66511: [PCI] - Handle 64-bit PCI base address registers (BARs) - Fix maximum address in resource requirements for 20-bit resources - Fix flags on memory and I/O port resources [NTOS] - Fi...
by cgutman＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: cgutman Date: Sun Mar 1 07:52:32 2015 New Revision: 66511 URL: http://svn.reactos.org/svn/reactos?rev=66511&view=rev Log: [PCI] - Handle 64-bit PCI base address registers (BARs) - Fix maximum address in resource requirements for 20-bit resources - Fix flags on memory and I/O port resources [NTOS] - Fix handling of 64-bit resources Modified: trunk/reactos/drivers/bus/pci/pdo.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Sun Mar 1 07:52:32 2015 @@ -21,6 +21,9 @@ #define DBGPRINT(...) #endif +#define PCI_ADDRESS_MEMORY_ADDRESS_MASK_64 0xfffffffffffffff0ull +#define PCI_ADDRESS_IO_ADDRESS_MASK_64 0xfffffffffffffffcull + /*** PRIVATE *****************************************************************/ static NTSTATUS @@ -191,80 +194,159 @@ return STATUS_SUCCESS; } +static BOOLEAN +PdoReadPciBar(PPDO_DEVICE_EXTENSION DeviceExtension, + ULONG Offset, + PULONG OriginalValue, + PULONG NewValue) +{ + ULONG Size; + ULONG AllOnes; + + /* Read the original value */ + Size = HalGetBusDataByOffset(PCIConfiguration, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, + OriginalValue, + Offset, + sizeof(ULONG)); + if (Size != sizeof(ULONG)) + { + DPRINT1("Wrong size %lu\n", Size); + return FALSE; + } + + /* Write all ones to determine which bits are held to zero */ + AllOnes = MAXULONG; + Size = HalSetBusDataByOffset(PCIConfiguration, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, + &AllOnes, + Offset, + sizeof(ULONG)); + if (Size != sizeof(ULONG)) + { + DPRINT1("Wrong size %lu\n", Size); + return FALSE; + } + + /* Get the range length */ + Size = HalGetBusDataByOffset(PCIConfiguration, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, + NewValue, + Offset, + sizeof(ULONG)); + if (Size != sizeof(ULONG)) + { + DPRINT1("Wrong size %lu\n", Size); + return FALSE; + } + + /* Restore original value */ + Size = HalSetBusDataByOffset(PCIConfiguration, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, + OriginalValue, + Offset, + sizeof(ULONG)); + if (Size != sizeof(ULONG)) + { + DPRINT1("Wrong size %lu\n", Size); + return FALSE; + } + + return TRUE; +} static BOOLEAN PdoGetRangeLength(PPDO_DEVICE_EXTENSION DeviceExtension, - ULONG Offset, - PULONG Base, - PULONG Length, - PULONG Flags) -{ - ULONG OrigValue; - ULONG BaseValue; - ULONG NewValue; - ULONG Size; - ULONG XLength; - - /* Save original value */ - Size= HalGetBusDataByOffset(PCIConfiguration, - DeviceExtension->PciDevice->BusNumber, - DeviceExtension->PciDevice->SlotNumber.u.AsULONG, - &OrigValue, - Offset, - sizeof(ULONG)); - if (Size != sizeof(ULONG)) - { - DPRINT1("Wrong size %lu\n", Size); + UCHAR Bar, + PULONGLONG Base, + PULONGLONG Length, + PULONG Flags, + PUCHAR NextBar, + PULONGLONG MaximumAddress) +{ + union { + struct { + ULONG Bar0; + ULONG Bar1; + } Bars; + ULONGLONG Bar; + } OriginalValue; + union { + struct { + ULONG Bar0; + ULONG Bar1; + } Bars; + ULONGLONG Bar; + } NewValue; + ULONG Offset; + + /* Compute the offset of this BAR in PCI config space */ + Offset = 0x10 + Bar * 4; + + /* Assume this is a 32-bit BAR until we find wrong */ + *NextBar = Bar + 1; + + /* Initialize BAR values to zero */ + OriginalValue.Bar = 0ULL; + NewValue.Bar = 0ULL; + + /* Read the first BAR */ + if (!PdoReadPciBar(DeviceExtension, Offset, + &OriginalValue.Bars.Bar0, + &NewValue.Bars.Bar0)) + { return FALSE; } - - BaseValue = (OrigValue & PCI_ADDRESS_IO_SPACE) - ? (OrigValue & PCI_ADDRESS_IO_ADDRESS_MASK) - : (OrigValue & PCI_ADDRESS_MEMORY_ADDRESS_MASK); - - *Base = BaseValue; - - /* Set magic value */ - NewValue = MAXULONG; - Size= HalSetBusDataByOffset(PCIConfiguration, - DeviceExtension->PciDevice->BusNumber, - DeviceExtension->PciDevice->SlotNumber.u.AsULONG, - &NewValue, - Offset, - sizeof(ULONG)); - if (Size != sizeof(ULONG)) - { - DPRINT1("Wrong size %lu\n", Size); - return FALSE; - } - - /* Get the range length */ - Size= HalGetBusDataByOffset(PCIConfiguration, - DeviceExtension->PciDevice->BusNumber, - DeviceExtension->PciDevice->SlotNumber.u.AsULONG, - &NewValue, - Offset, - sizeof(ULONG)); - if (Size != sizeof(ULONG)) - { - DPRINT1("Wrong size %lu\n", Size); - return FALSE; - } - - /* Restore original value */ - Size= HalSetBusDataByOffset(PCIConfiguration, - DeviceExtension->PciDevice->BusNumber, - DeviceExtension->PciDevice->SlotNumber.u.AsULONG, - &OrigValue, - Offset, - sizeof(ULONG)); - if (Size != sizeof(ULONG)) - { - DPRINT1("Wrong size %lu\n", Size); - return FALSE; - } - - if (NewValue == 0) + + /* Check if this is a memory BAR */ + if (!(OriginalValue.Bars.Bar0 & PCI_ADDRESS_IO_SPACE)) + { + /* Write the maximum address if the caller asked for it */ + if (MaximumAddress != NULL) + { + if ((OriginalValue.Bars.Bar0 & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_32BIT) + { + *MaximumAddress = 0x00000000FFFFFFFFULL; + } + else if ((OriginalValue.Bars.Bar0 & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_20BIT) + { + *MaximumAddress = 0x00000000000FFFFFULL; + } + else if ((OriginalValue.Bars.Bar0 & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_64BIT) + { + *MaximumAddress = 0xFFFFFFFFFFFFFFFFULL; + } + } + + /* Check if this is a 64-bit BAR */ + if ((OriginalValue.Bars.Bar0 & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_64BIT) + { + /* We've now consumed the next BAR too */ + *NextBar = Bar + 2; + + /* Read the next BAR */ + if (!PdoReadPciBar(DeviceExtension, Offset + 4, + &OriginalValue.Bars.Bar1, + &NewValue.Bars.Bar1)) + { + return FALSE; + } + } + } + else + { + /* Write the maximum I/O port address */ + if (MaximumAddress != NULL) + { + *MaximumAddress = 0x00000000FFFFFFFFULL; + } + } + + if (NewValue.Bar == 0) { DPRINT("Unused address register\n"); *Base = 0; @@ -272,48 +354,16 @@ *Flags = 0; return TRUE; } - - XLength = ~((NewValue & PCI_ADDRESS_IO_SPACE) - ? (NewValue & PCI_ADDRESS_IO_ADDRESS_MASK) - : (NewValue & PCI_ADDRESS_MEMORY_ADDRESS_MASK)) + 1; - -#if 0 - DbgPrint("BaseAddress 0x%08lx Length 0x%08lx", - BaseValue, XLength); - - if (NewValue & PCI_ADDRESS_IO_SPACE) - { - DbgPrint(" IO range"); - } - else - { - DbgPrint(" Memory range"); - if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 0) - { - DbgPrint(" in 32-Bit address space"); - } - else if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 2) - { - DbgPrint(" below 1BM "); - } - else if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 4) - { - DbgPrint(" in 64-Bit address space"); - } - - if (NewValue & PCI_ADDRESS_MEMORY_PREFETCHABLE) - { - DbgPrint(" prefetchable"); - } - } - - DbgPrint("\n"); -#endif - - *Length = XLength; - *Flags = (NewValue & PCI_ADDRESS_IO_SPACE) - ? (NewValue & ~PCI_ADDRESS_IO_ADDRESS_MASK) - : (NewValue & ~PCI_ADDRESS_MEMORY_ADDRESS_MASK); + + *Base = OriginalValue.Bar & PCI_ADDRESS_MEMORY_ADDRESS_MASK_64; + + *Length = ~((NewValue.Bar & PCI_ADDRESS_IO_SPACE) + ? (NewValue.Bar & PCI_ADDRESS_IO_ADDRESS_MASK_64) + : (NewValue.Bar & PCI_ADDRESS_MEMORY_ADDRESS_MASK_64)) + 1; + + *Flags = (NewValue.Bar & PCI_ADDRESS_IO_SPACE) + ? (NewValue.Bar & ~PCI_ADDRESS_IO_ADDRESS_MASK_64) + : (NewValue.Bar & ~PCI_ADDRESS_MEMORY_ADDRESS_MASK_64); return TRUE; } @@ -332,10 +382,11 @@ ULONG Size; ULONG ResCount = 0; ULONG ListSize; - ULONG i; - ULONG Base; - ULONG Length; + UCHAR Bar; + ULONGLONG Base; + ULONGLONG Length; ULONG Flags; + ULONGLONG MaximumAddress; UNREFERENCED_PARAMETER(IrpSp); DPRINT("PdoQueryResourceRequirements() called\n"); @@ -361,13 +412,15 @@ ResCount = 0; if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) { - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) { if (!PdoGetRangeLength(DeviceExtension, - 0x10 + i * 4, + Bar, &Base, &Length, - &Flags)) + &Flags, + &Bar, + NULL)) break; if (Length != 0) @@ -381,13 +434,15 @@ } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) { - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) { if (!PdoGetRangeLength(DeviceExtension, - 0x10 + i * 4, + Bar, &Base, &Length, - &Flags)) + &Flags, + &Bar, + NULL)) break; if (Length != 0) @@ -442,13 +497,15 @@ Descriptor = &ResourceList->List[0].Descriptors[0]; if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) { - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) { if (!PdoGetRangeLength(DeviceExtension, - 0x10 + i * 4, + Bar, &Base, &Length, - &Flags)) + &Flags, + &Bar, + &MaximumAddress)) { DPRINT1("PdoGetRangeLength() failed\n"); break; @@ -472,19 +529,20 @@ Descriptor->u.Port.Length = Length; Descriptor->u.Port.Alignment = 1; - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)Base; - Descriptor->u.Port.MaximumAddress.QuadPart = (ULONGLONG)(Base + Length - 1); + Descriptor->u.Port.MinimumAddress.QuadPart = Base; + Descriptor->u.Port.MaximumAddress.QuadPart = Base + Length - 1; } else { Descriptor->Type = CmResourceTypeMemory; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? CM_RESOURCE_MEMORY_PREFETCHABLE : 0; Descriptor->u.Memory.Length = Length; Descriptor->u.Memory.Alignment = 1; - Descriptor->u.Memory.MinimumAddress.QuadPart = (ULONGLONG)Base; - Descriptor->u.Memory.MaximumAddress.QuadPart = (ULONGLONG)(Base + Length - 1); + Descriptor->u.Memory.MinimumAddress.QuadPart = Base; + Descriptor->u.Memory.MaximumAddress.QuadPart = Base + Length - 1; } Descriptor++; @@ -500,19 +558,20 @@ Descriptor->u.Port.Length = Length; Descriptor->u.Port.Alignment = Length; - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; - Descriptor->u.Port.MaximumAddress.QuadPart = (ULONGLONG)0x00000000FFFFFFFF; + Descriptor->u.Port.MinimumAddress.QuadPart = 0; + Descriptor->u.Port.MaximumAddress.QuadPart = MaximumAddress; } else { Descriptor->Type = CmResourceTypeMemory; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? CM_RESOURCE_MEMORY_PREFETCHABLE : 0; Descriptor->u.Memory.Length = Length; Descriptor->u.Memory.Alignment = Length; - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; - Descriptor->u.Port.MaximumAddress.QuadPart = (ULONGLONG)0x00000000FFFFFFFF; + Descriptor->u.Port.MinimumAddress.QuadPart = 0; + Descriptor->u.Port.MaximumAddress.QuadPart = MaximumAddress; } Descriptor++; } @@ -532,13 +591,15 @@ } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) { - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) { if (!PdoGetRangeLength(DeviceExtension, - 0x10 + i * 4, + Bar, &Base, &Length, - &Flags)) + &Flags, + &Bar, + &MaximumAddress)) { DPRINT1("PdoGetRangeLength() failed\n"); break; @@ -562,19 +623,20 @@ Descriptor->u.Port.Length = Length; Descriptor->u.Port.Alignment = 1; - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)Base; - Descriptor->u.Port.MaximumAddress.QuadPart = (ULONGLONG)(Base + Length - 1); + Descriptor->u.Port.MinimumAddress.QuadPart = Base; + Descriptor->u.Port.MaximumAddress.QuadPart = Base + Length - 1; } else { Descriptor->Type = CmResourceTypeMemory; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? CM_RESOURCE_MEMORY_PREFETCHABLE : 0; Descriptor->u.Memory.Length = Length; Descriptor->u.Memory.Alignment = 1; - Descriptor->u.Memory.MinimumAddress.QuadPart = (ULONGLONG)Base; - Descriptor->u.Memory.MaximumAddress.QuadPart = (ULONGLONG)(Base + Length - 1); + Descriptor->u.Memory.MinimumAddress.QuadPart = Base; + Descriptor->u.Memory.MaximumAddress.QuadPart = Base + Length - 1; } Descriptor++; @@ -590,19 +652,20 @@ Descriptor->u.Port.Length = Length; Descriptor->u.Port.Alignment = Length; - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; - Descriptor->u.Port.MaximumAddress.QuadPart = (ULONGLONG)0x00000000FFFFFFFF; + Descriptor->u.Port.MinimumAddress.QuadPart = 0; + Descriptor->u.Port.MaximumAddress.QuadPart = MaximumAddress; } else { Descriptor->Type = CmResourceTypeMemory; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? CM_RESOURCE_MEMORY_PREFETCHABLE : 0; Descriptor->u.Memory.Length = Length; Descriptor->u.Memory.Alignment = Length; - Descriptor->u.Port.MinimumAddress.QuadPart = (ULONGLONG)0; - Descriptor->u.Port.MaximumAddress.QuadPart = (ULONGLONG)0x00000000FFFFFFFF; + Descriptor->u.Port.MinimumAddress.QuadPart = 0; + Descriptor->u.Port.MaximumAddress.QuadPart = MaximumAddress; } Descriptor++; } @@ -645,9 +708,9 @@ ULONG Size; ULONG ResCount = 0; ULONG ListSize; - ULONG i; - ULONG Base; - ULONG Length; + UCHAR Bar; + ULONGLONG Base; + ULONGLONG Length; ULONG Flags; DPRINT("PdoQueryResources() called\n"); @@ -674,13 +737,15 @@ ResCount = 0; if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) { - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) { if (!PdoGetRangeLength(DeviceExtension, - 0x10 + i * 4, + Bar, &Base, &Length, - &Flags)) + &Flags, + &Bar, + NULL)) break; if (Length) @@ -694,13 +759,15 @@ } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) { - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) { if (!PdoGetRangeLength(DeviceExtension, - 0x10 + i * 4, + Bar, &Base, &Length, - &Flags)) + &Flags, + &Bar, + NULL)) break; if (Length != 0) @@ -749,17 +816,16 @@ Descriptor = &PartialList->PartialDescriptors[0]; if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) { - for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) + for (Bar = 0; Bar < PCI_TYPE0_ADDRESSES;) { if (!PdoGetRangeLength(DeviceExtension, - 0x10 + i * 4, + Bar, &Base, &Length, - &Flags)) - { - DPRINT1("PdoGetRangeLength() failed\n"); + &Flags, + &Bar, + NULL)) break; - } if (Length == 0) { @@ -771,7 +837,9 @@ { Descriptor->Type = CmResourceTypePort; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Flags = CM_RESOURCE_PORT_IO; + Descriptor->Flags = CM_RESOURCE_PORT_IO | + CM_RESOURCE_PORT_16_BIT_DECODE | + CM_RESOURCE_PORT_POSITIVE_DECODE; Descriptor->u.Port.Start.QuadPart = (ULONGLONG)Base; Descriptor->u.Port.Length = Length; @@ -782,7 +850,8 @@ { Descriptor->Type = CmResourceTypeMemory; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? CM_RESOURCE_MEMORY_PREFETCHABLE : 0; Descriptor->u.Memory.Start.QuadPart = (ULONGLONG)Base; Descriptor->u.Memory.Length = Length; @@ -811,17 +880,16 @@ } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) { - for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) + for (Bar = 0; Bar < PCI_TYPE1_ADDRESSES;) { if (!PdoGetRangeLength(DeviceExtension, - 0x10 + i * 4, + Bar, &Base, &Length, - &Flags)) - { - DPRINT1("PdoGetRangeLength() failed\n"); + &Flags, + &Bar, + NULL)) break; - } if (Length == 0) { @@ -833,7 +901,9 @@ { Descriptor->Type = CmResourceTypePort; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Flags = CM_RESOURCE_PORT_IO; + Descriptor->Flags = CM_RESOURCE_PORT_IO | + CM_RESOURCE_PORT_16_BIT_DECODE | + CM_RESOURCE_PORT_POSITIVE_DECODE; Descriptor->u.Port.Start.QuadPart = (ULONGLONG)Base; Descriptor->u.Port.Length = Length; @@ -844,7 +914,8 @@ { Descriptor->Type = CmResourceTypeMemory; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE | + (Flags & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? CM_RESOURCE_MEMORY_PREFETCHABLE : 0; Descriptor->u.Memory.Start.QuadPart = (ULONGLONG)Base; Descriptor->u.Memory.Length = Length; 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 Mar 1 07:52:32 2015 @@ -73,7 +73,7 @@ IN PIO_RESOURCE_DESCRIPTOR IoDesc, OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc) { - LONGLONG Start; + ULONGLONG Start; CM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDesc; ASSERT(IoDesc->Type == CmDesc->Type); @@ -82,16 +82,16 @@ /* 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 - IoDesc->u.Memory.Length + 1; + for (Start = (ULONGLONG)IoDesc->u.Memory.MinimumAddress.QuadPart; + Start <= (ULONGLONG)IoDesc->u.Memory.MaximumAddress.QuadPart - IoDesc->u.Memory.Length + 1; Start += IoDesc->u.Memory.Alignment) { CmDesc->u.Memory.Length = IoDesc->u.Memory.Length; - CmDesc->u.Memory.Start.QuadPart = Start; + CmDesc->u.Memory.Start.QuadPart = (LONGLONG)Start; if (IopCheckDescriptorForConflict(CmDesc, &ConflictingDesc)) { - Start += ConflictingDesc.u.Memory.Start.QuadPart + + Start += (ULONGLONG)ConflictingDesc.u.Memory.Start.QuadPart + ConflictingDesc.u.Memory.Length; } else @@ -110,7 +110,7 @@ IN PIO_RESOURCE_DESCRIPTOR IoDesc, OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc) { - LONGLONG Start; + ULONGLONG Start; CM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDesc; ASSERT(IoDesc->Type == CmDesc->Type); @@ -119,16 +119,16 @@ /* 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 - IoDesc->u.Port.Length + 1; + for (Start = (ULONGLONG)IoDesc->u.Port.MinimumAddress.QuadPart; + Start <= (ULONGLONG)IoDesc->u.Port.MaximumAddress.QuadPart - IoDesc->u.Port.Length + 1; Start += IoDesc->u.Port.Alignment) { CmDesc->u.Port.Length = IoDesc->u.Port.Length; - CmDesc->u.Port.Start.QuadPart = Start; + CmDesc->u.Port.Start.QuadPart = (LONGLONG)Start; if (IopCheckDescriptorForConflict(CmDesc, &ConflictingDesc)) { - Start += ConflictingDesc.u.Port.Start.QuadPart + ConflictingDesc.u.Port.Length; + Start += (ULONGLONG)ConflictingDesc.u.Port.Start.QuadPart + ConflictingDesc.u.Port.Length; } else { @@ -300,8 +300,8 @@ case CmResourceTypePort: /* Make sure the length matches and it satisfies our address range */ if (CmDesc->u.Memory.Length == IoDesc->u.Memory.Length && - CmDesc->u.Memory.Start.QuadPart >= IoDesc->u.Memory.MinimumAddress.QuadPart && - CmDesc->u.Memory.Start.QuadPart + CmDesc->u.Memory.Length - 1 <= IoDesc->u.Memory.MaximumAddress.QuadPart) + (ULONGLONG)CmDesc->u.Memory.Start.QuadPart >= (ULONGLONG)IoDesc->u.Memory.MinimumAddress.QuadPart && + (ULONGLONG)CmDesc->u.Memory.Start.QuadPart + CmDesc->u.Memory.Length - 1 <= (ULONGLONG)IoDesc->u.Memory.MaximumAddress.QuadPart) { /* Found it */ Matched = TRUE; @@ -564,11 +564,11 @@ switch (ResDesc->Type) { case CmResourceTypeMemory: - if ((ResDesc->u.Memory.Start.QuadPart < ResDesc2->u.Memory.Start.QuadPart && - ResDesc->u.Memory.Start.QuadPart + ResDesc->u.Memory.Length > - ResDesc2->u.Memory.Start.QuadPart) || (ResDesc2->u.Memory.Start.QuadPart < - ResDesc->u.Memory.Start.QuadPart && ResDesc2->u.Memory.Start.QuadPart + - ResDesc2->u.Memory.Length > ResDesc->u.Memory.Start.QuadPart)) + if (((ULONGLONG)ResDesc->u.Memory.Start.QuadPart < (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart && + (ULONGLONG)ResDesc->u.Memory.Start.QuadPart + ResDesc->u.Memory.Length > + (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart) || ((ULONGLONG)ResDesc2->u.Memory.Start.QuadPart < + (ULONGLONG)ResDesc->u.Memory.Start.QuadPart && (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart + + ResDesc2->u.Memory.Length > (ULONGLONG)ResDesc->u.Memory.Start.QuadPart)) { if (!Silent) { @@ -585,11 +585,11 @@ break; case CmResourceTypePort: - if ((ResDesc->u.Port.Start.QuadPart < ResDesc2->u.Port.Start.QuadPart && - ResDesc->u.Port.Start.QuadPart + ResDesc->u.Port.Length > - ResDesc2->u.Port.Start.QuadPart) || (ResDesc2->u.Port.Start.QuadPart < - ResDesc->u.Port.Start.QuadPart && ResDesc2->u.Port.Start.QuadPart + - ResDesc2->u.Port.Length > ResDesc->u.Port.Start.QuadPart)) + if (((ULONGLONG)ResDesc->u.Port.Start.QuadPart < (ULONGLONG)ResDesc2->u.Port.Start.QuadPart && + (ULONGLONG)ResDesc->u.Port.Start.QuadPart + ResDesc->u.Port.Length > + (ULONGLONG)ResDesc2->u.Port.Start.QuadPart) || ((ULONGLONG)ResDesc2->u.Port.Start.QuadPart < + (ULONGLONG)ResDesc->u.Port.Start.QuadPart && (ULONGLONG)ResDesc2->u.Port.Start.QuadPart + + ResDesc2->u.Port.Length > (ULONGLONG)ResDesc->u.Port.Start.QuadPart)) { if (!Silent) {

1 0

[tfaber] 66510: [NETSHELL] - Use WINE_REGISTRY resource type for resource registered with __wine_register_resources CORE-9291 #resolve
by tfaber＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: tfaber Date: Sun Mar 1 05:57:09 2015 New Revision: 66510 URL: http://svn.reactos.org/svn/reactos?rev=66510&view=rev Log: [NETSHELL] - Use WINE_REGISTRY resource type for resource registered with __wine_register_resources CORE-9291 #resolve Modified: trunk/reactos/dll/shellext/netshell/netshell.rc Modified: trunk/reactos/dll/shellext/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/nets… ============================================================================== --- trunk/reactos/dll/shellext/netshell/netshell.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/netshell.rc [iso-8859-1] Sun Mar 1 05:57:09 2015 @@ -22,7 +22,7 @@ IDI_NET_TRANS ICON "res/nettrans.ico" IDI_NET_TRANSREC ICON "res/nettrrec.ico" -IDR_NETSHELL REGISTRY "res/netshell.rgs" +IDR_NETSHELL WINE_REGISTRY "res/netshell.rgs" /* UTF-8 */ #pragma code_page(65001)

1 0

[hbelusca] 66509: [WS2_32]: Export GetAddrInfoW (which is still a stub) and FreeAddrInfoW. Should make Lync happier (but since GetAddrInfo is a stub, maybe not so happy ^^). CORE-9287 #resolve
by hbelusca＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: hbelusca Date: Sun Mar 1 00:58:31 2015 New Revision: 66509 URL: http://svn.reactos.org/svn/reactos?rev=66509&view=rev Log: [WS2_32]: Export GetAddrInfoW (which is still a stub) and FreeAddrInfoW. Should make Lync happier (but since GetAddrInfo is a stub, maybe not so happy ^^). CORE-9287 #resolve Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.spec Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.sp… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] Sun Mar 1 00:58:31 2015 @@ -50,7 +50,8 @@ 500 stdcall WEP() -# @ stdcall GetAddrInfoW(wstr wstr ptr ptr) +@ stdcall FreeAddrInfoW(ptr) freeaddrinfo +@ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall WSApSetPostRoutine(ptr) @ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr) @ stdcall WSAAccept(long ptr ptr ptr long)

1 0

[hbelusca] 66508: [KBSWITCH] Add keyboard switcher to startup, per-user. Since we currently do not support expandable string values for shell run startup, just use a normal string. Also there's cur...
by hbelusca＠svn.reactos.org 01 Mar '15

01 Mar '15

Author: hbelusca Date: Sun Mar 1 00:28:17 2015 New Revision: 66508 URL: http://svn.reactos.org/svn/reactos?rev=66508&view=rev Log: [KBSWITCH] Add keyboard switcher to startup, per-user. Since we currently do not support expandable string values for shell run startup, just use a normal string. Also there's currently a bug in our explorer that makes the icon of kbswitch not appearing when it is launched at startup. See CORE-6787 for more information. Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Sun Mar 1 00:28:17 2015 @@ -1851,6 +1851,10 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",,0x00000012 + +; Keyboard layout switcher +;HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch.exe",0x00020000,"%SystemRoot%\system32\kbswitch.exe" +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch.exe",2,"kbswitch.exe" HKCU,"SOFTWARE\Microsoft\Windows NT",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Mar 1 00:28:17 2015 @@ -1608,9 +1608,6 @@ HKLM,"SOFTWARE\Microsoft\Ole","EnableDCOM",0x00000000,"Y" HKLM,"SOFTWARE\Microsoft\Ole","EnableRemoteConnect",0x00000000,"N" - -; Keyboard layout switcher -;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch",0x00000000,"kbswitch.exe" ; SvcHost services HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012

1 0

[hbelusca] 66507: [HELP]: Fix console output for languages using non-latin characters. Patch by Vort. CORE-7409 #resolve #comment Fixed, thanks!
by hbelusca＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: hbelusca Date: Sat Feb 28 23:50:01 2015 New Revision: 66507 URL: http://svn.reactos.org/svn/reactos?rev=66507&view=rev Log: [HELP]: Fix console output for languages using non-latin characters. Patch by Vort. CORE-7409 #resolve #comment Fixed, thanks! Modified: trunk/reactos/base/applications/cmdutils/help/help.c Modified: trunk/reactos/base/applications/cmdutils/help/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] Sat Feb 28 23:50:01 2015 @@ -21,50 +21,21 @@ #include "help.h" #include "resource.h" -BOOL IsConsoleHandle(HANDLE hHandle) -{ - DWORD dwMode; - - /* Check whether the handle may be that of a console... */ - if ((GetFileType(hHandle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR) - return FALSE; - - /* - * It may be. Perform another test... The idea comes from the - * MSDN description of the WriteConsole API: - * - * "WriteConsole fails if it is used with a standard handle - * that is redirected to a file. If an application processes - * multilingual output that can be redirected, determine whether - * the output handle is a console handle (one method is to call - * the GetConsoleMode function and check whether it succeeds). - * If the handle is a console handle, call WriteConsole. If the - * handle is not a console handle, the output is redirected and - * you should call WriteFile to perform the I/O." - */ - return GetConsoleMode(hHandle, &dwMode); -} - VOID PrintResourceString(INT resID, ...) { - HANDLE OutputHandle = GetStdHandle(STD_OUTPUT_HANDLE); - WCHAR tmpBuffer[RC_STRING_MAX_SIZE]; - va_list arg_ptr; + WCHAR bufSrc[RC_STRING_MAX_SIZE]; + WCHAR bufFormatted[RC_STRING_MAX_SIZE]; + CHAR bufFormattedOem[RC_STRING_MAX_SIZE]; - va_start(arg_ptr, resID); - LoadStringW(GetModuleHandleW(NULL), resID, tmpBuffer, RC_STRING_MAX_SIZE); + va_list args; + va_start(args, resID); - // FIXME: Optimize by using Win32 console functions. - if (IsConsoleHandle(OutputHandle)) - { - vfwprintf(stdout, tmpBuffer, arg_ptr); - } - else - { - vwprintf(tmpBuffer, arg_ptr); - } + LoadStringW(GetModuleHandleW(NULL), resID, bufSrc, RC_STRING_MAX_SIZE); + vswprintf(bufFormatted, bufSrc, args); + CharToOemW(bufFormatted, bufFormattedOem); + fputs(bufFormattedOem, stdout); - va_end(arg_ptr); + va_end(args); } BOOL IsInternalCommand(LPCWSTR Cmd) @@ -75,7 +46,7 @@ /* Invalid command */ if (!Cmd) return FALSE; - for (i = 0; i < sizeof(InternalCommands)/sizeof(InternalCommands[0]); ++i) + for (i = 0; i < ARRAYSIZE(InternalCommands); ++i) { res = _wcsicmp(InternalCommands[i], Cmd); if (res == 0)

1 0

[tfaber] 66506: [ROSAUTOTEST] - Disable error dialogs unless running in interactive mode ONLINE-441
by tfaber＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: tfaber Date: Sat Feb 28 21:29:44 2015 New Revision: 66506 URL: http://svn.reactos.org/svn/reactos?rev=66506&view=rev Log: [ROSAUTOTEST] - Disable error dialogs unless running in interactive mode ONLINE-441 Modified: trunk/rostests/rosautotest/CConfiguration.cpp trunk/rostests/rosautotest/CConfiguration.h trunk/rostests/rosautotest/CWineTest.cpp Modified: trunk/rostests/rosautotest/CConfiguration.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CConfiguratio… ============================================================================== --- trunk/rostests/rosautotest/CConfiguration.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CConfiguration.cpp [iso-8859-1] Sat Feb 28 21:29:44 2015 @@ -17,17 +17,22 @@ */ CConfiguration::CConfiguration() : m_CrashRecovery(false), + m_IsInteractive(false), m_PrintToConsole(true), m_Shutdown(false), m_Submit(false) { WCHAR WindowsDirectory[MAX_PATH]; + WCHAR Interactive[32]; /* Check if we are running under ReactOS from the SystemRoot directory */ if(!GetWindowsDirectoryW(WindowsDirectory, MAX_PATH)) FATAL("GetWindowsDirectoryW failed"); m_IsReactOS = !_wcsnicmp(&WindowsDirectory[3], L"reactos", 7); + + if(GetEnvironmentVariableW(L"WINETEST_INTERACTIVE", Interactive, _countof(Interactive))) + m_IsInteractive = _wtoi(Interactive); } /** Modified: trunk/rostests/rosautotest/CConfiguration.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CConfiguratio… ============================================================================== --- trunk/rostests/rosautotest/CConfiguration.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CConfiguration.h [iso-8859-1] Sat Feb 28 21:29:44 2015 @@ -9,6 +9,7 @@ { private: bool m_CrashRecovery; + bool m_IsInteractive; bool m_IsReactOS; bool m_PrintToConsole; bool m_Shutdown; @@ -30,6 +31,7 @@ bool DoPrint() const { return m_PrintToConsole; } bool DoShutdown() const { return m_Shutdown; } bool DoSubmit() const { return m_Submit; } + bool IsInteractive() const { return m_IsInteractive; } bool IsReactOS() const { return m_IsReactOS; } const string& GetComment() const { return m_Comment; } const wstring& GetModule() const { return m_Module; } Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Sat Feb 28 21:29:44 2015 @@ -248,9 +248,14 @@ } catch(CTestException& e) { + stringstream ss; + + ss << "An exception occurred trying to list tests for: " << UnicodeToAscii(m_CurrentFile) << endl; + StringOut(ss.str()); + StringOut(e.GetMessage()); + StringOut("\n"); + m_CurrentFile.clear(); delete[] m_ListBuffer; - StringOut(e.GetMessage()); - m_CurrentFile.clear(); } } @@ -327,6 +332,7 @@ auto_ptr<CTestList> TestList; auto_ptr<CWebService> WebService; CTestInfo* TestInfo; + DWORD ErrorMode; /* The virtual test list is of course faster, so it should be preferred over the journaled one. @@ -349,6 +355,10 @@ if(Configuration.DoSubmit()) WebService.reset(new CWebService()); + /* Disable error dialogs if we're running in non-interactive mode */ + if(!Configuration.IsInteractive()) + ErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); + /* Get information for each test to run */ while((TestInfo = TestList->GetNextTestInfo()) != 0) { @@ -361,4 +371,8 @@ StringOut("\n\n"); } -} + + /* Restore the original error mode */ + if(!Configuration.IsInteractive()) + SetErrorMode(ErrorMode); +}

1 0

[spetreolle] 66505: [NTDLL/LDR] LdrpInitializeProcess: Don't use NtLdrEntry to initialize LdrpImageEntry. It is overwritten afterwards to initialize the real NtLdrEntry.
by spetreolle＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: spetreolle Date: Sat Feb 28 21:23:07 2015 New Revision: 66505 URL: http://svn.reactos.org/svn/reactos?rev=66505&view=rev Log: [NTDLL/LDR] LdrpInitializeProcess: Don't use NtLdrEntry to initialize LdrpImageEntry. It is overwritten afterwards to initialize the real NtLdrEntry. Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Sat Feb 28 21:23:07 2015 @@ -1846,24 +1846,24 @@ PebLdr.Initialized = TRUE; /* Allocate a data entry for the Image */ - LdrpImageEntry = NtLdrEntry = LdrpAllocateDataTableEntry(Peb->ImageBaseAddress); + LdrpImageEntry = LdrpAllocateDataTableEntry(Peb->ImageBaseAddress); /* Set it up */ - NtLdrEntry->EntryPoint = LdrpFetchAddressOfEntryPoint(NtLdrEntry->DllBase); - NtLdrEntry->LoadCount = -1; - NtLdrEntry->EntryPointActivationContext = 0; - NtLdrEntry->FullDllName = ImageFileName; + LdrpImageEntry->EntryPoint = LdrpFetchAddressOfEntryPoint(LdrpImageEntry->DllBase); + LdrpImageEntry->LoadCount = -1; + LdrpImageEntry->EntryPointActivationContext = 0; + LdrpImageEntry->FullDllName = ImageFileName; if (IsDotNetImage) - NtLdrEntry->Flags = LDRP_COR_IMAGE; + LdrpImageEntry->Flags = LDRP_COR_IMAGE; else - NtLdrEntry->Flags = 0; + LdrpImageEntry->Flags = 0; /* Check if the name is empty */ if (!ImageFileName.Buffer[0]) { /* Use the same Base name */ - NtLdrEntry->BaseDllName = NtLdrEntry->FullDllName; + LdrpImageEntry->BaseDllName = LdrpImageEntry->FullDllName; } else { @@ -1882,21 +1882,21 @@ if (!NtDllName) { /* Use the same Base name */ - NtLdrEntry->BaseDllName = NtLdrEntry->FullDllName; + LdrpImageEntry->BaseDllName = LdrpImageEntry->FullDllName; } else { /* Setup the name */ - NtLdrEntry->BaseDllName.Length = (USHORT)((ULONG_PTR)ImageFileName.Buffer + ImageFileName.Length - (ULONG_PTR)NtDllName); - NtLdrEntry->BaseDllName.MaximumLength = NtLdrEntry->BaseDllName.Length + sizeof(WCHAR); - NtLdrEntry->BaseDllName.Buffer = (PWSTR)((ULONG_PTR)ImageFileName.Buffer + - (ImageFileName.Length - NtLdrEntry->BaseDllName.Length)); + LdrpImageEntry->BaseDllName.Length = (USHORT)((ULONG_PTR)ImageFileName.Buffer + ImageFileName.Length - (ULONG_PTR)NtDllName); + LdrpImageEntry->BaseDllName.MaximumLength = LdrpImageEntry->BaseDllName.Length + sizeof(WCHAR); + LdrpImageEntry->BaseDllName.Buffer = (PWSTR)((ULONG_PTR)ImageFileName.Buffer + + (ImageFileName.Length - LdrpImageEntry->BaseDllName.Length)); } } /* Processing done, insert it */ - LdrpInsertMemoryTableEntry(NtLdrEntry); - NtLdrEntry->Flags |= LDRP_ENTRY_PROCESSED; + LdrpInsertMemoryTableEntry(LdrpImageEntry); + LdrpImageEntry->Flags |= LDRP_ENTRY_PROCESSED; /* Now add an entry for NTDLL */ NtLdrEntry = LdrpAllocateDataTableEntry(SystemArgument1);

1 0

[tfaber] 66504: [ROSAUTOTEST] - Continue the testing process in case a test fails to execute ONLINE-441
by tfaber＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: tfaber Date: Sat Feb 28 21:12:25 2015 New Revision: 66504 URL: http://svn.reactos.org/svn/reactos?rev=66504&view=rev Log: [ROSAUTOTEST] - Continue the testing process in case a test fails to execute ONLINE-441 Added: trunk/rostests/rosautotest/CTestException.h (with props) Modified: trunk/rostests/rosautotest/CProcess.cpp trunk/rostests/rosautotest/CSimpleException.cpp trunk/rostests/rosautotest/CSimpleException.h trunk/rostests/rosautotest/CWineTest.cpp trunk/rostests/rosautotest/precomp.h Modified: trunk/rostests/rosautotest/CProcess.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CProcess.cpp?… ============================================================================== --- trunk/rostests/rosautotest/CProcess.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CProcess.cpp [iso-8859-1] Sat Feb 28 21:12:25 2015 @@ -23,7 +23,7 @@ wcscpy(CommandLinePtr, CommandLine.c_str()); if(!CreateProcessW(NULL, CommandLinePtr, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &m_ProcessInfo)) - FATAL("CreateProcessW failed\n"); + TESTEXCEPTION("CreateProcessW failed\n"); } /** Modified: trunk/rostests/rosautotest/CSimpleException.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CSimpleExcept… ============================================================================== --- trunk/rostests/rosautotest/CSimpleException.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CSimpleException.cpp [iso-8859-1] Sat Feb 28 21:12:25 2015 @@ -12,9 +12,9 @@ * You should always use the EXCEPTION or SSEXCEPTION macro for throwing this exception. * * @param Message - * Constant pointer to a char array containing a short message about the exception + * String containing a short message about the exception */ -CSimpleException::CSimpleException(const char* Message) +CSimpleException::CSimpleException(const string& Message) : m_Message(Message) { } Modified: trunk/rostests/rosautotest/CSimpleException.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CSimpleExcept… ============================================================================== --- trunk/rostests/rosautotest/CSimpleException.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CSimpleException.h [iso-8859-1] Sat Feb 28 21:12:25 2015 @@ -11,7 +11,7 @@ string m_Message; public: - CSimpleException(const char* Message); + CSimpleException(const string& Message); const string& GetMessage() const { return m_Message; } }; Added: trunk/rostests/rosautotest/CTestException.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CTestExceptio… ============================================================================== --- trunk/rostests/rosautotest/CTestException.h (added) +++ trunk/rostests/rosautotest/CTestException.h [iso-8859-1] Sat Feb 28 21:12:25 2015 @@ -0,0 +1,12 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Simple exception during test execution that can be skipped over + * COPYRIGHT: Copyright 2015 Thomas Faber <thomas.faber(a)reactos.org> + */ + +class CTestException : public CSimpleException +{ +public: + CTestException(const string& Message) : CSimpleException(Message) { } +}; Propchange: trunk/rostests/rosautotest/CTestException.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Sat Feb 28 21:12:25 2015 @@ -121,12 +121,12 @@ /* Wait till this process ended */ if(WaitForSingleObject(Process.GetProcessHandle(), ListTimeout) == WAIT_FAILED) - FATAL("WaitForSingleObject failed for the test list\n"); + TESTEXCEPTION("WaitForSingleObject failed for the test list\n"); } /* Read the output data into a buffer */ if(!Pipe.Peek(NULL, 0, NULL, &BytesAvailable)) - FATAL("CPipe::Peek failed for the test list\n"); + TESTEXCEPTION("CPipe::Peek failed for the test list\n"); /* Check if we got any */ if(!BytesAvailable) @@ -134,14 +134,14 @@ stringstream ss; ss << "The --list command did not return any data for " << UnicodeToAscii(m_CurrentFile) << endl; - SSEXCEPTION; + TESTEXCEPTION(ss.str()); } /* Read the data */ m_ListBuffer = new char[BytesAvailable]; if(!Pipe.Read(m_ListBuffer, BytesAvailable, &Temp)) - FATAL("CPipe::Read failed\n"); + TESTEXCEPTION("CPipe::Read failed\n"); return BytesAvailable; } @@ -208,40 +208,49 @@ { while(!m_CurrentFile.empty() || GetNextFile()) { - while(GetNextTest()) - { - /* If the user specified a test through the command line, check this here */ - if(!Configuration.GetTest().empty() && Configuration.GetTest() != m_CurrentTest) - continue; - + try + { + while(GetNextTest()) { - auto_ptr<CTestInfo> TestInfo(new CTestInfo()); - size_t UnderscorePosition; - - /* Build the command line */ - TestInfo->CommandLine = m_TestPath; - TestInfo->CommandLine += m_CurrentFile; - TestInfo->CommandLine += ' '; - TestInfo->CommandLine += AsciiToUnicode(m_CurrentTest); - - /* Store the Module name */ - UnderscorePosition = m_CurrentFile.find_last_of('_'); - - if(UnderscorePosition == m_CurrentFile.npos) + /* If the user specified a test through the command line, check this here */ + if(!Configuration.GetTest().empty() && Configuration.GetTest() != m_CurrentTest) + continue; + { - stringstream ss; - - ss << "Invalid test file name: " << UnicodeToAscii(m_CurrentFile) << endl; - SSEXCEPTION; + auto_ptr<CTestInfo> TestInfo(new CTestInfo()); + size_t UnderscorePosition; + + /* Build the command line */ + TestInfo->CommandLine = m_TestPath; + TestInfo->CommandLine += m_CurrentFile; + TestInfo->CommandLine += ' '; + TestInfo->CommandLine += AsciiToUnicode(m_CurrentTest); + + /* Store the Module name */ + UnderscorePosition = m_CurrentFile.find_last_of('_'); + + if(UnderscorePosition == m_CurrentFile.npos) + { + stringstream ss; + + ss << "Invalid test file name: " << UnicodeToAscii(m_CurrentFile) << endl; + SSEXCEPTION; + } + + TestInfo->Module = UnicodeToAscii(m_CurrentFile.substr(0, UnderscorePosition)); + + /* Store the test */ + TestInfo->Test = m_CurrentTest; + + return TestInfo.release(); } - - TestInfo->Module = UnicodeToAscii(m_CurrentFile.substr(0, UnderscorePosition)); - - /* Store the test */ - TestInfo->Test = m_CurrentTest; - - return TestInfo.release(); } + } + catch(CTestException& e) + { + delete[] m_ListBuffer; + StringOut(e.GetMessage()); + m_CurrentFile.clear(); } } @@ -271,6 +280,7 @@ StartTime = GetTickCount(); + try { /* Execute the test */ CPipedProcess Process(TestInfo->CommandLine, Pipe); @@ -286,7 +296,15 @@ TestInfo->Log += Buffer; } if(GetLastError() != ERROR_BROKEN_PIPE) - FATAL("CPipe::Read failed for the test run\n"); + TESTEXCEPTION("CPipe::Read failed for the test run\n"); + } + catch(CTestException& e) + { + if(!tailString.empty()) + StringOut(tailString); + tailString.clear(); + StringOut(e.GetMessage()); + TestInfo->Log += e.GetMessage(); } /* Print what's left */ @@ -297,6 +315,7 @@ ssFinish << "Test " << TestInfo->Test << " completed in "; ssFinish << setprecision(2) << fixed << TotalTime << " seconds." << endl; StringOut(ssFinish.str()); + TestInfo->Log += ssFinish.str(); } /** Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Sat Feb 28 21:12:25 2015 @@ -34,6 +34,7 @@ #include "CProcess.h" #include "CPipedProcess.h" #include "CSimpleException.h" +#include "CTestException.h" #include "CTestInfo.h" #include "CTest.h" #include "CTestList.h" @@ -45,9 +46,10 @@ #include <rosautotestmsg.h> /* Useful macros */ -#define EXCEPTION(Message) throw CSimpleException(Message) -#define FATAL(Message) throw CFatalException(__FILE__, __LINE__, Message) -#define SSEXCEPTION throw CSimpleException(ss.str().c_str()) +#define EXCEPTION(Message) throw CSimpleException(Message) +#define FATAL(Message) throw CFatalException(__FILE__, __LINE__, Message) +#define SSEXCEPTION throw CSimpleException(ss.str()) +#define TESTEXCEPTION(Message) throw CTestException(Message) /* main.c */ extern CConfiguration Configuration;

1 0

[tfaber] 66503: [CPPRT] - Implement __CxxFrameHandler3 as a wrapper around __CxxFrameHandler that translates VC8-style function exception descriptions to VC7-style. This is necessary to make C++ ex...
by tfaber＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: tfaber Date: Sat Feb 28 21:03:04 2015 New Revision: 66503 URL: http://svn.reactos.org/svn/reactos?rev=66503&view=rev Log: [CPPRT] - Implement __CxxFrameHandler3 as a wrapper around __CxxFrameHandler that translates VC8-style function exception descriptions to VC7-style. This is necessary to make C++ exceptions work on Windows Server 2003, because msvcrt!__CxxFrameHandler does not support VC8 descriptors there. CORE-9290 #resolve Added: trunk/reactos/lib/sdk/cpprt/i386/framehandler.c (with props) Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt trunk/reactos/lib/sdk/cpprt/i386/cpprt.s Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] Sat Feb 28 21:03:04 2015 @@ -1,5 +1,7 @@ set_cpp(WITH_EXCEPTIONS) + +include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) list(APPEND SOURCE ehvec.cpp @@ -7,6 +9,7 @@ if(ARCH STREQUAL "i386") add_asm_files(cpprt_asm i386/cpprt.s) + list(APPEND SOURCE i386/framehandler.c) elseif(ARCH STREQUAL "amd64") add_asm_files(cpprt_asm amd64/cpprt.s) endif() Modified: trunk/reactos/lib/sdk/cpprt/i386/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/cpprt.s… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] Sat Feb 28 21:03:04 2015 @@ -7,13 +7,27 @@ ALIAS <&alias> = <&orig> ENDM +EXTERN _CxxHandleV8Frame@20 : PROC +PUBLIC ___CxxFrameHandler3 +___CxxFrameHandler3: + push eax + push dword ptr [esp + 20] + push dword ptr [esp + 20] + push dword ptr [esp + 20] + push dword ptr [esp + 20] + call _CxxHandleV8Frame@20 + ret + +EXTERN ___CxxFrameHandler : PROC +PUBLIC _CallCxxFrameHandler +_CallCxxFrameHandler: + mov eax, dword ptr [esp + 20] + jmp ___CxxFrameHandler + ; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *)) DEFINE_ALIAS ??_L@YGXPAXIHP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z ; void __stdcall `eh vector destructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *)) DEFINE_ALIAS ??_M@YGXPAXIHP6EX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YGXPAXIHP6EX0@Z@Z -; These are the same -DEFINE_ALIAS ___CxxFrameHandler3, ___CxxFrameHandler - END Added: trunk/reactos/lib/sdk/cpprt/i386/framehandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/frameha… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/i386/framehandler.c (added) +++ trunk/reactos/lib/sdk/cpprt/i386/framehandler.c [iso-8859-1] Sat Feb 28 21:03:04 2015 @@ -0,0 +1,46 @@ +/* + * PROJECT: ReactOS C++ runtime library + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: __CxxFrameHandler3 to __CxxFrameHandler wrapper + * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <ndk/rtltypes.h> + +#define WINE_NO_TRACE_MSGS +#include <wine/debug.h> +#include <wine/exception.h> +#include <internal/wine/msvcrt.h> +#include <internal/wine/cppexcept.h> + +extern DWORD CDECL CallCxxFrameHandler(PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD *frame, + PCONTEXT context, EXCEPTION_REGISTRATION_RECORD **dispatch, + const cxx_function_descr *descr); + +DWORD +__stdcall +CxxHandleV8Frame( + _In_ PEXCEPTION_RECORD rec, + _In_ EXCEPTION_REGISTRATION_RECORD *frame, + _In_ PCONTEXT context, + _In_ EXCEPTION_REGISTRATION_RECORD **dispatch, + _In_ const cxx_function_descr *descr) +{ + cxx_function_descr stub_descr; + + if (descr->magic != CXX_FRAME_MAGIC_VC8) + return CallCxxFrameHandler(rec, frame, context, dispatch, descr); + + if ((descr->flags & FUNC_DESCR_SYNCHRONOUS) && + (rec->ExceptionCode != CXX_EXCEPTION)) + { + return ExceptionContinueSearch; /* handle only c++ exceptions */ + } + + stub_descr = *descr; + stub_descr.magic = CXX_FRAME_MAGIC_VC7; + return CallCxxFrameHandler(rec, frame, context, dispatch, &stub_descr); +} Propchange: trunk/reactos/lib/sdk/cpprt/i386/framehandler.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 66502: [MSTSC] Update MSTSC with latest (1.8.3) rdesktop version. Patch by 'hater', for more details see CORE-9013 #resolve #comment Committed, thanks!
by hbelusca＠svn.reactos.org 28 Feb '15

28 Feb '15

Author: hbelusca Date: Sat Feb 28 20:28:09 2015 New Revision: 66502 URL: http://svn.reactos.org/svn/reactos?rev=66502&view=rev Log: [MSTSC] Update MSTSC with latest (1.8.3) rdesktop version. Patch by 'hater', for more details see CORE-9013 #resolve #comment Committed, thanks! Added: trunk/reactos/base/applications/mstsc/asn.c (with props) Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt trunk/reactos/base/applications/mstsc/bitmap.c trunk/reactos/base/applications/mstsc/bsops.c trunk/reactos/base/applications/mstsc/cache.c trunk/reactos/base/applications/mstsc/channels.c trunk/reactos/base/applications/mstsc/constants.h trunk/reactos/base/applications/mstsc/iso.c trunk/reactos/base/applications/mstsc/licence.c trunk/reactos/base/applications/mstsc/mcs.c trunk/reactos/base/applications/mstsc/mppc.c trunk/reactos/base/applications/mstsc/orders.c trunk/reactos/base/applications/mstsc/orders.h trunk/reactos/base/applications/mstsc/parse.h trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/mstsc/proto.h trunk/reactos/base/applications/mstsc/pstcache.c trunk/reactos/base/applications/mstsc/rdesktop.h trunk/reactos/base/applications/mstsc/rdp.c trunk/reactos/base/applications/mstsc/rdp5.c trunk/reactos/base/applications/mstsc/secure.c trunk/reactos/base/applications/mstsc/ssl_calls.c trunk/reactos/base/applications/mstsc/tcp.c trunk/reactos/base/applications/mstsc/types.h trunk/reactos/base/applications/mstsc/uimain.c trunk/reactos/base/applications/mstsc/win32.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/CM… Added: trunk/reactos/base/applications/mstsc/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/as… Modified: trunk/reactos/base/applications/mstsc/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bi… Modified: trunk/reactos/base/applications/mstsc/bsops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bs… Modified: trunk/reactos/base/applications/mstsc/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ca… Modified: trunk/reactos/base/applications/mstsc/channels.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ch… Modified: trunk/reactos/base/applications/mstsc/constants.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… Modified: trunk/reactos/base/applications/mstsc/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/is… Modified: trunk/reactos/base/applications/mstsc/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/li… Modified: trunk/reactos/base/applications/mstsc/mcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/mc… Modified: trunk/reactos/base/applications/mstsc/mppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/mp… Modified: trunk/reactos/base/applications/mstsc/orders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/or… Modified: trunk/reactos/base/applications/mstsc/orders.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/or… Modified: trunk/reactos/base/applications/mstsc/parse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pa… Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… Modified: trunk/reactos/base/applications/mstsc/proto.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… Modified: trunk/reactos/base/applications/mstsc/pstcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ps… Modified: trunk/reactos/base/applications/mstsc/rdesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Modified: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Modified: trunk/reactos/base/applications/mstsc/rdp5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… Modified: trunk/reactos/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ss… Modified: trunk/reactos/base/applications/mstsc/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/tc… Modified: trunk/reactos/base/applications/mstsc/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ty… Modified: trunk/reactos/base/applications/mstsc/uimain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs