Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 65385: [TCPIP] - We receive the port number in network byte order. Act accordingly.
by jgardou＠svn.reactos.org 12 Nov '14

12 Nov '14

Author: jgardou Date: Wed Nov 12 11:38:57 2014 New Revision: 65385 URL: http://svn.reactos.org/svn/reactos?rev=65385&view=rev Log: [TCPIP] - We receive the port number in network byte order. Act accordingly. Modified: branches/tcpip_revolution/drivers/network/tcpip/address.c Modified: branches/tcpip_revolution/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/tcpip_revolution/drivers/networ… ============================================================================== --- branches/tcpip_revolution/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/tcpip_revolution/drivers/network/tcpip/address.c [iso-8859-1] Wed Nov 12 11:38:57 2014 @@ -74,7 +74,7 @@ if ((RequestAddr.addr == IPADDR_ANY) || (ip_addr_cmp(&RequestAddr, addr) && - ((Request->RemoteAddress.sin_port == port) || !port))) + ((Request->RemoteAddress.sin_port == lwip_htons(port)) || !port))) { PTA_IP_ADDRESS ReturnAddress; PIRP Irp; @@ -101,7 +101,7 @@ ReturnAddress = Request->ReturnInfo->RemoteAddress; ReturnAddress->Address->AddressLength = TDI_ADDRESS_LENGTH_IP; ReturnAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; - ReturnAddress->Address->Address->sin_port = port; + ReturnAddress->Address->Address->sin_port = lwip_htons(port); ReturnAddress->Address->Address->in_addr = ip4_addr_get_u32(addr); RtlZeroMemory(ReturnAddress->Address->Address->sin_zero, sizeof(ReturnAddress->Address->Address->sin_zero)); @@ -224,7 +224,7 @@ return STATUS_ADDRESS_ALREADY_EXISTS; } } - else if ((AddressFile->Address.sin_port == Port) + else if ((AddressFile->Address.sin_port == lwip_htons(Port)) && AddressFile->Protocol == Protocol) { Port++; @@ -278,7 +278,7 @@ RtlCopyMemory(&AddressFile->Address, Address, sizeof(*Address)); AddressFile->Protocol = Protocol; if (!Address->sin_port) - AddressFile->Address.sin_port = Port; + AddressFile->Address.sin_port = lwip_htons(Port); /* Initialize the datagram request stuff */ KeInitializeSpinLock(&AddressFile->RequestLock); @@ -296,7 +296,7 @@ ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); InsertEntityInstance(CL_TL_ENTITY, &AddressFile->Instance); AddressFile->lwip_udp_pcb = udp_new(); - udp_bind(AddressFile->lwip_udp_pcb, &IpAddr, AddressFile->Address.sin_port); + udp_bind(AddressFile->lwip_udp_pcb, &IpAddr, lwip_ntohs(AddressFile->Address.sin_port)); ip_set_option(AddressFile->lwip_udp_pcb, SOF_BROADCAST); /* Register our recv handler to lwip */ udp_recv( @@ -575,7 +575,7 @@ if (!NT_SUCCESS(Status)) goto Finish; ip4_addr_set_u32(&IpAddr, Address.in_addr); - Port = Address.sin_port; + Port = lwip_ntohs(Address.sin_port); } else { @@ -602,7 +602,7 @@ case IPPROTO_UDP: if (((ip4_addr_get_u32(&IpAddr) == IPADDR_ANY) || (ip4_addr_get_u32(&IpAddr) == IPADDR_BROADCAST)) && - (Port == lwip_ntohs(67)) && AddressFile->Address.in_addr == 0) + (Port == 67) && (AddressFile->Address.in_addr == 0)) { struct netif* lwip_netif = netif_list;

1 0

[jgardou] 65384: [TCPIP] - Implement sending data to the NIC from what lwip passes to us.
by jgardou＠svn.reactos.org 12 Nov '14

12 Nov '14

