Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 41462: - Report that we are NDIS 5.1
by cgutman＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: cgutman Date: Fri Jun 19 10:53:58 2009 New Revision: 41462 URL: http://svn.reactos.org/svn/reactos?rev=41462&view=rev Log: - Report that we are NDIS 5.1 Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Fri Jun 19 10:53:58 2009 @@ -33,7 +33,7 @@ #include "ndissys.h" -#define NDIS_VERSION 0x00050000 /* the version of NDIS we claim to be to miniport drivers */ +#define NDIS_VERSION 0x00050001 /* the version of NDIS we claim to be to miniport drivers */ #define PARAMETERS_KEY L"Parameters" /* The parameters subkey under the device-specific key */ /*

1 0

[cgutman] 41461: - Big debugging update - Also fix some little bugs and reduce code duplication
by cgutman＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: cgutman Date: Fri Jun 19 10:47:00 2009 New Revision: 41461 URL: http://svn.reactos.org/svn/reactos?rev=41461&view=rev Log: - Big debugging update - Also fix some little bugs and reduce code duplication Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/efilter.c trunk/reactos/drivers/network/ndis/ndis/hardware.c trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/memory.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/misc.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -357,6 +357,7 @@ (*Buffer)->Next = NULL; *Status = NDIS_STATUS_SUCCESS; } else { + NDIS_DbgPrint(MIN_TRACE, ("IoAllocateMdl failed (%x, %lx)\n", VirtualAddress, Length)); *Status = NDIS_STATUS_FAILURE; } } @@ -401,43 +402,13 @@ * PoolHandle = Handle returned by NdisAllocatePacketPool */ { - KIRQL OldIrql; - PNDIS_PACKET Temp; PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)PoolHandle; - NDIS_DbgPrint(MAX_TRACE, ("Status (0x%X) Packet (0x%X) PoolHandle (0x%X).\n", - Status, Packet, PoolHandle)); - - *Packet = NULL; - - if (Pool == NULL) - { - *Status = NDIS_STATUS_FAILURE; - return; - } - - KeAcquireSpinLock(&Pool->SpinLock.SpinLock, &OldIrql); - - if (Pool->FreeList) { - Temp = Pool->FreeList; - Pool->FreeList = (PNDIS_PACKET)Temp->Reserved[0]; - - KeReleaseSpinLock(&Pool->SpinLock.SpinLock, OldIrql); - - RtlZeroMemory(Temp, Pool->PacketLength); - Temp->Private.Pool = Pool; - Temp->Private.ValidCounts = TRUE; - Temp->Private.NdisPacketFlags = fPACKET_ALLOCATED_BY_NDIS; - Temp->Private.NdisPacketOobOffset = Pool->PacketLength - - (sizeof(NDIS_PACKET_OOB_DATA) + - sizeof(NDIS_PACKET_EXTENSION)); - - *Packet = Temp; - *Status = NDIS_STATUS_SUCCESS; - } else { - *Status = NDIS_STATUS_RESOURCES; - KeReleaseSpinLock(&Pool->SpinLock.SpinLock, OldIrql); - } + KeAcquireSpinLock(&Pool->SpinLock.SpinLock, &Pool->SpinLock.OldIrql); + NdisDprAllocatePacketNonInterlocked(Status, + Packet, + PoolHandle); + KeReleaseSpinLock(&Pool->SpinLock.SpinLock, Pool->SpinLock.OldIrql); } @@ -499,6 +470,7 @@ if (NumberOfDescriptors > 0xffff) { + NDIS_DbgPrint(MIN_TRACE, ("Invalid number of descriptors (%lx)\n")) *Status = NDIS_STATUS_RESOURCES; } else @@ -506,6 +478,7 @@ NumberOfDescriptors += NumberOfOverflowDescriptors; if (NumberOfDescriptors > 0xffff) { + NDIS_DbgPrint(MIN_TRACE, ("Total number of descriptors > 0xffff (%lx)\n")); NumberOfDescriptors = 0xffff; } @@ -533,8 +506,10 @@ } Packet->Reserved[0] = 0; } - else + else { + NDIS_DbgPrint(MIN_TRACE, ("Attempted to allocate a packet pool with 0 descriptors\n")); Pool->FreeList = NULL; + } *Status = NDIS_STATUS_SUCCESS; *PoolHandle = (PNDIS_HANDLE)Pool; @@ -689,6 +664,33 @@ * PoolHandle = Handle returned by NdisAllocatePacketPool */ { + PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)PoolHandle; + + KeAcquireSpinLockAtDpcLevel(&Pool->SpinLock.SpinLock); + NdisDprAllocatePacketNonInterlocked(Status, + Packet, + PoolHandle); + KeReleaseSpinLockFromDpcLevel(&Pool->SpinLock.SpinLock); +} + + +/* + * @implemented + */ +VOID +EXPORT +NdisDprAllocatePacketNonInterlocked( + OUT PNDIS_STATUS Status, + OUT PNDIS_PACKET *Packet, + IN NDIS_HANDLE PoolHandle) +/* + * FUNCTION: Allocates a packet at IRQL DISPATCH_LEVEL (w/o synchronization) + * ARGUMENTS: + * Status = Address of buffer to place status of operation + * Packet = Address of buffer to place a pointer to a packet descriptor + * PoolHandle = Handle returned by NdisAllocatePacketPool + */ +{ PNDIS_PACKET Temp; PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)PoolHandle; @@ -700,16 +702,13 @@ if (Pool == NULL) { *Status = NDIS_STATUS_FAILURE; + NDIS_DbgPrint(MIN_TRACE, ("Called passed a bad pool handle\n")); return; } - - KeAcquireSpinLockAtDpcLevel(&Pool->SpinLock.SpinLock); if (Pool->FreeList) { Temp = Pool->FreeList; Pool->FreeList = (PNDIS_PACKET)Temp->Reserved[0]; - - KeReleaseSpinLockFromDpcLevel(&Pool->SpinLock.SpinLock); RtlZeroMemory(Temp, Pool->PacketLength); Temp->Private.Pool = Pool; @@ -722,58 +721,7 @@ *Packet = Temp; *Status = NDIS_STATUS_SUCCESS; } else { - *Status = NDIS_STATUS_RESOURCES; - KeReleaseSpinLockFromDpcLevel(&Pool->SpinLock.SpinLock); - } -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisDprAllocatePacketNonInterlocked( - OUT PNDIS_STATUS Status, - OUT PNDIS_PACKET *Packet, - IN NDIS_HANDLE PoolHandle) -/* - * FUNCTION: Allocates a packet at IRQL DISPATCH_LEVEL (w/o synchronization) - * ARGUMENTS: - * Status = Address of buffer to place status of operation - * Packet = Address of buffer to place a pointer to a packet descriptor - * PoolHandle = Handle returned by NdisAllocatePacketPool - */ -{ - PNDIS_PACKET Temp; - PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)PoolHandle; - - NDIS_DbgPrint(MAX_TRACE, ("Status (0x%X) Packet (0x%X) PoolHandle (0x%X).\n", - Status, Packet, PoolHandle)); - - *Packet = NULL; - - if (Pool == NULL) - { - *Status = NDIS_STATUS_FAILURE; - return; - } - - if (Pool->FreeList) { - Temp = Pool->FreeList; - Pool->FreeList = (PNDIS_PACKET)Temp->Reserved[0]; - - RtlZeroMemory(Temp, Pool->PacketLength); - Temp->Private.Pool = Pool; - Temp->Private.ValidCounts = TRUE; - Temp->Private.NdisPacketFlags = fPACKET_ALLOCATED_BY_NDIS; - Temp->Private.NdisPacketOobOffset = Pool->PacketLength - - (sizeof(NDIS_PACKET_OOB_DATA) + - sizeof(NDIS_PACKET_EXTENSION)); - - *Packet = Temp; - *Status = NDIS_STATUS_SUCCESS; - } else { + NDIS_DbgPrint(MIN_TRACE, ("No more free descriptors\n")); *Status = NDIS_STATUS_RESOURCES; } } @@ -792,12 +740,11 @@ * Packet = Pointer to packet to free */ { - NDIS_DbgPrint(MAX_TRACE, ("Packet (0x%X).\n", Packet)); - - KeAcquireSpinLockAtDpcLevel(&((NDISI_PACKET_POOL*)Packet->Private.Pool)->SpinLock.SpinLock); - Packet->Reserved[0] = (ULONG_PTR)((NDISI_PACKET_POOL*)Packet->Private.Pool)->FreeList; - ((NDISI_PACKET_POOL*)Packet->Private.Pool)->FreeList = Packet; - KeReleaseSpinLockFromDpcLevel(&((NDISI_PACKET_POOL*)Packet->Private.Pool)->SpinLock.SpinLock); + PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)Packet->Private.Pool; + + KeAcquireSpinLockAtDpcLevel(&Pool->SpinLock.SpinLock); + NdisDprFreePacketNonInterlocked(Packet); + KeReleaseSpinLockFromDpcLevel(&Pool->SpinLock.SpinLock); } @@ -885,14 +832,11 @@ * Packet = Pointer to packet descriptor */ { - KIRQL OldIrql; - - NDIS_DbgPrint(MAX_TRACE, ("Packet (0x%X).\n", Packet)); - - KeAcquireSpinLock(&((NDISI_PACKET_POOL*)Packet->Private.Pool)->SpinLock.SpinLock, &OldIrql); - Packet->Reserved[0] = (ULONG_PTR)((NDISI_PACKET_POOL*)Packet->Private.Pool)->FreeList; - ((NDISI_PACKET_POOL*)Packet->Private.Pool)->FreeList = Packet; - KeReleaseSpinLock(&((NDISI_PACKET_POOL*)Packet->Private.Pool)->SpinLock.SpinLock, OldIrql); + PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)Packet->Private.Pool; + + KeAcquireSpinLock(&Pool->SpinLock.SpinLock, &Pool->SpinLock.OldIrql); + NdisDprFreePacketNonInterlocked(Packet); + KeReleaseSpinLock(&Pool->SpinLock.SpinLock, Pool->SpinLock.OldIrql); } @@ -951,6 +895,7 @@ *_FirstBufferVA = MmGetSystemAddressForMdl(Buffer); Buffer = Buffer->Next; } else { + NDIS_DbgPrint(MIN_TRACE, ("No buffers linked to this packet\n")); *_FirstBufferLength = 0; *_FirstBufferVA = NULL; } @@ -986,6 +931,7 @@ *_FirstBufferVA = MmGetSystemAddressForMdlSafe(Buffer, Priority); Buffer = Buffer->Next; } else { + NDIS_DbgPrint(MIN_TRACE, ("No buffers linked to this packet\n")); *_FirstBufferLength = 0; *_FirstBufferVA = NULL; } @@ -1088,6 +1034,7 @@ &NdisBuffer, NULL); if (!NdisBuffer) { + NDIS_DbgPrint(MIN_TRACE, ("No buffer to unchain\n")); *Buffer = NULL; return; } @@ -1136,6 +1083,7 @@ &NdisBuffer, NULL); if (!NdisBuffer) { + NDIS_DbgPrint(MIN_TRACE, ("No buffer to unchain\n")); *Buffer = NULL; return; } @@ -1182,6 +1130,7 @@ *Buffer = IoAllocateMdl(CurrentVa, Length, FALSE, FALSE, NULL); if (!*Buffer) { + NDIS_DbgPrint(MIN_TRACE, ("IoAllocateMdl failed (%x, %lx)\n", CurrentVa, Length)); *Status = NDIS_STATUS_FAILURE; return; } Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -68,6 +68,8 @@ PVOID Data; WCHAR Buff[25]; + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + /* reset parameter type to standard reg types */ switch(ParameterType) { @@ -114,9 +116,10 @@ *Status = ZwSetValueKey(((PMINIPORT_CONFIGURATION_CONTEXT)ConfigurationHandle)->Handle, Keyword, 0, ParameterType, Data, DataSize); - if(*Status != STATUS_SUCCESS) - *Status = NDIS_STATUS_FAILURE; - else + if(*Status != STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwSetValueKey failed (%x)\n", *Status)); + *Status = NDIS_STATUS_FAILURE; + } else *Status = NDIS_STATUS_SUCCESS; } @@ -189,7 +192,7 @@ DUPLICATE_SAME_ACCESS); if(!NT_SUCCESS(*Status)) { - NDIS_DbgPrint(MID_TRACE, ("Failed to open registry configuration for this miniport\n")); + NDIS_DbgPrint(MIN_TRACE, ("Failed to open registry configuration for this miniport\n")); *Status = NDIS_STATUS_FAILURE; return; } @@ -263,6 +266,7 @@ if(*Status != NDIS_STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwOpenKey failed (%x)\n", *Status)); *ConfigurationHandle = NULL; *Status = NDIS_STATUS_FAILURE; return; @@ -330,7 +334,7 @@ ParameterType != NdisParameterBinary ) { - NDIS_DbgPrint(MID_TRACE,("unsupported parameter type\n")); + NDIS_DbgPrint(MIN_TRACE,("unsupported parameter type\n")); *Status = NDIS_STATUS_NOT_SUPPORTED; return; } @@ -339,7 +343,7 @@ if (ConfigurationContext == NULL) { - NDIS_DbgPrint(MID_TRACE,("invalid parameter ConfigurationContext (0x%x)\n",ConfigurationContext)); + NDIS_DbgPrint(MIN_TRACE,("invalid parameter ConfigurationContext (0x%x)\n",ConfigurationContext)); return; } @@ -460,7 +464,7 @@ *Status = ZwQueryValueKey(ConfigurationContext->Handle, Keyword, KeyValuePartialInformation, NULL, 0, &KeyDataLength); if(*Status != STATUS_BUFFER_OVERFLOW && *Status != STATUS_BUFFER_TOO_SMALL && *Status != STATUS_SUCCESS) { - NDIS_DbgPrint(MID_TRACE,("ZwQueryValueKey #1 failed for %wZ, status 0x%x\n", Keyword, *Status)); + NDIS_DbgPrint(MIN_TRACE,("ZwQueryValueKey #1 failed for %wZ, status 0x%x\n", Keyword, *Status)); *Status = NDIS_STATUS_FAILURE; return; } @@ -480,7 +484,7 @@ if(*Status != STATUS_SUCCESS) { ExFreePool(KeyInformation); - NDIS_DbgPrint(MID_TRACE,("ZwQueryValueKey #2 failed for %wZ, status 0x%x\n", Keyword, *Status)); + NDIS_DbgPrint(MIN_TRACE,("ZwQueryValueKey #2 failed for %wZ, status 0x%x\n", Keyword, *Status)); *Status = NDIS_STATUS_FAILURE; return; } @@ -551,7 +555,7 @@ if(KeyInformation->Type != REG_SZ && KeyInformation->Type != REG_MULTI_SZ) { - NDIS_DbgPrint(MID_TRACE,("requested type does not match actual value type\n")); + NDIS_DbgPrint(MIN_TRACE,("requested type does not match actual value type\n")); ExFreePool(KeyInformation); *ParameterValue = NULL; *Status = NDIS_STATUS_FAILURE; @@ -721,6 +725,7 @@ NdisReadConfiguration(Status, &ParameterValue, ConfigurationHandle, &Keyword, NdisParameterString); if(*Status != NDIS_STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("NdisReadConfiguration failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; return; } @@ -808,6 +813,7 @@ *Status = ZwEnumerateKey(ConfigurationHandle, Index, KeyBasicInformation, NULL, 0, &KeyInformationLength); if(*Status != STATUS_BUFFER_TOO_SMALL && *Status != STATUS_BUFFER_OVERFLOW && *Status != STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwEnumerateKey failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; return; } @@ -825,6 +831,7 @@ if(*Status != STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwEnumerateKey failed (%x)\n", *Status)); ExFreePool(KeyInformation); *Status = NDIS_STATUS_FAILURE; return; @@ -842,6 +849,7 @@ if(*Status != STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwOpenKey failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; return; } @@ -901,6 +909,7 @@ if(*Status != STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwOpenKey failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; return; } Modified: trunk/reactos/drivers/network/ndis/ndis/efilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/efilter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/efilter.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -44,8 +44,12 @@ *Filter = (PETH_FILTER)NewFilter; return TRUE; } - *Filter = NULL; - return FALSE; + else + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); + *Filter = NULL; + return FALSE; + } } @@ -88,7 +92,10 @@ /* Not sure if this is a valid thing to do, but we do arrive here early * in the boot process with Filter NULL. We need to investigate whether * this should be handled or not allowed. */ - if( !Filter ) return; + if( !Filter ) { + NDIS_DbgPrint(MIN_TRACE, ("Filter is NULL\n")); + return; + } MiniIndicateData((PLOGICAL_ADAPTER)((PETHI_FILTER)Filter)->Miniport, MacReceiveContext, HeaderBuffer, @@ -118,7 +125,10 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - if( !Filter ) return; + if( !Filter ) { + NDIS_DbgPrint(MIN_TRACE, ("Filter is NULL\n")); + return; + } Adapter = (PLOGICAL_ADAPTER)((PETHI_FILTER)Filter)->Miniport; Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -68,6 +68,7 @@ if (Adapter->NdisMiniportBlock.BusType != NdisInterfacePci || Adapter->NdisMiniportBlock.AllocatedResources == NULL) { + NDIS_DbgPrint(MIN_TRACE, ("Bad bus type or no resources\n")); *AssignedResources = NULL; return NDIS_STATUS_FAILURE; } Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -68,12 +68,14 @@ NDIS_DbgPrint(MAX_TRACE, ("Called. Interrupt (0x%X)\n", NdisInterrupt)); if (NdisInterrupt->IsrRequested) { + NDIS_DbgPrint(MAX_TRACE, ("Calling MiniportISR\n")); (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.ISRHandler)( &InterruptRecognized, &QueueMiniportHandleInterrupt, NdisMiniportBlock->MiniportAdapterContext); } else if (NdisMiniportBlock->DriverHandle->MiniportCharacteristics.DisableInterruptHandler) { + NDIS_DbgPrint(MAX_TRACE, ("Calling MiniportDisableInterrupt\n")); (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.DisableInterruptHandler)( NdisMiniportBlock->MiniportAdapterContext); QueueMiniportHandleInterrupt = TRUE; @@ -276,8 +278,10 @@ ASSERT(Adapter); /* only bus masters may call this routine */ - if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) + if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) { + NDIS_DbgPrint(MIN_TRACE, ("Not a bus master\n")); return NDIS_STATUS_NOT_SUPPORTED; + } DeviceObject = Adapter->NdisMiniportBlock.DeviceObject; @@ -564,10 +568,11 @@ ASSERT(Adapter); /* only bus masters may call this routine */ - ASSERT(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER); if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER) || - Adapter->NdisMiniportBlock.SystemAdapterObject == NULL) + Adapter->NdisMiniportBlock.SystemAdapterObject == NULL) { + NDIS_DbgPrint(MIN_TRACE, ("Not bus master or bad adapter object\n")); return; + } MapRegistersPerBaseRegister = ((Adapter->NdisMiniportBlock.MaximumPhysicalMapping - 2) / PAGE_SIZE) + 2; @@ -717,12 +722,15 @@ DmaBlock = ExAllocatePool(NonPagedPool, sizeof(NDIS_DMA_BLOCK)); - if (!DmaBlock) + if (!DmaBlock) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } DmaBlock->SystemAdapterObject = (PVOID)IoGetDmaAdapter(Adapter->NdisMiniportBlock.PhysicalDeviceObject, &DeviceDesc, &MapRegisters); if (!DmaBlock->SystemAdapterObject) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); ExFreePool(DmaBlock); return NDIS_STATUS_RESOURCES; } @@ -882,8 +890,10 @@ *PortOffset = MmMapIoSpace(TranslatedAddress, NumberOfPorts, MmNonCached); NDIS_DbgPrint(MAX_TRACE, ("Returning 0x%x for port range\n", *PortOffset)); - if(!*PortOffset) + if(!*PortOffset) { + NDIS_DbgPrint(MIN_TRACE, ("MmMapIoSpace failed\n")); return NDIS_STATUS_RESOURCES; + } return NDIS_STATUS_SUCCESS; } @@ -941,8 +951,10 @@ NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - if (!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) + if (!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) { + NDIS_DbgPrint(MIN_TRACE, ("Not a bus master\n")); return NDIS_STATUS_NOT_SUPPORTED; + } RtlZeroMemory(&DeviceDesc, sizeof(DEVICE_DESCRIPTION)); Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -41,8 +41,10 @@ Block = ExAllocatePoolWithTag(NonPagedPool, Length, Tag); *VirtualAddress = Block; - if (!Block) + if (!Block) { + NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate memory (%lx)\n", Length)); return NDIS_STATUS_FAILURE; + } return NDIS_STATUS_SUCCESS; } @@ -94,8 +96,10 @@ *VirtualAddress = ExAllocatePool(NonPagedPool, Length); } - if (!*VirtualAddress) + if (!*VirtualAddress) { + NDIS_DbgPrint(MIN_TRACE, ("Allocation failed (%lx, %lx)\n", MemoryFlags, Length)); return NDIS_STATUS_FAILURE; + } return NDIS_STATUS_SUCCESS; } @@ -241,7 +245,7 @@ if(!Memory) { - NDIS_DbgPrint(MID_TRACE, ("Insufficient resources\n")); + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return; } @@ -319,7 +323,7 @@ if(!Memory) { - NDIS_DbgPrint(MID_TRACE, ("Insufficient resources\n")); + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_FAILURE; } Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -210,7 +210,7 @@ if (CurrentEntry == &Adapter->ProtocolListHead) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("WARNING: No upper protocol layer.\n")); + NDIS_DbgPrint(MIN_TRACE, ("WARNING: No upper protocol layer.\n")); } while (CurrentEntry != &Adapter->ProtocolListHead) @@ -523,13 +523,13 @@ #if DBG if(!Adapter) { - NDIS_DbgPrint(MID_TRACE, ("Adapter object was null\n")); + NDIS_DbgPrint(MIN_TRACE, ("Adapter object was null\n")); return FALSE; } if(!Packet) { - NDIS_DbgPrint(MID_TRACE, ("Packet was null\n")); + NDIS_DbgPrint(MIN_TRACE, ("Packet was null\n")); return FALSE; } #endif @@ -538,7 +538,7 @@ if (!NdisBuffer) { - NDIS_DbgPrint(MID_TRACE, ("Packet contains no buffers.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Packet contains no buffers.\n")); return FALSE; } @@ -560,7 +560,7 @@ if (BufferLength < Length) { - NDIS_DbgPrint(MID_TRACE, ("Buffer is too small.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Buffer is too small.\n")); return FALSE; } @@ -597,7 +597,7 @@ if(IsListEmpty(&AdapterListHead)) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("No registered miniports for protocol to bind to\n")); + NDIS_DbgPrint(MIN_TRACE, ("No registered miniports for protocol to bind to\n")); return NULL; } @@ -632,7 +632,7 @@ } else { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Leaving (adapter not found).\n")); + NDIS_DbgPrint(MIN_TRACE, ("Leaving (adapter not found for %wZ).\n", AdapterName)); } return Adapter; @@ -654,13 +654,8 @@ * Size = Size of the passed buffer * Buffer = Buffer for the output * BytesWritten = Address of buffer to place number of bytes written - * NOTES: - * If the specified buffer is too small, a new buffer is allocated, - * and the query is attempted again * RETURNS: * Status of operation - * TODO: - * Is there any way to use the buffer provided by the protocol? */ { NDIS_STATUS NdisStatus; @@ -669,7 +664,10 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); NdisRequest = ExAllocatePool(NonPagedPool, sizeof(NDIS_REQUEST)); - if (!NdisRequest) return NDIS_STATUS_RESOURCES; + if (!NdisRequest) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); + return NDIS_STATUS_RESOURCES; + } RtlZeroMemory(NdisRequest, sizeof(NDIS_REQUEST)); @@ -903,6 +901,8 @@ } else { + NDIS_DbgPrint(MIN_TRACE, ("No work item to dequeue\n")); + return NDIS_STATUS_FAILURE; } } @@ -956,6 +956,7 @@ break; default: + NDIS_DbgPrint(MIN_TRACE, ("Bad request type\n")); Status = NDIS_STATUS_FAILURE; } } @@ -1747,6 +1748,7 @@ ExAllocatePool(PagedPool, ResourceListSize); if (Adapter->NdisMiniportBlock.AllocatedResources == NULL) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1755,6 +1757,7 @@ ExAllocatePool(PagedPool, ResourceListSize); if (!Adapter->NdisMiniportBlock.Resources) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); ExFreePool(Adapter->NdisMiniportBlock.AllocatedResources); ExInterlockedRemoveEntryList(&Adapter->ListEntry, &AdapterListLock); return STATUS_INSUFFICIENT_RESOURCES; @@ -1781,6 +1784,7 @@ ExAllocatePool(PagedPool, ResourceListSize); if (Adapter->NdisMiniportBlock.AllocatedResourcesTranslated == NULL) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1890,7 +1894,7 @@ if (SelectedMediumIndex >= MEDIA_ARRAY_SIZE) { - NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter\n")); + NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() selected a bad index\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return NDIS_STATUS_UNSUPPORTED_MEDIA; } @@ -1912,7 +1916,7 @@ if (NdisStatus != NDIS_STATUS_SUCCESS) { ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); - NDIS_DbgPrint(MAX_TRACE, ("MiniQueryInformation failed (%x)\n", NdisStatus)); + NDIS_DbgPrint(MIN_TRACE, ("MiniQueryInformation failed (%x)\n", NdisStatus)); return NdisStatus; } @@ -1930,14 +1934,13 @@ /* FIXME: Support other types of media */ NDIS_DbgPrint(MIN_TRACE, ("error: unsupported media\n")); ASSERT(FALSE); -/* FIXME - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); */ ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return STATUS_UNSUCCESSFUL; } if (NdisStatus != NDIS_STATUS_SUCCESS) { - NDIS_DbgPrint(MAX_TRACE, ("couldn't create filter (%x)\n", NdisStatus)); + NDIS_DbgPrint(MIN_TRACE, ("couldn't create filter (%x)\n", NdisStatus)); return NdisStatus; } @@ -2100,6 +2103,8 @@ { Status = NdisIPnPStartDevice(DeviceObject, Irp); } + else + NDIS_DbgPrint(MIN_TRACE, ("Lower driver failed device start\n")); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); break; @@ -2110,6 +2115,8 @@ { Status = NdisIPnPStopDevice(DeviceObject, Irp); } + else + NDIS_DbgPrint(MIN_TRACE, ("Lower driver failed device stop\n")); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); break; @@ -2176,8 +2183,8 @@ MiniportPtr = IoGetDriverObjectExtension(DriverObject, (PVOID)TAG('D','I','M','N')); if (MiniportPtr == NULL) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get driver object extension.\n")); - return STATUS_UNSUCCESSFUL; + NDIS_DbgPrint(MIN_TRACE, ("Can't get driver object extension.\n")); + return NDIS_STATUS_FAILURE; } Miniport = *MiniportPtr; @@ -2193,7 +2200,7 @@ 0, NULL, &DriverKeyLength); if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW && Status != STATUS_SUCCESS) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key length.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Can't get miniport driver key length.\n")); return Status; } @@ -2201,7 +2208,7 @@ sizeof(ClassKeyName) + sizeof(LinkageKeyName)); if (LinkageKeyBuffer == NULL) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't allocate memory for driver key name.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Can't allocate memory for driver key name.\n")); return STATUS_INSUFFICIENT_RESOURCES; } @@ -2211,7 +2218,7 @@ &DriverKeyLength); if (!NT_SUCCESS(Status)) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Can't get miniport driver key.\n")); ExFreePool(LinkageKeyBuffer); return Status; } @@ -2239,7 +2246,7 @@ ExFreePool(LinkageKeyBuffer); if (!NT_SUCCESS(Status)) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport device name. (%x)\n", Status)); + NDIS_DbgPrint(MIN_TRACE, ("Can't get miniport device name. (%x)\n", Status)); return Status; } @@ -2428,7 +2435,7 @@ sizeof(PNDIS_M_DRIVER_BLOCK), (PVOID*)&MiniportPtr); if (!NT_SUCCESS(Status)) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't allocate driver object extension.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Can't allocate driver object extension.\n")); return NDIS_STATUS_RESOURCES; } @@ -2718,8 +2725,10 @@ AdapterName.Length = 0; AdapterName.MaximumLength = Adapter->NdisMiniportBlock.MiniportName.MaximumLength; AdapterName.Buffer = ExAllocatePool(PagedPool, AdapterName.MaximumLength); - if (!AdapterName.Buffer) + if (!AdapterName.Buffer) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } RtlCopyUnicodeString(&AdapterName, &Adapter->NdisMiniportBlock.MiniportName); @@ -2865,6 +2874,7 @@ if (!NT_SUCCESS(Status)) { + NDIS_DbgPrint(MIN_TRACE, ("IoCreateDevice failed (%x)\n", Status)); return Status; } @@ -2872,6 +2882,7 @@ if (!NT_SUCCESS(Status)) { + NDIS_DbgPrint(MIN_TRACE, ("IoCreateSymbolicLink failed (%x)\n", Status)); IoDeleteDevice(DeviceObject); return Status; } @@ -2880,6 +2891,7 @@ if (!DeviceBlock) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); IoDeleteDevice(DeviceObject); IoDeleteSymbolicLink(SymbolicName); return NDIS_STATUS_RESOURCES; Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -158,6 +158,7 @@ if (HandleObject->Mapped) { /* If a file already mapped we will return an error code */ + NDIS_DbgPrint(MIN_TRACE, ("File already mapped\n")); *Status = NDIS_STATUS_ALREADY_MAPPED; return; } @@ -247,6 +248,7 @@ if ( !FullFileName.Buffer ) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); *Status = NDIS_STATUS_RESOURCES; goto cleanup; } @@ -254,6 +256,7 @@ FileHandleObject = ExAllocatePool ( NonPagedPool, sizeof(NDIS_HANDLE_OBJECT) ); if ( !FileHandleObject ) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); *Status = NDIS_STATUS_RESOURCES; goto cleanup; } @@ -263,6 +266,7 @@ *Status = RtlAppendUnicodeStringToString ( &FullFileName, FileName ); if ( !NT_SUCCESS(*Status) ) { + NDIS_DbgPrint(MIN_TRACE, ("RtlAppendUnicodeStringToString failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; goto cleanup; } @@ -288,6 +292,7 @@ if ( !NT_SUCCESS(*Status) ) { + NDIS_DbgPrint(MIN_TRACE, ("ZwCreateFile failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; } Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -36,8 +36,10 @@ PNET_PNP_EVENT PnPEvent; PnPEvent = ExAllocatePool(PagedPool, sizeof(NET_PNP_EVENT)); - if (!PnPEvent) + if (!PnPEvent) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NULL; + } RtlZeroMemory(PnPEvent, sizeof(NET_PNP_EVENT)); @@ -48,6 +50,7 @@ PnPEvent->Buffer = ExAllocatePool(PagedPool, EventBufferLength); if (!PnPEvent->Buffer) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); ExFreePool(PnPEvent); return NULL; } @@ -117,8 +120,10 @@ ASSERT(Stack->Parameters.Power.Type == DevicePowerState); PnPEvent = ProSetupPnPEvent(NetEventSetPower, &Stack->Parameters.Power.State, sizeof(NDIS_DEVICE_POWER_STATE)); - if (!PnPEvent) + if (!PnPEvent) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } return ProSendAndFreePnPEvent(Adapter, PnPEvent, Irp); } @@ -136,8 +141,10 @@ ASSERT(Stack->Parameters.Power.Type == DevicePowerState); PnPEvent = ProSetupPnPEvent(NetEventQueryPower, &Stack->Parameters.Power.State, sizeof(NDIS_DEVICE_POWER_STATE)); - if (!PnPEvent) + if (!PnPEvent) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } return ProSendAndFreePnPEvent(Adapter, PnPEvent, Irp); } @@ -153,8 +160,10 @@ PNET_PNP_EVENT PnPEvent; PnPEvent = ProSetupPnPEvent(NetEventQueryRemoveDevice, NULL, 0); - if (!PnPEvent) + if (!PnPEvent) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } return ProSendAndFreePnPEvent(Adapter, PnPEvent, Irp); } @@ -169,8 +178,10 @@ PNET_PNP_EVENT PnPEvent; PnPEvent = ProSetupPnPEvent(NetEventCancelRemoveDevice, NULL, 0); - if (!PnPEvent) + if (!PnPEvent) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } return ProSendAndFreePnPEvent(Adapter, PnPEvent, Irp); } @@ -198,7 +209,10 @@ { PROTOCOL_BINDING *Protocol = (PROTOCOL_BINDING *)BindAdapterContext; - if (!NT_SUCCESS(Status)) return; + if (!NT_SUCCESS(Status)) { + NDIS_DbgPrint(MIN_TRACE, ("Binding failed (%x)\n", Status)); + return; + } /* Put protocol binding struct on global list */ ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); @@ -219,7 +233,10 @@ PROTOCOL_BINDING *Protocol = (PROTOCOL_BINDING *)UnbindAdapterContext; - if (!NT_SUCCESS(Status)) return; + if (!NT_SUCCESS(Status)) { + NDIS_DbgPrint(MIN_TRACE, ("Unbinding failed (%x)\n", Status)); + return; + } ExInterlockedRemoveEntryList(&Protocol->ListEntry, &ProtocolListLock); } @@ -252,8 +269,10 @@ #endif LookaheadBuffer = ExAllocatePool(NonPagedPool, Adapter->NdisMiniportBlock.CurrentLookahead + Adapter->MediumHeaderSize); - if (!LookaheadBuffer) + if (!LookaheadBuffer) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength); @@ -497,8 +516,10 @@ &PacketLength); Context = ExAllocatePool(NonPagedPool, sizeof(DMA_CONTEXT)); - if (!Context) + if (!Context) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } Context->Adapter = Adapter; Context->Packet = Packet; @@ -520,7 +541,7 @@ KeLowerIrql(OldIrql); if (!NT_SUCCESS(NdisStatus)) { - NDIS_DbgPrint(MIN_TRACE, ("GetScatterGatherList failed!\n")); + NDIS_DbgPrint(MIN_TRACE, ("GetScatterGatherList failed! (%x)\n", NdisStatus)); return NdisStatus; } @@ -760,7 +781,7 @@ if(!NdisProtocolHandle) { - NDIS_DbgPrint(MAX_TRACE, ("NdisProtocolHandle is NULL\n")); + NDIS_DbgPrint(MIN_TRACE, ("NdisProtocolHandle is NULL\n")); *OpenErrorStatus = *Status = NDIS_STATUS_FAILURE; return; } @@ -973,7 +994,7 @@ if(BindHandler) BindHandler(Status, BindContext, &DeviceName, &RegistryPath, 0); else - NDIS_DbgPrint(MID_TRACE, ("No protocol bind handler specified\n")); + NDIS_DbgPrint(MIN_TRACE, ("No protocol bind handler specified\n")); } } @@ -1081,6 +1102,7 @@ if (*Status == NDIS_STATUS_SUCCESS) { ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); } else { + NDIS_DbgPrint(MIN_TRACE, ("Binding failed (%x)\n", *Status)); ExFreePool(Protocol); *NdisProtocolHandle = NULL; } @@ -1225,6 +1247,7 @@ if (!Binding) { + NDIS_DbgPrint(MIN_TRACE, ("Bad binding handle\n")); *NdisDriverHandle = NULL; return; }

