Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 14495: Fix file properties
by hpoussin＠svn.reactos.com 04 Apr '05

04 Apr '05

Fix file properties Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c Modified: trunk/reactos/drivers/dd/serial/legacy.c _____ Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c --- trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-04 23:12:21 UTC (rev 14494) +++ trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-04 23:17:28 UTC (rev 14495) @@ -1,97 +1,97 @@ -/* $Id: - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/dd/serial/circularbuffer.c - * PURPOSE: Operations on a circular buffer - * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) - */ - -#define NDEBUG -#include "serial.h" - -NTSTATUS -InitializeCircularBuffer( - IN PCIRCULAR_BUFFER pBuffer, - IN ULONG BufferSize) -{ - DPRINT("Serial: InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); - pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, BufferSize * sizeof(UCHAR), SERIAL_TAG); - if (!pBuffer->Buffer) - return STATUS_INSUFFICIENT_RESOURCES; - pBuffer->Length = BufferSize; - pBuffer->ReadPosition = pBuffer->WritePosition = 0; - return STATUS_SUCCESS; -} - -NTSTATUS -FreeCircularBuffer( - IN PCIRCULAR_BUFFER pBuffer) -{ - DPRINT("Serial: FreeCircularBuffer(pBuffer %p)\n", pBuffer); - ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); - return STATUS_SUCCESS; -} - -BOOLEAN -IsCircularBufferEmpty( - IN PCIRCULAR_BUFFER pBuffer) -{ - DPRINT("Serial: IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); - return (pBuffer->ReadPosition == pBuffer->WritePosition); -} - -NTSTATUS -PushCircularBufferEntry( - IN PCIRCULAR_BUFFER pBuffer, - IN UCHAR Entry) -{ - ULONG NextPosition; - DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); - ASSERT(pBuffer->Length); - NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; - if (NextPosition == pBuffer->ReadPosition) - return STATUS_BUFFER_TOO_SMALL; - pBuffer->Buffer[pBuffer->WritePosition] = Entry; - pBuffer->WritePosition = NextPosition; - return STATUS_SUCCESS; -} - -NTSTATUS -PopCircularBufferEntry( - IN PCIRCULAR_BUFFER pBuffer, - OUT PUCHAR Entry) -{ - DPRINT("Serial: PopCircularBufferEntry(pBuffer %p)\n", pBuffer); - ASSERT(pBuffer->Length); - if (IsCircularBufferEmpty(pBuffer)) - return STATUS_ARRAY_BOUNDS_EXCEEDED; - *Entry = pBuffer->Buffer[pBuffer->ReadPosition]; - pBuffer->ReadPosition = (pBuffer->ReadPosition + 1) % pBuffer->Length; - return STATUS_SUCCESS; -} - -NTSTATUS -IncreaseCircularBufferSize( - IN PCIRCULAR_BUFFER pBuffer, - IN ULONG NewBufferSize) -{ - PUCHAR NewBuffer; - - DPRINT("Serial: IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); - ASSERT(pBuffer->Length); - if (pBuffer->Length > NewBufferSize) - return STATUS_INVALID_PARAMETER; - else if (pBuffer->Length == NewBufferSize) - return STATUS_SUCCESS; - - NewBuffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, NewBufferSize * sizeof(UCHAR), SERIAL_TAG); - if (!NewBuffer) - return STATUS_INSUFFICIENT_RESOURCES; - RtlCopyMemory(NewBuffer, pBuffer->Buffer, pBuffer->Length * sizeof(UCHAR)); - ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); - pBuffer->Buffer = NewBuffer; - pBuffer->Length = NewBufferSize; - return STATUS_SUCCESS; -} +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/circularbuffer.c + * PURPOSE: Operations on a circular buffer + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS +InitializeCircularBuffer( + IN PCIRCULAR_BUFFER pBuffer, + IN ULONG BufferSize) +{ + DPRINT("Serial: InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); + pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, BufferSize * sizeof(UCHAR), SERIAL_TAG); + if (!pBuffer->Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + pBuffer->Length = BufferSize; + pBuffer->ReadPosition = pBuffer->WritePosition = 0; + return STATUS_SUCCESS; +} + +NTSTATUS +FreeCircularBuffer( + IN PCIRCULAR_BUFFER pBuffer) +{ + DPRINT("Serial: FreeCircularBuffer(pBuffer %p)\n", pBuffer); + ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); + return STATUS_SUCCESS; +} + +BOOLEAN +IsCircularBufferEmpty( + IN PCIRCULAR_BUFFER pBuffer) +{ + DPRINT("Serial: IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); + return (pBuffer->ReadPosition == pBuffer->WritePosition); +} + +NTSTATUS +PushCircularBufferEntry( + IN PCIRCULAR_BUFFER pBuffer, + IN UCHAR Entry) +{ + ULONG NextPosition; + DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); + ASSERT(pBuffer->Length); + NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; + if (NextPosition == pBuffer->ReadPosition) + return STATUS_BUFFER_TOO_SMALL; + pBuffer->Buffer[pBuffer->WritePosition] = Entry; + pBuffer->WritePosition = NextPosition; + return STATUS_SUCCESS; +} + +NTSTATUS +PopCircularBufferEntry( + IN PCIRCULAR_BUFFER pBuffer, + OUT PUCHAR Entry) +{ + DPRINT("Serial: PopCircularBufferEntry(pBuffer %p)\n", pBuffer); + ASSERT(pBuffer->Length); + if (IsCircularBufferEmpty(pBuffer)) + return STATUS_ARRAY_BOUNDS_EXCEEDED; + *Entry = pBuffer->Buffer[pBuffer->ReadPosition]; + pBuffer->ReadPosition = (pBuffer->ReadPosition + 1) % pBuffer->Length; + return STATUS_SUCCESS; +} + +NTSTATUS +IncreaseCircularBufferSize( + IN PCIRCULAR_BUFFER pBuffer, + IN ULONG NewBufferSize) +{ + PUCHAR NewBuffer; + + DPRINT("Serial: IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); + ASSERT(pBuffer->Length); + if (pBuffer->Length > NewBufferSize) + return STATUS_INVALID_PARAMETER; + else if (pBuffer->Length == NewBufferSize) + return STATUS_SUCCESS; + + NewBuffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, NewBufferSize * sizeof(UCHAR), SERIAL_TAG); + if (!NewBuffer) + return STATUS_INSUFFICIENT_RESOURCES; + RtlCopyMemory(NewBuffer, pBuffer->Buffer, pBuffer->Length * sizeof(UCHAR)); + ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); + pBuffer->Buffer = NewBuffer; + pBuffer->Length = NewBufferSize; + return STATUS_SUCCESS; +} Property changes on: trunk/reactos/drivers/dd/serial/circularbuffer.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/dd/serial/cleanup.c ___________________________________________________________________ Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/close.c ___________________________________________________________________ Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/create.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/devctrl.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/info.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision _____ Modified: trunk/reactos/drivers/dd/serial/legacy.c --- trunk/reactos/drivers/dd/serial/legacy.c 2005-04-04 23:12:21 UTC (rev 14494) +++ trunk/reactos/drivers/dd/serial/legacy.c 2005-04-04 23:17:28 UTC (rev 14495) @@ -1,194 +1,194 @@ -/* $Id: - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/bus/serial/legacy.c - * PURPOSE: Legacy serial port enumeration - * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) - * Mark Junker (mjscod(a)gmx.de) - */ - -#define NDEBUG -#include "serial.h" - -UART_TYPE -SerialDetectUartType( - IN PUCHAR BaseAddress) -{ - UCHAR Lcr, TestLcr; - UCHAR OldScr, Scr5A, ScrA5; - BOOLEAN FifoEnabled; - UCHAR NewFifoStatus; - - Lcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)); - WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr ^ 0xFF); - TestLcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)) ^ 0xFF; - WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr); - - /* Accessing the LCR must work for a usable serial port */ - if (TestLcr != Lcr) - return UartUnknown; - - /* Ensure that all following accesses are done as required */ - READ_PORT_UCHAR(SER_RBR(BaseAddress)); - READ_PORT_UCHAR(SER_IER(BaseAddress)); - READ_PORT_UCHAR(SER_IIR(BaseAddress)); - READ_PORT_UCHAR(SER_LCR(BaseAddress)); - READ_PORT_UCHAR(SER_MCR(BaseAddress)); - READ_PORT_UCHAR(SER_LSR(BaseAddress)); - READ_PORT_UCHAR(SER_MSR(BaseAddress)); - READ_PORT_UCHAR(SER_SCR(BaseAddress)); - - /* Test scratch pad */ - OldScr = READ_PORT_UCHAR(SER_SCR(BaseAddress)); - WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0x5A); - Scr5A = READ_PORT_UCHAR(SER_SCR(BaseAddress)); - WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0xA5); - ScrA5 = READ_PORT_UCHAR(SER_SCR(BaseAddress)); - WRITE_PORT_UCHAR(SER_SCR(BaseAddress), OldScr); - - /* When non-functional, we have a 8250 */ - if (Scr5A != 0x5A || ScrA5 != 0xA5) - return Uart8250; - - /* Test FIFO type */ - FifoEnabled = (READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0x80) != 0; - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), SR_FCR_ENABLE_FIFO); - NewFifoStatus = READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0xC0; - if (!FifoEnabled) - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0); - switch (NewFifoStatus) - { - case 0x00: - return Uart16450; - case 0x40: - case 0x80: - /* Not sure about this but the documentation says that 0x40 - * indicates an unusable FIFO but my tests only worked - * with 0x80 */ - return Uart16550; - } - - /* FIFO is only functional for 16550A+ */ - return Uart16550A; -} - -static NTSTATUS -DetectLegacyDevice( - IN PDRIVER_OBJECT DriverObject, - IN ULONG ComPortBase, - IN ULONG Irq, - IN PULONG pComPortNumber OPTIONAL) -{ - ULONG ResourceListSize; - PCM_RESOURCE_LIST ResourceList; - PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; - BOOLEAN ConflictDetected; - UART_TYPE UartType; - PDEVICE_OBJECT Pdo = NULL; - PDEVICE_OBJECT Fdo; - KIRQL Dirql; - NTSTATUS Status; - - /* Create resource list */ - ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); - if (!ResourceList) - return STATUS_INSUFFICIENT_RESOURCES; - ResourceList->Count = 1; - ResourceList->List[0].InterfaceType = InterfaceTypeUndefined; - ResourceList->List[0].BusNumber = -1; /* unknown */ - ResourceList->List[0].PartialResourceList.Version = 1; - ResourceList->List[0].PartialResourceList.Revision = 1; - ResourceList->List[0].PartialResourceList.Count = 2; - ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[0]; - ResourceDescriptor->Type = CmResourceTypePort; - ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; - ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; - ResourceDescriptor->u.Port.Start.u.HighPart = 0; - ResourceDescriptor->u.Port.Start.u.LowPart = ComPortBase; - ResourceDescriptor->u.Port.Length = 8; - - ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[1]; - ResourceDescriptor->Type = CmResourceTypeInterrupt; - ResourceDescriptor->ShareDisposition = CmResourceShareShared; - ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; - ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector( - Internal, 0, 0, Irq, - &Dirql, - &ResourceDescriptor->u.Interrupt.Affinity); - ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; - - /* Report resource list */ - Status = IoReportResourceForDetection( - DriverObject, ResourceList, ResourceListSize, - NULL, NULL, 0, - &ConflictDetected); - if (Status == STATUS_CONFLICTING_ADDRESSES) - { - DPRINT("Serial: conflict detected for serial port at 0x%lx (Irq %lu)\n", ComPortBase, Irq); - ExFreePoolWithTag(ResourceList, SERIAL_TAG); - return STATUS_DEVICE_NOT_CONNECTED; - } - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(ResourceList, SERIAL_TAG); - return Status; - } - - /* Test if port exists */ - UartType = SerialDetectUartType((PUCHAR)ComPortBase); - - /* Report device if detected... */ - if (UartType != UartUnknown) - { - Status = IoReportDetectedDevice( - DriverObject, - ResourceList->List[0].InterfaceType, ResourceList->List[0].BusNumber, -1 /* unknown */, - ResourceList, NULL, - TRUE, - &Pdo); - if (NT_SUCCESS(Status)) - { - Status = SerialAddDeviceInternal(DriverObject, Pdo, UartType, pComPortNumber, &Fdo); - if (NT_SUCCESS(Status)) - { - Status = SerialPnpStartDevice(Fdo, ResourceList); - } - } - } - else - { - /* Release resources */ - Status = IoReportResourceForDetection( - DriverObject, NULL, 0, - NULL, NULL, 0, - &ConflictDetected); - Status = STATUS_DEVICE_NOT_CONNECTED; - } - ExFreePoolWithTag(ResourceList, SERIAL_TAG); - return Status; -} - -NTSTATUS -DetectLegacyDevices( - IN PDRIVER_OBJECT DriverObject) -{ - ULONG ComPortBase[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; - ULONG Irq[] = { 4, 3, 4, 3 }; - ULONG ComPortNumber[] = { 1, 2, 3, 4 }; - ULONG i; - NTSTATUS Status; - NTSTATUS ReturnedStatus = STATUS_SUCCESS; - - for (i = 0; i < sizeof(ComPortBase)/sizeof(ComPortBase[0]); i++) - { - Status = DetectLegacyDevice(DriverObject, ComPortBase[i], Irq[i], &ComPortNumber[i]); - if (!NT_SUCCESS(Status) && Status != STATUS_DEVICE_NOT_CONNECTED) - ReturnedStatus = Status; - DPRINT("Serial: Legacy device at 0x%x (IRQ %lu): status = 0x%08lx\n", ComPortBase[i], Irq[i], Status); - } - - return ReturnedStatus; -} +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/bus/serial/legacy.c + * PURPOSE: Legacy serial port enumeration + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * Mark Junker (mjscod(a)gmx.de) + */ + +#define NDEBUG +#include "serial.h" + +UART_TYPE +SerialDetectUartType( + IN PUCHAR BaseAddress) +{ + UCHAR Lcr, TestLcr; + UCHAR OldScr, Scr5A, ScrA5; + BOOLEAN FifoEnabled; + UCHAR NewFifoStatus; + + Lcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr ^ 0xFF); + TestLcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)) ^ 0xFF; + WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr); + + /* Accessing the LCR must work for a usable serial port */ + if (TestLcr != Lcr) + return UartUnknown; + + /* Ensure that all following accesses are done as required */ + READ_PORT_UCHAR(SER_RBR(BaseAddress)); + READ_PORT_UCHAR(SER_IER(BaseAddress)); + READ_PORT_UCHAR(SER_IIR(BaseAddress)); + READ_PORT_UCHAR(SER_LCR(BaseAddress)); + READ_PORT_UCHAR(SER_MCR(BaseAddress)); + READ_PORT_UCHAR(SER_LSR(BaseAddress)); + READ_PORT_UCHAR(SER_MSR(BaseAddress)); + READ_PORT_UCHAR(SER_SCR(BaseAddress)); + + /* Test scratch pad */ + OldScr = READ_PORT_UCHAR(SER_SCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0x5A); + Scr5A = READ_PORT_UCHAR(SER_SCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0xA5); + ScrA5 = READ_PORT_UCHAR(SER_SCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_SCR(BaseAddress), OldScr); + + /* When non-functional, we have a 8250 */ + if (Scr5A != 0x5A || ScrA5 != 0xA5) + return Uart8250; + + /* Test FIFO type */ + FifoEnabled = (READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0x80) != 0; + WRITE_PORT_UCHAR(SER_FCR(BaseAddress), SR_FCR_ENABLE_FIFO); + NewFifoStatus = READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0xC0; + if (!FifoEnabled) + WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0); + switch (NewFifoStatus) + { + case 0x00: + return Uart16450; + case 0x40: + case 0x80: + /* Not sure about this but the documentation says that 0x40 + * indicates an unusable FIFO but my tests only worked + * with 0x80 */ + return Uart16550; + } + + /* FIFO is only functional for 16550A+ */ + return Uart16550A; +} + +static NTSTATUS +DetectLegacyDevice( + IN PDRIVER_OBJECT DriverObject, + IN ULONG ComPortBase, + IN ULONG Irq, + IN PULONG pComPortNumber OPTIONAL) +{ + ULONG ResourceListSize; + PCM_RESOURCE_LIST ResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + BOOLEAN ConflictDetected; + UART_TYPE UartType; + PDEVICE_OBJECT Pdo = NULL; + PDEVICE_OBJECT Fdo; + KIRQL Dirql; + NTSTATUS Status; + + /* Create resource list */ + ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); + if (!ResourceList) + return STATUS_INSUFFICIENT_RESOURCES; + ResourceList->Count = 1; + ResourceList->List[0].InterfaceType = InterfaceTypeUndefined; + ResourceList->List[0].BusNumber = -1; /* unknown */ + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = 2; + ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[0]; + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + ResourceDescriptor->u.Port.Start.u.HighPart = 0; + ResourceDescriptor->u.Port.Start.u.LowPart = ComPortBase; + ResourceDescriptor->u.Port.Length = 8; + + ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[1]; + ResourceDescriptor->Type = CmResourceTypeInterrupt; + ResourceDescriptor->ShareDisposition = CmResourceShareShared; + ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; + ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector( + Internal, 0, 0, Irq, + &Dirql, + &ResourceDescriptor->u.Interrupt.Affinity); + ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; + + /* Report resource list */ + Status = IoReportResourceForDetection( + DriverObject, ResourceList, ResourceListSize, + NULL, NULL, 0, + &ConflictDetected); + if (Status == STATUS_CONFLICTING_ADDRESSES) + { + DPRINT("Serial: conflict detected for serial port at 0x%lx (Irq %lu)\n", ComPortBase, Irq); + ExFreePoolWithTag(ResourceList, SERIAL_TAG); + return STATUS_DEVICE_NOT_CONNECTED; + } + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(ResourceList, SERIAL_TAG); + return Status; + } + + /* Test if port exists */ + UartType = SerialDetectUartType((PUCHAR)ComPortBase); + + /* Report device if detected... */ + if (UartType != UartUnknown) + { + Status = IoReportDetectedDevice( + DriverObject, + ResourceList->List[0].InterfaceType, ResourceList->List[0].BusNumber, -1 /* unknown */, + ResourceList, NULL, + TRUE, + &Pdo); + if (NT_SUCCESS(Status)) + { + Status = SerialAddDeviceInternal(DriverObject, Pdo, UartType, pComPortNumber, &Fdo); + if (NT_SUCCESS(Status)) + { + Status = SerialPnpStartDevice(Fdo, ResourceList); + } + } + } + else + { + /* Release resources */ + Status = IoReportResourceForDetection( + DriverObject, NULL, 0, + NULL, NULL, 0, + &ConflictDetected); + Status = STATUS_DEVICE_NOT_CONNECTED; + } + ExFreePoolWithTag(ResourceList, SERIAL_TAG); + return Status; +} + +NTSTATUS +DetectLegacyDevices( + IN PDRIVER_OBJECT DriverObject) +{ + ULONG ComPortBase[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; + ULONG Irq[] = { 4, 3, 4, 3 }; + ULONG ComPortNumber[] = { 1, 2, 3, 4 }; + ULONG i; + NTSTATUS Status; + NTSTATUS ReturnedStatus = STATUS_SUCCESS; + + for (i = 0; i < sizeof(ComPortBase)/sizeof(ComPortBase[0]); i++) + { + Status = DetectLegacyDevice(DriverObject, ComPortBase[i], Irq[i], &ComPortNumber[i]); + if (!NT_SUCCESS(Status) && Status != STATUS_DEVICE_NOT_CONNECTED) + ReturnedStatus = Status; + DPRINT("Serial: Legacy device at 0x%x (IRQ %lu): status = 0x%08lx\n", ComPortBase[i], Irq[i], Status); + } + + return ReturnedStatus; +} Property changes on: trunk/reactos/drivers/dd/serial/legacy.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/dd/serial/makefile ___________________________________________________________________ Name: cleanup.c - close.c Property changes on: trunk/reactos/drivers/dd/serial/misc.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/pnp.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/power.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/rw.c ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/serial.c ___________________________________________________________________ Name: cleanup.c - close.c Property changes on: trunk/reactos/drivers/dd/serial/serial.h ___________________________________________________________________ Name: cleanup.c - close.c Name: svn:keywords + author date id revision Property changes on: trunk/reactos/drivers/dd/serial/serial.rc ___________________________________________________________________ Name: cleanup.c - close.c