Author: jgardou Date: Wed Nov 12 11:38:53 2014 New Revision: 65384 URL: http://svn.reactos.org/svn/reactos?rev=65384&view=rev Log: [TCPIP] - Implement sending data to the NIC from what lwip passes to us. Modified: branches/tcpip_revolution/drivers/network/tcpip/interface.h branches/tcpip_revolution/drivers/network/tcpip/ndis_lwip.c Modified: branches/tcpip_revolution/drivers/network/tcpip/interface.h URL: http://svn.reactos.org/svn/reactos/branches/tcpip_revolution/drivers/networ… ============================================================================== --- branches/tcpip_revolution/drivers/network/tcpip/interface.h [iso-8859-1] (original) +++ branches/tcpip_revolution/drivers/network/tcpip/interface.h [iso-8859-1] Wed Nov 12 11:38:53 2014 @@ -2,6 +2,9 @@ #pragma once #define TAG_INTERFACE 'fIpI' + +#define TCPIP_PACKETPOOL_SIZE 200 +#define TCPIP_BUFFERPOOL_SIZE 800 typedef struct { @@ -11,6 +14,8 @@ TCPIP_INSTANCE ClNlInstance; UNICODE_STRING DeviceName; NDIS_HANDLE NdisContext; + NDIS_HANDLE PacketPool; + NDIS_HANDLE BufferPool; UINT MediumIndex; ULONG Speed; } TCPIP_INTERFACE; Modified: branches/tcpip_revolution/drivers/network/tcpip/ndis_lwip.c URL: http://svn.reactos.org/svn/reactos/branches/tcpip_revolution/drivers/networ… ============================================================================== --- branches/tcpip_revolution/drivers/network/tcpip/ndis_lwip.c [iso-8859-1] (original) +++ branches/tcpip_revolution/drivers/network/tcpip/ndis_lwip.c [iso-8859-1] Wed Nov 12 11:38:53 2014 @@ -24,7 +24,7 @@ { NDIS_STATUS Status; NDIS_REQUEST Request; - UINT MTU; + UINT MTU, Speed; NDIS_OID QueryAddrOid; UINT PacketFilter; @@ -76,17 +76,20 @@ /* Get the link speed */ Request.RequestType = NdisRequestQueryInformation; Request.DATA.QUERY_INFORMATION.Oid = OID_GEN_LINK_SPEED; - Request.DATA.QUERY_INFORMATION.InformationBuffer = &Interface->Speed; - Request.DATA.QUERY_INFORMATION.InformationBufferLength = sizeof(ULONG); + Request.DATA.QUERY_INFORMATION.InformationBuffer = &Speed; + Request.DATA.QUERY_INFORMATION.InformationBufferLength = sizeof(UINT); NdisRequest(&Status, Interface->NdisContext, &Request); if (!NT_SUCCESS(Status)) { DPRINT1("Could not get link speed NIC driver!\n"); /* Good old 10Mb/s as default */ - Interface->Speed = 100000; + Speed = 100000; } /* NDIS drivers give it in 100bps unit */ - Interface->Speed *= 100; + Speed *= 100; + + /* Initialize lwip SNMP module */ + NETIF_INIT_SNMP(&Interface->lwip_netif, snmp_ifType_ethernet_csmacd, Speed); /* Set the packet filter */ Request.RequestType = NdisRequestSetInformation; @@ -100,6 +103,22 @@ return Status; } + /* Initialize the packet pool */ + NdisAllocatePacketPool(&Status, &Interface->PacketPool, TCPIP_PACKETPOOL_SIZE, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not allocate a packet pool.\n"); + return Status; + } + + /* Initialize the buffer pool */ + NdisAllocateBufferPool(&Status, &Interface->BufferPool, TCPIP_BUFFERPOOL_SIZE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not allocate a buffer pool.\n"); + return Status; + } + return NDIS_STATUS_SUCCESS; } @@ -160,6 +179,22 @@ } static +NDIS_STATUS +NTAPI +ProtocolReceive( + _In_ NDIS_HANDLE ProtocolBindingContext, + _In_ NDIS_HANDLE MacReceiveContext, + _In_ PVOID HeaderBuffer, + _In_ UINT HeaderBufferSize, + _In_ PVOID LookAheadBuffer, + _In_ UINT LookaheadBufferSize, + _In_ UINT PacketSize) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +static VOID NTAPI ProtocolReceiveComplete( @@ -175,6 +210,17 @@ _In_ NDIS_HANDLE ProtocolBindingContext) { UNIMPLEMENTED +} + +static +INT +NTAPI +ProtocolReceivePacket( + _In_ NDIS_HANDLE ProtocolBindingContext, + _In_ PNDIS_PACKET Packet) +{ + UNIMPLEMENTED + return 0; } /* bridge between NDIS and lwip: send data to the adapter */ @@ -184,7 +230,80 @@ struct netif *netif, struct pbuf *p) { - UNIMPLEMENTED + TCPIP_INTERFACE* Interface = CONTAINING_RECORD(netif, TCPIP_INTERFACE, lwip_netif); + NDIS_STATUS Status; + PNDIS_PACKET Packet; + PNDIS_BUFFER Buffer; + PVOID PayloadCopy = NULL; + + NT_ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); + + /* Allocate a packet */ + NdisAllocatePacket(&Status, &Packet, Interface->PacketPool); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not allocate a packet from packet pool!\n"); + return ERR_MEM; + } + + /* Map pbuf to a NDIS buffer chain, if possible (== allocated from non paged pool). */ + if ((p->type == PBUF_POOL) || (p->type == PBUF_RAM)) + { + while (p) + { + NdisAllocateBuffer(&Status, &Buffer, Interface->BufferPool, p->payload, p->len); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not allocate a buffer!\n"); + return ERR_MEM; + } + NdisChainBufferAtBack(Packet, Buffer); + p = p->next; + if (p) + { + DPRINT1("More than one buffer in the chain!\n"); + } + } + } + else + { + PayloadCopy = ExAllocatePoolWithTag(NonPagedPool, p->tot_len, TAG_INTERFACE); + if (!PayloadCopy) + { + NdisFreePacket(Packet); + return ERR_MEM; + } + pbuf_copy_partial(p, PayloadCopy, p->tot_len, 0); + NdisAllocateBuffer(&Status, &Buffer, Interface->BufferPool, p->payload, p->len); + NdisChainBufferAtFront(Packet, Buffer); + } + + /* Call ndis */ + NdisSend(&Status, Interface->NdisContext, Packet); + + DPRINT1("NdisSend: got status 0x%08x.\n", Status); + + /* Free the buffer chain */ + if (Status != NDIS_STATUS_PENDING) + { + NdisUnchainBufferAtFront(Packet, &Buffer); + while (Buffer) + { + NdisFreeBuffer(Buffer); + NdisUnchainBufferAtFront(Packet, &Buffer); + } + NdisFreePacket(Packet); + + if (PayloadCopy) + ExFreePoolWithTag(PayloadCopy, TAG_INTERFACE); + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NdisSend returned status 0x%08x.\n", Status); + return ERR_CONN; + } + return ERR_OK; } @@ -319,8 +438,10 @@ ProtocolCharacteristics.CloseAdapterCompleteHandler = ProtocolCloseAdapterComplete; ProtocolCharacteristics.ResetCompleteHandler = ProtocolResetComplete; ProtocolCharacteristics.RequestCompleteHandler = ProtocolRequestComplete; + ProtocolCharacteristics.ReceiveHandler = ProtocolReceive; ProtocolCharacteristics.ReceiveCompleteHandler = ProtocolReceiveComplete; ProtocolCharacteristics.StatusCompleteHandler = ProtocolStatusComplete; + ProtocolCharacteristics.ReceivePacketHandler = ProtocolReceivePacket; ProtocolCharacteristics.BindAdapterHandler = ProtocolBindAdapter; ProtocolCharacteristics.UnbindAdapterHandler = ProtocolUnbindAdapter; RtlInitUnicodeString(&ProtocolCharacteristics.Name, L"TcpIp");