1 0

[cgutman] 41460: - Make CancelId a LONG
by cgutman＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: cgutman Date: Fri Jun 19 09:12:20 2009 New Revision: 41460 URL: http://svn.reactos.org/svn/reactos?rev=41460&view=rev Log: - Make CancelId a LONG Modified: trunk/reactos/drivers/network/ndis/ndis/main.c trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] Fri Jun 19 09:12:20 2009 @@ -21,7 +21,7 @@ #endif /* DBG */ -UCHAR CancelId; +LONG CancelId; VOID NTAPI MainUnload( Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Fri Jun 19 09:12:20 2009 @@ -6,7 +6,7 @@ #include "ndissys.h" -extern UCHAR CancelId; +extern LONG CancelId; /* * @implemented @@ -522,7 +522,7 @@ { UCHAR PartialCancelId; - PartialCancelId = InterlockedIncrement((PLONG)&CancelId); + PartialCancelId = (UCHAR)InterlockedIncrement(&CancelId); NDIS_DbgPrint(MAX_TRACE, ("Cancel ID %u\n", PartialCancelId));

1 0

[hyperion] 41459: modified tools/rbuild/backend/mingw/compilers/gcc.mak modified tools/rbuild/backend/mingw/compilers/msc.mak New rules for C preprocessor that compiles to standard output (RBUILD_PIPE_CPP, RBUILD_PIPE_CXX_CPP) modified tools/rbuild/backend/mingw/rules.mak Use RBUILD_PIPE_CPP in RBUILD_WRC_RULE, instead of hardcoding GCC
by hyperion＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: hyperion Date: Fri Jun 19 06:28:33 2009 New Revision: 41459 URL: http://svn.reactos.org/svn/reactos?rev=41459&view=rev Log: modified tools/rbuild/backend/mingw/compilers/gcc.mak modified tools/rbuild/backend/mingw/compilers/msc.mak New rules for C preprocessor that compiles to standard output (RBUILD_PIPE_CPP, RBUILD_PIPE_CXX_CPP) modified tools/rbuild/backend/mingw/rules.mak Use RBUILD_PIPE_CPP in RBUILD_WRC_RULE, instead of hardcoding GCC Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Fri Jun 19 06:28:33 2009 @@ -30,12 +30,16 @@ endef +#(source, cflags) +RBUILD_PIPE_CPP=$${gcc} $(2) -xc -E $(1) +RBUILD_PIPE_CXX_CPP=$${gpp} $(2) -E $(1) + #(module, source, dependencies, cflags, output) define RBUILD_CPP $(5): $(2) $(3) | ${call RBUILD_dir,$(5)} $$(ECHO_CPP) - $${gcc} -xc -E $(4) $$< > $$@ + ${call RBUILD_PIPE_CPP,$$<,$(4)} > $$@ endef @@ -44,7 +48,7 @@ $(5): $(2) $(3) | ${call RBUILD_dir,$(5)} $$(ECHO_CPP) - $${gpp} -E $(4) $$< > $$@ + ${call RBUILD_PIPE_CXX_CPP,$$<,$(4)} > $$@ endef Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] Fri Jun 19 06:28:33 2009 @@ -23,17 +23,22 @@ RBUILD_DEPENDS=${call RBUILD_CL_DEPENDS,$(1),$(2),$(3),$(4) /TC,$(5)} RBUILD_CXX_DEPENDS=${call RBUILD_CL_DEPENDS,$(1),$(2),$(3),$(4) /TP,$(5)} +#(source, cflags) +RBUILD_PIPE_CL_CPP=$${cl} $(2) /E $(1) +RBUILD_PIPE_CPP=${call RBUILD_PIPE_CL_CPP,$(1),$(2) /TC} +RBUILD_PIPE_CXX_CPP=${call RBUILD_PIPE_CL_CPP,$(1),$(2) /TP} + #(module, source, dependencies, cflags, output) define RBUILD_CL_CPP $(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CPP) - $${cl} /E $(4) $$< > $$@ + ${call RBUILD_PIPE_CL_CPP,$$<,$(4)} > $$@ endef RBUILD_CPP=${call RBUILD_CL_CPP,$(1),$(2),$(3),$(4) /TC,$(5)} -RBUILD_CXX_CPP=${call RBUILD_CL_CPP,$(1),$(2),$(3),$(4) /TPP,$(5)} +RBUILD_CXX_CPP=${call RBUILD_CL_CPP,$(1),$(2),$(3),$(4) /TP,$(5)} #(module, source, dependencies, cflags, output) define RBUILD_CC Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Fri Jun 19 06:28:33 2009 @@ -209,13 +209,13 @@ ${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) ${call RBUILD_intermediate_path_unique,$(1),$(2)}.res.d $(3) $$(WRC_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_RC) - $${gcc} -xc ${call RBUILD_rc_pp_flags,$(1),$(4)} -E $$< | $$(WRC_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} + ${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(WRC_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} else ${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) $(3) $$(WRC_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_RC) - $${gcc} -xc ${call RBUILD_rc_pp_flags,$(1),$(4)} -E $$< | $$(WRC_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} + ${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(WRC_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} endif

