Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[fireball] 40362: Evgeniy Boltik <bstsoft@narod.ru> - Fix copypaste mistake in EngStretchBltROP. - Fix check in EngStretchBltROP, it should check original InputRect, not the clipped one. - Fix improper variable type in DIB_XXBPP_StretchBlt: PatternX and PatternY could be negative. See issue #4336 for more details.
by fireball＠svn.reactos.org 04 Apr '09

04 Apr '09

Author: fireball Date: Sat Apr 4 22:24:24 2009 New Revision: 40362 URL: http://svn.reactos.org/svn/reactos?rev=40362&view=rev Log: Evgeniy Boltik <bstsoft(a)narod.ru> - Fix copypaste mistake in EngStretchBltROP. - Fix check in EngStretchBltROP, it should check original InputRect, not the clipped one. - Fix improper variable type in DIB_XXBPP_StretchBlt: PatternX and PatternY could be negative. See issue #4336 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] Sat Apr 4 22:24:24 2009 @@ -50,7 +50,7 @@ PFN_DIB_GetPixel fnPattern_GetPixel = NULL; PFN_DIB_GetPixel fnMask_GetPixel = NULL; - ULONG PatternX = 0, PatternY = 0; + LONG PatternX = 0, PatternY = 0; BOOL UsesSource = ROP4_USES_SOURCE(ROP); BOOL UsesPattern = ROP4_USES_PATTERN(ROP); Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sat Apr 4 22:24:24 2009 @@ -938,8 +938,8 @@ } if (OutputRect.bottom < OutputRect.top) { - OutputRect.left = prclDest->right; - OutputRect.right = prclDest->left; + OutputRect.top = prclDest->bottom; + OutputRect.bottom = prclDest->top; } InputRect = *prclSrc; @@ -1198,8 +1198,8 @@ } InputRect = *SourceRect; - if (InputClippedRect.right < InputClippedRect.left || - InputClippedRect.bottom < InputClippedRect.top) + if (InputRect.right < InputRect.left || + InputRect.bottom < InputRect.top) { /* Everything clipped away, nothing to do */ return TRUE;

1 0

[jmorlan] 40361: - Check for cmd's AutoRun registry value in HKEY_CURRENT_USER as well as HKEY_LOCAL_MACHINE. - Allow AutoRun commands to be longer than MAX_PATH.
by jmorlan＠svn.reactos.org 04 Apr '09

04 Apr '09

Author: jmorlan Date: Sat Apr 4 21:51:55 2009 New Revision: 40361 URL: http://svn.reactos.org/svn/reactos?rev=40361&view=rev Log: - Check for cmd's AutoRun registry value in HKEY_CURRENT_USER as well as HKEY_LOCAL_MACHINE. - Allow AutoRun commands to be longer than MAX_PATH. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Apr 4 21:51:55 2009 @@ -1525,13 +1525,13 @@ #endif static VOID -ExecuteAutoRunFile (VOID) -{ - TCHAR autorun[MAX_PATH]; - DWORD len = MAX_PATH; +ExecuteAutoRunFile(HKEY hkeyRoot) +{ + TCHAR autorun[2048]; + DWORD len = sizeof autorun; HKEY hkey; - if( RegOpenKeyEx(HKEY_LOCAL_MACHINE, + if (RegOpenKeyEx(hkeyRoot, _T("SOFTWARE\\Microsoft\\Command Processor"), 0, KEY_READ, @@ -1547,9 +1547,8 @@ if (*autorun) ParseCommandLine(autorun); } + RegCloseKey(hkey); } - - RegCloseKey(hkey); } /* Get the command that comes after a /C or /K switch */ @@ -1756,7 +1755,10 @@ AddBreakHandler (); if (AutoRun) - ExecuteAutoRunFile(); + { + ExecuteAutoRunFile(HKEY_LOCAL_MACHINE); + ExecuteAutoRunFile(HKEY_CURRENT_USER); + } if (*ptr) {

1 0