1 0

[jgardou] 65383: [TCPIP] - Add special handling case for UDP packet on DHCP server port. lwip refuses to send packets to addresses on which no interface is bound. Of course, DHCP packets are sent b...
by jgardou＠svn.reactos.org 12 Nov '14

12 Nov '14

Author: jgardou Date: Wed Nov 12 11:38:48 2014 New Revision: 65383 URL: http://svn.reactos.org/svn/reactos?rev=65383&view=rev Log: [TCPIP] - Add special handling case for UDP packet on DHCP server port. lwip refuses to send packets to addresses on which no interface is bound. Of course, DHCP packets are sent before any address is given to an interface, so we have to handle this case here. lwip DHCP discovery code does the same thing. Modified: branches/tcpip_revolution/drivers/network/tcpip/address.c Modified: branches/tcpip_revolution/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/tcpip_revolution/drivers/networ… ============================================================================== --- branches/tcpip_revolution/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/tcpip_revolution/drivers/network/tcpip/address.c [iso-8859-1] Wed Nov 12 11:38:48 2014 @@ -583,7 +583,7 @@ Port = 0; } - DPRINT1("Sending datagram to address 0x%08x, port %u\n", ip4_addr_get_u32(&IpAddr), Port); + DPRINT1("Sending datagram to address 0x%08x, port %u\n", ip4_addr_get_u32(&IpAddr), lwip_ntohs(Port)); /* Get the buffer */ Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); @@ -600,7 +600,39 @@ switch (AddressFile->Protocol) { case IPPROTO_UDP: - lwip_error = udp_sendto(AddressFile->lwip_udp_pcb, p, &IpAddr, Port); + if (((ip4_addr_get_u32(&IpAddr) == IPADDR_ANY) || + (ip4_addr_get_u32(&IpAddr) == IPADDR_BROADCAST)) && + (Port == lwip_ntohs(67)) && AddressFile->Address.in_addr == 0) + { + struct netif* lwip_netif = netif_list; + + /* + * This is a DHCP packet for an address file with address 0.0.0.0. + * Try to find an ethernet interface with no address set, + * and send the packet through it. + */ + while (lwip_netif != NULL) + { + if (ip4_addr_get_u32(&lwip_netif->ip_addr) == 0) + break; + lwip_netif = lwip_netif->next; + } + + if (lwip_netif == NULL) + { + /* Do a regular send. (This will most likely fail) */ + lwip_error = udp_sendto(AddressFile->lwip_udp_pcb, p, &IpAddr, Port); + } + else + { + /* We found an interface with address being 0.0.0.0 */ + lwip_error = udp_sendto_if(AddressFile->lwip_udp_pcb, p, &IpAddr, Port, lwip_netif); + } + } + else + { + lwip_error = udp_sendto(AddressFile->lwip_udp_pcb, p, &IpAddr, Port); + } break; default: lwip_error = raw_sendto(AddressFile->lwip_raw_pcb, p, &IpAddr);

1 0

[tkreuzer] 65382: [WIN32K] Allow arbitrary transforms in NtGdiExtCreateRegion. Shearing and rotation are not handled correctly yet, but at least we do no longer fail on transforms that have scaling...
by tkreuzer＠svn.reactos.org 12 Nov '14

12 Nov '14

Author: tkreuzer Date: Wed Nov 12 10:15:09 2014 New Revision: 65382 URL: http://svn.reactos.org/svn/reactos?rev=65382&view=rev Log: [WIN32K] Allow arbitrary transforms in NtGdiExtCreateRegion. Shearing and rotation are not handled correctly yet, but at least we do no longer fail on transforms that have scaling and an offset, which are classified as GX_GENERAL Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Wed Nov 12 10:15:09 2014 @@ -3668,8 +3668,8 @@ XFORMOBJ_vInit(&xo, &matrix); ret = XFORMOBJ_iSetXform(&xo, (XFORML*)Xform); - /* Check for error, also no scale and shear allowed */ - if (ret != DDI_ERROR && ret != GX_GENERAL) + /* Check for error */ + if (ret != DDI_ERROR) { /* Apply the coordinate transformation on the rects */ if (XFORMOBJ_bApplyXform(&xo,

1 0

[tkreuzer] 65381: [GDI32_APITEST] Fix build
by tkreuzer＠svn.reactos.org 12 Nov '14

12 Nov '14

Author: tkreuzer Date: Wed Nov 12 09:58:45 2014 New Revision: 65381 URL: http://svn.reactos.org/svn/reactos?rev=65381&view=rev Log: [GDI32_APITEST] Fix build Modified: trunk/rostests/apitests/gdi32/ExtCreateRegion.c Modified: trunk/rostests/apitests/gdi32/ExtCreateRegion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateR… ============================================================================== --- trunk/rostests/apitests/gdi32/ExtCreateRegion.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/ExtCreateRegion.c [iso-8859-1] Wed Nov 12 09:58:45 2014 @@ -40,7 +40,7 @@ do { \ ok(((prect)->left == _left) && ((prect)->top == _top) && \ ((prect)->right == _right) && ((prect)->bottom == _bottom), \ - "Region does not match, expected (%ld,%ld,%ld,%ld) got (%ld,%ld,%ld,%ld)\n", \ + "Region does not match, expected (%d,%d,%d,%d) got (%ld,%ld,%ld,%ld)\n", \ _left, _top, _right, _bottom, \ (prect)->left, (prect)->top, (prect)->right, (prect)->bottom); \ } while (0)

1 0

[tkreuzer] 65380: [GDI32_APITEST] Add tests for ExtCreateRegion
by tkreuzer＠svn.reactos.org 12 Nov '14

12 Nov '14

