Ros-diffs

ros-diffs@reactos.org

81390 discussions

[evb] 48548: - Add support for PnP IRP to PDO: IRP_MN_QUERY_BUS_INFORMATION (PciQueryBusInformation), IRP_MN_QUERY_ID (PciQueryId), IRP_MN_QUERY_DEVICE_TEXT (PciQueryDeviceText), IRP_MN_QUERY_CAPABILITIES (PciQueryCapabilities), IRP_MN_QUERY_DEVICE_RELATIONS (PciQueryTargetDeviceRelations implement, PciQueryEjectionRelations, stub) - Stub support for PnP IRP to PDO: IRP_MN_QUERY_RESOURCE_REQUIREMENTS (PciQueryRequirements), IRP_MN_QUERY_RESOURCES(PciQueryResources) - Add support for PnP IRP to F
by evb＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: evb Date: Sat Aug 14 17:09:20 2010 New Revision: 48548 URL: http://svn.reactos.org/svn/reactos?rev=48548&view=rev Log: - Add support for PnP IRP to PDO: IRP_MN_QUERY_BUS_INFORMATION (PciQueryBusInformation), IRP_MN_QUERY_ID (PciQueryId), IRP_MN_QUERY_DEVICE_TEXT (PciQueryDeviceText), IRP_MN_QUERY_CAPABILITIES (PciQueryCapabilities), IRP_MN_QUERY_DEVICE_RELATIONS (PciQueryTargetDeviceRelations implement, PciQueryEjectionRelations, stub) - Stub support for PnP IRP to PDO: IRP_MN_QUERY_RESOURCE_REQUIREMENTS (PciQueryRequirements), IRP_MN_QUERY_RESOURCES(PciQueryResources) - Add support for PnP IRP to FDO: IRP_MN_QUERY_CAPABILITIES (handle in PciFdoIrpQueryDeviceCapabilities) - Build device capability UI number (PciDetermineSlotNumber), use PIR$ (seem support broken, need to check loader) or device property for bus not root - Use parent attachee device and this PDO for build device/system wake states, latency, device/system power mappings - PCI-ID manage support: PciInitIdBuffer, PciIdPrintf, PciIdPrintfAppend - Debug helper: PciDebugDumpQueryCapabilities - Thanks richard for advise + beer PCI-X driver now pass 10000 codes lines! Modified: trunk/reactos/drivers/bus/pcix/debug.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/pci/id.c trunk/reactos/drivers/bus/pcix/pdo.c trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/debug.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] Sat Aug 14 17:09:20 2010 @@ -49,6 +49,26 @@ "QUERY_POWER", }; +PCHAR SystemPowerStates[] = +{ + "Unspecified", + "Working", + "Sleeping1", + "Sleeping2", + "Sleeping3", + "Hibernate", + "Shutdown" +}; + +PCHAR DevicePowerStates[] = +{ + "Unspecified", + "D0", + "D1", + "D2", + "D3" +}; + ULONG PciBreakOnPdoPowerIrp, PciBreakOnFdoPowerIrp; ULONG PciBreakOnPdoPnpIrp, PciBreakOnFdoPnpIrp; @@ -194,4 +214,41 @@ } } +VOID +NTAPI +PciDebugDumpQueryCapabilities(IN PDEVICE_CAPABILITIES DeviceCaps) +{ + ULONG i; + + /* Dump the capabilities */ + DPRINT1("Capabilities\n Lock:%d, Eject:%d, Remove:%d, Dock:%d, UniqueId:%d\n", + DeviceCaps->LockSupported, + DeviceCaps->EjectSupported, + DeviceCaps->Removable, + DeviceCaps->DockDevice, + DeviceCaps->UniqueID); + DbgPrint(" SilentInstall:%d, RawOk:%d, SurpriseOk:%d\n", + DeviceCaps->SilentInstall, + DeviceCaps->RawDeviceOK, + DeviceCaps->SurpriseRemovalOK); + DbgPrint(" Address %08x, UINumber %08x, Latencies D1 %d, D2 %d, D3 %d\n", + DeviceCaps->Address, + DeviceCaps->UINumber, + DeviceCaps->D1Latency, + DeviceCaps->D2Latency, + DeviceCaps->D3Latency); + + /* Dump and convert the wake levels */ + DbgPrint(" System Wake: %s, Device Wake: %s\n DeviceState[PowerState] [", + SystemPowerStates[min(DeviceCaps->SystemWake, PowerSystemMaximum)], + DevicePowerStates[min(DeviceCaps->DeviceWake, PowerDeviceMaximum)]); + + /* Dump and convert the power state mappings */ + for (i = PowerSystemWorking; i < PowerSystemMaximum; i++) + DbgPrint(" %s", DevicePowerStates[DeviceCaps->DeviceState[i]]); + + /* Finish the dump */ + DbgPrint(" ]\n"); +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Sat Aug 14 17:09:20 2010 @@ -13,6 +13,8 @@ #include <debug.h> /* GLOBALS ********************************************************************/ + +PIO_RESOURCE_REQUIREMENTS_LIST PciZeroIoResourceRequirements; PCI_CONFIGURATOR PciConfigurators[] = { @@ -46,6 +48,65 @@ }; /* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +PciQueryResources(IN PPCI_PDO_EXTENSION PdoExtension, + OUT PCM_RESOURCE_LIST *Buffer) +{ + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PciQueryTargetDeviceRelations(IN PPCI_PDO_EXTENSION PdoExtension, + IN OUT PDEVICE_RELATIONS *pDeviceRelations) +{ + PDEVICE_RELATIONS DeviceRelations; + PAGED_CODE(); + + /* If there were existing relations, free them */ + if (*pDeviceRelations) ExFreePoolWithTag(*pDeviceRelations, 0); + + /* Allocate a new structure for the relations */ + DeviceRelations = ExAllocatePoolWithTag(NonPagedPool, + sizeof(DEVICE_RELATIONS), + 'BicP'); + if (!DeviceRelations) return STATUS_INSUFFICIENT_RESOURCES; + + /* Only one relation: the PDO */ + DeviceRelations->Count = 1; + DeviceRelations->Objects[0] = PdoExtension->PhysicalDeviceObject; + ObReferenceObject(DeviceRelations->Objects[0]); + + /* Return the new relations */ + *pDeviceRelations = DeviceRelations; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PciQueryEjectionRelations(IN PPCI_PDO_EXTENSION PdoExtension, + IN OUT PDEVICE_RELATIONS *pDeviceRelations) +{ + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); +} + +NTSTATUS +NTAPI +PciQueryRequirements(IN PPCI_PDO_EXTENSION PdoExtension, + IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *RequirementsList) +{ + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} /* * 7. The IO/MEM/Busmaster decodes are disabled for the device. Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Sat Aug 14 17:09:20 2010 @@ -295,9 +295,23 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + PDEVICE_CAPABILITIES Capabilities; + PAGED_CODE(); + ASSERT_FDO(DeviceExtension); + + /* Get the capabilities */ + Capabilities = IoStackLocation->Parameters.DeviceCapabilities.Capabilities; + + /* Inherit wake levels and power mappings from the higher-up capabilities */ + DeviceExtension->PowerState.SystemWakeLevel = Capabilities->SystemWake; + DeviceExtension->PowerState.DeviceWakeLevel = Capabilities->DeviceWake; + RtlCopyMemory(DeviceExtension->PowerState.SystemStateMapping, + Capabilities->DeviceState, + sizeof(DeviceExtension->PowerState.SystemStateMapping)); + + /* Dump the capabilities and return success */ + PciDebugDumpQueryCapabilities(Capabilities); + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Sat Aug 14 17:09:20 2010 @@ -78,6 +78,11 @@ // PCI Driver Verifier Failures // #define PCI_VERIFIER_CODES 0x04 + +// +// PCI ID Buffer ANSI Strings +// +#define MAX_ANSI_STRINGS 0x08 // // Device Extension, Interface, Translator and Arbiter Signatures @@ -411,6 +416,19 @@ } PCI_VERIFIER_DATA, *PPCI_VERIFIER_DATA; // +// PCI ID Buffer Descriptor +// +typedef struct _PCI_ID_BUFFER +{ + ULONG Count; + ANSI_STRING Strings[MAX_ANSI_STRINGS]; + ULONG StringSize[MAX_ANSI_STRINGS]; + ULONG TotalLength; + PCHAR CharBuffer; + CHAR BufferData[256]; +} PCI_ID_BUFFER, *PPCI_ID_BUFFER; + +// // PCI Configuration Callbacks // struct _PCI_CONFIGURATOR_CONTEXT; @@ -1111,6 +1129,20 @@ OUT PUSHORT Command ); +NTSTATUS +NTAPI +PciQueryBusInformation( + IN PPCI_PDO_EXTENSION PdoExtension, + IN PPNP_BUS_INFORMATION* Buffer +); + +NTSTATUS +NTAPI +PciQueryCapabilities( + IN PPCI_PDO_EXTENSION PdoExtension, + IN OUT PDEVICE_CAPABILITIES DeviceCapability +); + // // Configuration Routines // @@ -1215,6 +1247,12 @@ NTAPI PciDebugDumpCommonConfig( IN PPCI_COMMON_HEADER PciData +); + +VOID +NTAPI +PciDebugDumpQueryCapabilities( + IN PDEVICE_CAPABILITIES DeviceCaps ); // @@ -1452,6 +1490,34 @@ IN OUT PDEVICE_RELATIONS *pDeviceRelations ); +NTSTATUS +NTAPI +PciQueryResources( + IN PPCI_PDO_EXTENSION PdoExtension, + OUT PCM_RESOURCE_LIST *Buffer +); + +NTSTATUS +NTAPI +PciQueryTargetDeviceRelations( + IN PPCI_PDO_EXTENSION PdoExtension, + IN OUT PDEVICE_RELATIONS *pDeviceRelations +); + +NTSTATUS +NTAPI +PciQueryEjectionRelations( + IN PPCI_PDO_EXTENSION PdoExtension, + IN OUT PDEVICE_RELATIONS *pDeviceRelations +); + +NTSTATUS +NTAPI +PciQueryRequirements( + IN PPCI_PDO_EXTENSION PdoExtension, + IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *RequirementsList +); + // // Identification Functions // @@ -1460,6 +1526,23 @@ PciGetDeviceDescriptionMessage( IN UCHAR BaseClass, IN UCHAR SubClass +); + +NTSTATUS +NTAPI +PciQueryDeviceText( + IN PPCI_PDO_EXTENSION PdoExtension, + IN DEVICE_TEXT_TYPE QueryType, + IN ULONG Locale, + OUT PWCHAR *Buffer +); + +NTSTATUS +NTAPI +PciQueryId( + IN PPCI_PDO_EXTENSION DeviceExtension, + IN BUS_QUERY_ID_TYPE QueryType, + OUT PWCHAR *Buffer ); // @@ -1627,6 +1710,8 @@ extern PPCI_HACK_ENTRY PciHackTable; extern BOOLEAN PciAssignBusNumbers; extern BOOLEAN PciEnableNativeModeATA; +extern PPCI_IRQ_ROUTING_TABLE PciIrqRoutingTable; +extern BOOLEAN PciRunningDatacenter; /* Exported by NTOS, should this go in the NDK? */ extern NTSYSAPI BOOLEAN InitSafeBootMode; Modified: trunk/reactos/drivers/bus/pcix/pci/id.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/id.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] Sat Aug 14 17:09:20 2010 @@ -11,6 +11,7 @@ #include <pci.h> #define NDEBUG #include <debug.h> +#include "stdio.h" /* GLOBALS ********************************************************************/ @@ -107,4 +108,354 @@ return Message; } +VOID +NTAPI +PciInitIdBuffer(IN PPCI_ID_BUFFER IdBuffer) +{ + /* Initialize the sizes to zero and the pointer to the start of the buffer */ + IdBuffer->TotalLength = 0; + IdBuffer->Count = 0; + IdBuffer->CharBuffer = IdBuffer->BufferData; +} + +ULONG +NTAPI +PciIdPrintf(IN PPCI_ID_BUFFER IdBuffer, + IN PCCH Format, + ...) +{ + ULONG Size, Length; + PANSI_STRING AnsiString; + va_list va; + va_start(va, Format); + ASSERT(IdBuffer->Count < MAX_ANSI_STRINGS); + + /* Do the actual string formatting into the character buffer */ + vsprintf(IdBuffer->CharBuffer, Format, va); + + /* Initialize the ANSI_STRING that will hold this string buffer */ + AnsiString = &IdBuffer->Strings[IdBuffer->Count]; + RtlInitAnsiString(AnsiString, IdBuffer->CharBuffer); + + /* Calculate the final size of the string, in Unicode */ + Size = RtlAnsiStringToUnicodeSize(AnsiString); + + /* Update hte buffer with the size,and update the character pointer */ + IdBuffer->StringSize[IdBuffer->Count] = Size; + IdBuffer->TotalLength += Size; + Length = AnsiString->Length + sizeof(ANSI_NULL); + IdBuffer->CharBuffer += Length; + + /* Move to the next string for next time */ + IdBuffer->Count++; + + /* Return the length */ + return Length; +} + +ULONG +NTAPI +PciIdPrintfAppend(IN PPCI_ID_BUFFER IdBuffer, + IN PCCH Format, + ...) +{ + ULONG NextId, Size, Length, MaxLength; + PANSI_STRING AnsiString; + va_list va; + va_start(va, Format); + ASSERT(IdBuffer->Count); + + /* Choose the next static ANSI_STRING to use */ + NextId = IdBuffer->Count - 1; + + /* Max length is from the end of the buffer up until the current pointer */ + MaxLength = (PCHAR)(IdBuffer + 1) - IdBuffer->CharBuffer; + + /* Do the actual append, and return the length this string took */ + Length = vsprintf(IdBuffer->CharBuffer - 1, Format, va); + ASSERT(Length < MaxLength); + + /* Select the static ANSI_STRING, and update its length information */ + AnsiString = &IdBuffer->Strings[NextId]; + AnsiString->Length += Length; + AnsiString->MaximumLength += Length; + + /* Calculate the final size of the string, in Unicode */ + Size = RtlAnsiStringToUnicodeSize(AnsiString); + + /* Update the buffer with the size, and update the character pointer */ + IdBuffer->StringSize[NextId] = Size; + IdBuffer->TotalLength += Size; + IdBuffer->CharBuffer += Length; + + /* Return the size */ + return Size; +} + +NTSTATUS +NTAPI +PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, + IN BUS_QUERY_ID_TYPE QueryType, + OUT PWCHAR *Buffer) +{ + ULONG SubsysId; + CHAR VendorString[22]; + PPCI_PDO_EXTENSION PdoExtension; + PPCI_FDO_EXTENSION ParentExtension; + PWCHAR StringBuffer; + ULONG i, Size; + NTSTATUS Status; + PANSI_STRING NextString; + UNICODE_STRING DestinationString; + PCI_ID_BUFFER IdBuffer; + PAGED_CODE(); + + /* Assume failure */ + Status = STATUS_SUCCESS; + *Buffer = NULL; + + /* Start with the genric vendor string, which is the vendor ID + device ID */ + sprintf(VendorString, + "PCI\\VEN_%04X&DEV_%04X", + DeviceExtension->VendorId, + DeviceExtension->DeviceId); + + /* Initialize the PCI ID Buffer */ + PciInitIdBuffer(&IdBuffer); + + /* Build the subsystem ID as shown in PCI ID Strings */ + SubsysId = DeviceExtension->SubsystemVendorId | (DeviceExtension->SubsystemId << 16); + + /* Check what the caller is requesting */ + switch (QueryType) + { + case BusQueryDeviceID: + + /* A single ID, the vendor string + the revision ID */ + PciIdPrintf(&IdBuffer, + "%s&SUBSYS_%08X&REV_%02X", + VendorString, + SubsysId, + DeviceExtension->RevisionId); + break; + + case BusQueryHardwareIDs: + + /* First the vendor string + the subsystem ID + the revision ID */ + PciIdPrintf(&IdBuffer, + "%s&SUBSYS_%08X&REV_%02X", + VendorString, + SubsysId, + DeviceExtension->RevisionId); + + /* Next, without the revision */ + PciIdPrintf(&IdBuffer, + "%s&SUBSYS_%08X", + VendorString, + SubsysId); + + /* Next, the vendor string + the base class + sub class + progif */ + PciIdPrintf(&IdBuffer, + "%s&CC_%02X%02X%02X", + VendorString, + DeviceExtension->BaseClass, + DeviceExtension->SubClass, + DeviceExtension->ProgIf); + + /* Next, without the progif */ + PciIdPrintf(&IdBuffer, + "%s&CC_%02X%02X", + VendorString, + DeviceExtension->BaseClass, + DeviceExtension->SubClass); + + /* And finally, a terminator */ + PciIdPrintf(&IdBuffer, "\0"); + break; + + case BusQueryCompatibleIDs: + + /* First, the vendor + revision ID only */ + PciIdPrintf(&IdBuffer, + "%s&REV_%02X", + VendorString, + DeviceExtension->RevisionId); + + /* Next, the vendor string alone */ + PciIdPrintf(&IdBuffer, "%s", VendorString); + + /* Next, the vendor ID + the base class + the sub class + progif */ + PciIdPrintf(&IdBuffer, + "PCI\\VEN_%04X&CC_%02X%02X%02X", + DeviceExtension->VendorId, + DeviceExtension->BaseClass, + DeviceExtension->SubClass, + DeviceExtension->ProgIf); + + /* Now without the progif */ + PciIdPrintf(&IdBuffer, + "PCI\\VEN_%04X&CC_%02X%02X", + DeviceExtension->VendorId, + DeviceExtension->BaseClass, + DeviceExtension->SubClass); + + /* And then just the vendor ID itself */ + PciIdPrintf(&IdBuffer, + "PCI\\VEN_%04X", + DeviceExtension->VendorId); + + /* Then the base class + subclass + progif, without any vendor */ + PciIdPrintf(&IdBuffer, + "PCI\\CC_%02X%02X%02X", + DeviceExtension->BaseClass, + DeviceExtension->SubClass, + DeviceExtension->ProgIf); + + /* Next, without the progif */ + PciIdPrintf(&IdBuffer, + "PCI\\CC_%02X%02X", + DeviceExtension->BaseClass, + DeviceExtension->SubClass); + + /* And finally, a terminator */ + PciIdPrintf(&IdBuffer, "\0"); + break; + + case BusQueryInstanceID: + + /* Start with a terminator */ + PciIdPrintf(&IdBuffer, "\0"); + + /* And then encode the device and function number */ + PciIdPrintfAppend(&IdBuffer, + "%02X", + (DeviceExtension->Slot.u.bits.DeviceNumber << 3) | + DeviceExtension->Slot.u.bits.FunctionNumber); + + /* Loop every parent until the root */ + ParentExtension = DeviceExtension->ParentFdoExtension; + while (!PCI_IS_ROOT_FDO(ParentExtension)) + { + /* And encode the parent's device and function number as well */ + PdoExtension = ParentExtension->PhysicalDeviceObject->DeviceExtension; + PciIdPrintfAppend(&IdBuffer, + "%02X", + (PdoExtension->Slot.u.bits.DeviceNumber << 3) | + PdoExtension->Slot.u.bits.FunctionNumber); + } + break; + + default: + + /* Unknown query type */ + DPRINT1("PciQueryId expected ID type = %d\n", QueryType); + return STATUS_NOT_SUPPORTED; + } + + /* Something should've been generated if this has been reached */ + ASSERT(IdBuffer.Count > 0); + + /* Allocate the final string buffer to hold the ID */ + StringBuffer = ExAllocatePoolWithTag(PagedPool, IdBuffer.TotalLength, 'BicP'); + if (!StringBuffer) return STATUS_INSUFFICIENT_RESOURCES; + + /* Build the UNICODE_STRING structure for it */ + DPRINT1("PciQueryId(%d)\n", QueryType); + DestinationString.Buffer = StringBuffer; + DestinationString.MaximumLength = IdBuffer.TotalLength; + + /* Loop every ID in the buffer */ + for (i = 0; i < IdBuffer.Count; i++) + { + /* Select the ANSI_STRING for the ID */ + NextString = &IdBuffer.Strings[i]; + DPRINT1(" <- \"%s\"\n", NextString->Buffer); + + /* Convert it to a UNICODE_STRING */ + Status = RtlAnsiStringToUnicodeString(&DestinationString, NextString, FALSE); + ASSERT(NT_SUCCESS(Status)); + + /* Add it into the final destination buffer */ + Size = IdBuffer.StringSize[i]; + DestinationString.MaximumLength -= Size; + DestinationString.Buffer += (Size / sizeof(WCHAR)); + } + + /* Return the buffer to the caller and return status (should be success) */ + *Buffer = StringBuffer; + return Status; +} + +NTSTATUS +NTAPI +PciQueryDeviceText(IN PPCI_PDO_EXTENSION PdoExtension, + IN DEVICE_TEXT_TYPE QueryType, + IN ULONG Locale, + OUT PWCHAR *Buffer) +{ + PWCHAR MessageBuffer, LocationBuffer; + ULONG Length; + NTSTATUS Status; + + /* Check what the caller is requesting */ + switch (QueryType) + { + case DeviceTextDescription: + + /* Get the message from the resource section */ + MessageBuffer = PciGetDeviceDescriptionMessage(PdoExtension->BaseClass, + PdoExtension->SubClass); + + /* Return it to the caller, and select proper status code */ + *Buffer = MessageBuffer; + Status = MessageBuffer ? STATUS_SUCCESS : STATUS_NOT_SUPPORTED; + break; + + case DeviceTextLocationInformation: + + /* Get the message from the resource section */ + MessageBuffer = PciGetDescriptionMessage(0x10000, &Length); + if (!MessageBuffer) + { + /* It should be there, but fail if it wasn't found for some reason */ + Status = STATUS_NOT_SUPPORTED; + break; + } + + /* Add space for a null-terminator, and allocate the buffer */ + Length += 2 * sizeof(UNICODE_NULL); + LocationBuffer = ExAllocatePoolWithTag(PagedPool, + Length * sizeof(WCHAR), + 'BicP'); + *Buffer = LocationBuffer; + + /* Check if the allocation succeeded */ + if (LocationBuffer) + { + /* Build the location string based on bus, function, and device */ + swprintf(LocationBuffer, + MessageBuffer, + PdoExtension->ParentFdoExtension->BaseBus, + PdoExtension->Slot.u.bits.FunctionNumber, + PdoExtension->Slot.u.bits.DeviceNumber); + } + + /* Free the original string from the resource section */ + ExFreePoolWithTag(MessageBuffer, 0); + + /* Select the correct status */ + Status = LocationBuffer ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; + break; + + default: + + /* Anything else is unsupported */ + Status = STATUS_NOT_SUPPORTED; + break; + } + + /* Return whether or not a device text string was indeed found */ + return Status; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] Sat Aug 14 17:09:20 2010 @@ -200,9 +200,32 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + NTSTATUS Status; + PAGED_CODE(); + + /* Are ejection relations being queried? */ + if (IoStackLocation->Parameters.QueryDeviceRelations.Type == EjectionRelations) + { + /* Call the worker function */ + Status = PciQueryEjectionRelations(DeviceExtension, + (PDEVICE_RELATIONS*)&Irp-> + IoStatus.Information); + } + else if (IoStackLocation->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) + { + /* The only other relation supported is the target device relation */ + Status = PciQueryTargetDeviceRelations(DeviceExtension, + (PDEVICE_RELATIONS*)&Irp-> + IoStatus.Information); + } + else + { + /* All other relations are unsupported */ + Status = STATUS_NOT_SUPPORTED; + } + + /* Return either the result of the worker function, or unsupported status */ + return Status; } NTSTATUS @@ -211,9 +234,12 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + PAGED_CODE(); + + /* Call the worker function */ + return PciQueryCapabilities(DeviceExtension, + IoStackLocation-> + Parameters.DeviceCapabilities.Capabilities); } NTSTATUS @@ -222,9 +248,11 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + PAGED_CODE(); + + /* Call the worker function */ + return PciQueryResources(DeviceExtension, + (PCM_RESOURCE_LIST*)&Irp->IoStatus.Information); } NTSTATUS @@ -233,9 +261,12 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + PAGED_CODE(); + + /* Call the worker function */ + return PciQueryRequirements(DeviceExtension, + (PIO_RESOURCE_REQUIREMENTS_LIST*)&Irp-> + IoStatus.Information); } NTSTATUS @@ -244,9 +275,15 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + PAGED_CODE(); + + /* Call the worker function */ + return PciQueryDeviceText(DeviceExtension, + IoStackLocation-> + Parameters.QueryDeviceText.DeviceTextType, + IoStackLocation-> + Parameters.QueryDeviceText.LocaleId, + (PWCHAR*)&Irp->IoStatus.Information); } NTSTATUS @@ -255,9 +292,12 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + PAGED_CODE(); + + /* Call the worker function */ + return PciQueryId(DeviceExtension, + IoStackLocation->Parameters.QueryId.IdType, + (PWCHAR*)&Irp->IoStatus.Information); } NTSTATUS @@ -266,9 +306,12 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + PAGED_CODE(); + + /* Call the worker function */ + return PciQueryBusInformation(DeviceExtension, + (PPNP_BUS_INFORMATION*)&Irp-> + IoStatus.Information); } NTSTATUS Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Sat Aug 14 17:09:20 2010 @@ -1306,4 +1306,455 @@ } } +NTSTATUS +NTAPI +PciQueryBusInformation(IN PPCI_PDO_EXTENSION PdoExtension, + IN PPNP_BUS_INFORMATION* Buffer) +{ + PPNP_BUS_INFORMATION BusInfo; + + /* Allocate a structure for the bus information */ + BusInfo = ExAllocatePoolWithTag(PagedPool, + sizeof(PNP_BUS_INFORMATION), + 'BicP'); + if (!BusInfo) return STATUS_INSUFFICIENT_RESOURCES; + + /* Write the correct GUID and bus type identifier, and fill the bus number */ + BusInfo->BusTypeGuid = GUID_BUS_TYPE_PCI; + BusInfo->LegacyBusType = PCIBus; + BusInfo->BusNumber = PdoExtension->ParentFdoExtension->BaseBus; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PciDetermineSlotNumber(IN PPCI_PDO_EXTENSION PdoExtension, + OUT PULONG SlotNumber) +{ + PPCI_FDO_EXTENSION ParentExtension; + ULONG ResultLength; + NTSTATUS Status; + PSLOT_INFO SlotInfo; + + /* Check if a $PIR from the BIOS is used (legacy IRQ routing) */ + ParentExtension = PdoExtension->ParentFdoExtension; + DPRINT1("Slot lookup for %d.%d.%d\n", + ParentExtension ? ParentExtension->BaseBus : -1, + PdoExtension->Slot.u.bits.DeviceNumber, + PdoExtension->Slot.u.bits.FunctionNumber); + if ((PciIrqRoutingTable) && (ParentExtension)) + { + /* Read every slot information entry */ + SlotInfo = &PciIrqRoutingTable->Slot[0]; + DPRINT1("PIR$ %p is %lx bytes, slot 0 is at: %lx\n", + PciIrqRoutingTable, PciIrqRoutingTable->TableSize, SlotInfo); + while (SlotInfo < (PSLOT_INFO)((ULONG_PTR)PciIrqRoutingTable + + PciIrqRoutingTable->TableSize)) + { + DPRINT1("Slot Info: %d.%d->#%d\n", + SlotInfo->BusNumber, + SlotInfo->DeviceNumber, + SlotInfo->SlotNumber); + + /* Check if this slot information matches the PDO being queried */ + if ((ParentExtension->BaseBus == SlotInfo->BusNumber) && + (PdoExtension->Slot.u.bits.DeviceNumber == SlotInfo->DeviceNumber >> 3) && + (SlotInfo->SlotNumber)) + { + /* We found it, return it and return success */ + *SlotNumber = SlotInfo->SlotNumber; + return STATUS_SUCCESS; + } + + /* Try the next slot */ + SlotInfo++; + } + } + + /* Otherwise, grab the parent FDO and check if it's the root */ + if (PCI_IS_ROOT_FDO(ParentExtension)) + { + /* The root FDO doesn't have a slot number */ + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Otherwise, query the slot/UI address/number as a device property */ + Status = IoGetDeviceProperty(ParentExtension->PhysicalDeviceObject, + DevicePropertyUINumber, + sizeof(ULONG), + SlotNumber, + &ResultLength); + } + + /* Return the status of this endeavour */ + return Status; +} + +NTSTATUS +NTAPI +PciGetDeviceCapabilities(IN PDEVICE_OBJECT DeviceObject, + IN OUT PDEVICE_CAPABILITIES DeviceCapability) +{ + PIRP Irp; + NTSTATUS Status; + KEVENT Event; + PDEVICE_OBJECT AttachedDevice; + PIO_STACK_LOCATION IoStackLocation; + IO_STATUS_BLOCK IoStatusBlock; + PAGED_CODE(); + + /* Zero out capabilities and set undefined values to start with */ + RtlZeroMemory(DeviceCapability, sizeof(DEVICE_CAPABILITIES)); + DeviceCapability->Size = sizeof(DEVICE_CAPABILITIES); + DeviceCapability->Version = 1; + DeviceCapability->Address = -1; + DeviceCapability->UINumber = -1; + + /* Build the wait event for the IOCTL */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + + /* Find the device the PDO is attached to */ + AttachedDevice = IoGetAttachedDeviceReference(DeviceObject); + + /* And build an IRP for it */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, + AttachedDevice, + NULL, + 0, + NULL, + &Event, + &IoStatusBlock); + if (!Irp) + { + /* The IRP failed, fail the request as well */ + ObDereferenceObject(AttachedDevice); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Set default status */ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + /* Get a stack location in this IRP */ + IoStackLocation = IoGetNextIrpStackLocation(Irp); + ASSERT(IoStackLocation); + + /* Initialize it as a query capabilities IRP, with no completion routine */ + RtlZeroMemory(IoStackLocation, sizeof(IO_STACK_LOCATION)); + IoStackLocation->MajorFunction = IRP_MJ_PNP; + IoStackLocation->MinorFunction = IRP_MN_QUERY_CAPABILITIES; + IoStackLocation->Parameters.DeviceCapabilities.Capabilities = DeviceCapability; + IoSetCompletionRoutine(Irp, NULL, NULL, FALSE, FALSE, FALSE); + + /* Send the IOCTL to the driver */ + Status = IoCallDriver(AttachedDevice, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for a response and update the actual status */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = Irp->IoStatus.Status; + } + + /* Done, dereference the attached device and return the final result */ + ObDereferenceObject(AttachedDevice); + return Status; +} + +NTSTATUS +NTAPI +PciQueryPowerCapabilities(IN PPCI_PDO_EXTENSION PdoExtension, + IN PDEVICE_CAPABILITIES DeviceCapability) +{ + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; + DEVICE_CAPABILITIES AttachedCaps; + DEVICE_POWER_STATE NewPowerState, DevicePowerState, DeviceWakeLevel, DeviceWakeState; + SYSTEM_POWER_STATE SystemWakeState, DeepestWakeState, CurrentState; + + /* Nothing is known at first */ + DeviceWakeState = PowerDeviceUnspecified; + SystemWakeState = DeepestWakeState = PowerSystemUnspecified; + + /* Get the PCI capabilities for the parent PDO */ + DeviceObject = PdoExtension->ParentFdoExtension->PhysicalDeviceObject; + Status = PciGetDeviceCapabilities(DeviceObject, &AttachedCaps); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if there's not an existing device state for S0 */ + if (!AttachedCaps.DeviceState[PowerSystemWorking]) + { + /* Set D0<->S0 mapping */ + AttachedCaps.DeviceState[PowerSystemWorking] = PowerDeviceD0; + } + + /* Check if there's not an existing device state for S3 */ + if (!AttachedCaps.DeviceState[PowerSystemShutdown]) + { + /* Set D3<->S3 mapping */ + AttachedCaps.DeviceState[PowerSystemShutdown] = PowerDeviceD3; + } + + /* Check for a PDO with broken, or no, power capabilities */ + if (PdoExtension->HackFlags & PCI_HACK_NO_PM_CAPS) + { + /* Unknown wake device states */ + DeviceCapability->DeviceWake = PowerDeviceUnspecified; + DeviceCapability->SystemWake = PowerSystemUnspecified; + + /* No device state support */ + DeviceCapability->DeviceD1 = FALSE; + DeviceCapability->DeviceD2 = FALSE; + + /* No waking from any low-power device state is supported */ + DeviceCapability->WakeFromD0 = FALSE; + DeviceCapability->WakeFromD1 = FALSE; + DeviceCapability->WakeFromD2 = FALSE; + DeviceCapability->WakeFromD3 = FALSE; + + /* For the rest, copy whatever the parent PDO had */ + RtlCopyMemory(DeviceCapability->DeviceState, + AttachedCaps.DeviceState, + sizeof(DeviceCapability->DeviceState)); + return STATUS_SUCCESS; + } + + /* The PCI Device has power capabilities, so read which ones are supported */ + DeviceCapability->DeviceD1 = PdoExtension->PowerCapabilities.Support.D1; + DeviceCapability->DeviceD2 = PdoExtension->PowerCapabilities.Support.D2; + DeviceCapability->WakeFromD0 = PdoExtension->PowerCapabilities.Support.PMED0; + DeviceCapability->WakeFromD1 = PdoExtension->PowerCapabilities.Support.PMED1; + DeviceCapability->WakeFromD2 = PdoExtension->PowerCapabilities.Support.PMED2; + + /* Can the attached device wake from D3? */ + if (AttachedCaps.DeviceWake != PowerDeviceD3) + { + /* It can't, so check if this PDO supports hot D3 wake */ + DeviceCapability->WakeFromD3 = PdoExtension->PowerCapabilities.Support.PMED3Hot; + } + else + { + /* It can, is this the root bus? */ + if (PCI_IS_ROOT_FDO(PdoExtension->ParentFdoExtension)) + { + /* This is the root bus, so just check if it supports hot D3 wake */ + DeviceCapability->WakeFromD3 = PdoExtension->PowerCapabilities.Support.PMED3Hot; + } + else + { + /* Take the minimums? -- need to check with briang at work */ + UNIMPLEMENTED; + } + } + + /* Now loop each system power state to determine its device state mapping */ + for (CurrentState = PowerSystemWorking; + CurrentState < PowerSystemMaximum; + CurrentState++) + { + /* Read the current mapping from the attached device */ + DevicePowerState = AttachedCaps.DeviceState[CurrentState]; + NewPowerState = DevicePowerState; + + /* The attachee suports D1, but this PDO does not */ + if ((NewPowerState == PowerDeviceD1) && + !(PdoExtension->PowerCapabilities.Support.D1)) + { + /* Fall back to D2 */ + NewPowerState = PowerDeviceD2; + } + + /* The attachee supports D2, but this PDO does not */ + if ((NewPowerState == PowerDeviceD2) && + !(PdoExtension->PowerCapabilities.Support.D2)) + { + /* Fall back to D3 */ + NewPowerState = PowerDeviceD3; + } + + /* Set the mapping based on the best state supported */ + DeviceCapability->DeviceState[CurrentState] = NewPowerState; + + /* Check if sleep states are being processed, and a mapping was found */ + if ((CurrentState < PowerSystemHibernate) && + (NewPowerState != PowerDeviceUnspecified)) + { + /* Save this state as being the deepest one found until now */ + DeepestWakeState = CurrentState; + } + + /* + * Finally, check if the computed sleep state is within the states that + * this device can wake the system from, and if it's higher or equal to + * the sleep state mapping that came from the attachee, assuming that it + * had a valid mapping to begin with. + * + * It this is the case, then make sure that the computed sleep state is + * matched by the device's ability to actually wake from that state. + * + * For devices that support D3, the PCI device only needs Hot D3 as long + * as the attachee's state is less than D3. Otherwise, if the attachee + * might also be at D3, this would require a Cold D3 wake, so check that + * the device actually support this. + */ + if ((CurrentState < AttachedCaps.SystemWake) && + (NewPowerState >= DevicePowerState) && + (DevicePowerState != PowerDeviceUnspecified) && + (((NewPowerState == PowerDeviceD0) && (DeviceCapability->WakeFromD0)) || + ((NewPowerState == PowerDeviceD1) && (DeviceCapability->WakeFromD1)) || + ((NewPowerState == PowerDeviceD2) && (DeviceCapability->WakeFromD2)) || + ((NewPowerState == PowerDeviceD3) && + (PdoExtension->PowerCapabilities.Support.PMED3Hot) && + ((DevicePowerState < PowerDeviceD3) || + (PdoExtension->PowerCapabilities.Support.PMED3Cold))))) + { + /* The mapping is valid, so this will be the lowest wake state */ + SystemWakeState = CurrentState; + DeviceWakeState = NewPowerState; + } + } + + /* Read the current wake level */ + DeviceWakeLevel = PdoExtension->PowerState.DeviceWakeLevel; + + /* Check if the attachee's wake levels are valid, and the PDO's is higher */ + if ((AttachedCaps.SystemWake != PowerSystemUnspecified) && + (AttachedCaps.DeviceWake != PowerDeviceUnspecified) && + (DeviceWakeLevel != PowerDeviceUnspecified) && + (DeviceWakeLevel >= AttachedCaps.DeviceWake)) + { + /* Inherit the system wake from the attachee, and this PDO's wake level */ + DeviceCapability->SystemWake = AttachedCaps.SystemWake; + DeviceCapability->DeviceWake = DeviceWakeLevel; + + /* Now check if the wake level is D0, but the PDO doesn't support it */ + if ((DeviceCapability->DeviceWake == PowerDeviceD0) && + !(DeviceCapability->WakeFromD0)) + { + /* Bump to D1 */ + DeviceCapability->DeviceWake = PowerDeviceD1; + } + + /* Now check if the wake level is D1, but the PDO doesn't support it */ + if ((DeviceCapability->DeviceWake == PowerDeviceD1) && + !(DeviceCapability->WakeFromD1)) + { + /* Bump to D2 */ + DeviceCapability->DeviceWake = PowerDeviceD2; + } + + /* Now check if the wake level is D2, but the PDO doesn't support it */ + if ((DeviceCapability->DeviceWake == PowerDeviceD2) && + !(DeviceCapability->WakeFromD2)) + { + /* Bump it to D3 */ + DeviceCapability->DeviceWake = PowerDeviceD3; + } + + /* Now check if the wake level is D3, but the PDO doesn't support it */ + if ((DeviceCapability->DeviceWake == PowerDeviceD3) && + !(DeviceCapability->WakeFromD3)) + { + /* Then no valid wake state exists */ + DeviceCapability->DeviceWake = PowerDeviceUnspecified; + DeviceCapability->SystemWake = PowerSystemUnspecified; + } + + /* Check if no valid wake state was found */ + if ((DeviceCapability->DeviceWake == PowerDeviceUnspecified) || + (DeviceCapability->SystemWake == PowerSystemUnspecified)) + { + /* Check if one was computed earlier */ + if ((SystemWakeState != PowerSystemUnspecified) && + (DeviceWakeState != PowerDeviceUnspecified)) + { + /* Use the wake state that had been computed earlier */ + DeviceCapability->DeviceWake = DeviceWakeState; + DeviceCapability->SystemWake = SystemWakeState; + + /* If that state was D3, then the device supports Hot/Cold D3 */ + if (DeviceWakeState == PowerDeviceD3) DeviceCapability->WakeFromD3 = TRUE; + } + } + + /* + * Finally, check for off states (lower than S3, such as hibernate) and + * make sure that the device both supports waking from D3 as well as + * supports a Cold wake + */ + if ((DeviceCapability->SystemWake > PowerSystemSleeping3) && + ((DeviceCapability->DeviceWake != PowerDeviceD3) || + !(PdoExtension->PowerCapabilities.Support.PMED3Cold))) + { + /* It doesn't, so pick the computed lowest wake state from earlier */ + DeviceCapability->SystemWake = DeepestWakeState; + } + + /* Set the PCI Specification mandated maximum latencies for transitions */ + DeviceCapability->D1Latency = 0; + DeviceCapability->D2Latency = 2; + DeviceCapability->D3Latency = 100; + + /* Sanity check */ + ASSERT(DeviceCapability->DeviceState[PowerSystemWorking] == PowerDeviceD0); + } + else + { + /* No valid sleep states, no latencies to worry about */ + DeviceCapability->D1Latency = 0; + DeviceCapability->D2Latency = 0; + DeviceCapability->D3Latency = 0; + } + + /* This function always succeeds, even without power management support */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PciQueryCapabilities(IN PPCI_PDO_EXTENSION PdoExtension, + IN OUT PDEVICE_CAPABILITIES DeviceCapability) +{ + NTSTATUS Status; + + /* A PDO ID is never unique, and its address is its function and device */ + DeviceCapability->UniqueID = FALSE; + DeviceCapability->Address = PdoExtension->Slot.u.bits.FunctionNumber | + (PdoExtension->Slot.u.bits.DeviceNumber << 16); + + /* Check for host bridges */ + if ((PdoExtension->BaseClass == PCI_CLASS_BRIDGE_DEV) && + (PdoExtension->SubClass == PCI_SUBCLASS_BR_HOST)) + { + /* Raw device opens to a host bridge are acceptable */ + DeviceCapability->RawDeviceOK = TRUE; + } + else + { + /* Otherwise, other PDOs cannot be directly opened */ + DeviceCapability->RawDeviceOK = FALSE; + } + + /* PCI PDOs are pretty fixed things */ + DeviceCapability->LockSupported = FALSE; + DeviceCapability->EjectSupported = FALSE; + DeviceCapability->Removable = FALSE; + DeviceCapability->DockDevice = FALSE; + + /* The slot number is stored as a device property, go query it */ + PciDetermineSlotNumber(PdoExtension, &DeviceCapability->UINumber); + + /* Finally, query and power capabilities and convert them for PnP usage */ + Status = PciQueryPowerCapabilities(PdoExtension, DeviceCapability); + + /* Dump the capabilities if it all worked, and return the status */ + if (NT_SUCCESS(Status)) PciDebugDumpQueryCapabilities(DeviceCapability); + return Status; +} + /* EOF */