[janderwald] 40360: - Re-use WorkItem - Fixes leaking a workitem for each pin creation request
by janderwald＠svn.reactos.org 04 Apr '09

04 Apr '09

Author: janderwald Date: Sat Apr 4 20:04:25 2009 New Revision: 40360 URL: http://svn.reactos.org/svn/reactos?rev=40360&view=rev Log: - Re-use WorkItem - Fixes leaking a workitem for each pin creation request Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Sat Apr 4 20:04:25 2009 @@ -10,9 +10,6 @@ */ #include "private.h" -#include <devguid.h> -#include <initguid.h> -#include <ksmedia.h> /* This is called from DriverEntry so that PortCls can take care of some @@ -152,6 +149,9 @@ /* clear initializing flag */ fdo->Flags &= ~ DO_DEVICE_INITIALIZING; + /* allocate work item */ + portcls_ext->WorkItem = IoAllocateWorkItem(fdo); + /* allocate the device header */ status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, MaxObjects, portcls_ext->CreateItems); /* did we succeed */ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Sat Apr 4 20:04:25 2009 @@ -500,7 +500,6 @@ IIrpTarget *Filter; PKSOBJECT_CREATE_ITEM CreateItem; PPIN_WORKER_CONTEXT Context; - PIO_WORKITEM WorkItem; DPRINT("PcCreateItemDispatch called DeviceObject %p\n", DeviceObject); @@ -599,20 +598,11 @@ Context->Filter = Filter; Context->Irp = Irp; - WorkItem = IoAllocateWorkItem(DeviceObject); - if (!WorkItem) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - FreeItem(Context, TAG_PORTCLASS); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } DPRINT("Queueing IRP %p Irql %u\n", Irp, KeGetCurrentIrql()); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_PENDING; IoMarkIrpPending(Irp); - IoQueueWorkItem(WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)Context); + IoQueueWorkItem(DeviceExt->WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)Context); return STATUS_PENDING; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Sat Apr 4 20:04:25 2009 @@ -156,7 +156,7 @@ ULONG MaxSubDevices; KSOBJECT_CREATE_ITEM * CreateItems; - + PIO_WORKITEM WorkItem; IResourceList* resources; LIST_ENTRY SubDeviceList; LIST_ENTRY PhysicalConnectionList;

1 0

[cgutman] 40359: - Don't pass the address type to IPInitializePacket because it is set later - Fix packet corruption caused by using uninitialized data
by cgutman＠svn.reactos.org 04 Apr '09

04 Apr '09

Author: cgutman Date: Sat Apr 4 05:22:33 2009 New Revision: 40359 URL: http://svn.reactos.org/svn/reactos?rev=40359&view=rev Log: - Don't pass the address type to IPInitializePacket because it is set later - Fix packet corruption caused by using uninitialized data Modified: trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/network/loopback.c Modified: trunk/reactos/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icm… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Sat Apr 4 05:22:33 2009 @@ -74,13 +74,12 @@ GetDataPtr( IPPacket->NdisPacket, MaxLLHeaderSize, (PCHAR *)&IPPacket->Header, &IPPacket->ContigSize ); - IPPacket->Data = ((PCHAR)IPPacket->Header) + IPPacket->HeaderSize; - TI_DbgPrint(DEBUG_ICMP, ("Size (%d). Data at (0x%X).\n", Size, Data)); TI_DbgPrint(DEBUG_ICMP, ("NdisPacket at (0x%X).\n", NdisPacket)); IPPacket->HeaderSize = sizeof(IPv4_HEADER); IPPacket->TotalSize = Size - MaxLLHeaderSize; + IPPacket->Data = ((PCHAR)IPPacket->Header) + IPPacket->HeaderSize; TI_DbgPrint(DEBUG_ICMP, ("Copying Address: %x -> %x\n", &IPPacket->DstAddr, Destination)); Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sat Apr 4 05:22:33 2009 @@ -46,8 +46,7 @@ return; } - /* FIXME: IPv4 only */ - IPInitializePacket(&IPPacket, IP_ADDRESS_V4); + IPInitializePacket(&IPPacket, 0); NdisGetFirstBufferFromPacket(XmitPacket, &NdisBuffer,