1 0

[hpoussin] 14494: Move variable declarations at the start of functions
by hpoussin＠svn.reactos.com 04 Apr '05

04 Apr '05

Move variable declarations at the start of functions Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c Modified: trunk/reactos/drivers/dd/serial/serial.c _____ Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c --- trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-04 23:11:19 UTC (rev 14493) +++ trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-04 23:12:21 UTC (rev 14494) @@ -47,9 +47,10 @@ IN PCIRCULAR_BUFFER pBuffer, IN UCHAR Entry) { + ULONG NextPosition; DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); ASSERT(pBuffer->Length); - ULONG NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; + NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; if (NextPosition == pBuffer->ReadPosition) return STATUS_BUFFER_TOO_SMALL; pBuffer->Buffer[pBuffer->WritePosition] = Entry; _____ Modified: trunk/reactos/drivers/dd/serial/serial.c --- trunk/reactos/drivers/dd/serial/serial.c 2005-04-04 23:11:19 UTC (rev 14493) +++ trunk/reactos/drivers/dd/serial/serial.c 2005-04-04 23:12:21 UTC (rev 14494) @@ -26,6 +26,7 @@ IN PUNICODE_STRING RegPath) { ULONG i; + static BOOLEAN FirstTime = TRUE; DriverObject->DriverUnload = DriverUnload; DriverObject->DriverExtension->AddDevice = SerialAddDevice; @@ -44,7 +45,6 @@ /* FIXME: It seems that DriverEntry function may be called more * than once. Do only legacy detection the first time. */ - static BOOLEAN FirstTime = TRUE; if (FirstTime) { FirstTime = FALSE;

1 0

[hbirr] 14493: Check for an valid mdl pointer before calling IoFreeMdl in IoReadWriteCompletion.
by hbirr＠svn.reactos.com 04 Apr '05

04 Apr '05

Check for an valid mdl pointer before calling IoFreeMdl in IoReadWriteCompletion. Modified: trunk/reactos/ntoskrnl/io/cleanup.c _____ Modified: trunk/reactos/ntoskrnl/io/cleanup.c --- trunk/reactos/ntoskrnl/io/cleanup.c 2005-04-04 23:09:15 UTC (rev 14492) +++ trunk/reactos/ntoskrnl/io/cleanup.c 2005-04-04 23:11:19 UTC (rev 14493) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -109,7 +109,10 @@ if (DeviceObject->Flags & DO_DIRECT_IO) { - IoFreeMdl(Irp->MdlAddress); + if (Irp->MdlAddress) + { + IoFreeMdl(Irp->MdlAddress); + } } }

1 0

[hbirr] 14492: Fixed some bugs, which have prevented the using of isa dma channels.
by hbirr＠svn.reactos.com 04 Apr '05

04 Apr '05

Fixed some bugs, which have prevented the using of isa dma channels. Modified: trunk/reactos/hal/halx86/generic/dma.c _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-04-04 23:00:52 UTC (rev 14491) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-04-04 23:09:15 UTC (rev 14492) @@ -121,8 +121,8 @@ DWORD ChannelSelect; DWORD Controller; ULONG MaximumLength; - BOOLEAN ChannelSetup = FALSE; - DMA_MODE DmaMode; + BOOLEAN ChannelSetup = TRUE; + DMA_MODE DmaMode = {0}; DPRINT("Entered Function\n"); @@ -174,6 +174,7 @@ /* Set the Channel Selection */ ChannelSelect = DeviceDescription->DmaChannel & 0x03; + DmaMode.Channel = ChannelSelect; /* Get the Controller Setup */ Controller = (DeviceDescription->DmaChannel & 0x04) ? 2 : 1;

1 0

[hpoussin] 14491: Allow ACPI detection and legacy detection for serial ports
by hpoussin＠svn.reactos.com 04 Apr '05

04 Apr '05

Allow ACPI detection and legacy detection for serial ports Detect serial debug port and prevent its management by serial driver Activate serial driver in registry Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/drivers/dd/serial/legacy.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/serial.c Modified: trunk/reactos/drivers/dd/serial/serial.h Modified: trunk/reactos/ntoskrnl/io/pnpreport.c _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-04-04 22:48:51 UTC (rev 14490) +++ trunk/reactos/bootdata/hivesys.inf 2005-04-04 23:00:52 UTC (rev 14491) @@ -674,13 +674,14 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ErrorControl",0x0001000 1,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Group",0x00000000,"Base " HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ImagePath",0x00020000," system32\drivers\serial.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x00 000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x00 000001 HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Type",0x00010001,0x0000 0001 ;hard coded values HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","0",0x00000000,"ACP I\PNP0501" HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","Count",0x00010001, 0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","NextInstance",0x00 010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\0000","Service",0x0000 0000,"serial" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","Service",0x0000000 0,"serial" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","Service",0x0000000 0,"serial" ; Packet driver HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x0001000 1,0x00000001 _____ Modified: trunk/reactos/drivers/dd/serial/legacy.c --- trunk/reactos/drivers/dd/serial/legacy.c 2005-04-04 22:48:51 UTC (rev 14490) +++ trunk/reactos/drivers/dd/serial/legacy.c 2005-04-04 23:00:52 UTC (rev 14491) @@ -74,11 +74,12 @@ return Uart16550A; } -NTSTATUS +static NTSTATUS DetectLegacyDevice( IN PDRIVER_OBJECT DriverObject, IN ULONG ComPortBase, - IN ULONG Irq) + IN ULONG Irq, + IN PULONG pComPortNumber OPTIONAL) { ULONG ResourceListSize; PCM_RESOURCE_LIST ResourceList; @@ -125,9 +126,16 @@ NULL, NULL, 0, &ConflictDetected); if (Status == STATUS_CONFLICTING_ADDRESSES) + { + DPRINT("Serial: conflict detected for serial port at 0x%lx (Irq %lu)\n", ComPortBase, Irq); + ExFreePoolWithTag(ResourceList, SERIAL_TAG); return STATUS_DEVICE_NOT_CONNECTED; + } if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(ResourceList, SERIAL_TAG); return Status; + } /* Test if port exists */ UartType = SerialDetectUartType((PUCHAR)ComPortBase); @@ -143,7 +151,7 @@ &Pdo); if (NT_SUCCESS(Status)) { - Status = SerialAddDeviceInternal(DriverObject, Pdo, UartType, &Fdo); + Status = SerialAddDeviceInternal(DriverObject, Pdo, UartType, pComPortNumber, &Fdo); if (NT_SUCCESS(Status)) { Status = SerialPnpStartDevice(Fdo, ResourceList); @@ -159,6 +167,7 @@ &ConflictDetected); Status = STATUS_DEVICE_NOT_CONNECTED; } + ExFreePoolWithTag(ResourceList, SERIAL_TAG); return Status; } @@ -168,13 +177,14 @@ { ULONG ComPortBase[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; ULONG Irq[] = { 4, 3, 4, 3 }; + ULONG ComPortNumber[] = { 1, 2, 3, 4 }; ULONG i; NTSTATUS Status; NTSTATUS ReturnedStatus = STATUS_SUCCESS; for (i = 0; i < sizeof(ComPortBase)/sizeof(ComPortBase[0]); i++) { - Status = DetectLegacyDevice(DriverObject, ComPortBase[i], Irq[i]); + Status = DetectLegacyDevice(DriverObject, ComPortBase[i], Irq[i], &ComPortNumber[i]); if (!NT_SUCCESS(Status) && Status != STATUS_DEVICE_NOT_CONNECTED) ReturnedStatus = Status; DPRINT("Serial: Legacy device at 0x%x (IRQ %lu): status = 0x%08lx\n", ComPortBase[i], Irq[i], Status); _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-04-04 22:48:51 UTC (rev 14490) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-04-04 23:00:52 UTC (rev 14491) @@ -18,6 +18,7 @@ IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo, IN UART_TYPE UartType, + IN PULONG pComPortNumber OPTIONAL, OUT PDEVICE_OBJECT* pFdo OPTIONAL) { PDEVICE_OBJECT Fdo = NULL; @@ -27,6 +28,7 @@ UNICODE_STRING DeviceName; //UNICODE_STRING SymbolicLinkName; static ULONG DeviceNumber = 0; + static ULONG ComPortNumber = 1; DPRINT("Serial: SerialAddDeviceInternal called\n"); @@ -68,6 +70,10 @@ #endif DeviceExtension->SerialPortNumber = DeviceNumber++; + if (pComPortNumber == NULL) + DeviceExtension->ComPort = ComPortNumber++; + else + DeviceExtension->ComPort = *pComPortNumber; DeviceExtension->Pdo = Pdo; DeviceExtension->PnpState = dsStopped; DeviceExtension->UartType = UartType; @@ -122,13 +128,9 @@ /* We have here a PDO that does not correspond to a legacy * serial port. So call the internal AddDevice function. */ - DPRINT1("Serial: SerialAddDevice() called. Pdo 0x%p (should be NULL)\n", Pdo); - /* FIXME: due to a bug, previously described AddDevice is - * not called with a NULL Pdo. Block this call (blocks - * unfortunately all the other PnP serial ports devices). - */ - return SerialAddDeviceInternal(DriverObject, Pdo, UartUnknown, NULL); - //return STATUS_UNSUCCESSFUL; + return SerialAddDeviceInternal(DriverObject, Pdo, UartUnknown, NULL, NULL); + + } NTSTATUS STDCALL @@ -160,7 +162,6 @@ ASSERT(DeviceExtension->PnpState == dsStopped); - DeviceExtension->ComPort = DeviceExtension->SerialPortNumber + 1; DeviceExtension->BaudRate = 19200 | SERIAL_BAUD_USER; DeviceExtension->BaseAddress = 0; Dirql = 0; @@ -330,15 +331,16 @@ KIRQL Dirql; ULONG ComPortBase; ULONG Irq; + BOOLEAN ConflictDetected; DPRINT1("Serial: no allocated resources for this device! Creating fake list\n"); - switch (((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->SerialPortNu mber) + switch (((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ComPort) { - case 0: + case 1: ComPortBase = 0x3f8; Irq = 4; break; - case 1: + case 2: ComPortBase = 0x2f8; Irq = 3; break; @@ -350,10 +352,15 @@ ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); if (!ResourceList) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INSUFFICIENT_RESOURCES; + } ResourceList->Count = 1; - ResourceList->List[0].InterfaceType = Isa; - ResourceList->List[0].BusNumber = -1; /* FIXME */ + ResourceList->List[0].InterfaceType = InterfaceTypeUndefined; + ResourceList->List[0].BusNumber = -1; /* unknown */ ResourceList->List[0].PartialResourceList.Version = 1; ResourceList->List[0].PartialResourceList.Revision = 1; ResourceList->List[0].PartialResourceList.Count = 2; @@ -375,6 +382,19 @@ &ResourceDescriptor->u.Interrupt.Affinity); ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; + /* Verify that this COM port is not the serial debug port */ + Status = IoReportResourceForDetection( + DeviceObject->DriverObject, ResourceList, 0, + NULL, NULL, 0, + &ConflictDetected); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + Stack->Parameters.StartDevice.AllocatedResources = Stack->Parameters.StartDevice.AllocatedResourcesTranslated = ResourceList; _____ Modified: trunk/reactos/drivers/dd/serial/serial.c --- trunk/reactos/drivers/dd/serial/serial.c 2005-04-04 22:48:51 UTC (rev 14490) +++ trunk/reactos/drivers/dd/serial/serial.c 2005-04-04 23:00:52 UTC (rev 14491) @@ -41,6 +41,18 @@ DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = SerialQueryInformation; DriverObject->MajorFunction[IRP_MJ_PNP] = SerialPnp; DriverObject->MajorFunction[IRP_MJ_POWER] = SerialPower; - - return DetectLegacyDevices(DriverObject); + + /* FIXME: It seems that DriverEntry function may be called more + * than once. Do only legacy detection the first time. */ + static BOOLEAN FirstTime = TRUE; + if (FirstTime) + { + FirstTime = FALSE; + return DetectLegacyDevices(DriverObject); + } + else + { + DPRINT1("Serial: DriverEntry called for the second time!\n"); + return STATUS_SUCCESS; + } } _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-04-04 22:48:51 UTC (rev 14490) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-04-04 23:00:52 UTC (rev 14491) @@ -313,6 +313,7 @@ IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo, IN UART_TYPE UartType, + IN PULONG pComPortNumber OPTIONAL, OUT PDEVICE_OBJECT* pFdo OPTIONAL); NTSTATUS STDCALL _____ Modified: trunk/reactos/ntoskrnl/io/pnpreport.c --- trunk/reactos/ntoskrnl/io/pnpreport.c 2005-04-04 22:48:51 UTC (rev 14490) +++ trunk/reactos/ntoskrnl/io/pnpreport.c 2005-04-04 23:00:52 UTC (rev 14491) @@ -80,8 +80,49 @@ IN ULONG DeviceListSize OPTIONAL, OUT PBOOLEAN ConflictDetected) { - DPRINT1("IoReportResourceForDetection UNIMPLEMENTED but returns success.\n"); *ConflictDetected = FALSE; + DPRINT1("IoReportResourceForDetection unimplemented\n"); + + if (PopSystemPowerDeviceNode != NULL && DriverListSize > 0) + { + /* We hope serial ports will be enumerated by ACPI */ + *ConflictDetected = TRUE; + return STATUS_CONFLICTING_ADDRESSES; + } + + /* HACK: check if serial debug output is enabled. If yes, + * prevent serial port driver to detect this serial port + * by indicating a conflict + */ + if ((KdDebugState & KD_DEBUG_SERIAL) && DriverList != NULL) + { + ULONG ComPortBase = 0; + ULONG i; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + + switch (LogPortInfo.ComPort) + { + case 1: ComPortBase = 0x3f8; break; + case 2: ComPortBase = 0x2f8; break; + case 3: ComPortBase = 0x3e8; break; + case 4: ComPortBase = 0x2e8; break; + } + + /* search for this port address in DriverList */ + for (i = 0; i < DriverList->List[0].PartialResourceList.Count; i++) + { + ResourceDescriptor = &DriverList->List[0].PartialResourceList.PartialDescriptors[i]; + if (ResourceDescriptor->Type == CmResourceTypePort) + { + if (ResourceDescriptor->u.Port.Start.u.LowPart <= ComPortBase + && ResourceDescriptor->u.Port.Start.u.LowPart + ResourceDescriptor->u.Port.Length > ComPortBase) + { + *ConflictDetected = TRUE; + return STATUS_CONFLICTING_ADDRESSES; + } + } + } + } return STATUS_SUCCESS; }

1 0

[hpoussin] 14490: Correct IOCTL_SERIAL_CLEAR_STATS and IOCTL_SERIAL_PURGE
by hpoussin＠svn.reactos.com 04 Apr '05

04 Apr '05

Correct IOCTL_SERIAL_CLEAR_STATS and IOCTL_SERIAL_PURGE Manage read errors (overrun, parity, ...) Use output buffer even if Uart is ready to transmit Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/misc.c Modified: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-04-04 22:05:08 UTC (rev 14489) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-04-04 22:48:51 UTC (rev 14490) @@ -182,9 +182,10 @@ BOOLEAN SerialClearPerfStats( - IN PSERIALPERF_STATS pSerialPerfStats) + IN PSERIAL_DEVICE_EXTENSION DeviceExtension) { - RtlZeroMemory(pSerialPerfStats, sizeof(SERIALPERF_STATS)); + RtlZeroMemory(&DeviceExtension->SerialPerfStats, sizeof(SERIALPERF_STATS)); + DeviceExtension->BreakInterruptErrorCount = 0; return TRUE; } @@ -258,7 +259,18 @@ RtlZeroMemory(pSerialStatus, sizeof(SERIAL_STATUS)); - pSerialStatus->Errors = 0; /* FIXME */ + pSerialStatus->Errors = 0; + if (DeviceExtension->BreakInterruptErrorCount) + pSerialStatus->Errors |= SERIAL_ERROR_BREAK; + if (DeviceExtension->SerialPerfStats.FrameErrorCount) + pSerialStatus->Errors |= SERIAL_ERROR_FRAMING; + if (DeviceExtension->SerialPerfStats.SerialOverrunErrorCount) + pSerialStatus->Errors |= SERIAL_ERROR_OVERRUN; + if (DeviceExtension->SerialPerfStats.BufferOverrunErrorCount) + pSerialStatus->Errors |= SERIAL_ERROR_QUEUEOVERRUN; + if (DeviceExtension->SerialPerfStats.ParityErrorCount) + pSerialStatus->Errors |= SERIAL_ERROR_PARITY; + pSerialStatus->HoldReasons = 0; /* FIXME */ KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); @@ -311,7 +323,7 @@ KeSynchronizeExecution( DeviceExtension->Interrupt, (PKSYNCHRONIZE_ROUTINE)SerialClearPerfStats, - &DeviceExtension->SerialPerfStats); + DeviceExtension); Status = STATUS_SUCCESS; break; } @@ -552,27 +564,52 @@ } case IOCTL_SERIAL_PURGE: { - KIRQL Irql1, Irql2; + KIRQL Irql; DPRINT("Serial: IOCTL_SERIAL_PURGE\n"); - KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql1); - KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql2); - DeviceExtension->InputBuffer.ReadPosition = DeviceExtension->InputBuffer.WritePosition = 0; - DeviceExtension->OutputBuffer.ReadPosition = DeviceExtension->OutputBuffer.WritePosition = 0; - /* Clear receive/transmit buffers */ - if (DeviceExtension->UartType >= Uart16550A) + /* FIXME: SERIAL_PURGE_RXABORT and SERIAL_PURGE_TXABORT + * should stop current request */ + if (LengthIn != sizeof(ULONG) || BufferIn == NULL) + Status = STATUS_INVALID_PARAMETER; + else { - /* 16550 UARTs also have FIFO queues, but they are unusable due to a bug */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); - if (NT_SUCCESS(Status)) + ULONG PurgeMask = *(PULONG)BufferIn; + + Status = STATUS_SUCCESS; + /* FIXME: use SERIAL_PURGE_RXABORT and SERIAL_PURGE_TXABORT flags */ + if (PurgeMask & SERIAL_PURGE_RXCLEAR) { - WRITE_PORT_UCHAR(SER_FCR(ComPortBase), SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); + DeviceExtension->InputBuffer.ReadPosition = DeviceExtension->InputBuffer.WritePosition = 0; + if (DeviceExtension->UartType >= Uart16550A) + { + /* Clear also Uart FIFO */ + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (NT_SUCCESS(Status)) + { + WRITE_PORT_UCHAR(SER_FCR(ComPortBase), SR_FCR_CLEAR_RCVR); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + } + } + KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); } + + if (PurgeMask & SERIAL_PURGE_TXCLEAR) + { + KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql); + DeviceExtension->OutputBuffer.ReadPosition = DeviceExtension->OutputBuffer.WritePosition = 0; + if (DeviceExtension->UartType >= Uart16550A) + { + /* Clear also Uart FIFO */ + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (NT_SUCCESS(Status)) + { + WRITE_PORT_UCHAR(SER_FCR(ComPortBase), SR_FCR_CLEAR_XMIT); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + } + } + KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); + } } - else - Status = STATUS_SUCCESS; - KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql2); - KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql1); break; } case IOCTL_SERIAL_RESET_DEVICE: _____ Modified: trunk/reactos/drivers/dd/serial/misc.c --- trunk/reactos/drivers/dd/serial/misc.c 2005-04-04 22:05:08 UTC (rev 14489) +++ trunk/reactos/drivers/dd/serial/misc.c 2005-04-04 22:48:51 UTC (rev 14490) @@ -78,7 +78,7 @@ ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); - while (READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR) + while (READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DATA_RECEIVED) { Byte = READ_PORT_UCHAR(SER_RBR(ComPortBase)); DPRINT("Serial: Byte received on COM%lu: 0x%02x\n", @@ -116,7 +116,7 @@ KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql); while (!IsCircularBufferEmpty(&DeviceExtension->OutputBuffer) - && READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_TBE) + && READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_THR_EMPTY) { Status = PopCircularBufferEntry(&DeviceExtension->OutputBuffer, &Byte); if (!NT_SUCCESS(Status)) @@ -153,16 +153,28 @@ Iir &= SR_IIR_ID_MASK; if ((Iir & SR_IIR_SELF) != 0) { return FALSE; } - /* FIXME: sometimes, update DeviceExtension->MCR */ switch (Iir) { case SR_IIR_MSR_CHANGE: { - UCHAR IER; - DPRINT1("Serial: SR_IIR_MSR_CHANGE\n"); + UCHAR MSR, IER; + DPRINT("Serial: SR_IIR_MSR_CHANGE\n"); - DeviceExtension->MSR = READ_PORT_UCHAR(SER_MSR(ComPortBase)); - /* FIXME: what to do? */ + MSR = READ_PORT_UCHAR(SER_MSR(ComPortBase)); + if (MSR & SR_MSR_CTS_CHANGED) + { + if (MSR & SR_MSR_CTS) + KeInsertQueueDpc(&DeviceExtension->SendByteDpc, NULL, NULL); + else + ; /* FIXME: stop transmission */ + } + if (MSR & SR_MSR_DSR_CHANGED) + { + if (MSR & SR_MSR_DSR) + KeInsertQueueDpc(&DeviceExtension->ReceivedByteDpc, NULL, NULL); + else + ; /* FIXME: stop reception */ + } IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_MSR_CHANGE); return TRUE; @@ -183,24 +195,20 @@ } case SR_IIR_ERROR: { - /* FIXME: what to do? */ - DPRINT1("Serial: SR_IIR_ERROR\n"); - break; - /*Error = READ_PORT_UCHAR( Self->Port + UART_LSR ); - if( Error & LSR_OVERRUN ) - Self->WaitingReadBytes.PushBack( SerialFifo::OVERRUN ); - DeviceExtension->SerialPerfStats.SerialOverrunErrorCount++; - if( Error & LSR_PARITY_ERROR ) - Self->WaitingReadBytes.PushBack( SerialFifo::PARITY ); - DeviceExtension->SerialPerfStats.ParityErrorCount++; - if( Error & LSR_FRAMING_ERROR ) - Self->WaitingReadBytes.PushBack( SerialFifo::FRAMING ); - DeviceExtension->SerialPerfStats.FrameErrorCount++; - if( Error & LSR_BREAK ) - Self->WaitingReadBytes.PushBack( SerialFifo::BREAK ); - if( Error & LSR_TIMEOUT ) - Self->WaitingReadBytes.PushBack( SerialFifo::TIMEOUT ); - return KeInsertQueueDpc( &Self->DataInDpc, Self, 0 );*/ + UCHAR LSR; + DPRINT("Serial: SR_IIR_ERROR\n"); + + LSR = READ_PORT_UCHAR(SER_LSR(ComPortBase)); + if (LSR & SR_LSR_OVERRUN_ERROR) + InterlockedIncrement(&DeviceExtension->SerialPerfStats.SerialOverrunErro rCount); + if (LSR & SR_LSR_PARITY_ERROR) + InterlockedIncrement(&DeviceExtension->SerialPerfStats.ParityErrorCount) ; + if (LSR & SR_LSR_FRAMING_ERROR) + InterlockedIncrement(&DeviceExtension->SerialPerfStats.FrameErrorCount); + if (LSR & SR_LSR_BREAK_INT) + InterlockedIncrement(&DeviceExtension->BreakInterruptErrorCount); + + return TRUE; } } return FALSE; _____ Modified: trunk/reactos/drivers/dd/serial/rw.c --- trunk/reactos/drivers/dd/serial/rw.c 2005-04-04 22:05:08 UTC (rev 14489) +++ trunk/reactos/drivers/dd/serial/rw.c 2005-04-04 22:48:51 UTC (rev 14490) @@ -274,25 +274,8 @@ if (!NT_SUCCESS(Status)) goto ByeBye; + /* push bytes into output buffer */ KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql); - if (IsCircularBufferEmpty(&DeviceExtension->OutputBuffer)) - { - /* Put the maximum amount of data in UART output buffer */ - while (Information < Length) - { - /* if UART output buffer is not full, directly write to it */ - if ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_TBE) != 0) - { - DPRINT("Serial: direct write 0x%02x (%c)\n", Buffer[Information], Buffer[Information]); - WRITE_PORT_UCHAR(SER_THR(ComPortBase), Buffer[Information]); - DeviceExtension->SerialPerfStats.TransmittedCount++; - Information++; - } - else - break; - } - } - /* write remaining bytes into output buffer */ while (Information < Length) { Status = PushCircularBufferEntry(&DeviceExtension->OutputBuffer, Buffer[Information]); @@ -302,11 +285,13 @@ DeviceExtension->SerialPerfStats.BufferOverrunErrorCount++; break; } - DPRINT1("Serial: write to buffer 0x%02x\n", Buffer[Information]); Information++; } KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + + /* send bytes */ + SerialSendByte(NULL, DeviceExtension, NULL, NULL); ByeBye: Irp->IoStatus.Information = Information; _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-04-04 22:05:08 UTC (rev 14489) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-04-04 22:48:51 UTC (rev 14490) @@ -90,6 +90,7 @@ UART_TYPE UartType; ULONG WaitMask; + ULONG BreakInterruptErrorCount; SERIALPERF_STATS SerialPerfStats; SERIAL_TIMEOUTS SerialTimeOuts; BOOLEAN IsOpened; @@ -169,11 +170,23 @@ #define SR_MCR_DTR 0x01 #define SR_MCR_RTS 0x02 #define SER_LSR(x) ((x)+5) /* Line Status Register */ -#define SR_LSR_DR 0x01 -#define SR_LSR_TBE 0x20 +#define SR_LSR_DATA_RECEIVED 0x01 +#define SR_LSR_OVERRUN_ERROR 0x02 +#define SR_LSR_PARITY_ERROR 0x04 +#define SR_LSR_FRAMING_ERROR 0x08 +#define SR_LSR_BREAK_INT 0x10 +#define SR_LSR_THR_EMPTY 0x20 +#define SR_LSR_TSR_EMPTY 0x40 +#define SR_LSR_ERROR_IN_FIFO 0x80 /* Uart >= 16550A */ #define SER_MSR(x) ((x)+6) /* Modem Status Register */ -#define SR_MSR_CTS 0x10 -#define SR_MSR_DSR 0x20 +#define SR_MSR_CTS_CHANGED 0x01 +#define SR_MSR_DSR_CHANGED 0x02 +#define SR_MSR_RI_CHANGED 0x04 +#define SR_MSR_DCD_CHANGED 0x08 +#define SR_MSR_CTS 0x10 /* Clear To Send */ +#define SR_MSR_DSR 0x20 /* Data Set Ready */ +#define SI_MSR_RI 0x40 /* Ring Indicator */ +#define SR_MSR_DCD 0x80 /* Data Carrier Detect */ #define SER_SCR(x) ((x)+7) /* Scratch Pad Register */ /************************************ circularbuffer.c */