1 0

[jgardou] 48547: Sync with trunk (r48545)
by jgardou＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: jgardou Date: Sat Aug 14 15:15:44 2010 New Revision: 48547 URL: http://svn.reactos.org/svn/reactos?rev=48547&view=rev Log: Sync with trunk (r48545) Added: branches/reactos-yarotows/dll/win32/kernel32/kernel32.def - copied unchanged from r48545, trunk/reactos/dll/win32/kernel32/kernel32.def branches/reactos-yarotows/include/psdk/d3dnthal.h - copied unchanged from r48545, trunk/reactos/include/psdk/d3dnthal.h branches/reactos-yarotows/include/psdk/ddkernel.h - copied unchanged from r48545, trunk/reactos/include/psdk/ddkernel.h branches/reactos-yarotows/include/psdk/ddkmapi.h - copied unchanged from r48545, trunk/reactos/include/psdk/ddkmapi.h branches/reactos-yarotows/include/psdk/ddraw.h - copied unchanged from r48545, trunk/reactos/include/psdk/ddraw.h branches/reactos-yarotows/include/psdk/ddrawi.h - copied unchanged from r48545, trunk/reactos/include/psdk/ddrawi.h branches/reactos-yarotows/include/psdk/ddrawint.h - copied unchanged from r48545, trunk/reactos/include/psdk/ddrawint.h branches/reactos-yarotows/include/psdk/diskguid.h - copied unchanged from r48545, trunk/reactos/include/psdk/diskguid.h branches/reactos-yarotows/include/psdk/dmemmgr.h - copied unchanged from r48545, trunk/reactos/include/psdk/dmemmgr.h branches/reactos-yarotows/include/psdk/dmksctrl.h - copied unchanged from r48545, trunk/reactos/include/psdk/dmksctrl.h branches/reactos-yarotows/include/psdk/driverspecs.h - copied unchanged from r48545, trunk/reactos/include/psdk/driverspecs.h branches/reactos-yarotows/include/psdk/dvp.h - copied unchanged from r48545, trunk/reactos/include/psdk/dvp.h branches/reactos-yarotows/include/psdk/hidpi.h - copied unchanged from r48545, trunk/reactos/include/psdk/hidpi.h branches/reactos-yarotows/include/psdk/hidusage.h - copied unchanged from r48545, trunk/reactos/include/psdk/hidusage.h branches/reactos-yarotows/include/psdk/ieverp.h - copied unchanged from r48545, trunk/reactos/include/psdk/ieverp.h branches/reactos-yarotows/include/psdk/ntdd1394.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntdd1394.h branches/reactos-yarotows/include/psdk/ntdd8042.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntdd8042.h branches/reactos-yarotows/include/psdk/ntddbeep.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntddbeep.h branches/reactos-yarotows/include/psdk/ntddcdrm.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntddcdrm.h branches/reactos-yarotows/include/psdk/ntddcdvd.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntddcdvd.h branches/reactos-yarotows/include/psdk/ntdddisk.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntdddisk.h branches/reactos-yarotows/include/psdk/ntddft.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntddft.h branches/reactos-yarotows/include/psdk/ntddpar.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntddpar.h branches/reactos-yarotows/include/psdk/ntddser.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntddser.h branches/reactos-yarotows/include/psdk/ntddtape.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntddtape.h branches/reactos-yarotows/include/psdk/ntddtdi.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntddtdi.h branches/reactos-yarotows/include/psdk/ntddvdeo.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntddvdeo.h branches/reactos-yarotows/include/psdk/ntddvol.h - copied unchanged from r48545, trunk/reactos/include/psdk/ntddvol.h branches/reactos-yarotows/include/psdk/objerror.h - copied unchanged from r48545, trunk/reactos/include/psdk/objerror.h branches/reactos-yarotows/include/psdk/polarity.h - copied unchanged from r48545, trunk/reactos/include/psdk/polarity.h branches/reactos-yarotows/include/psdk/prntfont.h - copied unchanged from r48545, trunk/reactos/include/psdk/prntfont.h branches/reactos-yarotows/include/psdk/stierr.h - copied unchanged from r48545, trunk/reactos/include/psdk/stierr.h branches/reactos-yarotows/include/psdk/stireg.h - copied unchanged from r48545, trunk/reactos/include/psdk/stireg.h branches/reactos-yarotows/include/psdk/tdi.h - copied unchanged from r48545, trunk/reactos/include/psdk/tdi.h branches/reactos-yarotows/include/psdk/tdiinfo.h - copied unchanged from r48545, trunk/reactos/include/psdk/tdiinfo.h branches/reactos-yarotows/include/psdk/unknown.h - copied unchanged from r48545, trunk/reactos/include/psdk/unknown.h branches/reactos-yarotows/include/psdk/warning.h - copied unchanged from r48545, trunk/reactos/include/psdk/warning.h branches/reactos-yarotows/include/reactos/wine/ddk/imm.h - copied unchanged from r48545, trunk/reactos/include/reactos/wine/ddk/imm.h branches/reactos-yarotows/include/reactos/wine/imm.h - copied unchanged from r48545, trunk/reactos/include/reactos/wine/imm.h Removed: branches/reactos-yarotows/include/ddk/d3dnthal.h branches/reactos-yarotows/include/ddk/ddkernel.h branches/reactos-yarotows/include/ddk/ddkmapi.h branches/reactos-yarotows/include/ddk/ddrawi.h branches/reactos-yarotows/include/ddk/ddrawint.h branches/reactos-yarotows/include/ddk/diskguid.h branches/reactos-yarotows/include/ddk/dmemmgr.h branches/reactos-yarotows/include/ddk/dmksctrl.h branches/reactos-yarotows/include/ddk/driverspecs.h branches/reactos-yarotows/include/ddk/dvp.h branches/reactos-yarotows/include/ddk/hidpi.h branches/reactos-yarotows/include/ddk/hidusage.h branches/reactos-yarotows/include/ddk/ieverp.h branches/reactos-yarotows/include/ddk/imm.h branches/reactos-yarotows/include/ddk/isguids.h branches/reactos-yarotows/include/ddk/ntdd1394.h branches/reactos-yarotows/include/ddk/ntdd8042.h branches/reactos-yarotows/include/ddk/ntddbeep.h branches/reactos-yarotows/include/ddk/ntddcdrm.h branches/reactos-yarotows/include/ddk/ntddcdvd.h branches/reactos-yarotows/include/ddk/ntdddisk.h branches/reactos-yarotows/include/ddk/ntddft.h branches/reactos-yarotows/include/ddk/ntddpar.h branches/reactos-yarotows/include/ddk/ntddser.h branches/reactos-yarotows/include/ddk/ntddtape.h branches/reactos-yarotows/include/ddk/ntddtdi.h branches/reactos-yarotows/include/ddk/ntddvdeo.h branches/reactos-yarotows/include/ddk/ntddvol.h branches/reactos-yarotows/include/ddk/objerror.h branches/reactos-yarotows/include/ddk/polarity.h branches/reactos-yarotows/include/ddk/prntfont.h branches/reactos-yarotows/include/ddk/stierr.h branches/reactos-yarotows/include/ddk/stireg.h branches/reactos-yarotows/include/ddk/tdi.h branches/reactos-yarotows/include/ddk/tdiinfo.h branches/reactos-yarotows/include/ddk/unknown.h branches/reactos-yarotows/include/ddk/warning.h branches/reactos-yarotows/include/dxsdk/ddraw.h Modified: branches/reactos-yarotows/ (props changed) branches/reactos-yarotows/base/applications/taskmgr/applpage.c branches/reactos-yarotows/base/applications/taskmgr/debug.c branches/reactos-yarotows/base/applications/taskmgr/endproc.c branches/reactos-yarotows/base/applications/taskmgr/graph.c branches/reactos-yarotows/base/applications/taskmgr/graphctl.c branches/reactos-yarotows/base/applications/taskmgr/graphctl.h branches/reactos-yarotows/base/applications/taskmgr/optnmenu.c branches/reactos-yarotows/base/applications/taskmgr/perfdata.c branches/reactos-yarotows/base/applications/taskmgr/perfpage.c branches/reactos-yarotows/base/applications/taskmgr/procpage.c branches/reactos-yarotows/base/applications/taskmgr/taskmgr.c branches/reactos-yarotows/base/applications/taskmgr/taskmgr.h branches/reactos-yarotows/base/system/winlogon/winlogon.c branches/reactos-yarotows/dll/win32/dhcpcsvc/dhcp/adapter.c branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_main.c branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_private.h branches/reactos-yarotows/dll/win32/jscript/jscript_Si.rc (props changed) branches/reactos-yarotows/dll/win32/kernel32/file/backup.c branches/reactos-yarotows/dll/win32/kernel32/file/bintype.c branches/reactos-yarotows/dll/win32/kernel32/file/cnotify.c branches/reactos-yarotows/dll/win32/kernel32/file/copy.c branches/reactos-yarotows/dll/win32/kernel32/file/create.c branches/reactos-yarotows/dll/win32/kernel32/file/curdir.c branches/reactos-yarotows/dll/win32/kernel32/file/delete.c branches/reactos-yarotows/dll/win32/kernel32/file/deviceio.c branches/reactos-yarotows/dll/win32/kernel32/file/dir.c branches/reactos-yarotows/dll/win32/kernel32/file/dosdev.c branches/reactos-yarotows/dll/win32/kernel32/file/file.c branches/reactos-yarotows/dll/win32/kernel32/file/find.c branches/reactos-yarotows/dll/win32/kernel32/file/hardlink.c branches/reactos-yarotows/dll/win32/kernel32/file/iocompl.c branches/reactos-yarotows/dll/win32/kernel32/file/lfile.c branches/reactos-yarotows/dll/win32/kernel32/file/lock.c branches/reactos-yarotows/dll/win32/kernel32/file/mailslot.c branches/reactos-yarotows/dll/win32/kernel32/file/move.c branches/reactos-yarotows/dll/win32/kernel32/file/npipe.c branches/reactos-yarotows/dll/win32/kernel32/file/pipe.c branches/reactos-yarotows/dll/win32/kernel32/file/rw.c branches/reactos-yarotows/dll/win32/kernel32/file/tape.c branches/reactos-yarotows/dll/win32/kernel32/file/volume.c branches/reactos-yarotows/dll/win32/kernel32/include/kernel32.h branches/reactos-yarotows/dll/win32/kernel32/kernel32.pspec branches/reactos-yarotows/dll/win32/kernel32/kernel32.rbuild branches/reactos-yarotows/dll/win32/kernel32/misc/actctx.c branches/reactos-yarotows/dll/win32/kernel32/misc/console.c branches/reactos-yarotows/dll/win32/kernel32/misc/format_msg.c branches/reactos-yarotows/dll/win32/kernel32/misc/lcformat.c branches/reactos-yarotows/dll/win32/kernel32/misc/profile.c branches/reactos-yarotows/dll/win32/kernel32/misc/stubs.c branches/reactos-yarotows/dll/win32/kernel32/misc/version.c branches/reactos-yarotows/dll/win32/kernel32/process/session.c branches/reactos-yarotows/dll/win32/msafd/misc/dllmain.c branches/reactos-yarotows/dll/win32/msvcrt/msvcrt.spec branches/reactos-yarotows/dll/win32/shell32/iconcache.c branches/reactos-yarotows/dll/win32/shlwapi/string.c branches/reactos-yarotows/dll/win32/ws2_32/misc/dllmain.c branches/reactos-yarotows/drivers/bus/pcix/device.c branches/reactos-yarotows/drivers/bus/pcix/enum.c branches/reactos-yarotows/drivers/bus/pcix/pci.h branches/reactos-yarotows/drivers/bus/pcix/utils.c branches/reactos-yarotows/drivers/filesystems/cdfs/fsctl.c branches/reactos-yarotows/drivers/filesystems/cdfs/misc.c branches/reactos-yarotows/drivers/filesystems/fastfat/create.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/cleanup.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/close.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/create.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/dir.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/fastfat.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/fastfat.h branches/reactos-yarotows/drivers/filesystems/fastfat_new/fat.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/fatstruc.h branches/reactos-yarotows/drivers/filesystems/fastfat_new/fcb.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/finfo.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/fsctl.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/lock.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/rw.c branches/reactos-yarotows/drivers/filesystems/fastfat_new/volume.c branches/reactos-yarotows/drivers/network/ndis/include/miniport.h branches/reactos-yarotows/include/ddk/acpiioct.h branches/reactos-yarotows/include/ddk/bdasup.h branches/reactos-yarotows/include/ddk/d3dhal.h branches/reactos-yarotows/include/ddk/d3dhalex.h branches/reactos-yarotows/include/ddk/dmusicks.h branches/reactos-yarotows/include/ddk/drivinit.h branches/reactos-yarotows/include/ddk/drmk.h branches/reactos-yarotows/include/ddk/dxapi.h branches/reactos-yarotows/include/ddk/hubbusif.h branches/reactos-yarotows/include/ddk/ide.h branches/reactos-yarotows/include/ddk/ioaccess.h branches/reactos-yarotows/include/ddk/mcd.h branches/reactos-yarotows/include/ddk/mce.h branches/reactos-yarotows/include/ddk/miniport.h branches/reactos-yarotows/include/ddk/minitape.h branches/reactos-yarotows/include/ddk/mountmgr.h branches/reactos-yarotows/include/ddk/ndis.h branches/reactos-yarotows/include/ddk/ndistapi.h branches/reactos-yarotows/include/ddk/ndiswan.h branches/reactos-yarotows/include/ddk/ntddpcm.h branches/reactos-yarotows/include/ddk/ntddsnd.h branches/reactos-yarotows/include/ddk/ntimage.h branches/reactos-yarotows/include/ddk/ntnls.h branches/reactos-yarotows/include/ddk/ntpoapi.h branches/reactos-yarotows/include/ddk/ntstrsafe.h branches/reactos-yarotows/include/ddk/oprghdlr.h branches/reactos-yarotows/include/ddk/portcls.h branches/reactos-yarotows/include/ddk/punknown.h branches/reactos-yarotows/include/ddk/smbus.h branches/reactos-yarotows/include/ddk/stdunk.h branches/reactos-yarotows/include/ddk/storport.h branches/reactos-yarotows/include/ddk/strmini.h branches/reactos-yarotows/include/ddk/swenum.h branches/reactos-yarotows/include/ddk/tdikrnl.h branches/reactos-yarotows/include/ddk/tdistat.h branches/reactos-yarotows/include/ddk/upssvc.h branches/reactos-yarotows/include/ddk/usbbusif.h branches/reactos-yarotows/include/ddk/usbdlib.h branches/reactos-yarotows/include/ddk/usbprotocoldefs.h branches/reactos-yarotows/include/ddk/wdm.h branches/reactos-yarotows/include/ddk/wmilib.h branches/reactos-yarotows/include/psdk/dinput.h branches/reactos-yarotows/include/psdk/imm.h branches/reactos-yarotows/include/psdk/ntddndis.h branches/reactos-yarotows/include/psdk/sti.h branches/reactos-yarotows/include/psdk/winddi.h branches/reactos-yarotows/include/reactos/debug.h branches/reactos-yarotows/include/xdk/exfuncs.h branches/reactos-yarotows/include/xdk/iofuncs.h branches/reactos-yarotows/include/xdk/iotypes.h branches/reactos-yarotows/include/xdk/ketypes.h branches/reactos-yarotows/include/xdk/wmifuncs.h branches/reactos-yarotows/include/xdk/x86/ke.h branches/reactos-yarotows/lib/sdk/crt/locale/locale.c branches/reactos-yarotows/ntoskrnl/ex/init.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/ (props changed) branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/include/xlateobj.h branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactos-yarotows/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/taskmgr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/taskmgr/endproc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/taskmgr/graphctl.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/taskmgr/graphctl.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/taskmgr/optnmenu.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/dhcp… Modified: branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/iphl… Modified: branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/iphl… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/backup.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/bintype.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/copy.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/create.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/curdir.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/delete.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/dosdev.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/hardlink.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/lfile.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/lock.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/pipe.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/rw.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/tape.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/format_msg.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/version.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/process/session.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msaf… Modified: branches/reactos-yarotows/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msvc… Modified: branches/reactos-yarotows/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shlw… Modified: branches/reactos-yarotows/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/ws2_… Modified: branches/reactos-yarotows/drivers/bus/pcix/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/bus/pc… Modified: branches/reactos-yarotows/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/bus/pc… Modified: branches/reactos-yarotows/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/bus/pc… Modified: branches/reactos-yarotows/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/bus/pc… Modified: branches/reactos-yarotows/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/close.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/fat.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/lock.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… Modified: branches/reactos-yarotows/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/networ… Modified: branches/reactos-yarotows/include/ddk/acpiioct.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/ac… Modified: branches/reactos-yarotows/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/bd… Modified: branches/reactos-yarotows/include/ddk/d3dhal.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/d3… Modified: branches/reactos-yarotows/include/ddk/d3dhalex.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/d3… Removed: branches/reactos-yarotows/include/ddk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/d3… Removed: branches/reactos-yarotows/include/ddk/ddkernel.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dd… Removed: branches/reactos-yarotows/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dd… Removed: branches/reactos-yarotows/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dd… Removed: branches/reactos-yarotows/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dd… Removed: branches/reactos-yarotows/include/ddk/diskguid.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/di… Removed: branches/reactos-yarotows/include/ddk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dm… Removed: branches/reactos-yarotows/include/ddk/dmksctrl.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dm… Modified: branches/reactos-yarotows/include/ddk/dmusicks.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dm… Removed: branches/reactos-yarotows/include/ddk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dr… Modified: branches/reactos-yarotows/include/ddk/drivinit.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dr… Modified: branches/reactos-yarotows/include/ddk/drmk.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dr… Removed: branches/reactos-yarotows/include/ddk/dvp.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dv… Modified: branches/reactos-yarotows/include/ddk/dxapi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/dx… Removed: branches/reactos-yarotows/include/ddk/hidpi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/hi… Removed: branches/reactos-yarotows/include/ddk/hidusage.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/hi… Modified: branches/reactos-yarotows/include/ddk/hubbusif.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/hu… Modified: branches/reactos-yarotows/include/ddk/ide.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/id… Removed: branches/reactos-yarotows/include/ddk/ieverp.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/ie… Removed: branches/reactos-yarotows/include/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/im… Modified: branches/reactos-yarotows/include/ddk/ioaccess.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/io… Removed: branches/reactos-yarotows/include/ddk/isguids.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/is… Modified: branches/reactos-yarotows/include/ddk/mcd.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/mc… Modified: branches/reactos-yarotows/include/ddk/mce.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/mc… Modified: branches/reactos-yarotows/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/mi… Modified: branches/reactos-yarotows/include/ddk/minitape.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/mi… Modified: branches/reactos-yarotows/include/ddk/mountmgr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/mo… Modified: branches/reactos-yarotows/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nd… Modified: branches/reactos-yarotows/include/ddk/ndistapi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nd… Modified: branches/reactos-yarotows/include/ddk/ndiswan.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nd… Removed: branches/reactos-yarotows/include/ddk/ntdd1394.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntdd8042.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntddbeep.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntddcdrm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntddcdvd.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntddft.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntddpar.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Modified: branches/reactos-yarotows/include/ddk/ntddpcm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntddser.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Modified: branches/reactos-yarotows/include/ddk/ntddsnd.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntddtape.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntddtdi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntddvdeo.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/ntddvol.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Modified: branches/reactos-yarotows/include/ddk/ntimage.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Modified: branches/reactos-yarotows/include/ddk/ntnls.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Modified: branches/reactos-yarotows/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Modified: branches/reactos-yarotows/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/nt… Removed: branches/reactos-yarotows/include/ddk/objerror.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/ob… Modified: branches/reactos-yarotows/include/ddk/oprghdlr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/op… Removed: branches/reactos-yarotows/include/ddk/polarity.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/po… Modified: branches/reactos-yarotows/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/po… Removed: branches/reactos-yarotows/include/ddk/prntfont.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/pr… Modified: branches/reactos-yarotows/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/pu… Modified: branches/reactos-yarotows/include/ddk/smbus.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/sm… Modified: branches/reactos-yarotows/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/st… Removed: branches/reactos-yarotows/include/ddk/stierr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/st… Removed: branches/reactos-yarotows/include/ddk/stireg.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/st… Modified: branches/reactos-yarotows/include/ddk/storport.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/st… Modified: branches/reactos-yarotows/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/st… Modified: branches/reactos-yarotows/include/ddk/swenum.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/sw… Removed: branches/reactos-yarotows/include/ddk/tdi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/td… Removed: branches/reactos-yarotows/include/ddk/tdiinfo.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/td… Modified: branches/reactos-yarotows/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/td… Modified: branches/reactos-yarotows/include/ddk/tdistat.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/td… Removed: branches/reactos-yarotows/include/ddk/unknown.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/un… Modified: branches/reactos-yarotows/include/ddk/upssvc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/up… Modified: branches/reactos-yarotows/include/ddk/usbbusif.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/us… Modified: branches/reactos-yarotows/include/ddk/usbdlib.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/us… Modified: branches/reactos-yarotows/include/ddk/usbprotocoldefs.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/us… Removed: branches/reactos-yarotows/include/ddk/warning.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/wa… Modified: branches/reactos-yarotows/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/wd… Modified: branches/reactos-yarotows/include/ddk/wmilib.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ddk/wm… Removed: branches/reactos-yarotows/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/dxsdk/… Modified: branches/reactos-yarotows/include/psdk/dinput.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/d… Modified: branches/reactos-yarotows/include/psdk/imm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/i… Modified: branches/reactos-yarotows/include/psdk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/n… Modified: branches/reactos-yarotows/include/psdk/sti.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/s… Modified: branches/reactos-yarotows/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/w… Modified: branches/reactos-yarotows/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/xdk/ex… Modified: branches/reactos-yarotows/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/xdk/io… Modified: branches/reactos-yarotows/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/xdk/io… Modified: branches/reactos-yarotows/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/xdk/ke… Modified: branches/reactos-yarotows/include/xdk/wmifuncs.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/xdk/wm… Modified: branches/reactos-yarotows/include/xdk/x86/ke.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/xdk/x8… Modified: branches/reactos-yarotows/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/sdk/crt/lo… Modified: branches/reactos-yarotows/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/ex/in… Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/xlateobj.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win…