Author: tkreuzer Date: Wed Nov 12 09:49:32 2014 New Revision: 65380 URL: http://svn.reactos.org/svn/reactos?rev=65380&view=rev Log: [GDI32_APITEST] Add tests for ExtCreateRegion Added: trunk/rostests/apitests/gdi32/ExtCreateRegion.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Wed Nov 12 09:49:32 2014 @@ -25,6 +25,7 @@ EnumFontFamilies.c ExcludeClipRect.c ExtCreatePen.c + ExtCreateRegion.c GdiConvertBitmap.c GdiConvertBrush.c GdiConvertDC.c Added: trunk/rostests/apitests/gdi32/ExtCreateRegion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateR… ============================================================================== --- trunk/rostests/apitests/gdi32/ExtCreateRegion.c (added) +++ trunk/rostests/apitests/gdi32/ExtCreateRegion.c [iso-8859-1] Wed Nov 12 09:49:32 2014 @@ -0,0 +1,129 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ExtCeateRegion + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> + +#include <windows.h> +#include <math.h> + +VOID +InitXFORM( + PXFORM pxform, + FLOAT eM11, + FLOAT eM12, + FLOAT eM21, + FLOAT eM22, + FLOAT eDx, + FLOAT eDy) +{ + pxform->eM11 = eM11; + pxform->eM12 = eM12; + pxform->eM21 = eM21; + pxform->eM22 = eM22; + pxform->eDx = eDx; + pxform->eDy = eDy; +} + +#if 0 +void Test_ExtCreateRegion_Parameters() +{ + hrgn = ExtCreateRegion(NULL, 1, pRgnData); + ok(hrgn != NULL, "ExtCreateRegion failed \n"); +} +#endif // 0 + +#define CheckRect(prect, _left, _top, _right, _bottom) \ +do { \ + ok(((prect)->left == _left) && ((prect)->top == _top) && \ + ((prect)->right == _right) && ((prect)->bottom == _bottom), \ + "Region does not match, expected (%ld,%ld,%ld,%ld) got (%ld,%ld,%ld,%ld)\n", \ + _left, _top, _right, _bottom, \ + (prect)->left, (prect)->top, (prect)->right, (prect)->bottom); \ +} while (0) + +#define CheckRectRegion(hrgn, _left, _top, _right, _bottom) \ +do { \ + HRGN hrgnTemp = CreateRectRgn(_left, _top, _right, _bottom); \ + RECT rcTemp; \ + ok(GetRgnBox(hrgn, &rcTemp) == SIMPLEREGION, "Region is not SIMPLEREGION\n"); \ + CheckRect(&rcTemp, _left, _top, _right, _bottom); \ + ok(EqualRgn(hrgn, hrgnTemp), "Region does not match\n"); \ + DeleteObject(hrgnTemp); \ +} while (0) + +void Test_ExtCreateRegion_Transform() +{ + struct + { + RGNDATA rgndata; + CHAR data[sizeof(RECT) - 1]; + } RgnDataBuffer; + PRECT prect = (PRECT)&RgnDataBuffer.rgndata.Buffer; + const RGNDATA *pRgnData = (const RGNDATA *)&RgnDataBuffer; + XFORM xform; + FLOAT eAngle; + HRGN hrgn; + RECT rcTemp; + + RgnDataBuffer.rgndata.rdh.dwSize = sizeof(RGNDATAHEADER); + RgnDataBuffer.rgndata.rdh.iType = RDH_RECTANGLES; + RgnDataBuffer.rgndata.rdh.nCount = 1; + RgnDataBuffer.rgndata.rdh.nRgnSize = sizeof(RGNDATAHEADER) + sizeof(RECT); + RgnDataBuffer.rgndata.rdh.rcBound.left = 0; + RgnDataBuffer.rgndata.rdh.rcBound.top = 0; + RgnDataBuffer.rgndata.rdh.rcBound.right = 10; + RgnDataBuffer.rgndata.rdh.rcBound.bottom = 10; + prect->left = 0; + prect->top = 0; + prect->right = 10; + prect->bottom = 10; + + SetRectEmpty(&RgnDataBuffer.rgndata.rdh.rcBound); + + hrgn = ExtCreateRegion(NULL, sizeof(RgnDataBuffer), pRgnData); + ok(hrgn != NULL, "ExtCreateRegion failed with without transform\n"); + CheckRectRegion(hrgn, 0, 0, 10, 10); + + InitXFORM(&xform, 1., 0., 0., 1., 0., 0.); + hrgn = ExtCreateRegion(&xform, sizeof(RgnDataBuffer), pRgnData); + ok(hrgn != NULL, "ExtCreateRegion failed with identity transform\n"); + CheckRectRegion(hrgn, 0, 0, 10, 10); + + InitXFORM(&xform, 1., 0., 0., 1., 10., 10.); + hrgn = ExtCreateRegion(&xform, sizeof(RgnDataBuffer), pRgnData); + ok(hrgn != NULL, "ExtCreateRegion failed with offset transform\n"); + CheckRectRegion(hrgn, 10, 10, 20, 20); + + InitXFORM(&xform, 2.5, 0., 0., 1.5, 0., 0.); + hrgn = ExtCreateRegion(&xform, sizeof(RgnDataBuffer), pRgnData); + ok(hrgn != NULL, "ExtCreateRegion failed with scaling transform\n"); + CheckRectRegion(hrgn, 0, 0, 25, 15); + + InitXFORM(&xform, 2.5, 0., 0., 1.5, 20., 40.); + hrgn = ExtCreateRegion(&xform, sizeof(RgnDataBuffer), pRgnData); + ok(hrgn != NULL, "ExtCreateRegion failed with scaling+offset transform\n"); + CheckRectRegion(hrgn, 20, 40, 45, 55); + + InitXFORM(&xform, 1., 10., 0., 1., 0., 0.); + hrgn = ExtCreateRegion(&xform, sizeof(RgnDataBuffer), pRgnData); + ok(hrgn != NULL, "ExtCreateRegion failed with shearing transform\n"); + ok(GetRgnBox(hrgn, &rcTemp) == COMPLEXREGION, "not a complex region\n"); + CheckRect(&rcTemp, 0, 1, 10, 101); + + eAngle = 23.6f; + InitXFORM(&xform, cosf(eAngle), -sinf(eAngle), sinf(eAngle), cosf(eAngle), 10., 10.); + hrgn = ExtCreateRegion(&xform, sizeof(RgnDataBuffer), pRgnData); + ok(hrgn != NULL, "ExtCreateRegion failed with rotating transform\n"); + CheckRectRegion(hrgn, 0, 10, 10, 20); + +} + +START_TEST(ExtCreateRegion) +{ + Test_ExtCreateRegion_Transform(); +} + Propchange: trunk/rostests/apitests/gdi32/ExtCreateRegion.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Wed Nov 12 09:49:32 2014 @@ -26,6 +26,7 @@ extern void func_EnumFontFamilies(void); extern void func_ExcludeClipRect(void); extern void func_ExtCreatePen(void); +extern void func_ExtCreateRegion(void); extern void func_GdiConvertBitmap(void); extern void func_GdiConvertBrush(void); extern void func_GdiConvertDC(void); @@ -89,6 +90,7 @@ { "EnumFontFamilies", func_EnumFontFamilies }, { "ExcludeClipRect", func_ExcludeClipRect }, { "ExtCreatePen", func_ExtCreatePen }, + { "ExtCreateRegion", func_ExtCreateRegion }, { "GdiConvertBitmap", func_GdiConvertBitmap }, { "GdiConvertBrush", func_GdiConvertBrush }, { "GdiConvertDC", func_GdiConvertDC },