1 0

[hyperion] 41458: Revert 41455
by hyperion＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: hyperion Date: Fri Jun 19 05:12:25 2009 New Revision: 41458 URL: http://svn.reactos.org/svn/reactos?rev=41458&view=rev Log: Revert 41455 Modified: trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hiveinit.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=4… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Fri Jun 19 05:12:25 2009 @@ -79,7 +79,6 @@ PHHIVE RegistryHive, PVOID Cell) { - UNREFERENCED_PARAMETER(RegistryHive); return ((PHCELL)Cell - 1)->Size; } @@ -89,8 +88,6 @@ { PHCELL CellHeader; LONG Size; - - UNREFERENCED_PARAMETER(Hive); CellHeader = (PHCELL)Address - 1; Size = CellHeader->Size * -1; Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=4… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Fri Jun 19 05:12:25 2009 @@ -445,9 +445,6 @@ NTSTATUS Status; PHHIVE Hive = RegistryHive; - UNREFERENCED_PARAMETER(HiveType); - UNREFERENCED_PARAMETER(FileName); - /* * Create a new hive structure that will hold all the maintenance data. */

1 0

[cfinck] 438: As we LEFT JOIN the results with the suite names, we have to check for an SQL null value instead of an existing array key.
by cfinck＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: cfinck Date: Fri Jun 19 03:22:23 2009 New Revision: 438 URL: http://svn.reactos.org/svn/reactos?rev=438&view=rev Log: As we LEFT JOIN the results with the suite names, we have to check for an SQL null value instead of an existing array key. Modified: branches/danny-web/www/www.reactos.org/testman/compare.php Modified: branches/danny-web/www/www.reactos.org/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] Fri Jun 19 03:22:23 2009 @@ -25,8 +25,8 @@ // - we have both arrays, but not the values for both of them // - both values are identical if(!$prev_row || - !array_key_exists($subject, $current_row) || - !array_key_exists($subject, $prev_row) || + $current_row[$subject] === null || + $prev_row[$subject] === null || $current_row[$subject] == $prev_row[$subject]) { return " ";