1 0

[cgutman] 48546: [NTOSKRNL] - Move to the next entry in the thread IRP list before calling IoCancelIrp because if everything works as expected and IoCompleteRequest is called, we could end up with the IRP ripped out from under us before can move to the next element - See issue #5550 for details.
by cgutman＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: cgutman Date: Sat Aug 14 14:55:12 2010 New Revision: 48546 URL: http://svn.reactos.org/svn/reactos?rev=48546&view=rev Log: [NTOSKRNL] - Move to the next entry in the thread IRP list before calling IoCancelIrp because if everything works as expected and IoCompleteRequest is called, we could end up with the IRP ripped out from under us before can move to the next element - See issue #5550 for details. Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sat Aug 14 14:55:12 2010 @@ -1047,14 +1047,12 @@ NextEntry = ListHead->Flink; while (ListHead != NextEntry) { - /* Get the IRP */ + /* Get the IRP and move to the next entry */ Irp = CONTAINING_RECORD(NextEntry, IRP, ThreadListEntry); + NextEntry = NextEntry->Flink; /* Cancel it */ IoCancelIrp(Irp); - - /* Move to the next entry */ - NextEntry = NextEntry->Flink; } /* Wait 100 milliseconds */

1 0

[cgutman] 48545: [WS2_32] - Create a temporary variable and pass that to WSAIoctl for the bytes returned value instead of passing argp and corrupting the value we just retrieved
by cgutman＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: cgutman Date: Sat Aug 14 13:48:31 2010 New Revision: 48545 URL: http://svn.reactos.org/svn/reactos?rev=48545&view=rev Log: [WS2_32] - Create a temporary variable and pass that to WSAIoctl for the bytes returned value instead of passing argp and corrupting the value we just retrieved Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Sat Aug 14 13:48:31 2010 @@ -586,13 +586,15 @@ IN LONG cmd, IN OUT ULONG FAR* argp) { + ULONG tmp; + return WSAIoctl(s, cmd, argp, sizeof(ULONG), argp, sizeof(ULONG), - argp, + &tmp, 0, 0); }