1 0

[hbelusca] 65379: [NTVDM] - Store in bit 7 of Bda->VGAOptions (40:87) whether we needed to clear video memory (or not) when changing the video mode. - When retrieving the current video mode, set th...
by hbelusca＠svn.reactos.org 11 Nov '14

11 Nov '14

Author: hbelusca Date: Tue Nov 11 18:44:03 2014 New Revision: 65379 URL: http://svn.reactos.org/svn/reactos?rev=65379&view=rev Log: [NTVDM] - Store in bit 7 of Bda->VGAOptions (40:87) whether we needed to clear video memory (or not) when changing the video mode. - When retrieving the current video mode, set this bit 7 as required. - Improve a bit the DPRINT of VidBiosSetVideoMode for diagnostic purposes. - Remove the temporary "fix" (read: hack, and it broke some apps) from r65015 / r65018 : I'm working on a real fix. - Rework some subfunctions of the INT 10h, AH=11h function (font generator). - Fix reporting "256 kb video memory" in the Bda->VGAOptions flag. Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Tue Nov 11 18:44:03 2014 @@ -2289,7 +2289,8 @@ BYTE VidBiosGetVideoMode(VOID) { - return Bda->VideoMode; + /* Bit 7 of VideoMode is determined by bit 7 of VGAOptions */ + return Bda->VideoMode | (Bda->VGAOptions & 0x80); } static BOOLEAN VidBiosSetVideoMode(BYTE ModeNumber) @@ -2297,6 +2298,8 @@ BYTE Page; COORD Resolution; PVGA_REGISTERS VgaMode; + + BYTE OrgModeNumber = ModeNumber; /* * IBM standard modes do not clear the screen if the @@ -2315,18 +2318,10 @@ return FALSE; } - /* Check if this is the current mode */ - if (ModeNumber == Bda->VideoMode) - { - /* Just clear the VGA memory if needed */ - if (!DoNotClear) VgaClearMemory(); - return TRUE; - } - VgaMode = VideoModes[ModeNumber]; - DPRINT1("Switching to mode %02Xh %s clearing the screen; VgaMode = 0x%p\n", - ModeNumber, (DoNotClear ? "without" : "and"), VgaMode); + DPRINT1("Switching to mode %02Xh (%02Xh) %s clearing the screen; VgaMode = 0x%p\n", + ModeNumber, OrgModeNumber, (DoNotClear ? "without" : "and"), VgaMode); if (!VgaSetRegisters(VgaMode)) return FALSE; @@ -2345,6 +2340,9 @@ Bda->VideoPageSize = VideoModePageSize[ModeNumber]; Bda->VideoPage = 0; Bda->VideoPageOffset = Bda->VideoPage * Bda->VideoPageSize; + + /* 256 KB Video RAM; set bit 7 if we do not clear the screen */ + Bda->VGAOptions = 0x60 | (DoNotClear ? 0x80 : 0x00); /* Set the start address in the CRTC */ IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_LOW_REG); @@ -2738,8 +2736,8 @@ /* Get Current Video Mode */ case 0x0F: { - setAX(MAKEWORD(Bda->VideoMode, Bda->ScreenColumns)); - setBX(MAKEWORD(getBL(), Bda->VideoPage)); + setAX(MAKEWORD(VidBiosGetVideoMode(), Bda->ScreenColumns)); + setBH(Bda->VideoPage); break; } @@ -2939,23 +2937,100 @@ { switch (getAL()) { + /* Set User 8x8 Graphics Chars (Setup INT 1Fh Vector) */ + case 0x20: + { + /* Update the BIOS INT 1Fh vector to user-defined ES:BP pointer */ + // Far pointer to the 8x8 characters 80h-FFh + ((PULONG)BaseAddress)[0x1F] = MAKELONG(getBP(), getES()); + break; + } + + /* Setup ROM 8x8 Font for Graphics Mode */ + case 0x23: + { + // FIXME: Use BL and DL for the number of screen rows + + /* Write the default font to the VGA font plane */ + VgaWriteFont(0, Font8x8, sizeof(Font8x8)/sizeof(Font8x8[0]) / VGA_FONT_CHARACTERS); + + /* Update the BIOS INT 43h vector */ + // Far pointer to the 8x8 characters 00h-... + ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x8_OFFSET, VIDEO_BIOS_DATA_SEG); + + break; + } + + /* Setup ROM 8x16 Font for Graphics Mode */ + case 0x24: + { + // FIXME: Use BL and DL for the number of screen rows + + /* Write the default font to the VGA font plane */ + VgaWriteFont(0, Font8x16, sizeof(Font8x16)/sizeof(Font8x16[0]) / VGA_FONT_CHARACTERS); + + /* Update the BIOS INT 43h vector */ + // Far pointer to the 8x16 characters 00h-... + ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x16_OFFSET, VIDEO_BIOS_DATA_SEG); + + break; + } + + /* Get Current Character Font Information */ case 0x30: { - USHORT Offsets[] = + ULONG Address = (ULONG)NULL; + + switch (getBH()) { - FONT_8x8_HIGH_OFFSET, /* 00h - INT 0x1F pointer */ - 0, /* 01h - NOT IMPLEMENTED - INT 0x43 pointer */ - FONT_8x14_OFFSET, /* 02h - NOT IMPLEMENTED - 8x14 font */ - FONT_8x8_OFFSET, /* 03h - 8x8 font */ - FONT_8x8_HIGH_OFFSET, /* 04h - 8x8 font, upper half */ - 0, /* 05h - NOT IMPLEMENTED - 9x14 font */ - FONT_8x16_OFFSET, /* 06h - 8x16 font */ - 0, /* 07h - NOT IMPLEMENTED - 9x16 font */ - }; + /* 00h - INT 0x1F pointer */ + case 0x00: + Address = ((PULONG)BaseAddress)[0x1F]; + break; + + /* 01h - INT 0x43 pointer */ + case 0x01: + Address = ((PULONG)BaseAddress)[0x43]; + break; + + /* 02h - 8x14 font */ + case 0x02: + Address = MAKELONG(FONT_8x14_OFFSET, VIDEO_BIOS_DATA_SEG); + break; + + /* 03h - 8x8 font */ + case 0x03: + Address = MAKELONG(FONT_8x8_OFFSET, VIDEO_BIOS_DATA_SEG); + break; + + /* 04h - 8x8 font, upper half */ + case 0x04: + Address = MAKELONG(FONT_8x8_HIGH_OFFSET, VIDEO_BIOS_DATA_SEG); + break; + + /* 05h - NOT IMPLEMENTED - 9x14 font */ + case 0x05: + break; + + /* 06h - 8x16 font */ + case 0x06: + Address = MAKELONG(FONT_8x16_OFFSET, VIDEO_BIOS_DATA_SEG); + break; + + /* 07h - NOT IMPLEMENTED - 9x16 font */ + case 0x07: + break; + + default: + DPRINT1("INT 10h, AL=30h Function BH = 0x%02X NOT IMPLEMENTED\n", + getBH()); + } /* Return the data */ - setES(VIDEO_BIOS_DATA_SEG); - setBP(Offsets[getBH() & 7]); + setES(HIWORD(Address)); + setBP(LOWORD(Address)); + setCX(Bda->CharacterHeight); + setDL(Bda->ScreenRows); break; } @@ -3045,27 +3120,27 @@ { /* Some interrupts are in fact addresses to tables */ ((PULONG)BaseAddress)[0x1D] = (ULONG)NULL; + // Far pointer to the 8x8 characters 80h-FFh ((PULONG)BaseAddress)[0x1F] = MAKELONG(FONT_8x8_HIGH_OFFSET, VIDEO_BIOS_DATA_SEG); // ((PULONG)BaseAddress)[0x42] = (ULONG)NULL; - ((PULONG)BaseAddress)[0x43] = (ULONG)NULL; + // Far pointer to the 8x16 characters 00h-... + ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x16_OFFSET, VIDEO_BIOS_DATA_SEG); ((PULONG)BaseAddress)[0x44] = (ULONG)NULL; + // ((PULONG)BaseAddress)[0x6D] = (ULONG)NULL; /* Fill the tables */ RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x8_OFFSET), - Font8x8, - sizeof(Font8x8)); + Font8x8, sizeof(Font8x8)); RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x16_OFFSET), - Font8x16, - sizeof(Font8x16)); + Font8x16, sizeof(Font8x16)); RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x14_OFFSET), - Font8x14, - sizeof(Font8x14)); + Font8x14, sizeof(Font8x14)); /* Write the default font to the VGA font plane */ - VgaWriteFont(0, Font8x16, 16); + VgaWriteFont(0, Font8x16, sizeof(Font8x16)/sizeof(Font8x16[0]) / VGA_FONT_CHARACTERS); /* Initialize the VGA BDA data */ - Bda->VGAOptions = 0x30; /* 256 KB Video RAM */ + Bda->VGAOptions = 0x60; /* 256 KB Video RAM */ Bda->VGASwitches = 0x09; /* High-resolution */ //