1 0

[cfinck] 437: - Show the total sum of all executed and failed tests also in the Compare dialog, so that it's included in the comparison to the next result - Shorten some variable names for consistence
by cfinck＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: cfinck Date: Fri Jun 19 03:07:42 2009 New Revision: 437 URL: http://svn.reactos.org/svn/reactos?rev=437&view=rev Log: - Show the total sum of all executed and failed tests also in the Compare dialog, so that it's included in the comparison to the next result - Shorten some variable names for consistence Modified: branches/danny-web/www/www.reactos.org/testman/compare.php branches/danny-web/www/www.reactos.org/testman/css/compare.css branches/danny-web/www/www.reactos.org/testman/js/compare.js.php branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php Modified: branches/danny-web/www/www.reactos.org/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] Fri Jun 19 03:07:42 2009 @@ -18,18 +18,21 @@ require_once("lang/$lang.inc.php"); - function GetDifference(&$current_result_row, &$prev_result_row, $subject) + function GetDifference(&$current_row, &$prev_row, $subject) { // Return   ("" is not possible because of IE...) if - // - we have nothing to compare + // - we have no previous array to compare with + // - we have both arrays, but not the values for both of them // - both values are identical - if(!$prev_result_row["id"] || - $current_result_row[$subject] == $prev_result_row[$subject]) + if(!$prev_row || + !array_key_exists($subject, $current_row) || + !array_key_exists($subject, $prev_row) || + $current_row[$subject] == $prev_row[$subject]) { return " "; } - $diff = $current_result_row[$subject] - $prev_result_row[$subject]; + $diff = $current_row[$subject] - $prev_row[$subject]; if($diff > 0) return "(+$diff)"; @@ -131,6 +134,57 @@ $suite_ids = $stmt->fetchAll(PDO::FETCH_COLUMN); $suite_idlist = implode(",", $suite_ids); + // Add the table and fill in the table head part + echo '<table id="comparetable" class="datatable" cellspacing="0" cellpadding="0">'; + echo '<thead><tr class="head">'; + printf('<th class="TestSuite">%s</th>', $testman_langres["testsuite"]); + + $stmt = $dbh->prepare( + "SELECT UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform " . + "FROM " . DB_TESTMAN . ".winetest_runs r " . + "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " . + "WHERE r.id = :id" + ); + + for($i = 0; $i < count($id_array); $i++) + { + $stmt->bindParam(":id", $id_array[$i]); + $stmt->execute() or die("Query failed #2"); + $row = $stmt->fetch(PDO::FETCH_ASSOC); + + echo '<th onmousedown="ResultHead_OnMouseDown(this)">'; + printf($testman_langres["resulthead"], $row["revision"], GetDateString($row["timestamp"]), $row["name"], GetPlatformString($row["platform"])); + echo '</th>'; + } + + echo '</tr></thead>'; + echo '<tbody>'; + + // Get the total numbers + echo '<tr class="even">'; + printf('<td id="totals" onmouseover="Cell_OnMouseOver(this)" onmouseout="Cell_OnMouseOut(this)">%s</td>', $testman_langres["totals"]); + + $stmt = $dbh->prepare("SELECT r.count, r.failures FROM " . DB_TESTMAN . ".winetest_runs r WHERE r.id = :id"); + $prev_row = null; + + for($i = 0; $i < count($id_array); $i++) + { + $stmt->bindParam(":id", $id_array[$i]); + $stmt->execute() or die("Query failed #3"); + $row = $stmt->fetch(PDO::FETCH_ASSOC); + + echo '<td onmouseover="Cell_OnMouseOver(this)" onmouseout="Cell_OnMouseOut(this)">'; + printf('<div title="%s" class="box totaltests totals">%s <span class="diff">%s</span></div>', $testman_langres["totaltests"], $row["count"], GetDifference($row, $prev_row, "count")); + printf('<div title="%s" class="box %s_failedtests totals">%d <span class="diff">%s</span></div>', $testman_langres["failedtests"], ($row["failures"] > 0 ? 'real' : 'zero'), $row["failures"], GetDifference($row, $prev_row, "failures")); + echo '</td>'; + + $prev_row = $row; + } + + // Add an empty separation row + echo '</tr>'; + echo '<tr class="separator"></tr>'; + // Get the test results for each column $result_stmt = array(); @@ -144,36 +198,8 @@ "ORDER BY s.module, s.test" ); $result_stmt[$i]->bindParam(":testid", $id_array[$i]); - $result_stmt[$i]->execute() or die("Query failed #2 for statement $i"); - } - - echo '<table id="comparetable" class="datatable" cellspacing="0" cellpadding="0">'; - echo '<thead><tr class="head">'; - printf('<th class="TestSuite">%s</th>', $testman_langres["testsuite"]); - - $stmt = $dbh->prepare( - "SELECT UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform " . - "FROM " . DB_TESTMAN . ".winetest_runs r " . - "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " . - "WHERE r.id = :id" - ); - - for($i = 0; $i < count($id_array); $i++) - { - $stmt->bindParam(":id", $id_array[$i]); - $stmt->execute() or die("Query failed #3"); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - - echo '<th onmousedown="ResultHead_OnMouseDown(this)">'; - printf($testman_langres["resulthead"], $row["revision"], GetDateString($row["timestamp"]), $row["name"], GetPlatformString($row["platform"])); - echo '</th>'; - } - - echo '</tr></thead>'; - echo '<tbody>'; - - $oddeven = false; - $unchanged = array(); + $result_stmt[$i]->execute() or die("Query failed #4 for statement $i"); + } // Get all test suites for which we have at least one result in our ID list $stmt = $dbh->query( @@ -182,7 +208,10 @@ "JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id " . "WHERE test_id IN (" . $_GET["ids"] . ") " . "ORDER BY s.module ASC, s.test ASC" - ) or die("Query failed #3"); + ) or die("Query failed #5"); + + $oddeven = true; + $unchanged = array(); while($suites_row = $stmt->fetch(PDO::FETCH_ASSOC)) { @@ -190,32 +219,32 @@ printf('<td onmouseover="Cell_OnMouseOver(this)" onmouseout="Cell_OnMouseOut(this)">%s:%s</td>', $suites_row["module"], $suites_row["test"]); $changed = false; - $prev_result_row = null; + $prev_row = null; $temp_totaltests = -1; $temp_failedtests = -1; $temp_skippedtests = -1; for($i = 0; $i < count($result_stmt); $i++) { - $result_row = $result_stmt[$i]->fetch(PDO::FETCH_ASSOC); + $row = $result_stmt[$i]->fetch(PDO::FETCH_ASSOC); echo '<td onmouseover="Cell_OnMouseOver(this)" onmouseout="Cell_OnMouseOut(this)"'; - if($result_row["id"]) - printf(' class="clickable" onclick="Result_OnClick(%d)"', $result_row["id"]); + if($row["id"]) + printf(' class="clickable" onclick="Result_OnClick(%d)"', $row["id"]); echo '>'; // Check whether there are any changes within the test results of several runs - CheckIfChanged($changed, $temp_totaltests, $result_row["count"]); - CheckIfChanged($changed, $temp_failedtests, $result_row["failures"]); - CheckIfChanged($changed, $temp_skippedtests, $result_row["skipped"]); - - if($result_row["id"]) + CheckIfChanged($changed, $temp_totaltests, $row["count"]); + CheckIfChanged($changed, $temp_failedtests, $row["failures"]); + CheckIfChanged($changed, $temp_skippedtests, $row["skipped"]); + + if($row["id"]) { - printf('<div title="%s" class="box totaltests">%s <span class="diff">%s</span></div>', $testman_langres["totaltests"], GetTotalTestsString($result_row), GetDifference($result_row, $prev_result_row, "count")); - printf('<div title="%s" class="box %s_failedtests">%d <span class="diff">%s</span></div>', $testman_langres["failedtests"], (($result_row["failures"] > 0 || $result_row["status"] != "ok") ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); - printf('<div title="%s" class="box skippedtests">%d <span class="diff">%s</span></div>', $testman_langres["skippedtests"], $result_row["skipped"], GetDifference($result_row, $prev_result_row, "skipped")); + printf('<div title="%s" class="box totaltests">%s <span class="diff">%s</span></div>', $testman_langres["totaltests"], GetTotalTestsString($row), GetDifference($row, $prev_row, "count")); + printf('<div title="%s" class="box %s_failedtests">%d <span class="diff">%s</span></div>', $testman_langres["failedtests"], (($row["failures"] > 0 || $row["status"] != "ok") ? 'real' : 'zero'), $row["failures"], GetDifference($row, $prev_row, "failures")); + printf('<div title="%s" class="box skippedtests">%d <span class="diff">%s</span></div>', $testman_langres["skippedtests"], $row["skipped"], GetDifference($row, $prev_row, "skipped")); } else { @@ -225,7 +254,7 @@ echo '</td>'; - $prev_result_row = $result_row; + $prev_row = $row; } echo '</tr>'; @@ -242,10 +271,7 @@ echo "<script type=\"text/javascript\">\n"; echo "//<![CDATA[\n"; echo "var UnchangedRows = Array("; - - // Cut the last comma from the string echo implode(",", $unchanged); - echo ");\n"; echo "//]]>\n"; echo "</script>"; Modified: branches/danny-web/www/www.reactos.org/testman/css/compare.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/css/compare.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/css/compare.css [iso-8859-1] Fri Jun 19 03:07:42 2009 @@ -80,6 +80,10 @@ width: 200px; } +#comparetable td#totals { + font-weight: bold; +} + #comparetable td, #comparetable td div.box { border-right: solid 1px #BBBBBB; border-bottom: solid 1px #BBBBBB; @@ -103,3 +107,11 @@ font-weight: bold; width: 130px; } + +#comparetable td div.totals { + width: 163.5px; +} + +#comparetable tr.separator { + height: 10px; +} Modified: branches/danny-web/www/www.reactos.org/testman/js/compare.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/compare.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/compare.js.php [iso-8859-1] Fri Jun 19 03:07:42 2009 @@ -80,6 +80,10 @@ // Remove all difference data in this case as there is no previous element for(var i = 0; i < trs.length; i++) { + // Ignore empty rows (like separator rows) + if(!trs[i].childNodes.length) + continue; + var divs = trs[i].childNodes[Index].getElementsByTagName("div"); for(var j = 0; j < divs.length; j++) @@ -95,6 +99,10 @@ // No, then add the difference data accordingly for(var i = 0; i < trs.length; i++) { + // Ignore empty rows (like separator rows) + if(!trs[i].childNodes.length) + continue; + // We can only add difference data if the current table and the previous one contain result data if(trs[i].childNodes[Index].firstChild.nodeName != "DIV" || trs[i].childNodes[Index - 1].firstChild.nodeName != "DIV") continue; @@ -262,7 +270,8 @@ var tbody_trs = document.getElementById("comparetable").childNodes[1].childNodes; for(var i = 0; i < tbody_trs.length; i++) - SwapElements(tbody_trs[i].childNodes[DragColumnIndex], tbody_trs[i].childNodes[SwapColumnIndex]); + if(tbody_trs[i].childNodes.length) + SwapElements(tbody_trs[i].childNodes[DragColumnIndex], tbody_trs[i].childNodes[SwapColumnIndex]); AddDifferenceForColumn(DragColumn); AddDifferenceForColumn(SwapColumn); Modified: branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php [iso-8859-1] Fri Jun 19 03:07:42 2009 @@ -40,14 +40,15 @@ "showchanged" => "Nur geÃ¤nderte Ergebnisse anzeigen", "legend" => "Legende", - "totaltests" => "Alle Tests", + "totaltests" => "AusgefÃ¼hrte Tests", "failedtests" => "Fehlgeschlagene Tests", "skippedtests" => "Ãbersprungene Tests", "difference" => "Unterschied zum vorherigen Ergebnis", "testsuite" => "Test Suite", "resulthead" => "Revision %d<br />am %s<br />von %s<br />unter %s", - + "totals" => "Gesamtzahlen", + // Result Details page "detail_title" => "Ergebnis-Details", Modified: branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php [iso-8859-1] Fri Jun 19 03:07:42 2009 @@ -47,7 +47,8 @@ "testsuite" => "Test Suite", "resulthead" => "Revision %d<br />at %s<br />by %s<br />under %s", - + "totals" => "Totals", + // Result Details page "detail_title" => "Result Details", Modified: branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php [iso-8859-1] Fri Jun 19 03:07:42 2009 @@ -48,6 +48,7 @@ "testsuite" => "Zestaw testÃ³w", "resulthead" => "Rewizja %d<br />dnia %s<br />przez %s<br /> na %s", + "totals" => "ÅÄcznie", // Result Details page "detail_title" => "SzczegÃ³Åy wyniku",