1 0

[akhaldi] 48544: [CMAKE] - mc : Make the generated bin file names prefixed by the base name of the source file.
by akhaldi＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: akhaldi Date: Sat Aug 14 10:49:27 2010 New Revision: 48544 URL: http://svn.reactos.org/svn/reactos?rev=48544&view=rev Log: [CMAKE] - mc : Make the generated bin file names prefixed by the base name of the source file. Modified: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt Modified: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/m… ============================================================================== --- branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] Sat Aug 14 10:49:27 2010 @@ -5,7 +5,7 @@ get_filename_component(FILE ${_in_FILE} NAME_WE) add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h - COMMAND ${MINGW_PREFIX}windmc -A ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos + COMMAND ${MINGW_PREFIX}windmc -A -b ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ) set_source_files_properties( ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc

1 0

[akhaldi] 48543: [CMAKE] - Now that we have c++ flags set globally, no need to mention them on the respective targets. - debug.h : leftover from the kernel32 sync.
by akhaldi＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: akhaldi Date: Sat Aug 14 10:47:57 2010 New Revision: 48543 URL: http://svn.reactos.org/svn/reactos?rev=48543&view=rev Log: [CMAKE] - Now that we have c++ flags set globally, no need to mention them on the respective targets. - debug.h : leftover from the kernel32 sync. Modified: branches/cmake-bringup/include/reactos/debug.h branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt branches/cmake-bringup/lib/nls/idna/CMakeLists.txt branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt Modified: branches/cmake-bringup/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/d… ============================================================================== --- branches/cmake-bringup/include/reactos/debug.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/debug.h [iso-8859-1] Sat Aug 14 10:47:57 2010 @@ -107,6 +107,11 @@ #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + + #define ERR__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define WARN__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define TRACE__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define INFO__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #else /* not DBG */ /* On non-debug builds, we never show these */ @@ -119,6 +124,11 @@ #define WARN_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define TRACE_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define INFO_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + + #define ERR__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define WARN__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define TRACE__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define INFO__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #endif /* not DBG */ #define ASSERT_IRQL_LESS_OR_EQUAL(x) ASSERT(KeGetCurrentIrql()<=(x)) Modified: branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/icu4… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt [iso-8859-1] Sat Aug 14 10:47:57 2010 @@ -6,8 +6,6 @@ add_definitions(-DU_HAVE_INTTYPES_H) add_definitions(-DUCONFIG_NO_FILE_IO=1) add_definitions(-DICU_NO_USER_DATA_OVERRIDE=1) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") set(SOURCE "stubs.cpp" Modified: branches/cmake-bringup/lib/nls/idna/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/idna/CMak… ============================================================================== --- branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] Sat Aug 14 10:47:57 2010 @@ -1,8 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) - -# Special C++ flags -add_definitions(-fno-exceptions -fno-rtti) # Re-definition of WINVER remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line Modified: branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/normalize… ============================================================================== --- branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] Sat Aug 14 10:47:57 2010 @@ -1,8 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) - -# Special C++ flags -add_definitions(-fno-exceptions -fno-rtti) # Re-definition of WINVER remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line Modified: branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/scripts/C… ============================================================================== --- branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] Sat Aug 14 10:47:57 2010 @@ -1,8 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) - -# Special C++ flags -add_definitions(-fno-exceptions -fno-rtti) # Re-definition of WINVER remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line