1 0

[spetreolle] 65378: [ADVAPI_WINETEST] Make peace^W tests, not war.☮ Wave a hello to sysreg so that it doesn't kill us. ROSTESTS-56
by spetreolle＠svn.reactos.org 11 Nov '14

11 Nov '14

Author: spetreolle Date: Tue Nov 11 16:12:14 2014 New Revision: 65378 URL: http://svn.reactos.org/svn/reactos?rev=65378&view=rev Log: [ADVAPI_WINETEST] Make peace^W tests, not war.☮ Wave a hello to sysreg so that it doesn't kill us. ROSTESTS-56 Modified: trunk/rostests/winetests/advapi32/service.c Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… ============================================================================== --- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Tue Nov 11 16:12:14 2014 @@ -2166,6 +2166,9 @@ DWORD le1, le2; SERVICE_STATUS status; +#ifdef __REACTOS__ + fprintf(stdout, "ROSTESTS-56: Hello sysreg, I am awake\n"); +#endif ret = StartServiceA(svc_handle, 0, NULL); le1 = GetLastError(); ok(!ret, "%s: StartServiceA() should have failed\n", name); @@ -2260,12 +2263,6 @@ * insanely long timeout: 120s. So skip the rest of the tests. */ win_skip("Skip some service start/stop tests on NT4\n"); - goto cleanup; - } - - if (!winetest_interactive) - { - skip("ROSTESTS-56: Skipping service start timeout tests!\n"); goto cleanup; }