1 0

[chorns] 14489: Install generated files
by chorns＠svn.reactos.com 04 Apr '05

04 Apr '05

Install generated files Modified: branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/telnet/telnet.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.xml Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml Modified: branches/xmlbuildsystem/reactos/drivers/bus/isapnp/isapnp.xml Modified: branches/xmlbuildsystem/reactos/drivers/bus/pci/pci.xml Modified: branches/xmlbuildsystem/reactos/drivers/dd/beep/beep.xml Modified: branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml Modified: branches/xmlbuildsystem/reactos/drivers/dd/bootvid/bootvid.xml Modified: branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/fs_rec/fs_rec.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/ms/msfs.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/mup/mup.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml Modified: branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml Modified: branches/xmlbuildsystem/reactos/drivers/input/mouclass/mouclass.xml Modified: branches/xmlbuildsystem/reactos/drivers/input/psaux/psaux.xml Modified: branches/xmlbuildsystem/reactos/drivers/input/sermouse/sermouse.xml Modified: branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml Modified: branches/xmlbuildsystem/reactos/drivers/net/dd/ne2000/ne2000.xml Modified: branches/xmlbuildsystem/reactos/drivers/net/dd/pcnet/pcnet.xml Modified: branches/xmlbuildsystem/reactos/drivers/net/ndis/ndis.xml Modified: branches/xmlbuildsystem/reactos/drivers/net/npf/npf.xml Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml Modified: branches/xmlbuildsystem/reactos/drivers/net/tdi/tdi.xml Modified: branches/xmlbuildsystem/reactos/drivers/net/wshtcpip/wshtcpip.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml Modified: branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml Modified: branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml Modified: branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/vbemp.xml Modified: branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/vgamp.xml Modified: branches/xmlbuildsystem/reactos/drivers/video/videoprt/videoprt.xml Modified: branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml Modified: branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml Modified: branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml Modified: branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml Modified: branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml Modified: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml Modified: branches/xmlbuildsystem/reactos/lib/cards/cards.xml Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml Modified: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml Modified: branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml Modified: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml Modified: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml Modified: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml Modified: branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml Modified: branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml Modified: branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml Modified: branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml Modified: branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml Modified: branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml Modified: branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml Modified: branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml Modified: branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml Modified: branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml Modified: branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml Modified: branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml Modified: branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml Modified: branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml Modified: branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml Modified: branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml Modified: branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml Modified: branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml Modified: branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml Modified: branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml Modified: branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml Modified: branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml [truncated at 100 lines; 54 more skipped] _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="arp" type="win32cui"> +<module name="arp" type="win32cui" installbase="system32" installname="arp.exe"> <include base="arp">.</include> <define name="__USE_W32API" /> <library>kernel32</library> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="finger" type="win32cui"> +<module name="finger" type="win32cui" installbase="system32" installname="finger.exe"> <include base="finger">.</include> <define name="__USE_W32_SOCKETS" /> <library>kernel32</library> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="ftp" type="win32cui"> +<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe"> <include base="ftp">.</include> <define name="__USE_W32API" /> <library>kernel32</library> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="ipconfig" type="win32cui"> +<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe"> <include base="ipconfig">.</include> <define name="__USE_W32API" /> <library>kernel32</library> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="netstat" type="win32cui"> +<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe"> <include base="netstat">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="ping" type="win32cui"> +<module name="ping" type="win32cui" installbase="system32" installname="ping.exe"> <include base="ping">.</include> <define name="__USE_W32_SOCKETS" /> <define name="_WIN32_IE">0x600</define> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/telnet/telnet.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/telnet/telnet.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/apps/utils/net/telnet/telnet.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="telnet" type="win32cui"> +<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe"> <include base="telnet">.</include> <define name="__USE_W32API" /> <define name="__REACTOS__" /> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="whois" type="win32cui"> +<module name="whois" type="win32cui" installbase="system32" installname="whois.exe"> <include base="whois">.</include> <library>kernel32</library> <library>ws2_32</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml --- branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="acpi" type="kernelmodedriver"> +<module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys"> <include base="acpi">include</include> <include base="acpi">ospm/include</include> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/bus/isapnp/isapnp.xml --- branches/xmlbuildsystem/reactos/drivers/bus/isapnp/isapnp.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/bus/isapnp/isapnp.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="isapnp" type="kernelmodedriver"> +<module name="isapnp" type="kernelmodedriver" installbase="system32/drivers" installname="isapnp.sys"> <include base="isapnp">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/bus/pci/pci.xml --- branches/xmlbuildsystem/reactos/drivers/bus/pci/pci.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/bus/pci/pci.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="pci" type="kernelmodedriver"> +<module name="pci" type="kernelmodedriver" installbase="system32/drivers" installname="pci.sys"> <include base="pci">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/beep/beep.xml --- branches/xmlbuildsystem/reactos/drivers/dd/beep/beep.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/dd/beep/beep.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="beep" type="kernelmodedriver"> +<module name="beep" type="kernelmodedriver" installbase="system32/drivers" installname="beep.sys"> <library>ntoskrnl</library> <library>hal</library> <file>beep.c</file> _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml --- branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="blue" type="kernelmodedriver"> +<module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys"> <bootstrap base="reactos" /> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/bootvid/bootvid.xml --- branches/xmlbuildsystem/reactos/drivers/dd/bootvid/bootvid.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/dd/bootvid/bootvid.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="bootvid" type="kernelmodedriver"> +<module name="bootvid" type="kernelmodedriver" installbase="system32/drivers" installname="bootvid.sys"> <include base="bootvid">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml --- branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/dd/null/null.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="null" type="kernelmodedriver"> +<module name="null" type="kernelmodedriver" installbase="system32/drivers" installname="null.sys"> <include base="null">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml --- branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="serial" type="kernelmodedriver"> +<module name="serial" type="kernelmodedriver" installbase="system32/drivers" installname="serial.sys"> <library>ntoskrnl</library> <library>hal</library> <file>serial.c</file> _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="cdfs" type="kernelmodedriver"> +<module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys"> <bootstrap base="reactos" /> <include base="cdfs">.</include> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/fs_rec/fs_rec.xml --- branches/xmlbuildsystem/reactos/drivers/fs/fs_rec/fs_rec.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/fs/fs_rec/fs_rec.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="fs_rec" type="kernelmodedriver"> +<module name="fs_rec" type="kernelmodedriver" installbase="system32/drivers" installname="fs_rec.sys"> <include base="fs_rec">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/ms/msfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/ms/msfs.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/fs/ms/msfs.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="msfs" type="kernelmodedriver"> +<module name="msfs" type="kernelmodedriver" installbase="system32/drivers" installname="msfs.sys"> <include base="msfs">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/mup/mup.xml --- branches/xmlbuildsystem/reactos/drivers/fs/mup/mup.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/fs/mup/mup.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="mup" type="kernelmodedriver"> +<module name="mup" type="kernelmodedriver" installbase="system32/drivers" installname="mup.sys"> <include base="mup">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="npfs" type="kernelmodedriver"> +<module name="npfs" type="kernelmodedriver" installbase="system32/drivers" installname="npfs.sys"> <include base="npfs">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="ntfs" type="kernelmodedriver"> +<module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys"> <bootstrap base="reactos" /> <include base="ntfs">.</include> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="vfatfs" type="kernelmodedriver"> +<module name="vfatfs" type="kernelmodedriver" installbase="system32/drivers" installname="vfatfs.sys"> <bootstrap base="reactos" /> <include base="vfatfs">.</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml --- branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="keyboard" type="kernelmodedriver"> +<module name="keyboard" type="kernelmodedriver" installbase="system32/drivers" installname="keyboard.sys"> <bootstrap base="reactos" /> <include base="keyboard">.</include> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/input/mouclass/mouclass.xml --- branches/xmlbuildsystem/reactos/drivers/input/mouclass/mouclass.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/input/mouclass/mouclass.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="mouclass" type="kernelmodedriver"> +<module name="mouclass" type="kernelmodedriver" installbase="system32/drivers" installname="mouclass.sys"> <include base="mouclass">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/input/psaux/psaux.xml --- branches/xmlbuildsystem/reactos/drivers/input/psaux/psaux.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/input/psaux/psaux.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="psaux" type="kernelmodedriver"> +<module name="psaux" type="kernelmodedriver" installbase="system32/drivers" installname="psaux.sys"> <include base="psaux">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/input/sermouse/sermouse.xml --- branches/xmlbuildsystem/reactos/drivers/input/sermouse/sermouse.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/input/sermouse/sermouse.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="sermouse" type="kernelmodedriver"> +<module name="sermouse" type="kernelmodedriver" installbase="system32/drivers" installname="sermouse.sys"> <include base="sermouse">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml --- branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/lib/bzip2/bzip2.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="bzip2" type="kernelmodedll"> +<module name="bzip2" type="kernelmodedll" installbase="system32/drivers" installname="bzip2.dll"> <importlibrary definition="unbzip2.def" /> <define name="BZ_NO_STDIO" /> <define name="BZ_DECOMPRESS_ONLY" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml --- branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/net/afd/afd.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="afd" type="kernelmodedriver"> +<module name="afd" type="kernelmodedriver" installbase="system32/drivers" installname="afd.sys"> <include base="afd">include</include> <include base="ReactOS">include/afd</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/dd/ne2000/ne2000.xml --- branches/xmlbuildsystem/reactos/drivers/net/dd/ne2000/ne2000.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/net/dd/ne2000/ne2000.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="ne2000" type="kernelmodedriver"> +<module name="ne2000" type="kernelmodedriver" installbase="system32/drivers" installname="ne2000.sys"> <include base="ne2000">include</include> <library>ndis</library> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/dd/pcnet/pcnet.xml --- branches/xmlbuildsystem/reactos/drivers/net/dd/pcnet/pcnet.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/net/dd/pcnet/pcnet.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="pcnet" type="kernelmodedriver"> +<module name="pcnet" type="kernelmodedriver" installbase="system32/drivers" installname="pcnet.sys"> <include base="pcnet">.</include> <define name="NDIS50_MINIPORT" /> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/ndis/ndis.xml --- branches/xmlbuildsystem/reactos/drivers/net/ndis/ndis.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/net/ndis/ndis.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="ndis" type="kernelmodedriver"> +<module name="ndis" type="kernelmodedriver" installbase="system32/drivers" installname="ndis.sys"> <importlibrary definition="ndis.def"></importlibrary> <include base="ndis">include</include> <define name="NDIS_WRAPPER" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/npf/npf.xml --- branches/xmlbuildsystem/reactos/drivers/net/npf/npf.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/net/npf/npf.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="npf" type="kernelmodedriver"> +<module name="npf" type="kernelmodedriver" installbase="system32/drivers" installname="npf.sys"> <include base="npf">include</include> <include base="ntoskrnl">include</include> <define name="WIN_NT_DRIVER" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml --- branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="tcpip" type="kernelmodedriver"> +<module name="tcpip" type="kernelmodedriver" installbase="system32/drivers" installname="tcpip.sys"> <importlibrary definition="tcpip.def"></importlibrary> <include base="tcpip">include</include> <include base="oskittcp">include</include> _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/tdi/tdi.xml --- branches/xmlbuildsystem/reactos/drivers/net/tdi/tdi.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/net/tdi/tdi.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="tdi" type="kernelmodedriver"> +<module name="tdi" type="kernelmodedriver" installbase="system32/drivers" installname="tdi.sys"> <importlibrary definition="misc/tdi.def"></importlibrary> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/wshtcpip/wshtcpip.xml --- branches/xmlbuildsystem/reactos/drivers/net/wshtcpip/wshtcpip.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/net/wshtcpip/wshtcpip.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="wshtcpip" type="win32dll"> +<module name="wshtcpip" type="win32dll" installbase="system32" installname="wshtcpip.dll"> <importlibrary definition="wshtcpip.def"></importlibrary> <include base="wshtcpip">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml --- branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="atapi" type="kernelmodedriver"> +<module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys"> <bootstrap base="reactos" /> <include base="atapi">.</include> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml --- branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="cdrom" type="kernelmodedriver"> +<module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys"> <bootstrap base="reactos" /> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml --- branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="class2" type="kernelmodedriver"> +<module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys"> <bootstrap base="reactos" /> <importlibrary definition="class2.def" /> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml --- branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="disk" type="kernelmodedriver"> +<module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="debugout.sys"> <bootstrap base="reactos" /> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml --- branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="diskdump" type="kernelmodedriver"> +<module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys"> <bootstrap base="reactos" /> <library definition="diskdump.def" /> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml --- branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="floppy" type="kernelmodedriver"> +<module name="floppy" type="kernelmodedriver" installbase="system32/drivers" installname="floppy.sys"> <bootstrap base="reactos" /> <include base="floppy">.</include> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml --- branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="scsiport" type="kernelmodedriver"> +<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> <bootstrap base="reactos" /> <importlibrary definition="scsiport.def" /> <include base="scsiport">.</include> _____ Modified: branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml --- branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="framebuf" type="kernelmodedll" entrypoint="_DrvEnableDriver@12"> +<module name="framebuf" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> <importlibrary definition="framebuf.def" /> <include base="framebuf">.</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml --- branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="vgaddi" type="kernelmodedll" entrypoint="_DrvEnableDriver@12"> +<module name="vgaddi" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="vgaddi.dll"> <importlibrary definition="vgaddi.def" /> <include base="vgaddi">.</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/vbemp.xml --- branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/vbemp.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/vbemp.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="vbemp" type="kernelmodedriver"> +<module name="vbemp" type="kernelmodedriver" installbase="system32/drivers" installname="vbemp.sys"> <include base="vbemp">.</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/vgamp.xml --- branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/vgamp.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/vgamp.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="vgamp" type="kernelmodedriver"> +<module name="vgamp" type="kernelmodedriver" installbase="system32/drivers" installname="vgamp.dll"> <include base="vgamp">.</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/video/videoprt/videoprt.xml --- branches/xmlbuildsystem/reactos/drivers/video/videoprt/videoprt.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/drivers/video/videoprt/videoprt.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="videoprt" type="kernelmodedriver"> +<module name="videoprt" type="kernelmodedriver" installbase="system32/drivers" installname="videoprt.sys"> <importlibrary definition="videoprt.def" /> <include base="videoprt">.</include> <include base="ntoskrnl">include</include> _____ Modified: branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml --- branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="halup" type="kernelmodedll"> +<module name="halup" type="kernelmodedll" installbase="system32" installname="hal.dll"> <importlibrary definition="../../hal/hal.def" /> <bootstrap base="reactos" nameoncd="hal.dll" /> <include base="hal_generic">../include</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml --- branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}"> +<module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}" installbase="system32" installname="acledit.dll"> <importlibrary definition="acledit.def" /> <include base="acledit">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml --- branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}"> +<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll"> <importlibrary definition="aclui.def" /> <include base="aclui">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml --- branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}"> +<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll"> <importlibrary definition="advapi32.def" /> <include base="advapi32">.</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml --- branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="advpack" type="win32dll" baseaddress="${BASEADDRESS_ADVPACK}"> +<module name="advpack" type="win32dll" baseaddress="${BASEADDRESS_ADVPACK}" installbase="system32" installname="advpack.dll"> <importlibrary definition="advpack.def" /> <include base="advpack">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml --- branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}"> +<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll"> <importlibrary definition="cabinet.spec.def" /> <include base="cabinet">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/cards/cards.xml --- branches/xmlbuildsystem/reactos/lib/cards/cards.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/cards/cards.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}"> +<module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cards.dll"> <importlibrary definition="cards.def" /> <include base="cards">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml --- branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}"> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll"> <importlibrary definition="comctl32.spec.def" /> <include base="comctl32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml --- branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}"> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll"> <importlibrary definition="comdlg32.spec.def" /> <include base="comdlg32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml --- branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}"> +<module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}" installbase="system32" installname="access.cpl"> <importlibrary definition="access.def" /> <include base="access">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml --- branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}"> +<module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz.cpl"> <importlibrary definition="appwiz.def" /> <include base="appwiz">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml --- branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}"> +<module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}" installbase="system32" installname="control.exe"> <include base="control">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml --- branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}"> +<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl"> <importlibrary definition="desk.def" /> <include base="desk">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml --- branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}"> +<module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl"> <importlibrary definition="intl.def" /> <include base="intl">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml --- branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}"> +<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl"> <importlibrary definition="main.def" /> <include base="main">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml --- branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}"> +<module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}" installbase="system32" installname="ncpa.cpl"> <importlibrary definition="ncpa.def" /> <include base="ncpa">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml --- branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}"> +<module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl"> <importlibrary definition="sysdm.def" /> <include base="sysdm">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml --- branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}"> +<module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}" installbase="system32" installname="timedate.cpl"> <importlibrary definition="timedate.def" /> <include base="timedate">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml --- branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="crtdll" type="win32dll" baseaddress="${BASEADDRESS_CRTDLL}" mangledsymbols="true"> +<module name="crtdll" type="win32dll" baseaddress="${BASEADDRESS_CRTDLL}" mangledsymbols="true" installbase="system32" installname="crtdll.dll"> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-lgcc</linkerflag> <importlibrary definition="crtdll.def" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml --- branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}"> +<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll"> <importlibrary definition="dbghelp.spec.def" /> <include base="dbghelp">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml --- branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}"> +<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll"> <importlibrary definition="devenum.spec.def" /> <include base="devenum">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml --- branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}"> +<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll"> <importlibrary definition="dinput.spec.def" /> <include base="dinput">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml --- branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="dinput8" type="win32dll" baseaddress="${BASEADDRESS_DINPUT8}"> +<module name="dinput8" type="win32dll" baseaddress="${BASEADDRESS_DINPUT8}" installbase="system32" installname="dinput8.dll"> <importlibrary definition="dinput8.spec.def" /> <include base="dinput8">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml --- branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="dnsapi" type="win32dll" baseaddress="${BASEADDRESS_DNSAPI}"> +<module name="dnsapi" type="win32dll" baseaddress="${BASEADDRESS_DNSAPI}" installbase="system32" installname="dnsapi.dll"> <importlibrary definition="dnsapi.def" /> <include base="dnsapi">include</include> <include base="adns">src</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml --- branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="dsound" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}"> +<module name="dsound" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}" installbase="system32" installname="dsound.dll"> <importlibrary definition="dsound.def" /> <include base="dsound">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml --- branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}"> +<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll"> <importlibrary definition="dxdiagn.spec.def" /> <include base="dxdiagn">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml --- branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="fmifs" type="win32dll" entrypoint="_InitializeFmIfs@12" baseaddress="${BASEADDRESS_FMIFS}"> +<module name="fmifs" type="win32dll" entrypoint="_InitializeFmIfs@12" baseaddress="${BASEADDRESS_FMIFS}" installbase="system32" installname="fmifs.dll"> <importlibrary definition="fmifs.def" /> <include base="fmifs">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml --- branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="freetype" type="kernelmodedll" baseaddress="${BASEADDRESS_FREETYPE}"> +<module name="freetype" type="kernelmodedll" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll"> <importlibrary definition="freetype.def" /> <include base="freetype">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml --- branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}"> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll"> <importlibrary definition="gdi32.def" /> <include base="gdi32">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml --- branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}"> +<module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}" installbase="system32" installname="gdiplus.dll"> <importlibrary definition="gdiplus.def" /> <include base="gdiplus">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml --- branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="glu32" type="win32dll" baseaddress="${BASEADDRESS_GLU32}"> +<module name="glu32" type="win32dll" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll"> <importlibrary definition="glu32.def" /> <include base="glu32">include</include> <include base="glu32">libnurbs/internals</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml --- branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}"> +<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll"> <importlibrary definition="imagehlp.def" /> <include base="imagehlp">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml --- branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}"> +<module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}" installbase="system32" installname="imm32.dll"> <importlibrary definition="imm32.def" /> <include base="imm32">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml --- branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}"> +<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll"> <importlibrary definition="iphlpapi.spec.def" /> <include base="iphlpapi">include</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml --- branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="kbdda" type="kernelmodedll" entrypoint="0"> +<module name="kbdda" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdda.dll"> <importlibrary definition="kbdda.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml --- branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="kbddv" type="kernelmodedll" entrypoint="0"> +<module name="kbddv" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbddv.dll"> <importlibrary definition="kbddv.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml --- branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="kbdes" type="kernelmodedll" entrypoint="0"> +<module name="kbdes" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdes.dll"> <importlibrary definition="kbdes.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml --- branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="kbdfr" type="kernelmodedll" entrypoint="0"> +<module name="kbdfr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfr.dll"> <importlibrary definition="kbdfr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml --- branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="kbdgr" type="kernelmodedll" entrypoint="0"> +<module name="kbdgr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgr.dll"> <importlibrary definition="kbdgr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml --- branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="kbdse" type="kernelmodedll" entrypoint="0"> +<module name="kbdse" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdse.dll"> <importlibrary definition="kbdse.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml --- branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="kbduk" type="kernelmodedll" entrypoint="0"> +<module name="kbduk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduk.dll"> <importlibrary definition="kbduk.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml --- branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="kbdus" type="kernelmodedll" entrypoint="0"> +<module name="kbdus" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdus.dll"> <importlibrary definition="kbdus.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml --- branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -103,7 +103,7 @@ <file>tls.c</file> </directory> </module> -<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}"> +<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> <importlibrary definition="kernel32.def" /> <include base="kernel32">.</include> <include base="kernel32">include</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml --- branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="lz32" type="win32dll" baseaddress="${BASEADDRESS_LZ32}"> +<module name="lz32" type="win32dll" baseaddress="${BASEADDRESS_LZ32}" installbase="system32" installname="lz32.dll"> <importlibrary definition="lz32.def" /> <include base="lz32">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml --- branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}"> +<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll"> <importlibrary definition="mesa32.def" /> <linkerflag>-Wl,--enable-stdcall-fixup</linkerflag> <include base="mesa32">include</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml --- branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="midimap" type="win32dll" baseaddress="${BASEADDRESS_MIDIMAP}"> +<module name="midimap" type="win32dll" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll"> <importlibrary definition="midimap.spec.def" /> <include base="midimap">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml --- branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}"> +<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll"> <importlibrary definition="mmdrv.def" /> <include base="mmdrv">.</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml --- branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}"> +<module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll"> <importlibrary definition="mpr.spec.def" /> <include base="mpr">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml --- branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}"> +<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll"> <importlibrary definition="msacm32.spec.def" /> <include base="msacm32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml --- branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}"> +<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd32.dll"> <importlibrary definition="msafd.def" /> <include base="msafd">include</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml --- branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="msgina" type="win32dll" baseaddress="${BASEADDRESS_MSGINA}"> +<module name="msgina" type="win32dll" baseaddress="${BASEADDRESS_MSGINA}" installbase="system32" installname="msgina.dll"> <importlibrary definition="msgina.def" /> <include base="msgina">.</include> <include base="msgina">include</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml --- branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml 2005-04-04 20:50:55 UTC (rev 14488) +++ branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml 2005-04-04 22:05:08 UTC (rev 14489) @@ -1,4 +1,4 @@ -<module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}"> +<module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}" installbase="system32" installname="msimg32.dll"> [truncated at 1000 lines; 543 more skipped]