1 0

[cgutman] 40358: - Validate the buffer size before copying to it
by cgutman＠svn.reactos.org 04 Apr '09

04 Apr '09

Author: cgutman Date: Sat Apr 4 04:41:42 2009 New Revision: 40358 URL: http://svn.reactos.org/svn/reactos?rev=40358&view=rev Log: - Validate the buffer size before copying to it Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/d… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Sat Apr 4 04:41:42 2009 @@ -126,6 +126,12 @@ ("Target Buffer: %x, Source Buffer: %x, Size %d\n", Current->Buffer, DataBuffer, DataSize)); + if (DataSize > Current->BufferSize) + { + Current->Complete(Current->Context, STATUS_BUFFER_TOO_SMALL, DataSize); + return; + } + /* Copy the data into buffer provided by the user */ RtlCopyMemory( Current->Buffer, DataBuffer,

1 0

[cgutman] 40357: - Remove the rest of the code that sets the wrong IRP's status
by cgutman＠svn.reactos.org 04 Apr '09

04 Apr '09

Author: cgutman Date: Sat Apr 4 04:36:43 2009 New Revision: 40357 URL: http://svn.reactos.org/svn/reactos?rev=40357&view=rev Log: - Remove the rest of the code that sets the wrong IRP's status Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Apr 4 04:36:43 2009 @@ -84,11 +84,8 @@ /* I was wrong about this before as we can have pending writes to a not * yet connected socket */ - if( !SocketAcquireStateLock( FCB ) ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - } AFD_DbgPrint(MID_TRACE,("Irp->IoStatus.Status = %x\n", Irp->IoStatus.Status)); @@ -136,8 +133,6 @@ Status = MakeSocketIntoConnection( FCB ); if( !NT_SUCCESS(Status) ) { - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return Status; } @@ -156,12 +151,6 @@ if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; - } - - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; } SocketStateUnlock( FCB ); Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Apr 4 04:36:43 2009 @@ -98,11 +98,8 @@ PLIST_ENTRY NextIrpEntry, QeltEntry; PIRP NextIrp; - if( !SocketAcquireStateLock( FCB ) ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - } FCB->ListenIrp.InFlightRequest = NULL; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat Apr 4 04:36:43 2009 @@ -260,8 +260,6 @@ return STATUS_FILE_CLOSED; } else if( FCB->State == SOCKET_STATE_LISTENING ) { AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return STATUS_INVALID_PARAMETER; } @@ -464,11 +462,8 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) { - Irp->IoStatus.Status = STATUS_FILE_CLOSED; - Irp->IoStatus.Information = 0; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - } FCB->ReceiveIrp.InFlightRequest = NULL; @@ -514,8 +509,6 @@ } else Status = STATUS_NO_MEMORY; if( !NT_SUCCESS( Status ) ) { - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; if( DatagramRecv ) ExFreePool( DatagramRecv ); SocketStateUnlock( FCB ); return Status; Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sat Apr 4 04:36:43 2009 @@ -40,9 +40,8 @@ ASSERT_IRQL(APC_LEVEL); - if( !SocketAcquireStateLock( FCB ) ) { + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - } FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */ @@ -179,9 +178,8 @@ Irp->IoStatus.Status, Irp->IoStatus.Information)); - if( !SocketAcquireStateLock( FCB ) ) { + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - } FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */

1 0

[cgutman] 40356: - Initialize packets before using them - Part 2 of 2
by cgutman＠svn.reactos.org 04 Apr '09

04 Apr '09

