Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 54600: [TCPIP] - Make interface octets in/out stats more accurate
by cgutman＠svn.reactos.org 05 Dec '11

05 Dec '11

Author: cgutman Date: Mon Dec 5 18:42:21 2011 New Revision: 54600 URL: http://svn.reactos.org/svn/reactos?rev=54600&view=rev Log: [TCPIP] - Make interface octets in/out stats more accurate Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/lib/drivers/ip/network/transmit.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] Mon Dec 5 18:42:21 2011 @@ -353,7 +353,8 @@ ("Ether Type = %x Total = %d\n", PacketType, IPPacket.TotalSize)); - Interface->Stats.InBytes += IPPacket.TotalSize; + /* Update interface stats */ + Interface->Stats.InBytes += IPPacket.TotalSize + Adapter->HeaderSize; /* NDIS packet is freed in all of these cases */ switch (PacketType) { @@ -680,6 +681,7 @@ PLAN_ADAPTER Adapter = (PLAN_ADAPTER)Context; KIRQL OldIrql; PNDIS_PACKET XmitPacket; + PIP_INTERFACE Interface = Adapter->Context; TI_DbgPrint(DEBUG_DATALINK, ("Called( NdisPacket %x, Offset %d, Adapter %x )\n", @@ -713,7 +715,7 @@ (*PC(NdisPacket)->DLComplete)(PC(NdisPacket)->Context, NdisPacket, NDIS_STATUS_SUCCESS); - switch (Adapter->Media) { + switch (Adapter->Media) { case NdisMedium802_3: EHeader = (PETH_HEADER)Data; @@ -728,25 +730,25 @@ RtlCopyMemory(EHeader->SrcAddr, Adapter->HWAddress, IEEE_802_ADDR_LENGTH); switch (Type) { - case LAN_PROTO_IPv4: - EHeader->EType = ETYPE_IPv4; - break; - case LAN_PROTO_ARP: - EHeader->EType = ETYPE_ARP; - break; - case LAN_PROTO_IPv6: - EHeader->EType = ETYPE_IPv6; - break; - default: - ASSERT(FALSE); - return; + case LAN_PROTO_IPv4: + EHeader->EType = ETYPE_IPv4; + break; + case LAN_PROTO_ARP: + EHeader->EType = ETYPE_ARP; + break; + case LAN_PROTO_IPv6: + EHeader->EType = ETYPE_IPv6; + break; + default: + ASSERT(FALSE); + return; } break; default: /* FIXME: Support other medias */ break; - } + } TI_DbgPrint( MID_TRACE, ("LinkAddress: %x\n", LinkAddress)); if( LinkAddress ) { @@ -761,11 +763,14 @@ ((PCHAR)LinkAddress)[5] & 0xff)); } - if (Adapter->MTU < Size) { - /* This is NOT a pointer. MSDN explicitly says so. */ - NDIS_PER_PACKET_INFO_FROM_PACKET(NdisPacket, - TcpLargeSendPacketInfo) = (PVOID)((ULONG_PTR)Adapter->MTU); - } + if (Adapter->MTU < Size) { + /* This is NOT a pointer. MSDN explicitly says so. */ + NDIS_PER_PACKET_INFO_FROM_PACKET(NdisPacket, + TcpLargeSendPacketInfo) = (PVOID)((ULONG_PTR)Adapter->MTU); + } + + /* Update interface stats */ + Interface->Stats.OutBytes += Size; TcpipAcquireSpinLock( &Adapter->Lock, &OldIrql ); TI_DbgPrint(MID_TRACE, ("NdisSend\n")); Modified: trunk/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/tra… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] Mon Dec 5 18:42:21 2011 @@ -234,8 +234,6 @@ * send routine (IPSendFragment) */ { - UINT PacketSize; - TI_DbgPrint(MAX_TRACE, ("Called. IPPacket (0x%X) NCE (0x%X)\n", IPPacket, NCE)); DISPLAY_IP_PACKET(IPPacket); @@ -243,10 +241,6 @@ /* Fetch path MTU now, because it may change */ TI_DbgPrint(MID_TRACE,("PathMTU: %d\n", NCE->Interface->MTU)); - NdisQueryPacketLength(IPPacket->NdisPacket, &PacketSize); - - NCE->Interface->Stats.OutBytes += PacketSize; - return SendFragments(IPPacket, NCE, NCE->Interface->MTU); }

1 0

[jimtabor] 54599: - Fix return properties from atom.
by jimtabor＠svn.reactos.org 05 Dec '11

05 Dec '11

Author: jimtabor Date: Mon Dec 5 07:43:29 2011 New Revision: 54599 URL: http://svn.reactos.org/svn/reactos?rev=54599&view=rev Log: - Fix return properties from atom. Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] Mon Dec 5 07:43:29 2011 @@ -135,14 +135,19 @@ PWND Window, FLONG flChanged) { + PPROPERTY pprop; WNDGDI *Current; HWND hWnd; ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); hWnd = Window->head.h; - Current = (WNDGDI *)IntGetProp(Window, AtomWndObj); - + pprop = IntGetProp(Window, AtomWndObj); + if (!pprop) + { + return; + } + Current = (WNDGDI *)pprop->Data; if ( gcountPWO && Current && Current->Hwnd == hWnd && Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Mon Dec 5 07:43:29 2011 @@ -633,7 +633,7 @@ UserDerefObjectCo(Window); UserLeave(); - return (DWORD)HelpId; + return (DWORD)HelpId->Data; } case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW: if (IntIsWindow(hWnd)) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Mon Dec 5 07:43:29 2011 @@ -973,12 +973,15 @@ PWNDGDI pWndgdi; PWND Wnd; HWND hWnd; + PPROPERTY pprop; hWnd = IntWindowFromDC(hdc); if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) { - pWndgdi = (WNDGDI *)IntGetProp(Wnd, AtomWndObj); + pprop = IntGetProp(Wnd, AtomWndObj); + + pWndgdi = (WNDGDI *)pprop->Data; if ( pWndgdi && pWndgdi->Hwnd == hWnd ) {

1 0

[cgutman] 54598: [TCPIP] - Fix the overflow fix
by cgutman＠svn.reactos.org 05 Dec '11

05 Dec '11

Author: cgutman Date: Mon Dec 5 03:51:01 2011 New Revision: 54598 URL: http://svn.reactos.org/svn/reactos?rev=54598&view=rev Log: [TCPIP] - Fix the overflow fix Modified: trunk/reactos/drivers/network/tcpip/include/receive.h trunk/reactos/lib/drivers/ip/network/receive.c Modified: trunk/reactos/drivers/network/tcpip/include/receive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] Mon Dec 5 03:51:01 2011 @@ -38,7 +38,7 @@ IP_ADDRESS DstAddr; /* Destination address */ UCHAR Protocol; /* Internet Protocol number */ USHORT Id; /* Identification number */ - IP_HEADER IPv4Header; /* Pointer to IP header */ + PIP_HEADER IPv4Header; /* Pointer to IP header */ UINT HeaderSize; /* Length of IP header */ LIST_ENTRY FragmentListHead; /* IP fragment list */ LIST_ENTRY HoleListHead; /* IP datagram hole list */ 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] Mon Dec 5 03:51:01 2011 @@ -108,6 +108,12 @@ CurrentEntry = NextEntry; } + if (IPDR->IPv4Header) + { + TI_DbgPrint(DEBUG_IP, ("Freeing IPDR header at (0x%X).\n", IPDR->IPv4Header)); + ExFreePoolWithTag(IPDR->IPv4Header, PACKET_BUFFER_TAG); + } + TI_DbgPrint(DEBUG_IP, ("Freeing IPDR data at (0x%X).\n", IPDR)); ExFreeToNPagedLookasideList(&IPDRList, IPDR); @@ -218,7 +224,7 @@ IPPacket->MappedHeader = FALSE; /* Copy the header into the buffer */ - RtlCopyMemory(IPPacket->Header, &IPDR->IPv4Header, sizeof(IPDR->IPv4Header)); + RtlCopyMemory(IPPacket->Header, IPDR->IPv4Header, IPDR->HeaderSize); Data = (PVOID)((ULONG_PTR)IPPacket->Header + IPDR->HeaderSize); IPPacket->Data = Data; @@ -394,11 +400,21 @@ /* If this is the first fragment, save the IP header */ if (FragFirst == 0) { - TI_DbgPrint(DEBUG_IP, ("First fragment found. Header buffer is at (0x%X). " - "Header size is (%d).\n", &IPDR->IPv4Header, IPPacket->HeaderSize)); - - RtlCopyMemory(&IPDR->IPv4Header, IPPacket->Header, sizeof(IPDR->IPv4Header)); - IPDR->HeaderSize = sizeof(IPDR->IPv4Header); + IPDR->IPv4Header = ExAllocatePoolWithTag(NonPagedPool, + IPPacket->HeaderSize, + PACKET_BUFFER_TAG); + if (!IPDR->IPv4Header) + { + Cleanup(&IPDR->Lock, OldIrql, IPDR); + return; + } + + RtlCopyMemory(IPDR->IPv4Header, IPPacket->Header, IPPacket->HeaderSize); + IPDR->HeaderSize = IPPacket->HeaderSize; + + TI_DbgPrint(DEBUG_IP, ("First fragment found. Header buffer is at (0x%X). " + "Header size is (%d).\n", &IPDR->IPv4Header, IPPacket->HeaderSize)); + } /* Create a buffer, copy the data into it and put it

1 0