1 0

[chorns] 14488: Support installation of generated files
by chorns＠svn.reactos.com 04 Apr '05

04 Apr '05

Support installation of generated files Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-04 19:39:44 UTC (rev 14487) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-04 20:50:55 UTC (rev 14488) @@ -614,60 +614,38 @@ // allow that to override use_pch if true } -string -MingwBackend::GetNonModuleInstallDirectories ( const string& installDirectory ) -{ - string directories; - for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) - { - const InstallFile& installfile = *ProjectNode.installfiles[i]; - string targetDirectory ( installDirectory + SSEP + installfile.base ); - if ( directories.size () > 0 ) - directories += " "; - directories += MingwModuleHandler::PassThruCacheDirectory ( - FixupTargetFilename ( targetDirectory ), - true ); - } - return directories; -} - -string -MingwBackend::GetInstallDirectories ( const string& installDirectory ) -{ - return GetNonModuleInstallDirectories ( installDirectory ); -} - void -MingwBackend::GetNonModuleInstallFiles ( +MingwBackend::GetNonModuleInstallTargetFiles ( + string installDirectory, vector<string>& out ) const { for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) { const InstallFile& installfile = *ProjectNode.installfiles[i]; - out.push_back ( NormalizeFilename ( installfile.GetPath () ) ); + string targetFilenameNoFixup = installDirectory + SSEP + installfile.base + SSEP + installfile.newname; + string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( + NormalizeFilename ( targetFilenameNoFixup ), + true ); + out.push_back ( targetFilename ); } } void -MingwBackend::GetInstallFiles ( - vector<string>& out ) const -{ - GetNonModuleInstallFiles ( out ); -} - -void -MingwBackend::GetNonModuleInstallTargetFiles ( +MingwBackend::GetModuleInstallTargetFiles ( string installDirectory, vector<string>& out ) const { - for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) + for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) { - const InstallFile& installfile = *ProjectNode.installfiles[i]; - string targetFilenameNoFixup = installDirectory + SSEP + installfile.base + SSEP + installfile.newname; - string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( - FixupTargetFilename ( targetFilenameNoFixup ), - true ); - out.push_back ( targetFilename ); + const Module& module = *ProjectNode.modules[i]; + if ( module.installName.length () > 0 ) + { + string targetFilenameNoFixup = installDirectory + SSEP + module.installBase + SSEP + module.installName; + string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( + NormalizeFilename ( targetFilenameNoFixup ), + true ); + out.push_back ( targetFilename ); + } } } @@ -678,36 +656,68 @@ { GetNonModuleInstallTargetFiles ( installDirectory, out ); + GetModuleInstallTargetFiles ( installDirectory, + out ); } void -MingwBackend::OutputInstallfileTargets ( const string& installDirectory ) +MingwBackend::OutputInstallTarget ( const string& installDirectory, + const string& sourceFilename, + const string& targetFilename, + const string& targetDirectory ) { + string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( + NormalizeFilename ( installDirectory + SSEP + targetDirectory + SSEP + targetFilename ), + true ); + string normalizedTargetDirectory = MingwModuleHandler::PassThruCacheDirectory ( + NormalizeFilename ( installDirectory + SSEP + targetDirectory ), + true ); + fprintf ( fMakefile, + "%s: %s %s\n", + normalizedTargetFilename.c_str (), + sourceFilename.c_str (), + normalizedTargetDirectory.c_str () ); + fprintf ( fMakefile, + "\t$(ECHO_CP)\n" ); + fprintf ( fMakefile, + "\t${cp} %s %s\n", + sourceFilename.c_str (), + normalizedTargetFilename.c_str () ); +} + +void +MingwBackend::OutputNonModuleInstallTargets ( const string& installDirectory ) +{ for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) { const InstallFile& installfile = *ProjectNode.installfiles[i]; - string targetFilenameNoFixup = installDirectory + SSEP + installfile.base + SSEP + installfile.newname; - string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( - FixupTargetFilename ( targetFilenameNoFixup ), - true ); - string targetDirectory = MingwModuleHandler::PassThruCacheDirectory ( - FixupTargetFilename ( installDirectory + SSEP + installfile.base ), - true ); - fprintf ( fMakefile, - "%s: %s %s\n", - targetFilename.c_str (), - installfile.GetPath ().c_str (), - targetDirectory.c_str () ); - fprintf ( fMakefile, - "\t$(ECHO_CP)\n" ); - fprintf ( fMakefile, - "\t${cp} %s %s\n", - installfile.GetPath ().c_str (), - targetFilename.c_str () ); + OutputInstallTarget ( installDirectory, + installfile.GetPath (), + installfile.newname, + installfile.base ); } } void +MingwBackend::OutputModuleInstallTargets ( const string& installDirectory ) +{ + for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) + { + const Module& module = *ProjectNode.modules[i]; + if ( module.installName.length () > 0 ) + { + string sourceFilename = MingwModuleHandler::PassThruCacheDirectory ( + NormalizeFilename ( module.GetPath () ), + true ); + OutputInstallTarget ( installDirectory, + sourceFilename, + module.installName, + module.installBase ); + } + } +} + +void MingwBackend::GenerateInstallTarget () { string installDirectoryNoFixup = "reactos"; @@ -723,7 +733,8 @@ "install: %s %s\n", installDirectory.c_str (), installTargetFiles.c_str () ); - OutputInstallfileTargets ( installDirectoryNoFixup ); + OutputNonModuleInstallTargets ( installDirectoryNoFixup ); + OutputModuleInstallTargets ( installDirectoryNoFixup ); fprintf ( fMakefile, "\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-04 19:39:44 UTC (rev 14487) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-04 20:50:55 UTC (rev 14488) @@ -50,9 +50,16 @@ void GetInstallFiles ( std::vector<std::string>& out ) const; void GetNonModuleInstallTargetFiles ( std::string installDirectory, std::vector<std::string>& out ) const; + void GetModuleInstallTargetFiles ( std::string installDirectory, + std::vector<std::string>& out ) const; void GetInstallTargetFiles ( std::string installDirectory, std::vector<std::string>& out ) const; - void OutputInstallfileTargets ( const std::string& installDirectory ); + void OutputInstallTarget ( const std::string& installDirectory, + const std::string& sourceFilename, + const std::string& targetFilename, + const std::string& targetDirectory ); + void OutputNonModuleInstallTargets ( const std::string& installDirectory ); + void OutputModuleInstallTargets ( const std::string& installDirectory ); void GenerateInstallTarget (); FILE* fMakefile; bool use_pch; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-04 19:39:44 UTC (rev 14487) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-04 20:50:55 UTC (rev 14488) @@ -97,7 +97,7 @@ } return path; } - + /*static*/ string MingwModuleHandler::PassThruCacheDirectory ( const string &file, bool out ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-04-04 19:39:44 UTC (rev 14487) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-04-04 20:50:55 UTC (rev 14488) @@ -133,7 +133,9 @@ host (HostDefault) { if ( node.name != "module" ) - throw Exception ( "internal tool error: Module created with non-<module> node" ); + throw InvalidOperationException ( __FILE__, + __LINE__, + "Module created with non-<module> node" ); path = FixSeparator ( modulePath ); @@ -202,6 +204,18 @@ att = moduleNode.GetAttribute ( "prefix", false ); if ( att != NULL ) prefix = att->value; + + att = moduleNode.GetAttribute ( "installbase", false ); + if ( att != NULL ) + installBase = att->value; + else + installBase = ""; + + att = moduleNode.GetAttribute ( "installname", false ); + if ( att != NULL ) + installName = att->value; + else + installName = ""; } Module::~Module () _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-04-04 19:39:44 UTC (rev 14487) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-04-04 20:50:55 UTC (rev 14488) @@ -171,6 +171,8 @@ bool cplusplus; std::string prefix; HostType host; + std::string installBase; + std::string installName; Module ( const Project& project, const XMLElement& moduleNode, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-04-04 19:39:44 UTC (rev 14487) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-04-04 20:50:55 UTC (rev 14488) @@ -107,7 +107,7 @@ There can be zero or more modules per xml build file. Syntax: - <module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true"> + <module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" > ... </module> @@ -118,6 +118,8 @@ entrypoint - Entrypoint symbol of the generated file if such file is generated for the particular module type. baseaddress - Base address of the generated file if such file is generated for the particular module type. mangledsymbols - Controls wether or not to pass --kill-at to dlltool. If this attribute has the value false then --kill-at is passed to dlltool. If the value is true, then --kill-at is not passed to dlltool. If the generated file exports C++ classes then this need to be true. + installbase - Base directory of the generated file in the installation directory. This attribute is optional. + installname - Name of generated file in the installation directory. This attribute is optional, but if not specified, the generated file is not copied to the installation directory. Value: None. _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml 2005-04-04 19:39:44 UTC (rev 14487) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml 2005-04-04 20:50:55 UTC (rev 14488) @@ -7,7 +7,7 @@ </module> </directory> <directory name="dir2"> - <module name="module2" type="kernelmodedll"> + <module name="module2" type="kernelmodedll" installbase="reactos" installname="module2.ext"> <dependency>module1</dependency> <library>module1</library> <file>file3.c</file> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-04-04 19:39:44 UTC (rev 14487) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-04-04 20:50:55 UTC (rev 14488) @@ -10,6 +10,7 @@ Module& module1 = *project.modules[0]; IS_TRUE(module1.type == BuildTool); + ARE_EQUAL(2, module1.non_if_data.files.size()); ARE_EQUAL("dir1" SSEP "file1.c", module1.non_if_data.files[0]->name); ARE_EQUAL("dir1" SSEP "file2.c", module1.non_if_data.files[1]->name); @@ -18,6 +19,9 @@ Module& module2 = *project.modules[1]; IS_TRUE(module2.type == KernelModeDLL); + ARE_EQUAL("reactos", module2.installBase); + ARE_EQUAL("module2.ext", module2.installName); + ARE_EQUAL(2, module2.non_if_data.files.size()); ARE_EQUAL("dir2" SSEP "file3.c", module2.non_if_data.files[0]->name); ARE_EQUAL("dir2" SSEP "file4.c", module2.non_if_data.files[1]->name);