Author: cgutman Date: Sat Apr 4 04:24:20 2009 New Revision: 40356 URL: http://svn.reactos.org/svn/reactos?rev=40356&view=rev Log: - Initialize packets before using them - Part 2 of 2 Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sat Apr 4 04:24:20 2009 @@ -254,6 +254,8 @@ Adapter = WorkItem->Adapter; BytesTransferred = WorkItem->BytesTransferred; + IPInitializePacket(&IPPacket, 0); + IPPacket.NdisPacket = Packet; NdisGetFirstBufferFromPacket(Packet, @@ -289,6 +291,7 @@ TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); ARPReceive(Adapter->Context, &IPPacket); default: + IPPacket.Free(&IPPacket); break; }

1 0

[cgutman] 40355: - Initialize packets before using them - Make PrepareICMPPacket return BOOLEAN - Call the packet's free function to free it - Remove unnecessary NULL checks - Part 1 of 2
by cgutman＠svn.reactos.org 04 Apr '09

04 Apr '09

Author: cgutman Date: Sat Apr 4 04:23:09 2009 New Revision: 40355 URL: http://svn.reactos.org/svn/reactos?rev=40355&view=rev Log: - Initialize packets before using them - Make PrepareICMPPacket return BOOLEAN - Call the packet's free function to free it - Remove unnecessary NULL checks - Part 1 of 2 Modified: trunk/reactos/lib/drivers/ip/network/arp.c trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/network/loopback.c trunk/reactos/lib/drivers/ip/network/receive.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/arp… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Sat Apr 4 04:23:09 2009 @@ -253,6 +253,8 @@ SenderHWAddress, LAN_PROTO_ARP); } + + Packet->Free(Packet); } /* EOF */ Modified: trunk/reactos/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icm… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Sat Apr 4 04:23:09 2009 @@ -34,7 +34,7 @@ } -PIP_PACKET PrepareICMPPacket( +BOOLEAN PrepareICMPPacket( PIP_INTERFACE Interface, PIP_PACKET IPPacket, PIP_ADDRESS Destination, @@ -57,6 +57,8 @@ TI_DbgPrint(DEBUG_ICMP, ("Called. DataSize (%d).\n", DataSize)); + IPInitializePacket(IPPacket, IP_ADDRESS_V4); + /* No special flags */ IPPacket->Flags = 0; @@ -65,7 +67,7 @@ /* Allocate NDIS packet */ NdisStatus = AllocatePacketWithBuffer( &NdisPacket, NULL, Size ); - if( !NT_SUCCESS(NdisStatus) ) return NULL; + if( !NT_SUCCESS(NdisStatus) ) return FALSE; IPPacket->NdisPacket = NdisPacket; @@ -114,7 +116,7 @@ TI_DbgPrint(MID_TRACE,("Leaving\n")); - return IPPacket; + return TRUE; } Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sat Apr 4 04:23:09 2009 @@ -45,6 +45,9 @@ (PC(NdisPacket)->DLComplete)( PC(NdisPacket)->Context, NdisPacket, NdisStatus ); return; } + + /* FIXME: IPv4 only */ + IPInitializePacket(&IPPacket, IP_ADDRESS_V4); NdisGetFirstBufferFromPacket(XmitPacket, &NdisBuffer, Modified: trunk/reactos/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rec… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] Sat Apr 4 04:23:09 2009 @@ -608,11 +608,13 @@ case 6: IPPacket->Type = IP_ADDRESS_V6; TI_DbgPrint(MAX_TRACE, ("Datagram of type IPv6 discarded.\n")); - return; + break; default: TI_DbgPrint(MIN_TRACE, ("Datagram has an unsupported IP version %d.\n", Version)); - return; - } + break; + } + + IPPacket->Free(IPPacket); } /* EOF */ Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Sat Apr 4 04:23:09 2009 @@ -107,8 +107,6 @@ /* FIXME: Assumes IPv4 */ IPInitializePacket(Packet, IP_ADDRESS_V4); - if (!Packet) - return STATUS_INSUFFICIENT_RESOURCES; Packet->TotalSize = sizeof(IPv4_HEADER) + DataLen; Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sat Apr 4 04:23:09 2009 @@ -88,8 +88,6 @@ /* FIXME: Assumes IPv4 */ IPInitializePacket(Packet, IP_ADDRESS_V4); - if (!Packet) - return STATUS_INSUFFICIENT_RESOURCES; Packet->TotalSize = sizeof(IPv4_HEADER) + sizeof(UDP_HEADER) + DataLen;