1 0

[hbelusca] 65377: [NTVDM]: Make static some variables, fix IRQ1/12 timing, use NT QueryPerformanceCounter API instead of its Win32 part and move the "while (VdmRunning && CpuRunning)" loop into Clo...
by hbelusca＠svn.reactos.org 11 Nov '14

11 Nov '14

Author: hbelusca Date: Tue Nov 11 15:49:56 2014 New Revision: 65377 URL: http://svn.reactos.org/svn/reactos?rev=65377&view=rev Log: [NTVDM]: Make static some variables, fix IRQ1/12 timing, use NT QueryPerformanceCounter API instead of its Win32 part and move the "while (VdmRunning && CpuRunning)" loop into ClockUpdate. Modified: trunk/reactos/subsystems/ntvdm/clock.c Modified: trunk/reactos/subsystems/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/clock.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/clock.c [iso-8859-1] Tue Nov 11 15:49:56 2014 @@ -21,6 +21,9 @@ #include "hardware/timer.h" #include "hardware/vga.h" +/* Extra PSDK/NDK Headers */ +#include <ndk/kefuncs.h> + /* DEFINES ********************************************************************/ /* @@ -43,20 +46,19 @@ /* VARIABLES ******************************************************************/ -LARGE_INTEGER StartPerfCount, Frequency; +static LARGE_INTEGER StartPerfCount, Frequency; -LARGE_INTEGER LastTimerTick, LastRtcTick, Counter; -LONGLONG TimerTicks; -DWORD StartTickCount, CurrentTickCount; -DWORD LastClockUpdate; -DWORD LastVerticalRefresh; +static LARGE_INTEGER LastTimerTick, LastRtcTick, Counter; +static LONGLONG TimerTicks; +static DWORD StartTickCount, CurrentTickCount; +static DWORD LastClockUpdate; +static DWORD LastVerticalRefresh; -UINT Irq1Counter = 0; -UINT Irq12Counter = 0; +static DWORD LastIrq1Tick = 0, LastIrq12Tick = 0; #ifdef IPS_DISPLAY - DWORD LastCyclePrintout; - ULONGLONG Cycles = 0; + static DWORD LastCyclePrintout; + static ULONGLONG Cycles = 0; #endif /* PUBLIC FUNCTIONS ***********************************************************/ @@ -65,11 +67,20 @@ { extern BOOLEAN CpuRunning; UINT i; + // LARGE_INTEGER Counter; #ifdef WORKING_TIMER - DWORD PitResolution = PitGetResolution(); + DWORD PitResolution; #endif - DWORD RtcFrequency = RtcGetTicksPerSecond(); + DWORD RtcFrequency; + + while (VdmRunning && CpuRunning) + { + +#ifdef WORKING_TIMER + PitResolution = PitGetResolution(); +#endif + RtcFrequency = RtcGetTicksPerSecond(); /* Get the current number of ticks */ CurrentTickCount = GetTickCount(); @@ -86,7 +97,9 @@ #endif { /* Get the current performance counter value */ - QueryPerformanceCounter(&Counter); + /// DWORD_PTR oldmask = SetThreadAffinityMask(GetCurrentThread(), 0); + NtQueryPerformanceCounter(&Counter, NULL); + /// SetThreadAffinityMask(GetCurrentThread(), oldmask); } /* Get the number of PIT ticks that have passed */ @@ -122,16 +135,16 @@ LastVerticalRefresh = CurrentTickCount; } - if (++Irq1Counter == IRQ1_CYCLES) + if ((CurrentTickCount - LastIrq1Tick) >= IRQ1_CYCLES) { GenerateIrq1(); - Irq1Counter = 0; + LastIrq1Tick = CurrentTickCount; } - if (++Irq12Counter == IRQ12_CYCLES) + if ((CurrentTickCount - LastIrq12Tick) >= IRQ12_CYCLES) { GenerateIrq12(); - Irq12Counter = 0; + LastIrq12Tick = CurrentTickCount; } /* Horizontal retrace occurs as fast as possible */ @@ -154,20 +167,23 @@ Cycles = 0; } #endif + + } } BOOLEAN ClockInitialize(VOID) { /* Initialize the performance counter (needed for hardware timers) */ - if (!QueryPerformanceFrequency(&Frequency)) + /* Find the starting performance */ + NtQueryPerformanceCounter(&StartPerfCount, &Frequency); + if (Frequency.QuadPart == 0) { wprintf(L"FATAL: Performance counter not available\n"); return FALSE; } - /* Find the starting performance and tick count */ + /* Find the starting tick count */ StartTickCount = GetTickCount(); - QueryPerformanceCounter(&StartPerfCount); /* Set the different last counts to the starting count */ LastClockUpdate = LastVerticalRefresh =

1 0