[cgutman] 54597: [TCPIP] - Massive IPPacket usage overhaul (fix missing frees, initializations, and double frees) - Make IP receive completely agnostic of the buffers and data location (part 2 of 2...
by cgutman＠svn.reactos.org 05 Dec '11

05 Dec '11

Author: cgutman Date: Mon Dec 5 03:14:50 2011 New Revision: 54597 URL: http://svn.reactos.org/svn/reactos?rev=54597&view=rev Log: [TCPIP] - Massive IPPacket usage overhaul (fix missing frees, initializations, and double frees) - Make IP receive completely agnostic of the buffers and data location (part 2 of 2) - Use paged pool for the majority of allocations during receive and assembly - Implement ProtocolReceivePacket for faster performance with 3rd party NIC drivers - Fix a buffer overflow if an IPv4 packet is received with a header larger than 20 bytes - Many more improvements and bug fixes Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/include/ip.h trunk/reactos/drivers/network/tcpip/include/receive.h trunk/reactos/drivers/network/tcpip/tcpip/buffer.c trunk/reactos/lib/drivers/ip/network/arp.c trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/loopback.c trunk/reactos/lib/drivers/ip/network/receive.c trunk/reactos/lib/drivers/ip/network/router.c trunk/reactos/lib/drivers/ip/network/routines.c trunk/reactos/lib/drivers/ip/network/transmit.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/tcp/if.c trunk/reactos/lib/drivers/ip/transport/udp/udp.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] Mon Dec 5 03:14:50 2011 @@ -12,35 +12,16 @@ UINT TransferDataCalled = 0; UINT TransferDataCompleteCalled = 0; -UINT LanReceiveWorkerCalled = 0; -BOOLEAN LanReceiveWorkerBusy = FALSE; #define CCS_ROOT L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet" #define TCPIP_GUID L"{4D36E972-E325-11CE-BFC1-08002BE10318}" - -#define NGFP(_Packet) \ - { \ - PVOID _Header; \ - ULONG _ContigSize, _TotalSize; \ - PNDIS_BUFFER _NdisBuffer; \ - \ - TI_DbgPrint(MID_TRACE,("Checking Packet %x\n", _Packet)); \ - NdisGetFirstBufferFromPacket(_Packet, \ - &_NdisBuffer, \ - &_Header, \ - &_ContigSize, \ - &_TotalSize); \ - TI_DbgPrint(MID_TRACE,("NdisBuffer: %x\n", _NdisBuffer)); \ - TI_DbgPrint(MID_TRACE,("Header : %x\n", _Header)); \ - TI_DbgPrint(MID_TRACE,("ContigSize: %x\n", _ContigSize)); \ - TI_DbgPrint(MID_TRACE,("TotalSize : %x\n", _TotalSize)); \ - } typedef struct _LAN_WQ_ITEM { LIST_ENTRY ListEntry; PNDIS_PACKET Packet; PLAN_ADAPTER Adapter; UINT BytesTransferred; + BOOLEAN LegacyReceive; } LAN_WQ_ITEM, *PLAN_WQ_ITEM; NDIS_HANDLE NdisProtocolHandle = (NDIS_HANDLE)NULL; @@ -97,6 +78,83 @@ } return NdisStatus; +} + +/* Used by legacy ProtocolReceive for packet type */ +NDIS_STATUS +GetPacketTypeFromHeaderBuffer(PLAN_ADAPTER Adapter, + PVOID HeaderBuffer, + ULONG HeaderBufferSize, + PULONG PacketType) +{ + PETH_HEADER EthHeader = HeaderBuffer; + + if (HeaderBufferSize < Adapter->HeaderSize) + { + TI_DbgPrint(DEBUG_DATALINK, ("Runt frame (size %d).\n", HeaderBufferSize)); + return NDIS_STATUS_NOT_ACCEPTED; + } + + switch (Adapter->Media) + { + case NdisMedium802_3: + /* Ethernet and IEEE 802.3 frames can be destinguished by + looking at the IEEE 802.3 length field. This field is + less than or equal to 1500 for a valid IEEE 802.3 frame + and larger than 1500 is it's a valid EtherType value. + See RFC 1122, section 2.3.3 for more information */ + + *PacketType = EthHeader->EType; + break; + + default: + TI_DbgPrint(MIN_TRACE, ("Unsupported media.\n")); + + /* FIXME: Support other medias */ + return NDIS_STATUS_NOT_ACCEPTED; + } + + TI_DbgPrint(DEBUG_DATALINK, ("EtherType (0x%X).\n", *PacketType)); + + return NDIS_STATUS_SUCCESS; +} + +/* Used by ProtocolReceivePacket for packet type */ +NDIS_STATUS +GetPacketTypeFromNdisPacket(PLAN_ADAPTER Adapter, + PNDIS_PACKET NdisPacket, + PULONG PacketType) +{ + PVOID HeaderBuffer; + ULONG BytesCopied; + NDIS_STATUS Status; + + HeaderBuffer = ExAllocatePool(NonPagedPool, + Adapter->HeaderSize); + if (!HeaderBuffer) + return NDIS_STATUS_RESOURCES; + + /* Copy the media header */ + BytesCopied = CopyPacketToBuffer(HeaderBuffer, + NdisPacket, + 0, + Adapter->HeaderSize); + if (BytesCopied != Adapter->HeaderSize) + { + /* Runt frame */ + ExFreePool(HeaderBuffer); + TI_DbgPrint(DEBUG_DATALINK, ("Runt frame (size %d).\n", BytesCopied)); + return NDIS_STATUS_NOT_ACCEPTED; + } + + Status = GetPacketTypeFromHeaderBuffer(Adapter, + HeaderBuffer, + BytesCopied, + PacketType); + + ExFreePool(HeaderBuffer); + + return Status; } @@ -235,48 +293,67 @@ } VOID LanReceiveWorker( PVOID Context ) { - UINT PacketType; + ULONG PacketType; PLAN_WQ_ITEM WorkItem = (PLAN_WQ_ITEM)Context; PNDIS_PACKET Packet; PLAN_ADAPTER Adapter; UINT BytesTransferred; - PNDIS_BUFFER NdisBuffer; IP_PACKET IPPacket; + BOOLEAN LegacyReceive; + PIP_INTERFACE Interface; TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); Packet = WorkItem->Packet; Adapter = WorkItem->Adapter; BytesTransferred = WorkItem->BytesTransferred; + LegacyReceive = WorkItem->LegacyReceive; ExFreePoolWithTag(WorkItem, WQ_CONTEXT_TAG); + Interface = Adapter->Context; + IPInitializePacket(&IPPacket, 0); IPPacket.NdisPacket = Packet; - - 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)); - - PacketType = PC(IPPacket.NdisPacket)->PacketType; - IPPacket.Position = 0; + IPPacket.ReturnPacket = !LegacyReceive; + + if (LegacyReceive) + { + /* Packet type is precomputed */ + PacketType = PC(IPPacket.NdisPacket)->PacketType; + + /* Data is at position 0 */ + IPPacket.Position = 0; + + /* Packet size is determined by bytes transferred */ + IPPacket.TotalSize = BytesTransferred; + } + else + { + /* Determine packet type from media header */ + if (GetPacketTypeFromNdisPacket(Adapter, + IPPacket.NdisPacket, + &PacketType) != NDIS_STATUS_SUCCESS) + { + /* Bad packet */ + IPPacket.Free(&IPPacket); + return; + } + + /* Data is at the end of the media header */ + IPPacket.Position = Adapter->HeaderSize; + + /* Calculate packet size (excluding media header) */ + NdisQueryPacketLength(IPPacket.NdisPacket, &IPPacket.TotalSize); + } TI_DbgPrint (DEBUG_DATALINK, - ("Ether Type = %x ContigSize = %d Total = %d\n", - PacketType, IPPacket.ContigSize, IPPacket.TotalSize)); + ("Ether Type = %x Total = %d\n", + PacketType, IPPacket.TotalSize)); + + Interface->Stats.InBytes += IPPacket.TotalSize; /* NDIS packet is freed in all of these cases */ switch (PacketType) { @@ -298,8 +375,8 @@ VOID LanSubmitReceiveWork( NDIS_HANDLE BindingContext, PNDIS_PACKET Packet, - NDIS_STATUS Status, - UINT BytesTransferred) { + UINT BytesTransferred, + BOOLEAN LegacyReceive) { PLAN_WQ_ITEM WQItem = ExAllocatePoolWithTag(NonPagedPool, sizeof(LAN_WQ_ITEM), WQ_CONTEXT_TAG); PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; @@ -311,6 +388,7 @@ WQItem->Packet = Packet; WQItem->Adapter = Adapter; WQItem->BytesTransferred = BytesTransferred; + WQItem->LegacyReceive = LegacyReceive; if (!ChewCreate( LanReceiveWorker, WQItem )) ExFreePoolWithTag(WQItem, WQ_CONTEXT_TAG); @@ -342,7 +420,30 @@ if( Status != NDIS_STATUS_SUCCESS ) return; - LanSubmitReceiveWork( BindingContext, Packet, Status, BytesTransferred ); + LanSubmitReceiveWork(BindingContext, + Packet, + BytesTransferred, + TRUE); +} + +INT NTAPI ProtocolReceivePacket( + NDIS_HANDLE BindingContext, + PNDIS_PACKET NdisPacket) +{ + PLAN_ADAPTER Adapter = BindingContext; + + if (Adapter->State != LAN_STATE_STARTED) { + TI_DbgPrint(DEBUG_DATALINK, ("Adapter is stopped.\n")); + return 0; + } + + LanSubmitReceiveWork(BindingContext, + NdisPacket, + 0, /* Unused */ + FALSE); + + /* Hold 1 reference on this packet */ + return 1; } NDIS_STATUS NTAPI ProtocolReceive( @@ -367,15 +468,12 @@ * Status of operation */ { - USHORT EType; - UINT PacketType, BytesTransferred; - UINT temp; - //IP_PACKET IPPacket; + ULONG PacketType; + UINT BytesTransferred; PCHAR BufferData; NDIS_STATUS NdisStatus; PNDIS_PACKET NdisPacket; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; - PETH_HEADER EHeader = (PETH_HEADER)HeaderBuffer; TI_DbgPrint(DEBUG_DATALINK, ("Called. (packetsize %d)\n",PacketSize)); @@ -389,30 +487,17 @@ return NDIS_STATUS_NOT_ACCEPTED; } - if (Adapter->Media == NdisMedium802_3) { - /* Ethernet and IEEE 802.3 frames can be destinguished by - looking at the IEEE 802.3 length field. This field is - less than or equal to 1500 for a valid IEEE 802.3 frame - and larger than 1500 is it's a valid EtherType value. - See RFC 1122, section 2.3.3 for more information */ - /* FIXME: Test for Ethernet and IEEE 802.3 frame */ - if (((EType = EHeader->EType) != ETYPE_IPv4) && (EType != ETYPE_ARP)) { - TI_DbgPrint(DEBUG_DATALINK, ("Not IP or ARP frame. EtherType (0x%X).\n", EType)); - return NDIS_STATUS_NOT_ACCEPTED; - } - /* We use EtherType constants to destinguish packet types */ - PacketType = EType; - } else { - TI_DbgPrint(MIN_TRACE, ("Unsupported media.\n")); - /* FIXME: Support other medias */ + NdisStatus = GetPacketTypeFromHeaderBuffer(Adapter, + HeaderBuffer, + HeaderBufferSize, + &PacketType); + if (NdisStatus != NDIS_STATUS_SUCCESS) return NDIS_STATUS_NOT_ACCEPTED; - } - - /* Get a transfer data packet */ TI_DbgPrint(DEBUG_DATALINK, ("Adapter: %x (MTU %d)\n", Adapter, Adapter->MTU)); + /* Get a transfer data packet */ NdisStatus = AllocatePacketWithBuffer( &NdisPacket, NULL, PacketSize ); if( NdisStatus != NDIS_STATUS_SUCCESS ) { @@ -423,10 +508,7 @@ TI_DbgPrint(DEBUG_DATALINK, ("pretransfer LookaheadBufferSize %d packsize %d\n",LookaheadBufferSize,PacketSize)); - GetDataPtr( NdisPacket, 0, &BufferData, &temp ); - - //IPPacket.NdisPacket = NdisPacket; - //IPPacket.Position = 0; + GetDataPtr( NdisPacket, 0, &BufferData, &PacketSize ); TransferDataCalled++; @@ -1486,6 +1568,7 @@ ProtChars.RequestCompleteHandler = ProtocolRequestComplete; ProtChars.SendCompleteHandler = ProtocolSendComplete; ProtChars.TransferDataCompleteHandler = ProtocolTransferDataComplete; + ProtChars.ReceivePacketHandler = ProtocolReceivePacket; ProtChars.ReceiveHandler = ProtocolReceive; ProtChars.ReceiveCompleteHandler = ProtocolReceiveComplete; ProtChars.StatusHandler = ProtocolStatus; Modified: trunk/reactos/drivers/network/tcpip/include/ip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/ip.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/ip.h [iso-8859-1] Mon Dec 5 03:14:50 2011 @@ -78,11 +78,12 @@ OBJECT_FREE_ROUTINE Free; /* Routine used to free resources for the object */ UCHAR Type; /* Type of IP packet (see IP_ADDRESS_xx above) */ UCHAR Flags; /* Flags for packet (see IP_PACKET_FLAG_xx below)*/ + BOOLEAN MappedHeader; /* States whether Header is from an MDL or allocated from pool */ + BOOLEAN ReturnPacket; /* States whether NdisPacket should be passed to NdisReturnPackets */ PVOID Header; /* Pointer to IP header for this packet */ UINT HeaderSize; /* Size of IP header */ PVOID Data; /* Current pointer into packet data */ UINT TotalSize; /* Total amount of data in packet (IP header and data) */ - UINT ContigSize; /* Number of contiguous bytes left in current buffer */ UINT Position; /* Current logical offset into packet */ PNDIS_PACKET NdisPacket; /* Pointer to NDIS packet */ IP_ADDRESS SrcAddr; /* Source address */ Modified: trunk/reactos/drivers/network/tcpip/include/receive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] Mon Dec 5 03:14:50 2011 @@ -10,12 +10,13 @@ #include <ip.h> /* Number of seconds before destroying the IPDR */ -#define MAX_TIMEOUT_COUNT 5 +#define MAX_TIMEOUT_COUNT 3 /* IP datagram fragment descriptor. Used to store IP datagram fragments */ typedef struct IP_FRAGMENT { LIST_ENTRY ListEntry; /* Entry on list */ PNDIS_PACKET Packet; /* NDIS packet containing fragment data */ + BOOLEAN ReturnPacket; /* States whether to call NdisReturnPackets */ UINT PacketOffset; /* Offset into NDIS packet where data is */ UINT Offset; /* Offset into datagram where this fragment is */ UINT Size; /* Size of this fragment */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] Mon Dec 5 03:14:50 2011 @@ -311,29 +311,6 @@ return OldSize; } -NDIS_STATUS PrependPacket( PNDIS_PACKET Packet, PCHAR Data, UINT Length, - BOOLEAN Copy ) { - PNDIS_BUFFER Buffer; - NDIS_STATUS Status; - PCHAR NewBuf; - - if( Copy ) { - NewBuf = ExAllocatePoolWithTag( NonPagedPool, Length, PACKET_BUFFER_TAG ); - if( !NewBuf ) return NDIS_STATUS_RESOURCES; - RtlCopyMemory( NewBuf, Data, Length ); - } else NewBuf = Data; - - NdisAllocateBuffer( &Status, &Buffer, GlobalBufferPool, NewBuf, Length ); - if( Status != NDIS_STATUS_SUCCESS ) { - if (Copy) ExFreePoolWithTag(NewBuf, PACKET_BUFFER_TAG); - return Status; - } - - NdisChainBufferAtFront( Packet, Buffer ); - - return STATUS_SUCCESS; -} - void GetDataPtr( PNDIS_PACKET Packet, UINT Offset, PCHAR *DataOut, 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] Mon Dec 5 03:14:50 2011 @@ -185,36 +185,88 @@ PARP_HEADER Header; IP_ADDRESS SrcAddress; IP_ADDRESS DstAddress; - PVOID SenderHWAddress; - PVOID SenderProtoAddress; - PVOID TargetProtoAddress; + PCHAR SenderHWAddress, SenderProtoAddress, TargetProtoAddress; PNEIGHBOR_CACHE_ENTRY NCE; PNDIS_PACKET NdisPacket; PIP_INTERFACE Interface = (PIP_INTERFACE)Context; + ULONG BytesCopied, DataSize; + PCHAR DataBuffer; + + PAGED_CODE(); TI_DbgPrint(DEBUG_ARP, ("Called.\n")); + + Packet->Header = ExAllocatePoolWithTag(PagedPool, + sizeof(ARP_HEADER), + PACKET_BUFFER_TAG); + if (!Packet->Header) + { + TI_DbgPrint(DEBUG_ARP, ("Unable to allocate header buffer\n")); + Packet->Free(Packet); + return; + } + Packet->MappedHeader = FALSE; + + BytesCopied = CopyPacketToBuffer((PCHAR)Packet->Header, + Packet->NdisPacket, + Packet->Position, + sizeof(ARP_HEADER)); + if (BytesCopied != sizeof(ARP_HEADER)) + { + TI_DbgPrint(DEBUG_ARP, ("Unable to copy in header buffer\n")); + Packet->Free(Packet); + return; + } Header = (PARP_HEADER)Packet->Header; /* FIXME: Ethernet only */ if (WN2H(Header->HWType) != 1) { TI_DbgPrint(DEBUG_ARP, ("Unknown ARP hardware type (0x%X).\n", WN2H(Header->HWType))); + Packet->Free(Packet); return; } /* Check protocol type */ if (Header->ProtoType != ETYPE_IPv4) { TI_DbgPrint(DEBUG_ARP, ("Unknown ARP protocol type (0x%X).\n", WN2H(Header->ProtoType))); - return; - } - - SenderHWAddress = (PVOID)((ULONG_PTR)Header + sizeof(ARP_HEADER)); - SenderProtoAddress = (PVOID)((ULONG_PTR)SenderHWAddress + Header->HWAddrLen); - TargetProtoAddress = (PVOID)((ULONG_PTR)SenderProtoAddress + Header->ProtoAddrLen + Header->HWAddrLen); + Packet->Free(Packet); + return; + } + + DataSize = (2 * Header->HWAddrLen) + (2 * Header->ProtoAddrLen); + DataBuffer = ExAllocatePool(PagedPool, + DataSize); + if (!DataBuffer) + { + TI_DbgPrint(DEBUG_ARP, ("Unable to allocate data buffer\n")); + Packet->Free(Packet); + return; + } + + BytesCopied = CopyPacketToBuffer(DataBuffer, + Packet->NdisPacket, + Packet->Position + sizeof(ARP_HEADER), + DataSize); + if (BytesCopied != DataSize) + { + TI_DbgPrint(DEBUG_ARP, ("Unable to copy in data buffer\n")); + ExFreePool(DataBuffer); + Packet->Free(Packet); + return; + } + + SenderHWAddress = (PVOID)(DataBuffer); + SenderProtoAddress = (PVOID)(SenderHWAddress + Header->HWAddrLen); + TargetProtoAddress = (PVOID)(SenderProtoAddress + Header->ProtoAddrLen + Header->HWAddrLen); AddrInitIPv4(&DstAddress, *((PULONG)TargetProtoAddress)); if (!AddrIsEqual(&DstAddress, &Interface->Unicast)) - return; + { + ExFreePool(DataBuffer); + Packet->Free(Packet); + return; + } AddrInitIPv4(&SrcAddress, *((PULONG)SenderProtoAddress)); @@ -233,7 +285,11 @@ } if (Header->Opcode != ARP_OPCODE_REQUEST) - return; + { + ExFreePool(DataBuffer); + Packet->Free(Packet); + return; + } /* This is a request for our address. Swap the addresses and send an ARP reply back to the sender */ @@ -257,6 +313,7 @@ LAN_PROTO_ARP); } + ExFreePool(DataBuffer); Packet->Free(Packet); } 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] Mon Dec 5 03:14:50 2011 @@ -84,15 +84,16 @@ if( !NT_SUCCESS(NdisStatus) ) return FALSE; IPPacket->NdisPacket = NdisPacket; + IPPacket->MappedHeader = TRUE; GetDataPtr( IPPacket->NdisPacket, 0, - (PCHAR *)&IPPacket->Header, &IPPacket->ContigSize ); + (PCHAR *)&IPPacket->Header, &IPPacket->TotalSize ); + ASSERT(IPPacket->TotalSize == Size); 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; IPPacket->Data = ((PCHAR)IPPacket->Header) + IPPacket->HeaderSize; TI_DbgPrint(DEBUG_ICMP, ("Copying Address: %x -> %x\n", @@ -135,11 +136,6 @@ return TRUE; } -VOID ICMPSendPacketComplete -( PVOID Context, PNDIS_PACKET Packet, NDIS_STATUS Status ) { - FreeNdisPacket( Packet ); -} - NTSTATUS ICMPSendDatagram( PADDRESS_FILE AddrFile, PTDI_CONNECTION_INFORMATION ConnInfo, @@ -192,8 +188,8 @@ */ if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { - UnlockObject(AddrFile, OldIrql); - return STATUS_NETWORK_UNREACHABLE; + UnlockObject(AddrFile, OldIrql); + return STATUS_NETWORK_UNREACHABLE; } LocalAddress = NCE->Interface->Unicast; @@ -202,8 +198,8 @@ { if(!(NCE = NBLocateNeighbor( &LocalAddress ))) { - UnlockObject(AddrFile, OldIrql); - return STATUS_INVALID_PARAMETER; + UnlockObject(AddrFile, OldIrql); + return STATUS_INVALID_PARAMETER; } } @@ -217,14 +213,16 @@ UnlockObject(AddrFile, OldIrql); if( !NT_SUCCESS(Status) ) - return Status; + return Status; TI_DbgPrint(MID_TRACE,("About to send datagram\n")); Status = IPSendDatagram(&Packet, NCE); - FreeNdisPacket(Packet.NdisPacket); if (!NT_SUCCESS(Status)) + { + Packet.Free(&Packet); return Status; + } *DataUsed = DataSize; @@ -232,7 +230,6 @@ return STATUS_SUCCESS; } - VOID ICMPReceive( @@ -260,8 +257,6 @@ TI_DbgPrint(DEBUG_ICMP, ("Code (%d).\n", ICMPHeader->Code)); TI_DbgPrint(DEBUG_ICMP, ("Checksum (0x%X).\n", ICMPHeader->Checksum)); - - RawIpReceive(Interface, IPPacket); /* Checksum ICMP header and data */ if (!IPv4CorrectChecksum(IPPacket->Data, IPPacket->TotalSize - IPPacket->HeaderSize)) { @@ -270,20 +265,22 @@ return; } + RawIpReceive(Interface, IPPacket); + switch (ICMPHeader->Type) { - case ICMP_TYPE_ECHO_REQUEST: - ICMPReply( Interface, IPPacket, ICMP_TYPE_ECHO_REPLY, 0 ); - return; - - case ICMP_TYPE_ECHO_REPLY: - break; - - default: - TI_DbgPrint(DEBUG_ICMP, - ("Discarded ICMP datagram of unknown type %d.\n", - ICMPHeader->Type)); - /* Discard packet */ - break; + case ICMP_TYPE_ECHO_REQUEST: + ICMPReply( Interface, IPPacket, ICMP_TYPE_ECHO_REPLY, 0 ); + break; + + case ICMP_TYPE_ECHO_REPLY: + break; + + default: + TI_DbgPrint(DEBUG_ICMP, + ("Discarded ICMP datagram of unknown type %d.\n", + ICMPHeader->Type)); + /* Discard packet */ + break; } } @@ -300,7 +297,6 @@ */ { PNEIGHBOR_CACHE_ENTRY NCE; - NTSTATUS Status; TI_DbgPrint(DEBUG_ICMP, ("Called.\n")); @@ -311,14 +307,12 @@ /* Get a route to the destination address */ if ((NCE = RouteGetRouteToDestination(&IPPacket->DstAddr))) { /* Send the packet */ - Status = IPSendDatagram(IPPacket, NCE); - Complete(Context, IPPacket->NdisPacket, Status); + IPSendDatagram(IPPacket, NCE); } else { /* No route to destination (or no free resources) */ TI_DbgPrint(DEBUG_ICMP, ("No route to destination address 0x%X.\n", - IPPacket->DstAddr.Address.IPv4Address)); - /* Discard packet */ - Complete( Context, IPPacket->NdisPacket, NDIS_STATUS_NOT_ACCEPTED ); + IPPacket->DstAddr.Address.IPv4Address)); + IPPacket->Free(IPPacket); } } @@ -343,7 +337,7 @@ */ { UINT DataSize; - IP_PACKET NewPacket = *IPPacket; + IP_PACKET NewPacket; TI_DbgPrint(DEBUG_ICMP, ("Called. Type (%d) Code (%d).\n", Type, Code)); @@ -356,7 +350,7 @@ ((PICMP_HEADER)NewPacket.Data)->Code = Code; ((PICMP_HEADER)NewPacket.Data)->Checksum = 0; - ICMPTransmit(&NewPacket, SendICMPComplete, NULL); + ICMPTransmit(&NewPacket, NULL, NULL); } /* EOF */ Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Mon Dec 5 03:14:50 2011 @@ -40,12 +40,40 @@ { PIP_PACKET IPPacket = Object; + TI_DbgPrint(MAX_TRACE, ("Freeing object: 0x%p\n", Object)); + /* Detect double free */ ASSERT(IPPacket->Type != 0xFF); IPPacket->Type = 0xFF; + /* Check if there's a packet to free */ if (IPPacket->NdisPacket != NULL) - FreeNdisPacket(IPPacket->NdisPacket); + { + if (IPPacket->ReturnPacket) + { + /* Return the packet to the miniport driver */ + TI_DbgPrint(MAX_TRACE, ("Returning packet 0x%p\n", + IPPacket->NdisPacket)); + NdisReturnPackets(&IPPacket->NdisPacket, 1); + } + else + { + /* Free it the conventional way */ + TI_DbgPrint(MAX_TRACE, ("Freeing packet 0x%p\n", + IPPacket->NdisPacket)); + FreeNdisPacket(IPPacket->NdisPacket); + } + } + + /* Check if we have a pool-allocated header */ + if (!IPPacket->MappedHeader && IPPacket->Header) + { + /* Free it */ + TI_DbgPrint(MAX_TRACE, ("Freeing header: 0x%p\n", + IPPacket->Header)); + ExFreePoolWithTag(IPPacket->Header, + PACKET_BUFFER_TAG); + } } VOID FreeIF( 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] Mon Dec 5 03:14:50 2011 @@ -44,7 +44,6 @@ PNDIS_PACKET XmitPacket; NDIS_STATUS NdisStatus; PIP_PACKET IPPacket; - PNDIS_BUFFER NdisBuffer; ASSERT_KM_POINTER(NdisPacket); ASSERT_KM_POINTER(PC(NdisPacket)); @@ -65,11 +64,12 @@ IPPacket->NdisPacket = XmitPacket; - NdisGetFirstBufferFromPacket(XmitPacket, - &NdisBuffer, - &IPPacket->Header, - &IPPacket->ContigSize, - &IPPacket->TotalSize); + GetDataPtr(IPPacket->NdisPacket, + 0, + (PCHAR*)&IPPacket->Header, + &IPPacket->TotalSize); + + IPPacket->MappedHeader = TRUE; if (!ChewCreate(LoopPassiveWorker, IPPacket)) { 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] Mon Dec 5 03:14:50 2011 @@ -92,7 +92,14 @@ TI_DbgPrint(DEBUG_IP, ("Freeing fragment packet at (0x%X).\n", CurrentF->Packet)); /* Free the fragment data buffer */ - FreeNdisPacket(CurrentF->Packet); + if (CurrentF->ReturnPacket) + { + NdisReturnPackets(&CurrentF->Packet, 1); + } + else + { + FreeNdisPacket(CurrentF->Packet); + } TI_DbgPrint(DEBUG_IP, ("Freeing fragment at (0x%X).\n", CurrentF)); @@ -189,27 +196,29 @@ PIP_FRAGMENT Fragment; PCHAR Data; + PAGED_CODE(); + TI_DbgPrint(DEBUG_IP, ("Reassembling datagram from IPDR at (0x%X).\n", IPDR)); TI_DbgPrint(DEBUG_IP, ("IPDR->HeaderSize = %d\n", IPDR->HeaderSize)); TI_DbgPrint(DEBUG_IP, ("IPDR->DataSize = %d\n", IPDR->DataSize)); IPPacket->TotalSize = IPDR->HeaderSize + IPDR->DataSize; - IPPacket->ContigSize = IPPacket->TotalSize; IPPacket->HeaderSize = IPDR->HeaderSize; RtlCopyMemory(&IPPacket->SrcAddr, &IPDR->SrcAddr, sizeof(IP_ADDRESS)); RtlCopyMemory(&IPPacket->DstAddr, &IPDR->DstAddr, sizeof(IP_ADDRESS)); /* Allocate space for full IP datagram */ - IPPacket->Header = ExAllocatePoolWithTag(NonPagedPool, IPPacket->TotalSize, PACKET_BUFFER_TAG); + IPPacket->Header = ExAllocatePoolWithTag(PagedPool, IPPacket->TotalSize, PACKET_BUFFER_TAG); if (!IPPacket->Header) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); (*IPPacket->Free)(IPPacket); return FALSE; } + IPPacket->MappedHeader = FALSE; /* Copy the header into the buffer */ - RtlCopyMemory(IPPacket->Header, &IPDR->IPv4Header, IPDR->HeaderSize); + RtlCopyMemory(IPPacket->Header, &IPDR->IPv4Header, sizeof(IPDR->IPv4Header)); Data = (PVOID)((ULONG_PTR)IPPacket->Header + IPDR->HeaderSize); IPPacket->Data = Data; @@ -388,8 +397,8 @@ TI_DbgPrint(DEBUG_IP, ("First fragment found. Header buffer is at (0x%X). " "Header size is (%d).\n", &IPDR->IPv4Header, IPPacket->HeaderSize)); - RtlCopyMemory(&IPDR->IPv4Header, IPPacket->Header, IPPacket->HeaderSize); - IPDR->HeaderSize = IPPacket->HeaderSize; + RtlCopyMemory(&IPDR->IPv4Header, IPPacket->Header, sizeof(IPDR->IPv4Header)); + IPDR->HeaderSize = sizeof(IPDR->IPv4Header); } /* Create a buffer, copy the data into it and put it @@ -406,6 +415,7 @@ Fragment->Size = IPPacket->TotalSize - IPPacket->HeaderSize; Fragment->Packet = IPPacket->NdisPacket; + Fragment->ReturnPacket = IPPacket->ReturnPacket; Fragment->PacketOffset = IPPacket->Position + IPPacket->HeaderSize; Fragment->Offset = FragFirst; @@ -428,14 +438,14 @@ Assemble the datagram and pass it to an upper layer protocol */ TI_DbgPrint(DEBUG_IP, ("Complete datagram received.\n")); + + RemoveIPDR(IPDR); + TcpipReleaseSpinLock(&IPDR->Lock, OldIrql); /* FIXME: Assumes IPv4 */ IPInitializePacket(&Datagram, IP_ADDRESS_V4); Success = ReassembleDatagram(&Datagram, IPDR); - - RemoveIPDR(IPDR); - TcpipReleaseSpinLock(&IPDR->Lock, OldIrql); FreeIPDR(IPDR); @@ -448,12 +458,9 @@ /* Give the packet to the protocol dispatcher */ IPDispatchProtocol(IF, &Datagram); - IF->Stats.InBytes += Datagram.TotalSize; - /* We're done with this datagram */ - ExFreePoolWithTag(Datagram.Header, PACKET_BUFFER_TAG); TI_DbgPrint(MAX_TRACE, ("Freeing datagram at (0x%X).\n", Datagram)); - (*Datagram.Free)(&Datagram); + Datagram.Free(&Datagram); } else TcpipReleaseSpinLock(&IPDR->Lock, OldIrql); } @@ -535,69 +542,78 @@ * IPPacket = Pointer to IP packet */ { + UCHAR FirstByte; + ULONG BytesCopied; + TI_DbgPrint(DEBUG_IP, ("Received IPv4 datagram.\n")); - - IPPacket->HeaderSize = (((PIPv4_HEADER)IPPacket->Header)->VerIHL & 0x0F) << 2; + + /* Read in the first IP header byte for size information */ + BytesCopied = CopyPacketToBuffer((PCHAR)&FirstByte, + IPPacket->NdisPacket, + IPPacket->Position, + sizeof(UCHAR)); + if (BytesCopied != sizeof(UCHAR)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to copy in first byte\n")); + /* Discard packet */ + return; + } + + IPPacket->HeaderSize = (FirstByte & 0x0F) << 2; TI_DbgPrint(DEBUG_IP, ("IPPacket->HeaderSize = %d\n", IPPacket->HeaderSize)); if (IPPacket->HeaderSize > IPv4_MAX_HEADER_SIZE) { - TI_DbgPrint - (MIN_TRACE, - ("Datagram received with incorrect header size (%d).\n", + TI_DbgPrint(MIN_TRACE, ("Datagram received with incorrect header size (%d).\n", IPPacket->HeaderSize)); - /* Discard packet */ - return; + /* Discard packet */ + return; + } + + /* This is freed by IPPacket->Free() */ + IPPacket->Header = ExAllocatePoolWithTag(NonPagedPool, + IPPacket->HeaderSize, + PACKET_BUFFER_TAG); + if (!IPPacket->Header) + { + TI_DbgPrint(MIN_TRACE, ("No resources to allocate header\n")); + /* Discard packet */ + return; + } + + IPPacket->MappedHeader = FALSE; + + BytesCopied = CopyPacketToBuffer((PCHAR)IPPacket->Header, + IPPacket->NdisPacket, + IPPacket->Position, + IPPacket->HeaderSize); + if (BytesCopied != IPPacket->HeaderSize) + { + TI_DbgPrint(MIN_TRACE, ("Failed to copy in header\n")); + /* Discard packet */ + return; } /* Checksum IPv4 header */ if (!IPv4CorrectChecksum(IPPacket->Header, IPPacket->HeaderSize)) { - TI_DbgPrint - (MIN_TRACE, - ("Datagram received with bad checksum. Checksum field (0x%X)\n", + TI_DbgPrint(MIN_TRACE, ("Datagram received with bad checksum. Checksum field (0x%X)\n", WN2H(((PIPv4_HEADER)IPPacket->Header)->Checksum))); - /* Discard packet */ - return; + /* Discard packet */ + return; } IPPacket->TotalSize = WN2H(((PIPv4_HEADER)IPPacket->Header)->TotalLength); AddrInitIPv4(&IPPacket->SrcAddr, ((PIPv4_HEADER)IPPacket->Header)->SrcAddr); AddrInitIPv4(&IPPacket->DstAddr, ((PIPv4_HEADER)IPPacket->Header)->DstAddr); - - IPPacket->Data = (PVOID)((ULONG_PTR)IPPacket->Header + IPPacket->HeaderSize); - + TI_DbgPrint(MID_TRACE,("IPPacket->Position = %d\n", - IPPacket->Position)); - - //OskitDumpBuffer(IPPacket->Header, IPPacket->TotalSize); + IPPacket->Position)); /* FIXME: Possibly forward packets with multicast addresses */ /* FIXME: Should we allow packets to be received on the wrong interface? */ /* XXX Find out if this packet is destined for us */ ProcessFragment(IF, IPPacket); -#if 0 - } else { - /* This packet is not destined for us. If we are a router, - try to find a route and forward the packet */ - - /* FIXME: Check if acting as a router */ - NCE = NULL; - if (NCE) { - PROUTE_CACHE_NODE RCN; - - /* FIXME: Possibly fragment datagram */ - /* Forward the packet */ - if(!RouteGetRouteToDestination( &IPPacket->DstAddr, NULL, &RCN )) - IPSendDatagram(IPPacket, RCN, ReflectPacketComplete, IPPacket); - } else { - TI_DbgPrint(MIN_TRACE, ("No route to destination (0x%X).\n", - IPPacket->DstAddr.Address.IPv4Address)); - - /* FIXME: Send ICMP error code */ - } - } -#endif } @@ -609,26 +625,39 @@ * IPPacket = Pointer to IP packet */ { - UINT Version; - - /* Check that IP header has a supported version */ - Version = (((PIPv4_HEADER)IPPacket->Header)->VerIHL >> 4); - - switch (Version) { - case 4: - IPPacket->Type = IP_ADDRESS_V4; - IPv4Receive(IF, IPPacket); - break; - case 6: - IPPacket->Type = IP_ADDRESS_V6; - TI_DbgPrint(MAX_TRACE, ("Datagram of type IPv6 discarded.\n")); - break; - default: - TI_DbgPrint(MIN_TRACE, ("Datagram has an unsupported IP version %d.\n", Version)); - break; - } - - IPPacket->Free(IPPacket); + UCHAR FirstByte; + UINT Version, BytesCopied; + + /* Read in the first IP header byte for version information */ + BytesCopied = CopyPacketToBuffer((PCHAR)&FirstByte, + IPPacket->NdisPacket, + IPPacket->Position, + sizeof(UCHAR)); + if (BytesCopied != sizeof(UCHAR)) + { + TI_DbgPrint(MIN_TRACE, ("Failed to copy in first byte\n")); + IPPacket->Free(IPPacket); + return; + } + + /* Check that IP header has a supported version */ + Version = (FirstByte >> 4); + + switch (Version) { + case 4: + IPPacket->Type = IP_ADDRESS_V4; + IPv4Receive(IF, IPPacket); + break; + case 6: + IPPacket->Type = IP_ADDRESS_V6; + TI_DbgPrint(MAX_TRACE, ("Datagram of type IPv6 discarded.\n")); + break; + default: + TI_DbgPrint(MIN_TRACE, ("Datagram has an unsupported IP version %d.\n", Version)); + break; + } + + IPPacket->Free(IPPacket); } /* EOF */ Modified: trunk/reactos/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] Mon Dec 5 03:14:50 2011 @@ -382,8 +382,8 @@ } if( Found ) { - TI_DbgPrint(DEBUG_ROUTER, ("Deleting route\n")); - DestroyFIBE( Current ); + TI_DbgPrint(DEBUG_ROUTER, ("Deleting route\n")); + DestroyFIBE( Current ); } RouterDumpRoutes(); @@ -427,18 +427,18 @@ CurrentEntry = FIBListHead.Flink; while (CurrentEntry != &FIBListHead) { NextEntry = CurrentEntry->Flink; - Current = CONTAINING_RECORD(CurrentEntry, FIB_ENTRY, ListEntry); + Current = CONTAINING_RECORD(CurrentEntry, FIB_ENTRY, ListEntry); NCE = Current->Router; - if( AddrIsEqual(NetworkAddress, &Current->NetworkAddress) && - AddrIsEqual(Netmask, &Current->Netmask) ) { - TI_DbgPrint(DEBUG_ROUTER,("Attempting to add duplicate route to %s\n", A2S(NetworkAddress))); - TcpipReleaseSpinLock(&FIBLock, OldIrql); - return NULL; - } - - CurrentEntry = NextEntry; + if( AddrIsEqual(NetworkAddress, &Current->NetworkAddress) && + AddrIsEqual(Netmask, &Current->Netmask) ) { + TI_DbgPrint(DEBUG_ROUTER,("Attempting to add duplicate route to %s\n", A2S(NetworkAddress))); + TcpipReleaseSpinLock(&FIBLock, OldIrql); + return NULL; + } + + CurrentEntry = NextEntry; } TcpipReleaseSpinLock(&FIBLock, OldIrql); Modified: trunk/reactos/lib/drivers/ip/network/routines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] Mon Dec 5 03:14:50 2011 @@ -60,10 +60,7 @@ PIP_PACKET IPPacket) { #if DBG - PCHAR p; UINT Length; - PNDIS_BUFFER Buffer; - PNDIS_BUFFER NextBuffer; PCHAR CharBuffer; if ((DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK) != TRUE) || @@ -76,28 +73,14 @@ return; } - TI_DbgPrint(MIN_TRACE, ("IPPacket is at (0x%X).\n", IPPacket)); + TI_DbgPrint(MIN_TRACE, ("IPPacket is at (0x%X).\n", IPPacket)); TI_DbgPrint(MIN_TRACE, ("Header buffer is at (0x%X).\n", IPPacket->Header)); TI_DbgPrint(MIN_TRACE, ("Header size is (%d).\n", IPPacket->HeaderSize)); TI_DbgPrint(MIN_TRACE, ("TotalSize (%d).\n", IPPacket->TotalSize)); - TI_DbgPrint(MIN_TRACE, ("ContigSize (%d).\n", IPPacket->ContigSize)); TI_DbgPrint(MIN_TRACE, ("NdisPacket (0x%X).\n", IPPacket->NdisPacket)); - if (IPPacket->NdisPacket) { - NdisQueryPacket(IPPacket->NdisPacket, NULL, NULL, &Buffer, NULL); - for (; Buffer != NULL; Buffer = NextBuffer) { - NdisGetNextBuffer(Buffer, &NextBuffer); - NdisQueryBuffer(Buffer, (PVOID)&p, &Length); - //OskitDumpBuffer( p, Length ); - } - } else { - p = IPPacket->Header; - Length = IPPacket->ContigSize; - //OskitDumpBuffer( p, Length ); - } - CharBuffer = IPPacket->Header; - Length = IPPacket->ContigSize; + Length = IPPacket->HeaderSize; DisplayIPHeader(CharBuffer, Length); #endif } Modified: trunk/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/tra… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] Mon Dec 5 03:14:50 2011 @@ -155,22 +155,26 @@ IPPacket, NCE, PathMTU)); /* Make a smaller buffer if we will only send one fragment */ - GetDataPtr( IPPacket->NdisPacket, 0, &InData, &InSize ); + GetDataPtr( IPPacket->NdisPacket, IPPacket->Position, &InData, &InSize ); if( InSize < BufferSize ) BufferSize = InSize; TI_DbgPrint(MAX_TRACE, ("Fragment buffer is %d bytes\n", BufferSize)); IFC = ExAllocatePoolWithTag(NonPagedPool, sizeof(IPFRAGMENT_CONTEXT), IFC_TAG); if (IFC == NULL) + { + IPPacket->Free(IPPacket); return STATUS_INSUFFICIENT_RESOURCES; + } /* Allocate NDIS packet */ NdisStatus = AllocatePacketWithBuffer ( &IFC->NdisPacket, NULL, BufferSize ); if( !NT_SUCCESS(NdisStatus) ) { - ExFreePoolWithTag( IFC, IFC_TAG ); - return NdisStatus; + IPPacket->Free(IPPacket); + ExFreePoolWithTag( IFC, IFC_TAG ); + return NdisStatus; } GetDataPtr( IFC->NdisPacket, 0, (PCHAR *)&Data, &InSize ); @@ -211,6 +215,7 @@ FreeNdisPacket(IFC->NdisPacket); ExFreePoolWithTag(IFC, IFC_TAG); + IPPacket->Free(IPPacket); return NdisStatus; } @@ -234,16 +239,11 @@ TI_DbgPrint(MAX_TRACE, ("Called. IPPacket (0x%X) NCE (0x%X)\n", IPPacket, NCE)); DISPLAY_IP_PACKET(IPPacket); - /*OskitDumpBuffer( IPPacket->Header, IPPacket->TotalSize );*/ /* Fetch path MTU now, because it may change */ TI_DbgPrint(MID_TRACE,("PathMTU: %d\n", NCE->Interface->MTU)); - NdisQueryPacket(IPPacket->NdisPacket, - NULL, - NULL, - NULL, - &PacketSize); + NdisQueryPacketLength(IPPacket->NdisPacket, &PacketSize); NCE->Interface->Stats.OutBytes += PacketSize; 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] Mon Dec 5 03:14:50 2011 @@ -43,7 +43,8 @@ GetDataPtr( IPPacket->NdisPacket, 0, (PCHAR *)&IPPacket->Header, - &IPPacket->ContigSize ); + &IPPacket->TotalSize ); + IPPacket->MappedHeader = TRUE; IPPacket->HeaderSize = 20; @@ -144,10 +145,10 @@ } if( !NT_SUCCESS(Status) ) { - TI_DbgPrint(MIN_TRACE, ("Cannot add header. Status = (0x%X)\n", - Status)); - FreeNdisPacket(Packet->NdisPacket); - return Status; + TI_DbgPrint(MIN_TRACE, ("Cannot add header. Status = (0x%X)\n", + Status)); + Packet->Free(Packet); + return Status; } TI_DbgPrint(MID_TRACE, ("Copying data (hdr %x data %x (%d))\n", @@ -199,16 +200,16 @@ TI_DbgPrint(MID_TRACE,("RemoteAddressTa: %x\n", RemoteAddressTa)); switch( RemoteAddressTa->Address[0].AddressType ) { - case TDI_ADDRESS_TYPE_IP: - RemoteAddress.Type = IP_ADDRESS_V4; - RemoteAddress.Address.IPv4Address = - RemoteAddressTa->Address[0].Address[0].in_addr; - RemotePort = RemoteAddressTa->Address[0].Address[0].sin_port; - break; - - default: - UnlockObject(AddrFile, OldIrql); - return STATUS_UNSUCCESSFUL; + case TDI_ADDRESS_TYPE_IP: + RemoteAddress.Type = IP_ADDRESS_V4; + RemoteAddress.Address.IPv4Address = + RemoteAddressTa->Address[0].Address[0].in_addr; + RemotePort = RemoteAddressTa->Address[0].Address[0].sin_port; + break; + + default: + UnlockObject(AddrFile, OldIrql); + return STATUS_UNSUCCESSFUL; } TI_DbgPrint(MID_TRACE,("About to get route to destination\n")); @@ -221,8 +222,8 @@ * interface we're sending over */ if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { - UnlockObject(AddrFile, OldIrql); - return STATUS_NETWORK_UNREACHABLE; + UnlockObject(AddrFile, OldIrql); + return STATUS_NETWORK_UNREACHABLE; } LocalAddress = NCE->Interface->Unicast; @@ -230,8 +231,8 @@ else { if(!(NCE = NBLocateNeighbor( &LocalAddress ))) { - UnlockObject(AddrFile, OldIrql); - return STATUS_INVALID_PARAMETER; + UnlockObject(AddrFile, OldIrql); + return STATUS_INVALID_PARAMETER; } } @@ -247,15 +248,17 @@ UnlockObject(AddrFile, OldIrql); if( !NT_SUCCESS(Status) ) - return Status; + return Status; TI_DbgPrint(MID_TRACE,("About to send datagram\n")); Status = IPSendDatagram(&Packet, NCE); - FreeNdisPacket(Packet.NdisPacket); if (!NT_SUCCESS(Status)) + { + Packet.Free(&Packet); return Status; - + } + *DataUsed = DataSize; TI_DbgPrint(MID_TRACE,("Leaving\n")); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Mon Dec 5 03:14:50 2011 @@ -12,7 +12,7 @@ { NDIS_STATUS NdisStatus; PNEIGHBOR_CACHE_ENTRY NCE; - IP_PACKET Packet = { 0 }; + IP_PACKET Packet; IP_ADDRESS RemoteAddress, LocalAddress; PIPv4_HEADER Header; @@ -33,6 +33,8 @@ return ERR_IF; } + IPInitializePacket(&Packet, LocalAddress.Type); + if (!(NCE = RouteGetRouteToDestination(&RemoteAddress))) { return ERR_RTE; @@ -43,11 +45,12 @@ { return ERR_MEM; } - - GetDataPtr(Packet.NdisPacket, 0, (PCHAR*)&Packet.Header, &Packet.ContigSize); + + GetDataPtr(Packet.NdisPacket, 0, (PCHAR*)&Packet.Header, &Packet.TotalSize); + Packet.MappedHeader = TRUE; ASSERT(p->tot_len == p->len); - ASSERT(Packet.ContigSize == p->len); + ASSERT(Packet.TotalSize == p->len); RtlCopyMemory(Packet.Header, p->payload, p->len); @@ -57,12 +60,12 @@ Packet.DstAddr = RemoteAddress; NdisStatus = IPSendDatagram(&Packet, NCE); - FreeNdisPacket(Packet.NdisPacket); if (!NT_SUCCESS(NdisStatus)) { + Packet.Free(&Packet); return ERR_RTE; } - + return 0; } 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] Mon Dec 5 03:14:50 2011 @@ -105,33 +105,37 @@ Packet->TotalSize = sizeof(IPv4_HEADER) + sizeof(UDP_HEADER) + DataLen; /* Prepare packet */ - Status = AllocatePacketWithBuffer( &Packet->NdisPacket, - NULL, - Packet->TotalSize ); - - if( !NT_SUCCESS(Status) ) return Status; + Status = AllocatePacketWithBuffer(&Packet->NdisPacket, + NULL, + Packet->TotalSize ); + + if( !NT_SUCCESS(Status) ) + { + Packet->Free(Packet); + return Status; + } TI_DbgPrint(MID_TRACE, ("Allocated packet: %x\n", Packet->NdisPacket)); TI_DbgPrint(MID_TRACE, ("Local Addr : %s\n", A2S(LocalAddress))); TI_DbgPrint(MID_TRACE, ("Remote Addr: %s\n", A2S(RemoteAddress))); switch (RemoteAddress->Type) { - case IP_ADDRESS_V4: - Status = AddUDPHeaderIPv4(AddrFile, RemoteAddress, RemotePort, - LocalAddress, LocalPort, Packet, DataBuffer, DataLen); - break; - case IP_ADDRESS_V6: - /* FIXME: Support IPv6 */ - TI_DbgPrint(MIN_TRACE, ("IPv6 UDP datagrams are not supported.\n")); - default: - Status = STATUS_UNSUCCESSFUL; - break; + case IP_ADDRESS_V4: + Status = AddUDPHeaderIPv4(AddrFile, RemoteAddress, RemotePort, + LocalAddress, LocalPort, Packet, DataBuffer, DataLen); + break; + case IP_ADDRESS_V6: + /* FIXME: Support IPv6 */ + TI_DbgPrint(MIN_TRACE, ("IPv6 UDP datagrams are not supported.\n")); + default: + Status = STATUS_UNSUCCESSFUL; + break; } if (!NT_SUCCESS(Status)) { - TI_DbgPrint(MIN_TRACE, ("Cannot add UDP header. Status = (0x%X)\n", - Status)); - FreeNdisPacket(Packet->NdisPacket); - return Status; + TI_DbgPrint(MIN_TRACE, ("Cannot add UDP header. Status = (0x%X)\n", + Status)); + Packet->Free(Packet); + return Status; } TI_DbgPrint(MID_TRACE, ("Displaying packet\n")); @@ -196,8 +200,8 @@ * interface we're sending over */ if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { - UnlockObject(AddrFile, OldIrql); - return STATUS_NETWORK_UNREACHABLE; + UnlockObject(AddrFile, OldIrql); + return STATUS_NETWORK_UNREACHABLE; } LocalAddress = NCE->Interface->Unicast; @@ -205,8 +209,8 @@ else { if(!(NCE = NBLocateNeighbor( &LocalAddress ))) { - UnlockObject(AddrFile, OldIrql); - return STATUS_INVALID_PARAMETER; + UnlockObject(AddrFile, OldIrql); + return STATUS_INVALID_PARAMETER; } } @@ -225,10 +229,12 @@ return Status; Status = IPSendDatagram(&Packet, NCE); - FreeNdisPacket(Packet.NdisPacket); if (!NT_SUCCESS(Status)) + { + Packet.Free(&Packet); return Status; - + } + *DataUsed = DataSize; return STATUS_SUCCESS;

1 0

[jimtabor] 54596: [Win32k] - Fix more set active window API tests. The window postion change message with fixed lparam is erroneous. How can the address be the same since it originates from kernel ...
by jimtabor＠svn.reactos.org 05 Dec '11

05 Dec '11

Author: jimtabor Date: Mon Dec 5 01:09:25 2011 New Revision: 54596 URL: http://svn.reactos.org/svn/reactos?rev=54596&view=rev Log: [Win32k] - Fix more set active window API tests. The window postion change message with fixed lparam is erroneous. How can the address be the same since it originates from kernel space? Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Dec 5 01:09:25 2011 @@ -814,6 +814,13 @@ INT cyMsgFontChar; /* 010 */ UINT wMaxBtnSize; /* 014 */ } DPISERVERINFO, *PDPISERVERINFO; + +// PUSIFlags: +#define PUSIF_PALETTEDISPLAY 0x01 +#define PUSIF_SNAPTO 0x02 +#define PUSIF_COMBOBOXANIMATION 0x04 +#define PUSIF_LISTBOXSMOOTHSCROLLING 0x08 +#define PUSIF_KEYBOARDCUES 0x20 typedef struct _PERUSERSERVERINFO { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Mon Dec 5 01:09:25 2011 @@ -63,7 +63,8 @@ if (WindowPrev) UserRefObjectCo(WindowPrev, &RefPrev); /* Send palette messages */ - if (co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) + if (gpsi->PUSIFlags & PUSIF_PALETTEDISPLAY && + co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) { UserSendNotifyMessage( HWND_BROADCAST, WM_PALETTEISCHANGING, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Mon Dec 5 01:09:25 2011 @@ -306,6 +306,12 @@ gpsi->BitsPixel = NtGdiGetDeviceCaps(ScreenDeviceContext, BITSPIXEL); gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; gpsi->dmLogPixels = NtGdiGetDeviceCaps(ScreenDeviceContext, LOGPIXELSY); + if (NtGdiGetDeviceCaps(ScreenDeviceContext, RASTERCAPS) & RC_PALETTE) + { + gpsi->PUSIFlags |= PUSIF_PALETTEDISPLAY; + } + else + gpsi->PUSIFlags &= ~PUSIF_PALETTEDISPLAY; // Font is realized and this dc was previously set to internal DC_ATTR. gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, (DWORD*)&gpsi->cySysFontChar); gpsi->tmSysFont = tmw;

1 0

[jimtabor] 54595: [Win32k] - Fix crash in shutdown, see bug 6714.
by jimtabor＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: jimtabor Date: Sun Dec 4 22:35:18 2011 New Revision: 54595 URL: http://svn.reactos.org/svn/reactos?rev=54595&view=rev Log: [Win32k] - Fix crash in shutdown, see bug 6714. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sun Dec 4 22:35:18 2011 @@ -841,7 +841,7 @@ !IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL) && (wVk == VK_ESCAPE || wVk == VK_TAB)) { - TRACE("Alt-Tab/Esc Pressed wParam %x\n",Msg.wParam); + TRACE("Alt-Tab/Esc Pressed wParam %x\n",wVk); } /* If we have a focus queue, post a keyboard message */ @@ -1065,6 +1065,17 @@ LARGE_INTEGER LargeTickCount; BOOL bResult = FALSE; + switch(lpMsg->message) + { + case WM_KEYDOWN: + case WM_KEYUP: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + break; + default: + return FALSE; + } + pWnd = UserGetWindowObject(lpMsg->hwnd); if (!pWnd) // Must have a window! { @@ -1073,7 +1084,14 @@ } pti = pWnd->head.pti; - pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl; + + if (!pti->KeyboardLayout) + { + pti->KeyboardLayout = W32kGetDefaultKeyLayout(); + pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl; + } + else + pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl; if (!pKbdTbl) return FALSE;

1 0

[jgardou] 54594: [ACPI] - return correct status in case of unknown GUID passed for IRP_MN_QUERY_INTERFACE
by jgardou＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: jgardou Date: Sun Dec 4 22:34:55 2011 New Revision: 54594 URL: http://svn.reactos.org/svn/reactos?rev=54594&view=rev Log: [ACPI] - return correct status in case of unknown GUID passed for IRP_MN_QUERY_INTERFACE Modified: trunk/reactos/drivers/bus/acpi/interface.c Modified: trunk/reactos/drivers/bus/acpi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/interface… ============================================================================== --- trunk/reactos/drivers/bus/acpi/interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/interface.c [iso-8859-1] Sun Dec 4 22:34:55 2011 @@ -139,6 +139,6 @@ else { DPRINT1("Invalid GUID\n"); - return STATUS_INVALID_PARAMETER; + return STATUS_NOT_SUPPORTED; } }

1 0

[cgutman] 54593: [TCPIP] - Avoid an extra copy operation when receiving packets - Optimize loopback code a bit - Make IP receive independent of the location of the data and continuity of buffers in...
by cgutman＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: cgutman Date: Sun Dec 4 22:31:49 2011 New Revision: 54593 URL: http://svn.reactos.org/svn/reactos?rev=54593&view=rev Log: [TCPIP] - Avoid an extra copy operation when receiving packets - Optimize loopback code a bit - Make IP receive independent of the location of the data and continuity of buffers in the NDIS packet for ProtocolReceivePacket support (part 1 of x) Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/include/receive.h trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/loopback.c trunk/reactos/lib/drivers/ip/network/receive.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] Sun Dec 4 22:31:49 2011 @@ -278,22 +278,21 @@ ("Ether Type = %x ContigSize = %d Total = %d\n", PacketType, IPPacket.ContigSize, IPPacket.TotalSize)); + /* NDIS packet is freed in all of these cases */ switch (PacketType) { - case ETYPE_IPv4: - case ETYPE_IPv6: - TI_DbgPrint(MID_TRACE,("Received IP Packet\n")); - IPReceive(Adapter->Context, &IPPacket); - break; - case ETYPE_ARP: - TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); - ARPReceive(Adapter->Context, &IPPacket); - break; - default: - IPPacket.Free(&IPPacket); - break; - } - - FreeNdisPacket( Packet ); + case ETYPE_IPv4: + case ETYPE_IPv6: + TI_DbgPrint(MID_TRACE,("Received IP Packet\n")); + IPReceive(Adapter->Context, &IPPacket); + break; + case ETYPE_ARP: + TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); + ARPReceive(Adapter->Context, &IPPacket); + break; + default: + IPPacket.Free(&IPPacket); + break; + } } VOID LanSubmitReceiveWork( Modified: trunk/reactos/drivers/network/tcpip/include/receive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] Sun Dec 4 22:31:49 2011 @@ -15,7 +15,8 @@ /* IP datagram fragment descriptor. Used to store IP datagram fragments */ typedef struct IP_FRAGMENT { LIST_ENTRY ListEntry; /* Entry on list */ - PVOID Data; /* Pointer to fragment data */ + PNDIS_PACKET Packet; /* NDIS packet containing fragment data */ + UINT PacketOffset; /* Offset into NDIS packet where data is */ UINT Offset; /* Offset into datagram where this fragment is */ UINT Size; /* Size of this fragment */ } IP_FRAGMENT, *PIP_FRAGMENT; Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Sun Dec 4 22:31:49 2011 @@ -30,14 +30,22 @@ VOID TCPUnregisterInterface(PIP_INTERFACE IF); -VOID DontFreePacket( +VOID DeinitializePacket( PVOID Object) /* - * FUNCTION: Do nothing for when the IPPacket struct is part of another + * FUNCTION: Frees buffers attached to the packet * ARGUMENTS: * Object = Pointer to an IP packet structure */ { + PIP_PACKET IPPacket = Object; + + /* Detect double free */ + ASSERT(IPPacket->Type != 0xFF); + IPPacket->Type = 0xFF; + + if (IPPacket->NdisPacket != NULL) + FreeNdisPacket(IPPacket->NdisPacket); } VOID FreeIF( @@ -62,10 +70,9 @@ * Pointer to the created IP packet. NULL if there was not enough free resources. */ { - /* FIXME: Is this needed? */ RtlZeroMemory(IPPacket, sizeof(IP_PACKET)); - IPPacket->Free = DontFreePacket; + IPPacket->Free = DeinitializePacket; IPPacket->Type = Type; return IPPacket; 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] Sun Dec 4 22:31:49 2011 @@ -17,10 +17,10 @@ { PIP_PACKET IPPacket = Context; + /* IPReceive() takes care of the NDIS packet */ IPReceive(Loopback, IPPacket); - FreeNdisPacket(IPPacket->NdisPacket); - ExFreePool(Context); + ExFreePool(IPPacket); } VOID LoopTransmit( @@ -43,9 +43,8 @@ UINT PacketLength; PNDIS_PACKET XmitPacket; NDIS_STATUS NdisStatus; - IP_PACKET IPPacket; + PIP_PACKET IPPacket; PNDIS_BUFFER NdisBuffer; - PVOID WorkerBuffer; ASSERT_KM_POINTER(NdisPacket); ASSERT_KM_POINTER(PC(NdisPacket)); @@ -59,24 +58,23 @@ ( &XmitPacket, PacketBuffer, PacketLength ); if( NT_SUCCESS(NdisStatus) ) { - IPInitializePacket(&IPPacket, 0); - - IPPacket.NdisPacket = XmitPacket; - - NdisGetFirstBufferFromPacket(XmitPacket, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); + IPPacket = ExAllocatePool(NonPagedPool, sizeof(IP_PACKET)); + if (IPPacket) + { + IPInitializePacket(IPPacket, 0); - - WorkerBuffer = ExAllocatePool(NonPagedPool, sizeof(IPPacket)); - if (WorkerBuffer) - { - RtlCopyMemory(WorkerBuffer, &IPPacket, sizeof(IPPacket)); - if (!ChewCreate(LoopPassiveWorker, WorkerBuffer)) + IPPacket->NdisPacket = XmitPacket; + + NdisGetFirstBufferFromPacket(XmitPacket, + &NdisBuffer, + &IPPacket->Header, + &IPPacket->ContigSize, + &IPPacket->TotalSize); + + if (!ChewCreate(LoopPassiveWorker, IPPacket)) { - ExFreePool(WorkerBuffer); + IPPacket->Free(IPPacket); + ExFreePool(IPPacket); NdisStatus = NDIS_STATUS_RESOURCES; } } 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] Sun Dec 4 22:31:49 2011 @@ -89,10 +89,10 @@ /* Unlink it from the list */ RemoveEntryList(CurrentEntry); - TI_DbgPrint(DEBUG_IP, ("Freeing fragment data at (0x%X).\n", CurrentF->Data)); + TI_DbgPrint(DEBUG_IP, ("Freeing fragment packet at (0x%X).\n", CurrentF->Packet)); /* Free the fragment data buffer */ - ExFreePoolWithTag(CurrentF->Data, FRAGMENT_DATA_TAG); + FreeNdisPacket(CurrentF->Packet); TI_DbgPrint(DEBUG_IP, ("Freeing fragment at (0x%X).\n", CurrentF)); @@ -186,20 +186,16 @@ */ { PLIST_ENTRY CurrentEntry; - PIP_FRAGMENT Current; - PVOID Data; + PIP_FRAGMENT Fragment; + PCHAR Data; TI_DbgPrint(DEBUG_IP, ("Reassembling datagram from IPDR at (0x%X).\n", IPDR)); TI_DbgPrint(DEBUG_IP, ("IPDR->HeaderSize = %d\n", IPDR->HeaderSize)); TI_DbgPrint(DEBUG_IP, ("IPDR->DataSize = %d\n", IPDR->DataSize)); - TI_DbgPrint(DEBUG_IP, ("Fragment header:\n")); - //OskitDumpBuffer((PCHAR)IPDR->IPv4Header, IPDR->HeaderSize); - IPPacket->TotalSize = IPDR->HeaderSize + IPDR->DataSize; IPPacket->ContigSize = IPPacket->TotalSize; IPPacket->HeaderSize = IPDR->HeaderSize; - /*IPPacket->Position = IPDR->HeaderSize;*/ RtlCopyMemory(&IPPacket->SrcAddr, &IPDR->SrcAddr, sizeof(IP_ADDRESS)); RtlCopyMemory(&IPPacket->DstAddr, &IPDR->DstAddr, sizeof(IP_ADDRESS)); @@ -221,15 +217,14 @@ /* Copy data from all fragments into buffer */ CurrentEntry = IPDR->FragmentListHead.Flink; while (CurrentEntry != &IPDR->FragmentListHead) { - Current = CONTAINING_RECORD(CurrentEntry, IP_FRAGMENT, ListEntry); - - TI_DbgPrint(DEBUG_IP, ("Copying (%d) bytes of fragment data from (0x%X) to offset (%d).\n", - Current->Size, Data, Current->Offset)); - /* Copy fragment data to the destination buffer at the correct offset */ - RtlCopyMemory((PVOID)((ULONG_PTR)Data + Current->Offset), - Current->Data, - Current->Size); - //OskitDumpBuffer( Data, Current->Offset + Current->Size ); + Fragment = CONTAINING_RECORD(CurrentEntry, IP_FRAGMENT, ListEntry); + + /* Copy fragment data into datagram buffer */ + CopyPacketToBuffer(Data + Fragment->Offset, + Fragment->Packet, + Fragment->PacketOffset, + Fragment->Size); + CurrentEntry = CurrentEntry->Flink; } @@ -410,24 +405,12 @@ TI_DbgPrint(DEBUG_IP, ("Fragment descriptor allocated at (0x%X).\n", Fragment)); Fragment->Size = IPPacket->TotalSize - IPPacket->HeaderSize; - Fragment->Data = ExAllocatePoolWithTag(NonPagedPool, Fragment->Size, FRAGMENT_DATA_TAG); - if (!Fragment->Data) { - /* We don't have the resources to process this packet, discard it */ - ExFreeToNPagedLookasideList(&IPFragmentList, Fragment); - Cleanup(&IPDR->Lock, OldIrql, IPDR); - return; - } - - /* Position here is an offset from the NdisPacket start, not the header */ - TI_DbgPrint(DEBUG_IP, ("Fragment data buffer allocated at (0x%X) Size (%d) Pos (%d).\n", - Fragment->Data, Fragment->Size, IPPacket->Position)); - - /* Copy datagram data into fragment buffer */ - CopyPacketToBuffer(Fragment->Data, - IPPacket->NdisPacket, - IPPacket->HeaderSize, - Fragment->Size); + Fragment->Packet = IPPacket->NdisPacket; + Fragment->PacketOffset = IPPacket->Position + IPPacket->HeaderSize; Fragment->Offset = FragFirst; + + /* Disassociate the NDIS packet so it isn't freed upon return from IPReceive() */ + IPPacket->NdisPacket = NULL; /* If this is the last fragment, compute and save the datagram data size */ if (!MoreFragments) @@ -581,7 +564,6 @@ AddrInitIPv4(&IPPacket->SrcAddr, ((PIPv4_HEADER)IPPacket->Header)->SrcAddr); AddrInitIPv4(&IPPacket->DstAddr, ((PIPv4_HEADER)IPPacket->Header)->DstAddr); - IPPacket->Position += IPPacket->HeaderSize; IPPacket->Data = (PVOID)((ULONG_PTR)IPPacket->Header + IPPacket->HeaderSize); TI_DbgPrint(MID_TRACE,("IPPacket->Position = %d\n",

1 0

[ion] 54592: [KERNEL32]: Implement BasepComputeProcessPath. [KERNEL32]: Replace BasepGetDllPath with BasepComputeProcessDllPath. Paths now work right. This is step 1. SearchPatchW is next (BasepCom...
by ion＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: ion Date: Sun Dec 4 19:30:12 2011 New Revision: 54592 URL: http://svn.reactos.org/svn/reactos?rev=54592&view=rev Log: [KERNEL32]: Implement BasepComputeProcessPath. [KERNEL32]: Replace BasepGetDllPath with BasepComputeProcessDllPath. Paths now work right. This is step 1. SearchPatchW is next (BasepComputeProcessPath), followed by CreateProcessInternalW (BasepComputeProcessExePath). Then all paths will work right. Modified: trunk/reactos/dll/win32/kernel32/client/loader.c trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Sun Dec 4 19:30:12 2011 @@ -67,105 +67,6 @@ /* It'a a normal DLL, just return its handle */ return hModule; -} - -/** - * @name GetDllLoadPath - * - * Internal function to compute the load path to use for a given dll. - * - * @remarks Returned pointer must be freed by caller. - */ - -LPWSTR -GetDllLoadPath(LPCWSTR lpModule) -{ - ULONG Pos = 0, Length = 4, Tmp; - PWCHAR EnvironmentBufferW = NULL; - LPCWSTR lpModuleEnd = NULL; - UNICODE_STRING ModuleName; - DWORD LastError = GetLastError(); /* GetEnvironmentVariable changes LastError */ - - // FIXME: This function is used only by SearchPathW, and is deprecated and will be deleted ASAP. - - if (lpModule != NULL && wcslen(lpModule) > 2 && lpModule[1] == ':') - { - lpModuleEnd = lpModule + wcslen(lpModule); - } - else - { - ModuleName = NtCurrentPeb()->ProcessParameters->ImagePathName; - lpModule = ModuleName.Buffer; - lpModuleEnd = lpModule + (ModuleName.Length / sizeof(WCHAR)); - } - - if (lpModule != NULL) - { - while (lpModuleEnd > lpModule && *lpModuleEnd != L'/' && - *lpModuleEnd != L'\\' && *lpModuleEnd != L':') - { - --lpModuleEnd; - } - Length = (lpModuleEnd - lpModule) + 1; - } - - Length += GetCurrentDirectoryW(0, NULL); - Length += GetDllDirectoryW(0, NULL); - Length += GetSystemDirectoryW(NULL, 0); - Length += GetWindowsDirectoryW(NULL, 0); - Length += GetEnvironmentVariableW(L"PATH", NULL, 0); - - EnvironmentBufferW = RtlAllocateHeap(RtlGetProcessHeap(), 0, - (Length + 1) * sizeof(WCHAR)); - if (EnvironmentBufferW == NULL) - { - return NULL; - } - - if (lpModule) - { - RtlCopyMemory(EnvironmentBufferW, lpModule, - (lpModuleEnd - lpModule) * sizeof(WCHAR)); - Pos += lpModuleEnd - lpModule; - EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetCurrentDirectoryW(Length, EnvironmentBufferW + Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetDllDirectoryW(Length - Pos, EnvironmentBufferW + Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetSystemDirectoryW(EnvironmentBufferW + Pos, Length - Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetWindowsDirectoryW(EnvironmentBufferW + Pos, Length - Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetEnvironmentVariableW(L"PATH", EnvironmentBufferW + Pos, Length - Pos); - - /* Make sure buffer is null terminated */ - EnvironmentBufferW[Pos++] = UNICODE_NULL; - - - SetLastError(LastError); - return EnvironmentBufferW; } /* @@ -421,9 +322,9 @@ } /* Compute the load path */ - SearchPath = BasepGetDllPath((dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH) ? (LPWSTR)lpLibFileName : NULL, - NULL); - + SearchPath = BaseComputeProcessDllPath((dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH) ? + DllName.Buffer : NULL, + NULL); if (!SearchPath) { /* Getting DLL path failed, so set last error, free mem and return */ @@ -766,20 +667,24 @@ if (NT_SUCCESS(Status)) return Module; /* If not, then the path should be computed */ - DllPath = BasepGetDllPath(NULL, 0); - - /* Call LdrGetHandle() again providing the computed DllPath - and wrapped into SEH */ - _SEH2_TRY - { - Status = LdrGetDllHandle(DllPath, NULL, ModuleName, &Module); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Fail with the SEH error */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; + DllPath = BaseComputeProcessDllPath(NULL, 0); + if (!DllPath) + { + Status = STATUS_NO_MEMORY; + } + else + { + _SEH2_TRY + { + Status = LdrGetDllHandle(DllPath, NULL, ModuleName, &Module); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Fail with the SEH error */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } /* Free the DllPath */ RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath); Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Dec 4 19:30:12 2011 @@ -33,7 +33,7 @@ 0x10000000 // 7C not allowed }; -BASE_SEARCH_PATH_TYPE BaseDllOrderCurrent[BaseCurrentDirMax][BaseSearchPathMax] = +BASE_SEARCH_PATH_TYPE BaseDllOrderCurrent[BaseCurrentDirPlacementMax][BaseSearchPathMax] = { { BaseSearchPathApp, @@ -78,7 +78,38 @@ BaseSearchPathInvalid }; +BASE_CURRENT_DIR_PLACEMENT BasepDllCurrentDirPlacement = BaseCurrentDirPlacementInvalid; + +extern UNICODE_STRING BasePathVariableName; + /* PRIVATE FUNCTIONS **********************************************************/ + +PWCHAR +WINAPI +BasepEndOfDirName(IN PWCHAR FileName) +{ + PWCHAR FileNameEnd, FileNameSeparator; + + /* Find the first slash */ + FileNameSeparator = wcschr(FileName, OBJ_NAME_PATH_SEPARATOR); + if (FileNameSeparator) + { + /* Find the last one */ + FileNameEnd = wcsrchr(FileNameSeparator, OBJ_NAME_PATH_SEPARATOR); + ASSERT(FileNameEnd); + + /* Handle the case where they are one and the same */ + if (FileNameEnd == FileNameSeparator) FileNameEnd++; + } + else + { + /* No directory was specified */ + FileNameEnd = NULL; + } + + /* Return where the directory ends and the filename starts */ + return FileNameEnd; +} LPWSTR WINAPI @@ -86,7 +117,274 @@ IN LPWSTR AppName, IN LPVOID Environment) { - return NULL; + PWCHAR PathBuffer, Buffer, AppNameEnd, PathCurrent; + ULONG PathLengthInBytes; + NTSTATUS Status; + UNICODE_STRING EnvPath; + PBASE_SEARCH_PATH_TYPE Order; + + /* Initialize state */ + AppNameEnd = Buffer = PathBuffer = NULL; + Status = STATUS_SUCCESS; + PathLengthInBytes = 0; + + /* Loop the ordering array */ + for (Order = PathOrder; *Order != BaseSearchPathInvalid; Order++) { + switch (*Order) + { + /* Compute the size of the DLL path */ + case BaseSearchPathDll: + + /* This path only gets called if SetDllDirectory was called */ + ASSERT(BaseDllDirectory.Buffer != NULL); + + /* Make sure there's a DLL directory size */ + if (BaseDllDirectory.Length) + { + /* Add it, plus the separator */ + PathLengthInBytes += BaseDllDirectory.Length + sizeof(L';'); + } + break; + + /* Compute the size of the current path */ + case BaseSearchPathCurrent: + + /* Add ".;" */ + PathLengthInBytes += (2 * sizeof(WCHAR)); + break; + + /* Compute the size of the "PATH" environment variable */ + case BaseSearchPathEnv: + + /* Grab PEB lock if one wasn't passed in */ + if (!Environment) RtlAcquirePebLock(); + + /* Query the size first */ + EnvPath.MaximumLength = 0; + Status = RtlQueryEnvironmentVariable_U(Environment, + &BasePathVariableName, + &EnvPath); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Compute the size we'll need for the environment */ + EnvPath.MaximumLength = EnvPath.Length + sizeof(WCHAR); + if ((EnvPath.Length + sizeof(WCHAR)) > UNICODE_STRING_MAX_BYTES) + { + /* Don't let it overflow */ + EnvPath.MaximumLength = EnvPath.Length; + } + + /* Allocate the environment buffer */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + EnvPath.MaximumLength); + if (Buffer) + { + /* Now query the PATH environment variable */ + EnvPath.Buffer = Buffer; + Status = RtlQueryEnvironmentVariable_U(Environment, + &BasePathVariableName, + &EnvPath); + } + else + { + /* Failure case */ + Status = STATUS_NO_MEMORY; + } + } + + /* Release the PEB lock from above */ + if (!Environment) RtlReleasePebLock(); + + /* There might not be a PATH */ + if (Status == STATUS_VARIABLE_NOT_FOUND) + { + /* In this case, skip this PathOrder */ + EnvPath.Length = EnvPath.MaximumLength = 0; + Status = STATUS_SUCCESS; + } + else if (!NT_SUCCESS(Status)) + { + /* An early failure, go to exit code */ + goto Quickie; + } + else + { + /* Add the length of the PATH variable */ + ASSERT(!(EnvPath.Length & 1)); + PathLengthInBytes += (EnvPath.Length + sizeof(L';')); + } + break; + + /* Compute the size of the default search path */ + case BaseSearchPathDefault: + + /* Just add it... it already has a ';' at the end */ + ASSERT(!(BaseDefaultPath.Length & 1)); + PathLengthInBytes += BaseDefaultPath.Length; + break; + + /* Compute the size of the current app directory */ + case BaseSearchPathApp: + /* Find out where the app name ends, to get only the directory */ + if (AppName) AppNameEnd = BasepEndOfDirName(AppName); + + /* Check if there was no application name passed in */ + if (!(AppName) || !(AppNameEnd)) + { + /* Do we have a per-thread CURDIR to use? */ + if (NtCurrentTeb()->NtTib.SubSystemTib) + { + /* This means someone added RTL_PERTHREAD_CURDIR */ + UNIMPLEMENTED; + while (TRUE); + } + + /* We do not. Do we have the LDR_ENTRY for the executable? */ + if (!BasepExeLdrEntry) + { + /* We do not. Grab it */ + LdrEnumerateLoadedModules(0, + BasepLocateExeLdrEntry, + NtCurrentPeb()->ImageBaseAddress); + } + + /* Now do we have it? */ + if (BasepExeLdrEntry) + { + /* Yes, so read the name out of it */ + AppName = BasepExeLdrEntry->FullDllName.Buffer; + } + + /* Find out where the app name ends, to get only the directory */ + if (AppName) AppNameEnd = BasepEndOfDirName(AppName); + } + + /* So, do we have an application name and its directory? */ + if ((AppName) && (AppNameEnd)) + { + /* Add the size of the app's directory, plus the separator */ + PathLengthInBytes += ((AppNameEnd - AppName) * sizeof(WCHAR)) + sizeof(L';'); + } + break; + + default: + break; + } + } + + /* Bam, all done, we now have the final path size */ + ASSERT(PathLengthInBytes > 0); + ASSERT(!(PathLengthInBytes & 1)); + + /* Allocate the buffer to hold it */ + PathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, PathLengthInBytes); + if (!PathBuffer) + { + /* Failure path */ + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Now we loop again, this time to copy the data */ + PathCurrent = PathBuffer; + for (Order = PathOrder; *Order != BaseSearchPathInvalid; Order++) { + switch (*Order) + { + /* Add the DLL path */ + case BaseSearchPathDll: + if (BaseDllDirectory.Length) + { + /* Copy it in the buffer, ASSERT there's enough space */ + ASSERT((((PathCurrent - PathBuffer + 1) * sizeof(WCHAR)) + BaseDllDirectory.Length) <= PathLengthInBytes); + RtlCopyMemory(PathCurrent, + BaseDllDirectory.Buffer, + BaseDllDirectory.Length); + + /* Update the current pointer, add a separator */ + PathCurrent += (BaseDllDirectory.Length / sizeof(WCHAR)); + *PathCurrent++ = ';'; + } + break; + + /* Add the current applicaiton path */ + case BaseSearchPathApp: + if ((AppName) && (AppNameEnd)) + { + /* Copy it in the buffer, ASSERT there's enough space */ + ASSERT(((PathCurrent - PathBuffer + 1 + (AppNameEnd - AppName)) * sizeof(WCHAR)) <= PathLengthInBytes); + RtlCopyMemory(PathCurrent, + AppName, + (AppNameEnd - AppName) * sizeof(WCHAR)); + + /* Update the current pointer, add a separator */ + PathCurrent += AppNameEnd - AppName; + *PathCurrent++ = ';'; + } + break; + + /* Add the default search path */ + case BaseSearchPathDefault: + /* Copy it in the buffer, ASSERT there's enough space */ + ASSERT((((PathCurrent - PathBuffer) * sizeof(WCHAR)) + BaseDefaultPath.Length) <= PathLengthInBytes); + RtlCopyMemory(PathCurrent, BaseDefaultPath.Buffer, BaseDefaultPath.Length); + + /* Update the current pointer. The default path already has a ";" */ + PathCurrent += (BaseDefaultPath.Length / sizeof(WCHAR)); + break; + + /* Add the path in the PATH environment variable */ + case BaseSearchPathEnv: + if (EnvPath.Length) + { + /* Copy it in the buffer, ASSERT there's enough space */ + ASSERT((((PathCurrent - PathBuffer + 1) * sizeof(WCHAR)) + EnvPath.Length) <= PathLengthInBytes); + RtlCopyMemory(PathCurrent, EnvPath.Buffer, EnvPath.Length); + + /* Update the current pointer, add a separator */ + PathCurrent += (EnvPath.Length / sizeof(WCHAR)); + *PathCurrent++ = ';'; + } + break; + + /* Add the current dierctory */ + case BaseSearchPathCurrent: + + /* Copy it in the buffer, ASSERT there's enough space */ + ASSERT(((PathCurrent - PathBuffer + 2) * sizeof(WCHAR)) <= PathLengthInBytes); + *PathCurrent++ = '.'; + + /* Add the path separator */ + *PathCurrent++ = ';'; + break; + + default: + break; + } + } + + /* Everything should've perfectly fit in there */ + ASSERT((PathCurrent - PathBuffer) * sizeof(WCHAR) == PathLengthInBytes); + ASSERT(PathCurrent > PathBuffer); + + /* Terminate the whole thing */ + PathCurrent[-1] = UNICODE_NULL; + +Quickie: + /* Exit path: free our buffers */ + if (Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + if (PathBuffer) + { + /* This only gets freed in the failure path, since caller wants it */ + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); + PathBuffer = NULL; + } + } + + /* Return the path! */ + return PathBuffer; } LPWSTR @@ -94,7 +392,7 @@ BaseComputeProcessSearchPath(VOID) { DPRINT1("Computing Process Search path\n"); - + /* Compute the path using default process order */ return BasepComputeProcessPath(BaseProcessOrder, NULL, NULL); } @@ -120,7 +418,14 @@ IN PVOID Environment) { LPWSTR DllPath = NULL; - DPRINT1("Computing DLL path: %wZ with BaseDll: %wZ\n", FullPath, &BaseDllDirectory); + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\System\\CurrentControlSet\\Control\\Session Manager"); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"SafeDllSearchMode"); + OBJECT_ATTRIBUTES ObjectAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(&KeyName, OBJ_CASE_INSENSITIVE); + KEY_VALUE_PARTIAL_INFORMATION PartialInfo; + HANDLE KeyHandle; + NTSTATUS Status; + ULONG ResultLength; + BASE_CURRENT_DIR_PLACEMENT CurrentDirPlacement, OldCurrentDirPlacement; /* Acquire DLL directory lock */ RtlEnterCriticalSection(&BaseDllDirectoryLock); @@ -141,8 +446,65 @@ /* Release DLL directory lock */ RtlLeaveCriticalSection(&BaseDllDirectoryLock); - /* There is no base DLL directory */ - UNIMPLEMENTED; + /* Read the current placement */ + CurrentDirPlacement = BasepDllCurrentDirPlacement; + if (CurrentDirPlacement == BaseCurrentDirPlacementInvalid) + { + /* Open the configuration key */ + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Query if safe search is enabled */ + Status = NtQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + &PartialInfo, + sizeof(PartialInfo), + &ResultLength); + if (NT_SUCCESS(Status)) + { + /* Read the value if the size is OK */ + if (ResultLength == sizeof(PartialInfo)) + { + CurrentDirPlacement = *(PULONG)PartialInfo.Data; + } + } + + /* Close the handle */ + NtClose(KeyHandle); + + /* Validate the registry value */ + if ((CurrentDirPlacement <= BaseCurrentDirPlacementInvalid) || + (CurrentDirPlacement >= BaseCurrentDirPlacementMax)) + { + /* Default to safe search */ + CurrentDirPlacement = BaseCurrentDirPlacementSafe; + } + } + + /* Update the placement and read the old one */ + OldCurrentDirPlacement = InterlockedCompareExchange((PLONG)&BasepDllCurrentDirPlacement, + CurrentDirPlacement, + BaseCurrentDirPlacementInvalid); + if (OldCurrentDirPlacement != BaseCurrentDirPlacementInvalid) + { + /* If there already was a placement, use it */ + CurrentDirPlacement = OldCurrentDirPlacement; + } + } + + /* Check if the placement is invalid or not set */ + if ((CurrentDirPlacement <= BaseCurrentDirPlacementInvalid) || + (CurrentDirPlacement >= BaseCurrentDirPlacementMax)) + { + /* Default to safe search */ + CurrentDirPlacement = BaseCurrentDirPlacementSafe; + } + + /* Compute the process path using either normal or safe search */ + DllPath = BasepComputeProcessPath(BaseDllOrderCurrent[CurrentDirPlacement], + FullPath, + Environment); /* Return dll path */ return DllPath; @@ -939,6 +1301,105 @@ return (name[1] == '.' && (name[2] == '/' || name[2] == '\\')); } +/** + * @name GetDllLoadPath + * + * Internal function to compute the load path to use for a given dll. + * + * @remarks Returned pointer must be freed by caller. + */ + +LPWSTR +GetDllLoadPath(LPCWSTR lpModule) +{ + ULONG Pos = 0, Length = 4, Tmp; + PWCHAR EnvironmentBufferW = NULL; + LPCWSTR lpModuleEnd = NULL; + UNICODE_STRING ModuleName; + DWORD LastError = GetLastError(); /* GetEnvironmentVariable changes LastError */ + + // FIXME: This function is used only by SearchPathW, and is deprecated and will be deleted ASAP. + + if (lpModule != NULL && wcslen(lpModule) > 2 && lpModule[1] == ':') + { + lpModuleEnd = lpModule + wcslen(lpModule); + } + else + { + ModuleName = NtCurrentPeb()->ProcessParameters->ImagePathName; + lpModule = ModuleName.Buffer; + lpModuleEnd = lpModule + (ModuleName.Length / sizeof(WCHAR)); + } + + if (lpModule != NULL) + { + while (lpModuleEnd > lpModule && *lpModuleEnd != L'/' && + *lpModuleEnd != L'\\' && *lpModuleEnd != L':') + { + --lpModuleEnd; + } + Length = (lpModuleEnd - lpModule) + 1; + } + + Length += GetCurrentDirectoryW(0, NULL); + Length += GetDllDirectoryW(0, NULL); + Length += GetSystemDirectoryW(NULL, 0); + Length += GetWindowsDirectoryW(NULL, 0); + Length += GetEnvironmentVariableW(L"PATH", NULL, 0); + + EnvironmentBufferW = RtlAllocateHeap(RtlGetProcessHeap(), 0, + (Length + 1) * sizeof(WCHAR)); + if (EnvironmentBufferW == NULL) + { + return NULL; + } + + if (lpModule) + { + RtlCopyMemory(EnvironmentBufferW, lpModule, + (lpModuleEnd - lpModule) * sizeof(WCHAR)); + Pos += lpModuleEnd - lpModule; + EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetCurrentDirectoryW(Length, EnvironmentBufferW + Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetDllDirectoryW(Length - Pos, EnvironmentBufferW + Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetSystemDirectoryW(EnvironmentBufferW + Pos, Length - Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetWindowsDirectoryW(EnvironmentBufferW + Pos, Length - Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetEnvironmentVariableW(L"PATH", EnvironmentBufferW + Pos, Length - Pos); + + /* Make sure buffer is null terminated */ + EnvironmentBufferW[Pos++] = UNICODE_NULL; + + + SetLastError(LastError); + return EnvironmentBufferW; +} + /* * @implemented */ Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Dec 4 19:30:12 2011 @@ -373,201 +373,6 @@ sizeof(HANDLE), &Dummy); } -} - -LPWSTR -WINAPI -BasepGetProcessPath(DWORD Reserved, - LPWSTR FullPath, - PVOID Environment) -{ - NTSTATUS Status; - LPWSTR AllocatedPath = NULL, ch; - ULONG DefaultLength = BaseDefaultPath.Length; - ULONG AppLength = 0; - UNICODE_STRING EnvPath; - LPWSTR NamePtr; - LPWSTR PathBuffer; - BOOLEAN SecondAttempt = FALSE; - PPEB Peb = NtCurrentPeb(); - - if (!Environment) RtlAcquirePebLock(); - - /* Query PATH env var into append path */ - Status = RtlQueryEnvironmentVariable_U(Environment, - &BasePathVariableName, - &BaseDefaultPathAppend); - if (NT_SUCCESS(Status)) - { - /* Add up PATH environment length */ - DefaultLength += BaseDefaultPathAppend.Length; - } - else if (Status == STATUS_BUFFER_TOO_SMALL) - { - /* We have to allocate path dynamically */ - AllocatedPath = RtlAllocateHeap(RtlGetProcessHeap(), 0, BaseDefaultPathAppend.Length + sizeof(UNICODE_NULL)); - - if (AllocatedPath) - { - /* Set up EnvPath */ - EnvPath.Buffer = AllocatedPath; - EnvPath.Length = BaseDefaultPathAppend.Length + sizeof(UNICODE_NULL); - EnvPath.MaximumLength = EnvPath.Length; - - /* Query PATH env var into newly allocated path */ - Status = RtlQueryEnvironmentVariable_U(Environment, - &BasePathVariableName, - &EnvPath); - - if (NT_SUCCESS(Status)) - { - DefaultLength += EnvPath.Length; - } - else - { - /* Free newly allocated path, it didn't work */ - RtlFreeHeap(RtlGetProcessHeap(), 0, AllocatedPath); - AllocatedPath = NULL; - Status = STATUS_NO_MEMORY; - } - } - } - -secondattempt: - if (!FullPath) - { - /* Initialize BasepExeLdrEntry if necessary */ - if (!BasepExeLdrEntry) - LdrEnumerateLoadedModules(0, BasepLocateExeLdrEntry, Peb->ImageBaseAddress); - - DPRINT("Found BasepExeLdrEntry %wZ\n", &BasepExeLdrEntry->FullDllName); - - /* Set name pointer to the full dll path */ - NamePtr = BasepExeLdrEntry->FullDllName.Buffer; - } - else - { - /* Set name pointer to the provided path */ - NamePtr = FullPath; - } - - /* Determine application path length */ - if (NamePtr) - { - ch = NamePtr; - while (*ch) - { - /* Check if there is a slash */ - if (*ch == L'\\') - { - /* Update app length */ - AppLength = (ULONG_PTR)ch - (ULONG_PTR)NamePtr + sizeof(WCHAR); - } - - ch++; - } - } - - /* Now check, if we found a valid path in the provided full path */ - if (!AppLength && FullPath && !SecondAttempt) - { - /* We were provided with a bad full path, retry again using just this app's path */ - FullPath = NULL; - SecondAttempt = TRUE; - goto secondattempt; - } - - /* Allocate the path buffer */ - PathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, DefaultLength + AppLength + 2*sizeof(WCHAR)); - if (!PathBuffer) - { - /* Fail */ - if (!Environment) RtlReleasePebLock(); - if (AllocatedPath) RtlFreeHeap(RtlGetProcessHeap(), 0, AllocatedPath); - return NULL; - } - - /* Copy contents there */ - if (AppLength) - { - /* Remove trailing slashes if it's not root dir */ - if (AppLength != 3*sizeof(WCHAR)) - AppLength -= sizeof(WCHAR); - - /* Copy contents */ - RtlMoveMemory(PathBuffer, NamePtr, AppLength); - } - - /* Release the lock */ - if (!Environment) RtlReleasePebLock(); - - /* Finish preparing the path string */ - NamePtr = &PathBuffer[AppLength / sizeof(WCHAR)]; - - /* Put a separating ";" if something was added */ - if (AppLength) - { - *NamePtr = L';'; - NamePtr++; - } - - if (AllocatedPath) - { - /* Dynamically allocated env path, copy from the static buffer, - concatenate with dynamic buffer and free it */ - RtlMoveMemory(NamePtr, BaseDefaultPath.Buffer, BaseDefaultPath.Length); - RtlMoveMemory(&NamePtr[BaseDefaultPath.Length / sizeof(WCHAR)], AllocatedPath, EnvPath.Length); - - /* Free it */ - RtlFreeHeap(RtlGetProcessHeap(), 0, AllocatedPath); - } - else - { - /* Static env path string, copy directly from BaseDefaultPath */ - RtlMoveMemory(NamePtr, BaseDefaultPath.Buffer, DefaultLength); - } - - /* Null terminate the string */ - NamePtr[DefaultLength / sizeof(WCHAR)] = 0; - - return PathBuffer; -} - -LPWSTR -WINAPI -BasepGetDllPath(LPWSTR FullPath, - PVOID Environment) -{ -#if 0 - LPWSTR DllPath = NULL; - - /* Acquire DLL directory lock */ - RtlEnterCriticalSection(&BaseDllDirectoryLock); - - /* Check if we have a base dll directory */ - if (BaseDllDirectory.Buffer) - { - /* Then get process path */ - DllPath = BasepGetProcessPath(0, FullPath, Environment); - - /* Release DLL directory lock */ - RtlLeaveCriticalSection(&BaseDllDirectoryLock); - - /* Return dll path */ - return DllPath; - } - - /* Release DLL directory lock */ - RtlLeaveCriticalSection(&BaseDllDirectoryLock); - - /* There is no base DLL directory */ - UNIMPLEMENTED; - - /* Return dll path */ - return DllPath; -#else - return BasepGetProcessPath(0, FullPath, Environment); -#endif } VOID @@ -631,7 +436,9 @@ if ((Size) && (Size <= (MAX_PATH + 4))) { /* Get the DLL Path */ - DllPathString = BasepGetDllPath(ApplicationPathName, Environment); + DllPathString = BaseComputeProcessDllPath(ApplicationPathName, + Environment); + if (!DllPathString) return STATUS_NO_MEMORY; /* Initialize Strings */ RtlInitUnicodeString(&DllPath, DllPathString); @@ -640,7 +447,8 @@ else { /* Get the DLL Path */ - DllPathString = BasepGetDllPath(FullPath, Environment); + DllPathString = BaseComputeProcessDllPath(FullPath, Environment); + if (!DllPathString) return STATUS_NO_MEMORY; /* Initialize Strings */ RtlInitUnicodeString(&DllPath, DllPathString); Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sun Dec 4 19:30:12 2011 @@ -88,14 +88,6 @@ DWORD dwReserved; } LOADPARMS32; -typedef enum _BASE_CURRENT_DIR_PRIORITY -{ - BaseCurrentDirInvalid = -1, - BaseCurrentDirFirst, - BaseCurrentDirLast, - BaseCurrentDirMax -} BASE_CURRENT_DIR_PRIORITY; - typedef enum _BASE_SEARCH_PATH_TYPE { BaseSearchPathInvalid, @@ -107,6 +99,14 @@ BaseSearchPathMax } BASE_SEARCH_PATH_TYPE, *PBASE_SEARCH_PATH_TYPE; +typedef enum _BASE_CURRENT_DIR_PLACEMENT +{ + BaseCurrentDirPlacementInvalid = -1, + BaseCurrentDirPlacementDefault, + BaseCurrentDirPlacementSafe, + BaseCurrentDirPlacementMax +} BASE_CURRENT_DIR_PLACEMENT; + #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR 1 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS 2 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE 3 @@ -289,17 +289,15 @@ OUT PHANDLE hSection, IN PUNICODE_STRING ApplicationName); -LPWSTR -WINAPI -BasepGetDllPath(LPWSTR FullPath, - PVOID Environment); - - PCODEPAGE_ENTRY FASTCALL IntGetCodePageEntry(UINT CodePage); LPWSTR -GetDllLoadPath(LPCWSTR lpModule); +WINAPI +BaseComputeProcessDllPath( + IN LPWSTR FullPath, + IN PVOID Environment +); VOID WINAPI

1 0

[cgutman] 54591: [NTOSKRNL] - Fix a logic error - Signal the balancer in the !CanWait case if we're too low on pages since it runs asynchronously as of recently
by cgutman＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: cgutman Date: Sun Dec 4 19:22:51 2011 New Revision: 54591 URL: http://svn.reactos.org/svn/reactos?rev=54591&view=rev Log: [NTOSKRNL] - Fix a logic error - Signal the balancer in the !CanWait case if we're too low on pages since it runs asynchronously as of recently Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sun Dec 4 19:22:51 2011 @@ -239,7 +239,7 @@ /* * Make sure we don't exceed our individual target. */ - PagesUsed = InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed) + 1; + PagesUsed = InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed); if (PagesUsed > MiMemoryConsumers[Consumer].PagesTarget && !MiIsBalancerThread()) { @@ -275,6 +275,7 @@ if (!CanWait) { (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + MmRebalanceMemoryConsumers(); return(STATUS_NO_MEMORY); }

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