1 0

[akhaldi] 48542: [CMAKE] - Link mingw_common to kernel32 and ntdll. - Fix mingw_wmain. - Improve the paths use.
by akhaldi＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: akhaldi Date: Sat Aug 14 10:44:46 2010 New Revision: 48542 URL: http://svn.reactos.org/svn/reactos?rev=48542&view=rev Log: [CMAKE] - Link mingw_common to kernel32 and ntdll. - Fix mingw_wmain. - Improve the paths use. Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sat Aug 14 10:44:46 2010 @@ -35,33 +35,30 @@ ) add_library(mingw_common ${MINGW_COMMON_SOURCE}) -target_link_libraries(mingw_common oldnames) - +target_link_libraries(mingw_common oldnames ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) - add_dependencies(mingw_common psdk) - add_library(mingw_main crt0_c.c crtexe.c dllargv.c) set_property(TARGET mingw_main PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP) add_dependencies(mingw_main psdk) -add_library(mingw_wmain crt0_c.c crtexe.c dllargv.c) +add_library(mingw_wmain crt0_w.c crtexe.c dllargv.c) set_property(TARGET mingw_wmain PROPERTY COMPILE_DEFINITIONS WPRFLAG UNICODE _UNICODE) add_dependencies(mingw_wmain psdk) add_library(mingw_dllmain crtdll.c dllargv.c) add_dependencies(mingw_dllmain psdk) -ADD_CUSTOM_COMMAND( - OUTPUT ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a - COMMAND ${MINGW_PREFIX}dlltool --def ${REACTOS_SOURCE_DIR}/lib/3rdparty/mingw/moldname-msvcrt.def --kill-at --output-lib ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a - COMMAND ${MINGW_PREFIX}ar -rc ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a + COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a + COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a ) -SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a PROPERTIES GENERATED TRUE) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) -ADD_CUSTOM_TARGET(oldnames ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a) +add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) add_library(getopt getopt.c) set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP)