[jgardou] 65376: [TCPIP] - Properly return STATUS_BUFFER_OVERFLOW if the provided buffer is too small when receiving a datagram. - Do not skip the IP header for raw IP packets (application do in fa...
by jgardou＠svn.reactos.org 11 Nov '14

11 Nov '14

Author: jgardou Date: Tue Nov 11 10:41:23 2014 New Revision: 65376 URL: http://svn.reactos.org/svn/reactos?rev=65376&view=rev Log: [TCPIP] - Properly return STATUS_BUFFER_OVERFLOW if the provided buffer is too small when receiving a datagram. - Do not skip the IP header for raw IP packets (application do in fact require it) - Only pass ICMP echo reply packets to callers, the rest is processed by lwip. 'ping 127.0.0.1' now properly works. Modified: branches/tcpip_revolution/drivers/network/tcpip/address.c branches/tcpip_revolution/drivers/network/tcpip/precomp.h Modified: branches/tcpip_revolution/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/tcpip_revolution/drivers/networ… ============================================================================== --- branches/tcpip_revolution/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/tcpip_revolution/drivers/network/tcpip/address.c [iso-8859-1] Tue Nov 11 10:41:23 2014 @@ -48,13 +48,15 @@ ADDRESS_FILE* AddressFile, struct pbuf *p, ip_addr_t *addr, - u16_t port, - BOOLEAN MustFree) + u16_t port) { KIRQL OldIrql; LIST_ENTRY* ListEntry; RECEIVE_DATAGRAM_REQUEST* Request; ip_addr_t RequestAddr; + BOOLEAN Result = FALSE; + + NT_ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); DPRINT1("Receiving datagram for addr 0x%08x on port %u.\n", ip4_addr_get_u32(addr), port); @@ -84,6 +86,7 @@ /* We found a request for this one */ IoSetCancelRoutine(Irp, NULL); RemoveEntryList(&Request->ListEntry); + Result = TRUE; KeReleaseSpinLockFromDpcLevel(&AddressFile->RequestLock); IoReleaseCancelSpinLock(OldIrql); @@ -94,7 +97,7 @@ p, Request->Buffer, Request->BufferLength, - AddressFile->Protocol == IPPROTO_UDP ? 0 : IP_HLEN); + 0); ReturnAddress = Request->ReturnInfo->RemoteAddress; ReturnAddress->Address->AddressLength = TDI_ADDRESS_LENGTH_IP; ReturnAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; @@ -103,22 +106,24 @@ RtlZeroMemory(ReturnAddress->Address->Address->sin_zero, sizeof(ReturnAddress->Address->Address->sin_zero)); - Irp->IoStatus.Status = STATUS_SUCCESS; + if (Request->BufferLength < p->tot_len) + Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + else + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); - pbuf_free(p); - - return TRUE; + + /* Start again from the beginning */ + IoAcquireCancelSpinLock(&OldIrql); + KeAcquireSpinLockAtDpcLevel(&AddressFile->RequestLock); } } KeReleaseSpinLockFromDpcLevel(&AddressFile->RequestLock); IoReleaseCancelSpinLock(OldIrql); - if (MustFree) - pbuf_free(p); - - return FALSE; + + return Result; } static @@ -132,7 +137,8 @@ { UNREFERENCED_PARAMETER(pcb); - ReceiveDatagram(arg, p, addr, port, TRUE); + ReceiveDatagram(arg, p, addr, port); + pbuf_free(p); } static @@ -143,9 +149,41 @@ struct pbuf *p, ip_addr_t *addr) { + BOOLEAN Result; + ADDRESS_FILE* AddressFile = arg; + UNREFERENCED_PARAMETER(pcb); - return ReceiveDatagram(arg, p, addr, 0, FALSE); + /* If this is for ICMP, only process the "echo received" packets. + * The rest is processed by lwip. */ + if (AddressFile->Protocol == IPPROTO_ICMP) + { + /* See icmp_input */ + s16_t hlen; + struct ip_hdr *iphdr; + + iphdr = (struct ip_hdr *)p->payload; + hlen = IPH_HL(iphdr) * 4; + + /* Adjust the pbuf to skip the IP header */ + if (pbuf_header(p, -hlen)) + return FALSE; + + if (*((u8_t*)p->payload) != ICMP_ER) + { + pbuf_header(p, hlen); + return FALSE; + } + + pbuf_header(p, hlen); + } + + Result = ReceiveDatagram(arg, p, addr, 0); + + if (Result) + pbuf_free(p); + + return Result; } NTSTATUS @@ -246,7 +284,7 @@ KeInitializeSpinLock(&AddressFile->RequestLock); InitializeListHead(&AddressFile->RequestListHead); - /* Give it an entity ID and open a PCB is needed. */ + /* Give it an entity ID and open a PCB if needed. */ switch (Protocol) { case IPPROTO_TCP: @@ -314,11 +352,18 @@ return STATUS_SUCCESS; } + /* remove the lwip pcb */ + if (AddressFile->Protocol == IPPROTO_UDP) + udp_remove(AddressFile->lwip_udp_pcb); + else if (AddressFile->Protocol != IPPROTO_TCP) + raw_remove(AddressFile->lwip_raw_pcb); + /* Remove from the list and free the structure */ RemoveEntryList(&AddressFile->ListEntry); KeReleaseSpinLock(&AddressListLock, OldIrql); RemoveEntityInstance(&AddressFile->Instance); + ExFreePoolWithTag(AddressFile, TAG_ADDRESS_FILE); @@ -363,8 +408,8 @@ PIO_STACK_LOCATION IrpSp; ADDRESS_FILE* AddressFile; RECEIVE_DATAGRAM_REQUEST* Request; + LIST_ENTRY* ListEntry; KIRQL OldIrql; - LIST_ENTRY* ListEntry; IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -448,6 +493,9 @@ if (!NT_SUCCESS(Status)) goto Failure; } + + DPRINT1("Queuing datagram receive on address 0x%08x, port %u.\n", + Request->RemoteAddress.in_addr, Request->RemoteAddress.sin_port); /* Get the buffer */ Request->Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); @@ -535,6 +583,8 @@ Port = 0; } + DPRINT1("Sending datagram to address 0x%08x, port %u\n", ip4_addr_get_u32(&IpAddr), Port); + /* Get the buffer */ Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); BufferLength = MmGetMdlByteCount(Irp->MdlAddress); Modified: branches/tcpip_revolution/drivers/network/tcpip/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/tcpip_revolution/drivers/networ… ============================================================================== --- branches/tcpip_revolution/drivers/network/tcpip/precomp.h [iso-8859-1] (original) +++ branches/tcpip_revolution/drivers/network/tcpip/precomp.h [iso-8859-1] Tue Nov 11 10:41:23 2014 @@ -18,10 +18,11 @@ #include <pseh/pseh2.h> +#include <lwip/icmp.h> #include <lwip/ip.h> +#include <lwip/raw.h> +#include <lwip/snmp.h> #include <lwip/tcpip.h> -#include <lwip/snmp.h> -#include <lwip/raw.h> #include <lwip/udp.h> #include <netif/etharp.h>

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