1 0

[sginsberg] 41453: - Fix compiler flag for rosautotest - Get rid of -Wno-format in the Winetests, replacing it with __ROS_LONG64__.
by sginsberg＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: sginsberg Date: Fri Jun 19 02:16:49 2009 New Revision: 41453 URL: http://svn.reactos.org/svn/reactos?rev=41453&view=rev Log: - Fix compiler flag for rosautotest - Get rid of -Wno-format in the Winetests, replacing it with __ROS_LONG64__. Modified: trunk/rostests/rosautotest/rosautotest.rbuild trunk/rostests/winetests/comctl32/comctl32.rbuild trunk/rostests/winetests/credui/credui.rbuild trunk/rostests/winetests/cryptnet/cryptnet.rbuild trunk/rostests/winetests/cryptui/cryptui.rbuild trunk/rostests/winetests/dnsapi/dnsapi.rbuild trunk/rostests/winetests/fusion/fusion.rbuild trunk/rostests/winetests/gdi32/gdi32.rbuild trunk/rostests/winetests/inetcomm/inetcomm.rbuild trunk/rostests/winetests/inetmib1/inetmib1.rbuild trunk/rostests/winetests/itss/itss.rbuild trunk/rostests/winetests/kernel32/kernel32.rbuild trunk/rostests/winetests/localspl/localspl.rbuild trunk/rostests/winetests/localui/localui.rbuild trunk/rostests/winetests/mscms/mscms.rbuild trunk/rostests/winetests/msctf/msctf.rbuild trunk/rostests/winetests/msvcrt/msvcrt.rbuild trunk/rostests/winetests/msvcrtd/msvcrtd.rbuild trunk/rostests/winetests/msvfw32/msvfw32.rbuild trunk/rostests/winetests/msxml3/msxml3.rbuild trunk/rostests/winetests/ntdsapi/ntdsapi.rbuild trunk/rostests/winetests/ntprint/ntprint.rbuild trunk/rostests/winetests/oleacc/oleacc.rbuild trunk/rostests/winetests/pdh/pdh.rbuild trunk/rostests/winetests/qmgr/qmgr.rbuild trunk/rostests/winetests/quartz/quartz.rbuild trunk/rostests/winetests/rasapi32/rasapi32.rbuild trunk/rostests/winetests/riched20/riched20.rbuild trunk/rostests/winetests/riched32/riched32.rbuild trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild trunk/rostests/winetests/secur32/secur32.rbuild trunk/rostests/winetests/serialui/serialui.rbuild trunk/rostests/winetests/setupapi/setupapi.rbuild trunk/rostests/winetests/shdocvw/shdocvw.rbuild trunk/rostests/winetests/snmpapi/snmpapi.rbuild trunk/rostests/winetests/spoolss/spoolss.rbuild trunk/rostests/winetests/twain_32/twain_32.rbuild trunk/rostests/winetests/user32/user32.rbuild trunk/rostests/winetests/userenv/userenv.rbuild trunk/rostests/winetests/wintrust/wintrust.rbuild trunk/rostests/winetests/wlanapi/wlanapi.rbuild trunk/rostests/winetests/wldap32/wldap32.rbuild trunk/rostests/winetests/ws2_32/ws2_32.rbuild Modified: trunk/rostests/rosautotest/rosautotest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/rosautotest.r… ============================================================================== --- trunk/rostests/rosautotest/rosautotest.rbuild [iso-8859-1] (original) +++ trunk/rostests/rosautotest/rosautotest.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="rosautotest" type="win32cui" installbase="system32" installname="rosautotest.exe" unicode="yes"> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> + <compilerflag compiler="cxx" compilerset="gcc">-fno-rtti</compilerflag> <include base="rosautotest">.</include> <library>advapi32</library> <library>kernel32</library> Modified: trunk/rostests/winetests/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comctl… ============================================================================== --- trunk/rostests/winetests/comctl32/comctl32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/comctl32.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,9 +2,8 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="comctl32_winetest" type="win32cui" installbase="bin" installname="comctl32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="comctl32_winetest">.</include> - <define name="__ROS_LONG64__" /> + <define name="__ROS_LONG64__" /> <file>comboex.c</file> <file>datetime.c</file> <file>dpa.c</file> Modified: trunk/rostests/winetests/credui/credui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/credui/credui.r… ============================================================================== --- trunk/rostests/winetests/credui/credui.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/credui/credui.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="credui_winetest" type="win32cui" installbase="bin" installname="credui_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="credui_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>credui.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/cryptnet/cryptnet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/cryptn… ============================================================================== --- trunk/rostests/winetests/cryptnet/cryptnet.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptnet/cryptnet.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="cryptnet_winetest" type="win32cui" installbase="bin" installname="cryptnet_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="cryptnet_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>cryptnet.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/cryptui… ============================================================================== --- trunk/rostests/winetests/cryptui/cryptui.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptui/cryptui.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="cryptui_winetest" type="win32cui" installbase="bin" installname="cryptui_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="cryptui_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>cryptui.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/dnsapi/dnsapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/dnsapi.r… ============================================================================== --- trunk/rostests/winetests/dnsapi/dnsapi.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/dnsapi/dnsapi.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="dnsapi_winetest" type="win32cui" installbase="bin" installname="dnsapi_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="dnsapi_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>name.c</file> <file>record.c</file> <file>testlist.c</file> Modified: trunk/rostests/winetests/fusion/fusion.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/fusion.r… ============================================================================== --- trunk/rostests/winetests/fusion/fusion.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/fusion.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="fusion_winetest" type="win32cui" installbase="bin" installname="fusion_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="fusion_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>asmcache.c</file> <file>asmenum.c</file> <file>asmname.c</file> Modified: trunk/rostests/winetests/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/gdi32.rbu… ============================================================================== --- trunk/rostests/winetests/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/gdi32.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="gdi32_winetest" type="win32cui" installbase="bin" installname="gdi32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="gdi32_winetest">.</include> <define name="__ROS_LONG64__" /> <library>ntdll</library> Modified: trunk/rostests/winetests/inetcomm/inetcomm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/inetco… ============================================================================== --- trunk/rostests/winetests/inetcomm/inetcomm.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/inetcomm/inetcomm.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="inetcomm_winetest" type="win32cui" installbase="bin" installname="inetcomm_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="inetcomm_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>mimeintl.c</file> <file>mimeole.c</file> <file>testlist.c</file> Modified: trunk/rostests/winetests/inetmib1/inetmib1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetmib1/inetmi… ============================================================================== --- trunk/rostests/winetests/inetmib1/inetmib1.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/inetmib1/inetmib1.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="inetmib1_winetest" type="win32cui" installbase="bin" installname="inetmib1_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="inetmib1_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>main.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/itss/itss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/itss.rbuil… ============================================================================== --- trunk/rostests/winetests/itss/itss.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/itss/itss.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="itss_winetest" type="win32cui" installbase="bin" installname="itss_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="itss_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>protocol.c</file> <file>rsrc.rc</file> <file>testlist.c</file> Modified: trunk/rostests/winetests/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/kernel… ============================================================================== --- trunk/rostests/winetests/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/kernel32.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="kernel32_winetest" type="win32cui" installbase="bin" installname="kernel32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="kernel32_winetest">.</include> <define name="__ROS_LONG64__" /> <library>ntdll</library> Modified: trunk/rostests/winetests/localspl/localspl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/locals… ============================================================================== --- trunk/rostests/winetests/localspl/localspl.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/localspl/localspl.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="localspl_winetest" type="win32cui" installbase="bin" installname="localspl_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="localspl_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>localmon.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/localui/localui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localui/localui… ============================================================================== --- trunk/rostests/winetests/localui/localui.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/localui/localui.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="localui_winetest" type="win32cui" installbase="bin" installname="localui_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="localui_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>localui.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/mscms/mscms.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/mscms.rbu… ============================================================================== --- trunk/rostests/winetests/mscms/mscms.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/mscms/mscms.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="mscms_winetest" type="win32cui" installbase="bin" installname="mscms_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="mscms_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>profile.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/msctf/msctf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/msctf.rbu… ============================================================================== --- trunk/rostests/winetests/msctf/msctf.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/msctf.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="msctf_winetest" type="win32cui" installbase="bin" installname="msctf_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="msctf_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>inputprocessor.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/msvcrt.r… ============================================================================== --- trunk/rostests/winetests/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/msvcrt.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,10 +2,9 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="msvcrt_winetest" type="win32cui" installbase="bin" installname="msvcrt_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="msvcrt_winetest">.</include> <include base="msvcrt">include/reactos/wine/msvcrt</include> - <define name="__ROS_LONG64__" /> + <define name="__ROS_LONG64__" /> <define name="_CRT_NONSTDC_NO_DEPRECATE" /> <library>kernel32</library> <library>msvcrt</library> Modified: trunk/rostests/winetests/msvcrtd/msvcrtd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrtd/msvcrtd… ============================================================================== --- trunk/rostests/winetests/msvcrtd/msvcrtd.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrtd/msvcrtd.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="msvcrtd_winetest" type="win32cui" installbase="bin" installname="msvcrtd_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="msvcrtd_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>debug.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/msvfw32/msvfw32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/msvfw32… ============================================================================== --- trunk/rostests/winetests/msvfw32/msvfw32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/msvfw32/msvfw32.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="msvfw32_winetest" type="win32cui" installbase="bin" installname="msvfw32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="msvfw32_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>msvfw.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/msxml3.r… ============================================================================== --- trunk/rostests/winetests/msxml3/msxml3.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/msxml3.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,8 +2,8 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="msxml3_winetest" type="win32cui" installbase="bin" installname="msxml3_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="msxml3_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>domdoc.c</file> <file>saxreader.c</file> <file>schema.c</file> Modified: trunk/rostests/winetests/ntdsapi/ntdsapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdsapi/ntdsapi… ============================================================================== --- trunk/rostests/winetests/ntdsapi/ntdsapi.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdsapi/ntdsapi.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="ntdsapi_winetest" type="win32cui" installbase="bin" installname="ntdsapi_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="ntdsapi_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>ntdsapi.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/ntprint/ntprint.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntprint/ntprint… ============================================================================== --- trunk/rostests/winetests/ntprint/ntprint.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/ntprint/ntprint.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="ntprint_winetest" type="win32cui" installbase="bin" installname="ntprint_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="ntprint_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>ntprint.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/oleacc/oleacc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleacc/oleacc.r… ============================================================================== --- trunk/rostests/winetests/oleacc/oleacc.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/oleacc/oleacc.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="oleacc_winetest" type="win32cui" installbase="bin" installname="oleacc_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="oleacc_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>main.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/pdh/pdh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/pdh/pdh.rbuild?… ============================================================================== --- trunk/rostests/winetests/pdh/pdh.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/pdh/pdh.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="pdh_winetest" type="win32cui" installbase="bin" installname="pdh_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="pdh_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>pdh.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/qmgr/qmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/qmgr.rbuil… ============================================================================== --- trunk/rostests/winetests/qmgr/qmgr.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/qmgr.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="qmgr_winetest" type="win32cui" installbase="bin" installname="qmgr_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="qmgr_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>enum_files.c</file> <file>enum_jobs.c</file> <file>file.c</file> Modified: trunk/rostests/winetests/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/quartz.r… ============================================================================== --- trunk/rostests/winetests/quartz/quartz.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/quartz.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="quartz_winetest" type="win32cui" installbase="bin" installname="quartz_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="quartz_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>avisplitter.c</file> <file>filtergraph.c</file> <file>filtermapper.c</file> Modified: trunk/rostests/winetests/rasapi32/rasapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rasapi32/rasapi… ============================================================================== --- trunk/rostests/winetests/rasapi32/rasapi32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/rasapi32/rasapi32.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="rasapi32_winetest" type="win32cui" installbase="bin" installname="rasapi32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="rasapi32_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>rasapi.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/riched… ============================================================================== --- trunk/rostests/winetests/riched20/riched20.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/riched20.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,9 +2,8 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="riched20_winetest" type="win32cui" installbase="bin" installname="riched20_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="riched20_winetest">.</include> - <define name="__ROS_LONG64__" /> + <define name="__ROS_LONG64__" /> <file>editor.c</file> <file>richole.c</file> <file>testlist.c</file> Modified: trunk/rostests/winetests/riched32/riched32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched32/riched… ============================================================================== --- trunk/rostests/winetests/riched32/riched32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/riched32/riched32.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,9 +2,8 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="riched32_winetest" type="win32cui" installbase="bin" installname="riched32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="riched32_winetest">.</include> - <define name="__ROS_LONG64__" /> + <define name="__ROS_LONG64__" /> <file>editor.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpcrt4.r… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -8,7 +8,6 @@ <file>server.idl</file> </module> <module name="rpcrt4_winetest" type="win32cui" installbase="bin" installname="rpcrt4_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="rpcrt4_winetest">.</include> <include root="intermediate" base="rpcrt4_winetest">.</include> <define name="__ROS_LONG64__" /> Modified: trunk/rostests/winetests/secur32/secur32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/secur32… ============================================================================== --- trunk/rostests/winetests/secur32/secur32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/secur32/secur32.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="secur32_winetest" type="win32cui" installbase="bin" installname="secur32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="secur32_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>main.c</file> <file>ntlm.c</file> <file>schannel.c</file> Modified: trunk/rostests/winetests/serialui/serialui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/serialui/serial… ============================================================================== --- trunk/rostests/winetests/serialui/serialui.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/serialui/serialui.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="serialui_winetest" type="win32cui" installbase="bin" installname="serialui_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="serialui_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>confdlg.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/setupa… ============================================================================== --- trunk/rostests/winetests/setupapi/setupapi.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/setupapi.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="setupapi_winetest" type="win32cui" installbase="bin" installname="setupapi_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="setupapi_winetest">.</include> <define name="__ROS_LONG64__" /> <library>ntdll</library> Modified: trunk/rostests/winetests/shdocvw/shdocvw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/shdocvw… ============================================================================== --- trunk/rostests/winetests/shdocvw/shdocvw.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/shdocvw/shdocvw.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="shdocvw_winetest" type="win32cui" installbase="bin" installname="shdocvw_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="shdocvw_winetest">.</include> <define name="__ROS_LONG64__" /> <file>intshcut.c</file> Modified: trunk/rostests/winetests/snmpapi/snmpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/snmpapi/snmpapi… ============================================================================== --- trunk/rostests/winetests/snmpapi/snmpapi.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/snmpapi/snmpapi.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="snmpapi_winetest" type="win32cui" installbase="bin" installname="snmpapi_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="snmpapi_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>util.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/spoolss/spoolss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/spoolss/spoolss… ============================================================================== --- trunk/rostests/winetests/spoolss/spoolss.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/spoolss/spoolss.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="spoolss_winetest" type="win32cui" installbase="bin" installname="spoolss_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="spoolss_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>spoolss.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/twain_32/twain_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/twain_32/twain_… ============================================================================== --- trunk/rostests/winetests/twain_32/twain_32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/twain_32/twain_32.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="twain_32_winetest" type="win32cui" installbase="bin" installname="twain_32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="twain_32_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>dsm.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/user32.r… ============================================================================== --- trunk/rostests/winetests/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/user32.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="user32_winetest" type="win32cui" installbase="bin" installname="user32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="user32_winetest">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__ROS_LONG64__" /> Modified: trunk/rostests/winetests/userenv/userenv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/userenv/userenv… ============================================================================== --- trunk/rostests/winetests/userenv/userenv.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/userenv/userenv.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="userenv_winetest" type="win32cui" installbase="bin" installname="userenv_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="userenv_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>userenv.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/wintru… ============================================================================== --- trunk/rostests/winetests/wintrust/wintrust.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/wintrust.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,8 +2,8 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="wintrust_winetest" type="win32cui" installbase="bin" installname="wintrust_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="wintrust_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>asn.c</file> <file>crypt.c</file> <file>register.c</file> Modified: trunk/rostests/winetests/wlanapi/wlanapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wlanapi/wlanapi… ============================================================================== --- trunk/rostests/winetests/wlanapi/wlanapi.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/wlanapi/wlanapi.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,9 +2,8 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="wlanapi_winetest" type="win32cui" installbase="bin" installname="wlanapi_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="wininet_winetest">.</include> - <define name="__ROS_LONG64__" /> + <define name="__ROS_LONG64__" /> <library>wine</library> <library>wlanapi</library> <library>kernel32</library> Modified: trunk/rostests/winetests/wldap32/wldap32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/wldap32… ============================================================================== --- trunk/rostests/winetests/wldap32/wldap32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/wldap32/wldap32.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -1,6 +1,6 @@ <module name="wldap32_winetest" type="win32cui" installbase="bin" installname="wldap32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="wldap32_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>parse.c</file> <file>testlist.c</file> <library>wine</library> Modified: trunk/rostests/winetests/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/ws2_32.r… ============================================================================== --- trunk/rostests/winetests/ws2_32/ws2_32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/ws2_32.rbuild [iso-8859-1] Fri Jun 19 02:16:49 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="ws2_32_winetest" type="win32cui" installbase="bin" installname="ws2_32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="ws2_32_winetest">.</include> <define name="__ROS_LONG64__" /> <file>protocol.c</file>