1 0

[akhaldi] 48541: [CMAKE] - Sync the recent crt changes from trunk. - Improve crt build.
by akhaldi＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: akhaldi Date: Sat Aug 14 10:41:24 2010 New Revision: 48541 URL: http://svn.reactos.org/svn/reactos?rev=48541&view=rev Log: [CMAKE] - Sync the recent crt changes from trunk. - Improve crt build. Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/locale/locale.c Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sat Aug 14 10:41:24 2010 @@ -4,10 +4,66 @@ add_definitions(-D_CRTBLD) file(GLOB_RECURSE CRT_SOURCE "*.c") -LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdio/findgen.c) -LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c) -add_library(crt ${CRT_SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch) +if(NOT ARCH MATCHES i386) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/except/i386/unwind.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/*.c) +if(NOT ARCH MATCHES amd64) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/float/i386/*.c) +endif(NOT ARCH MATCHES amd64) +else(NOT ARCH MATCHES i386) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/stubs.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/mem/memchr.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/mem/memcpy.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/mem/memmove.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/mem/memset.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strcat.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strchr.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strcmp.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strcpy.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strlen.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strncat.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strncmp.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strncpy.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strnlen.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strrchr.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcscat.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcschr.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcscmp.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcscpy.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcslen.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcsncat.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcsncmp.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcsncpy.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcsnlen.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcsrchr.c) +endif(NOT ARCH MATCHES i386) + +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/abs.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/cos.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/j0_y0.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/j1_y1.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/jn_yn.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/labs.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/rand_nt.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/math/sin.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdio/findgen.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdlib/atold.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdlib/malloc.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/mbstowcs_nt.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/wcstombs_nt.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/witoa.c) +list(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/witow.c) + +file(GLOB_RECURSE CRT_ASM_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/except/${ARCH}/*.s" + "${CMAKE_CURRENT_SOURCE_DIR}/math/${ARCH}/*.s" + "${CMAKE_CURRENT_SOURCE_DIR}/mem/${ARCH}/*.s" + "${CMAKE_CURRENT_SOURCE_DIR}/string/${ARCH}/*.s" + "${CMAKE_CURRENT_SOURCE_DIR}/setjmp/${ARCH}/*.s") + +add_library(crt ${CRT_SOURCE} ${CRT_ASM_SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch) + set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) add_dependencies(crt psdk) Modified: branches/cmake-bringup/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/local… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/locale/locale.c [iso-8859-1] Sat Aug 14 10:41:24 2010 @@ -755,38 +755,20 @@ /********************************************************************* - * __lc_collate_cp (MSVCRT.@) - * - * @unimplemented - */ -void __lc_collate_cp(int cp) -{ -FIXME("__lc_collate_cp - stub\n"); -return; -} - - -/********************************************************************* - * __lc_handle (MSVCRT.@) - * - * @unimplemented - */ -void __lc_handle(void) -{ -FIXME("__lc_handle - stub\n"); -return; -} - - -/********************************************************************* - * __lc_codepage (MSVCRT.@) - * - * @unimplemented - */ -void __lc_codepage(void) -{ -FIXME("__lc_codepage - stub\n"); -return; + * ___lc_handle_func (MSVCRT.@) + */ +HANDLE * CDECL ___lc_handle_func(void) +{ + return MSVCRT___lc_handle; +} + + +/********************************************************************* + * ___lc_codepage_func (MSVCRT.@) + */ +int CDECL ___lc_codepage_func(void) +{ + return MSVCRT___lc_codepage; }