1 0

[chorns] 14487: Let dependencies control 'make install'
by chorns＠svn.reactos.com 04 Apr '05

04 Apr '05

Let dependencies control 'make install' Modified: branches/xmlbuildsystem/reactos/media/nls/nls.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h _____ Modified: branches/xmlbuildsystem/reactos/media/nls/nls.xml --- branches/xmlbuildsystem/reactos/media/nls/nls.xml 2005-04-04 03:55:43 UTC (rev 14486) +++ branches/xmlbuildsystem/reactos/media/nls/nls.xml 2005-04-04 19:39:44 UTC (rev 14487) @@ -3,34 +3,6 @@ <cdfile base="reactos">l_intl.nls</cdfile> <installfile base="system32">c_037.nls</installfile> -<installfile base="system32">c_037.nls</installfile> -<installfile base="system32">c_10000.nls</installfile> -<installfile base="system32">c_10006.nls</installfile> -<installfile base="system32">c_10007.nls</installfile> -<installfile base="system32">c_10029.nls</installfile> -<installfile base="system32">c_1006.nls</installfile> -<installfile base="system32">c_10079.nls</installfile> -<installfile base="system32">c_10081.nls</installfile> -<installfile base="system32">c_1026.nls</installfile> -<installfile base="system32">c_1250.nls</installfile> -<installfile base="system32">c_1251.nls</installfile> -<installfile base="system32" newname="ansi.nls">c_1252.nls</installfile> -<installfile base="system32">c_1253.nls</installfile> -<installfile base="system32">c_1254.nls</installfile> -<installfile base="system32">c_1255.nls</installfile> -<installfile base="system32">c_1256.nls</installfile> -<installfile base="system32">c_1257.nls</installfile> -<installfile base="system32">c_1258.nls</installfile> -<installfile base="system32">c_20866.nls</installfile> -<installfile base="system32">c_28591.nls</installfile> -<installfile base="system32">c_28592.nls</installfile> -<installfile base="system32">c_28593.nls</installfile> -<installfile base="system32">c_28594.nls</installfile> -<installfile base="system32">c_28595.nls</installfile> -<installfile base="system32">c_28596.nls</installfile> -<installfile base="system32">c_28597.nls</installfile> -<installfile base="system32">c_28598.nls</installfile> -<installfile base="system32">c_28599.nls</installfile> <installfile base="system32">c_424.nls</installfile> <installfile base="system32" newname="oem.nls">c_437.nls</installfile> <installfile base="system32">c_500.nls</installfile> @@ -56,4 +28,31 @@ <installfile base="system32">c_936.nls</installfile> <installfile base="system32">c_949.nls</installfile> <installfile base="system32">c_950.nls</installfile> +<installfile base="system32">c_1006.nls</installfile> +<installfile base="system32">c_1026.nls</installfile> +<installfile base="system32">c_1250.nls</installfile> +<installfile base="system32">c_1251.nls</installfile> +<installfile base="system32" newname="ansi.nls">c_1252.nls</installfile> +<installfile base="system32">c_1253.nls</installfile> +<installfile base="system32">c_1254.nls</installfile> +<installfile base="system32">c_1255.nls</installfile> +<installfile base="system32">c_1256.nls</installfile> +<installfile base="system32">c_1257.nls</installfile> +<installfile base="system32">c_1258.nls</installfile> +<installfile base="system32">c_10000.nls</installfile> +<installfile base="system32">c_10006.nls</installfile> +<installfile base="system32">c_10007.nls</installfile> +<installfile base="system32">c_10029.nls</installfile> +<installfile base="system32">c_10079.nls</installfile> +<installfile base="system32">c_10081.nls</installfile> +<installfile base="system32">c_20866.nls</installfile> +<installfile base="system32">c_28591.nls</installfile> +<installfile base="system32">c_28592.nls</installfile> +<installfile base="system32">c_28593.nls</installfile> +<installfile base="system32">c_28594.nls</installfile> +<installfile base="system32">c_28595.nls</installfile> +<installfile base="system32">c_28596.nls</installfile> +<installfile base="system32">c_28597.nls</installfile> +<installfile base="system32">c_28598.nls</installfile> +<installfile base="system32">c_28599.nls</installfile> <installfile base="system32" newname="casemap.nls">l_intl.nls</installfile> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-04 03:55:43 UTC (rev 14486) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-04 19:39:44 UTC (rev 14487) @@ -656,7 +656,9 @@ } void -MingwBackend::OutputInstallfileCopyCommands ( const string& installDirectory ) +MingwBackend::GetNonModuleInstallTargetFiles ( + string installDirectory, + vector<string>& out ) const { for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) { @@ -665,7 +667,38 @@ string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( FixupTargetFilename ( targetFilenameNoFixup ), true ); + out.push_back ( targetFilename ); + } +} + +void +MingwBackend::GetInstallTargetFiles ( + string installDirectory, + vector<string>& out ) const +{ + GetNonModuleInstallTargetFiles ( installDirectory, + out ); +} + +void +MingwBackend::OutputInstallfileTargets ( const string& installDirectory ) +{ + for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) + { + const InstallFile& installfile = *ProjectNode.installfiles[i]; + string targetFilenameNoFixup = installDirectory + SSEP + installfile.base + SSEP + installfile.newname; + string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( + FixupTargetFilename ( targetFilenameNoFixup ), + true ); + string targetDirectory = MingwModuleHandler::PassThruCacheDirectory ( + FixupTargetFilename ( installDirectory + SSEP + installfile.base ), + true ); fprintf ( fMakefile, + "%s: %s %s\n", + targetFilename.c_str (), + installfile.GetPath ().c_str (), + targetDirectory.c_str () ); + fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, "\t${cp} %s %s\n", @@ -679,19 +712,18 @@ { string installDirectoryNoFixup = "reactos"; string installDirectory = MingwModuleHandler::PassThruCacheDirectory ( - FixupTargetFilename ( installDirectoryNoFixup ), + NormalizeFilename ( installDirectoryNoFixup ), true ); - string installDirectories = GetInstallDirectories ( installDirectoryNoFixup ); - vector<string> vInstallFiles; - GetInstallFiles ( vInstallFiles ); - string installFiles = v2s ( vInstallFiles, 5 ); + vector<string> vInstallTargetFiles; + GetInstallTargetFiles ( installDirectoryNoFixup, + vInstallTargetFiles ); + string installTargetFiles = v2s ( vInstallTargetFiles, 5 ); fprintf ( fMakefile, - "install: all %s %s %s\n", + "install: %s %s\n", installDirectory.c_str (), - installDirectories.c_str (), - installFiles.c_str () ); - OutputInstallfileCopyCommands ( installDirectoryNoFixup ); + installTargetFiles.c_str () ); + OutputInstallfileTargets ( installDirectoryNoFixup ); fprintf ( fMakefile, "\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-04 03:55:43 UTC (rev 14486) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-04 19:39:44 UTC (rev 14487) @@ -48,7 +48,11 @@ std::string GetInstallDirectories ( const std::string& installDirectory ); void GetNonModuleInstallFiles ( std::vector<std::string>& out ) const; void GetInstallFiles ( std::vector<std::string>& out ) const; - void OutputInstallfileCopyCommands ( const std::string& installDirectory ); + void GetNonModuleInstallTargetFiles ( std::string installDirectory, + std::vector<std::string>& out ) const; + void GetInstallTargetFiles ( std::string installDirectory, + std::vector<std::string>& out ) const; + void OutputInstallfileTargets ( const std::string& installDirectory ); void GenerateInstallTarget (); FILE* fMakefile; bool use_pch;

1 0

[ion] 14486: Compile with w32api...gift for Steven
by ion＠svn.reactos.com 04 Apr '05

04 Apr '05

Compile with w32api...gift for Steven Modified: trunk/reactos/lib/psapi/makefile Modified: trunk/reactos/lib/psapi/psapi.c _____ Modified: trunk/reactos/lib/psapi/makefile --- trunk/reactos/lib/psapi/makefile 2005-04-03 21:36:15 UTC (rev 14485) +++ trunk/reactos/lib/psapi/makefile 2005-04-04 03:55:43 UTC (rev 14486) @@ -11,7 +11,7 @@ TARGET_CFLAGS = -I./include -Wall -Werror # require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS -D_SEH_NO_NATIVE_NLG +TARGET_CFLAGS += -D_DISABLE_TIDENTS -D_SEH_NO_NATIVE_NLG -D__USE_W32API TARGET_LFLAGS = -nostartfiles -nostdlib _____ Modified: trunk/reactos/lib/psapi/psapi.c --- trunk/reactos/lib/psapi/psapi.c 2005-04-03 21:36:15 UTC (rev 14485) +++ trunk/reactos/lib/psapi/psapi.c 2005-04-04 03:55:43 UTC (rev 14486) @@ -282,7 +282,7 @@ } /* allocate the memory */ - pmsnName = PsaiMalloc(nBufSize + offsetof(MEMORY_SECTION_NAME, NameBuffer)); + pmsnName = PsaiMalloc(nBufSize + sizeof(MEMORY_SECTION_NAME)); if(pmsnName == NULL) { @@ -315,7 +315,7 @@ if(bUnicode) { /* destination is an Unicode string: direct copy */ - memcpy((LPWSTR)lpName, pmsnName->NameBuffer, pmsnName->SectionFileName.Length); + memcpy((LPWSTR)lpName, pmsnName + 1, pmsnName->SectionFileName.Length); PsaiFree(pmsnName);

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