1 0

[sginsberg] 41452: - Revert 39470, reapplying the __ROS_LONG64__ check for INT_PTR and UINT_PTR on 32-bit.
by sginsberg＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: sginsberg Date: Fri Jun 19 02:07:20 2009 New Revision: 41452 URL: http://svn.reactos.org/svn/reactos?rev=41452&view=rev Log: - Revert 39470, reapplying the __ROS_LONG64__ check for INT_PTR and UINT_PTR on 32-bit. Modified: trunk/reactos/include/psdk/basetsd.h Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Fri Jun 19 02:07:20 2009 @@ -100,10 +100,10 @@ { return( (void*)(ULONG_PTR)ul ); } #endif /* !__midl */ #else /* !_WIN64 */ -#if 1// !defined(__ROS_LONG64__) +#if !defined(__ROS_LONG64__) typedef int INT_PTR, *PINT_PTR; typedef unsigned int UINT_PTR, *PUINT_PTR; -#else // WTF??? HACK of break +#else typedef long INT_PTR, *PINT_PTR; typedef unsigned long UINT_PTR, *PUINT_PTR; #endif

1 0

[sginsberg] 41451: - Only pass gcc flags to gcc.
by sginsberg＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: sginsberg Date: Fri Jun 19 02:06:16 2009 New Revision: 41451 URL: http://svn.reactos.org/svn/reactos?rev=41451&view=rev Log: - Only pass gcc flags to gcc. Modified: trunk/rosapps/applications/net/netreg/netreg.rbuild trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild Modified: trunk/rosapps/applications/net/netreg/netreg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/netreg/ne… ============================================================================== --- trunk/rosapps/applications/net/netreg/netreg.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/net/netreg/netreg.rbuild [iso-8859-1] Fri Jun 19 02:06:16 2009 @@ -4,7 +4,7 @@ <library>user32</library> <library>ws2_32</library> <library>advapi32</library> - <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> + <compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag> <file>netreg.cpp</file> <file>netreg.rc</file> </module> Modified: trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/… ============================================================================== --- trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild [iso-8859-1] Fri Jun 19 02:06:16 2009 @@ -6,7 +6,7 @@ <library>kernel32</library> <library>ws2_32</library> <library>user32</library> - <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> + <compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag> <file>config.cpp</file> <file>error.cpp</file> <file>http.cpp</file>

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