1 0

[akhaldi] 48540: [CMAKE] - I forgot to link to the wine lib instead of its compiled lib (I have it locally to avoid recompiling it).
by akhaldi＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: akhaldi Date: Sat Aug 14 10:34:01 2010 New Revision: 48540 URL: http://svn.reactos.org/svn/reactos?rev=48540&view=rev Log: [CMAKE] - I forgot to link to the wine lib instead of its compiled lib (I have it locally to avoid recompiling it). Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Sat Aug 14 10:34:01 2010 @@ -32,7 +32,7 @@ target_link_libraries(user32 ${CMAKE_CURRENT_SOURCE_DIR}/user32.def - ${REACTOS_SOURCE_DIR}/lib/3rdparty/libwine/libwine.a + wine ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a imm32

1 0

[akhaldi] 48539: [CMAKE] - Improve advapi32 build.
by akhaldi＠svn.reactos.org 14 Aug '10

14 Aug '10

Author: akhaldi Date: Sat Aug 14 10:32:00 2010 New Revision: 48539 URL: http://svn.reactos.org/svn/reactos?rev=48539&view=rev Log: [CMAKE] - Improve advapi32 build. Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sat Aug 14 10:32:00 2010 @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -Wl,-L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") add_definitions(-DUNICODE -D_UNICODE) add_definitions(-D_ADVAPI32_) @@ -29,8 +29,9 @@ target_link_libraries(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.def wine pseh - mingw_common - rpcrt4) + rpcrt4 + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE}) add_dependencies(advapi32 svcctl_client lsa_client eventlogrpc_client version)

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