1 0

[cgutman] 40354: - Loopback adapter rewrite - We don't need to queue a work item to receive so we don't now - This simplifies the code significantly - It also increases loopback throughput
by cgutman＠svn.reactos.org 03 Apr '09

03 Apr '09

Author: cgutman Date: Sat Apr 4 01:05:22 2009 New Revision: 40354 URL: http://svn.reactos.org/svn/reactos?rev=40354&view=rev Log: - Loopback adapter rewrite - We don't need to queue a work item to receive so we don't now - This simplifies the code significantly - It also increases loopback throughput Modified: trunk/reactos/lib/drivers/ip/network/loopback.c Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sat Apr 4 01:05:22 2009 @@ -1,126 +1,14 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS TCP/IP protocol driver - * FILE: datalink/loopback.c + * FILE: lib/drivers/ip/network/loopback.c * PURPOSE: Loopback adapter - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 01/08-2000 Created + * PROGRAMMERS: Cameron Gutman (cgutman(a)reactos.org) */ #include "precomp.h" PIP_INTERFACE Loopback = NULL; -typedef struct _LAN_WQ_ITEM { - LIST_ENTRY ListEntry; - PNDIS_PACKET Packet; - PLAN_ADAPTER Adapter; - UINT BytesTransferred; -} LAN_WQ_ITEM, *PLAN_WQ_ITEM; - -/* Work around being called back into afd at Dpc level */ -KSPIN_LOCK LoopWorkLock; -LIST_ENTRY LoopWorkList; -WORK_QUEUE_ITEM LoopWorkItem; -BOOLEAN LoopReceiveWorkerBusy = FALSE; - -VOID NTAPI LoopReceiveWorker( PVOID Context ) { - PLIST_ENTRY ListEntry; - PLAN_WQ_ITEM WorkItem; - PNDIS_PACKET Packet; - PLAN_ADAPTER Adapter; - UINT BytesTransferred; - PNDIS_BUFFER NdisBuffer; - IP_PACKET IPPacket; - KIRQL OldIrql; - - TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); - - TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); - while( !IsListEmpty(&LoopWorkList) ) - { - ListEntry = RemoveHeadList( &LoopWorkList ); - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); - - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - - TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); - - Packet = WorkItem->Packet; - Adapter = WorkItem->Adapter; - BytesTransferred = WorkItem->BytesTransferred; - - exFreePool( WorkItem ); - - IPPacket.NdisPacket = Packet; - - TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", - Packet, Adapter, BytesTransferred)); - - NdisGetFirstBufferFromPacket(Packet, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); - - IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; - /* Determine which upper layer protocol that should receive - this packet and pass it to the correct receive handler */ - - TI_DbgPrint - (MID_TRACE, - ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", - IPPacket.ContigSize, IPPacket.TotalSize, - BytesTransferred)); - - IPPacket.Position = 0; - - IPReceive(Loopback, &IPPacket); - - FreeNdisPacket( Packet ); - TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); - } - TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n")); - LoopReceiveWorkerBusy = FALSE; - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); -} - -VOID LoopSubmitReceiveWork( - NDIS_HANDLE BindingContext, - PNDIS_PACKET Packet, - NDIS_STATUS Status, - UINT BytesTransferred) { - PLAN_WQ_ITEM WQItem; - PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; - KIRQL OldIrql; - - TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); - - WQItem = exAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); - if( !WQItem ) { - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); - return; - } - - WQItem->Packet = Packet; - WQItem->Adapter = Adapter; - WQItem->BytesTransferred = BytesTransferred; - InsertTailList( &LoopWorkList, &WQItem->ListEntry ); - - TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x BytesTrans %x\n", - Packet, Adapter, BytesTransferred)); - - if( !LoopReceiveWorkerBusy ) { - LoopReceiveWorkerBusy = TRUE; - ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); - TI_DbgPrint(DEBUG_DATALINK, - ("Work item inserted %x %x\n", &LoopWorkItem, WQItem)); - } else { - TI_DbgPrint(DEBUG_DATALINK, - ("LOOP WORKER BUSY %x %x\n", &LoopWorkItem, WQItem)); - } - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); -} VOID LoopTransmit( PVOID Context, @@ -138,31 +26,44 @@ * Type = LAN protocol type (unused) */ { + IP_PACKET IPPacket; + PNDIS_PACKET XmitPacket; + PNDIS_BUFFER NdisBuffer; + NDIS_STATUS NdisStatus; PCHAR PacketBuffer; UINT PacketLength; - PNDIS_PACKET XmitPacket; - NDIS_STATUS NdisStatus; - ASSERT_KM_POINTER(NdisPacket); - ASSERT_KM_POINTER(PC(NdisPacket)); - ASSERT_KM_POINTER(PC(NdisPacket)->DLComplete); + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); - TI_DbgPrint(MAX_TRACE, ("Called (NdisPacket = %x)\n", NdisPacket)); - - GetDataPtr( NdisPacket, MaxLLHeaderSize, &PacketBuffer, &PacketLength ); + GetDataPtr( NdisPacket, Offset, &PacketBuffer, &PacketLength ); NdisStatus = AllocatePacketWithBuffer ( &XmitPacket, PacketBuffer, PacketLength ); - if( NT_SUCCESS(NdisStatus) ) { - LoopSubmitReceiveWork - ( NULL, XmitPacket, STATUS_SUCCESS, PacketLength ); + if (NdisStatus != NDIS_STATUS_SUCCESS) + { + (PC(NdisPacket)->DLComplete)( PC(NdisPacket)->Context, NdisPacket, NdisStatus ); + return; } - (PC(NdisPacket)->DLComplete) - ( PC(NdisPacket)->Context, NdisPacket, STATUS_SUCCESS ); + NdisGetFirstBufferFromPacket(XmitPacket, + &NdisBuffer, + &IPPacket.Header, + &IPPacket.ContigSize, + &IPPacket.TotalSize); - TI_DbgPrint(MAX_TRACE, ("Done\n")); + IPPacket.NdisPacket = XmitPacket; + IPPacket.Position = 0; + + TI_DbgPrint(MID_TRACE, + ("ContigSize: %d, TotalSize: %d\n", + IPPacket.ContigSize, IPPacket.TotalSize)); + + IPReceive(Loopback, &IPPacket); + + FreeNdisPacket(XmitPacket); + + (PC(NdisPacket)->DLComplete)( PC(NdisPacket)->Context, NdisPacket, NDIS_STATUS_SUCCESS ); } NDIS_STATUS LoopRegisterAdapter( @@ -177,15 +78,9 @@ * Status of operation */ { - NDIS_STATUS Status; LLIP_BIND_INFO BindInfo; - Status = NDIS_STATUS_SUCCESS; - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - InitializeListHead( &LoopWorkList ); - ExInitializeWorkItem( &LoopWorkItem, LoopReceiveWorker, NULL ); /* Bind the adapter to network (IP) layer */ BindInfo.Context = NULL; @@ -211,7 +106,7 @@ TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - return Status; + return NDIS_STATUS_SUCCESS; }

1 0

[gedmurphy] 40353: Create a branch for Ash's shell work
by gedmurphy＠svn.reactos.org 03 Apr '09

03 Apr '09

Author: gedmurphy Date: Fri Apr 3 22:55:14 2009 New Revision: 40353 URL: http://svn.reactos.org/svn/reactos?rev=40353&view=rev Log: Create a branch for Ash's shell work Added: branches/Ash_Shell/ - copied from r40352, trunk/reactos/

1 0

← Newer
1
...
40
41
42
43
44
45
46
47
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009