Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 59709: [TCPIP] - Disable object logging now that all the deadlocks, leaks, double-frees, and use-after-frees visible in our test suite are fixed in TCP/IP
by cgutman＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: cgutman Date: Mon Aug 12 06:46:06 2013 New Revision: 59709 URL: http://svn.reactos.org/svn/reactos?rev=59709&view=rev Log: [TCPIP] - Disable object logging now that all the deadlocks, leaks, double-frees, and use-after-frees visible in our test suite are fixed in TCP/IP Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Mon Aug 12 06:46:06 2013 @@ -11,7 +11,7 @@ #include "precomp.h" /* Uncomment for logging of connections and address files every 10 seconds */ -#define LOG_OBJECTS +//#define LOG_OBJECTS /* List of all address file objects managed by this driver */ LIST_ENTRY AddressFileListHead;

1 0

[cgutman] 59708: [IP] - Fix a nasty bug preventing any of the non-default interface's NCEs from being selected - Fix a bug preventing loopback NCEs from being found (fixes hang in ws2_32:sock winet...
by cgutman＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: cgutman Date: Mon Aug 12 06:00:06 2013 New Revision: 59708 URL: http://svn.reactos.org/svn/reactos?rev=59708&view=rev Log: [IP] - Fix a nasty bug preventing any of the non-default interface's NCEs from being selected - Fix a bug preventing loopback NCEs from being found (fixes hang in ws2_32:sock winetest) Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Mon Aug 12 06:00:06 2013 @@ -444,8 +444,6 @@ TcpipAcquireSpinLock(&NeighborCache[HashValue].Lock, &OldIrql); - NCE = NeighborCache[HashValue].Cache; - /* If there's no adapter specified, we'll look for a match on * each one. */ if (Interface == NULL) @@ -460,6 +458,7 @@ do { + NCE = NeighborCache[HashValue].Cache; while (NCE != NULL) { if (NCE->Interface == Interface && @@ -476,6 +475,21 @@ } while ((FirstInterface != NULL) && ((Interface = GetDefaultInterface()) != FirstInterface)); + + if ((NCE == NULL) && (FirstInterface != NULL)) + { + /* This time we'll even match loopback NCEs */ + NCE = NeighborCache[HashValue].Cache; + while (NCE != NULL) + { + if (AddrIsEqual(Address, &NCE->Address)) + { + break; + } + + NCE = NCE->Next; + } + } TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql);

1 0

[cgutman] 59707: [LWIP] - Indicate the graceful close before calling the FIN event handler
by cgutman＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: cgutman Date: Mon Aug 12 04:58:22 2013 New Revision: 59707 URL: http://svn.reactos.org/svn/reactos?rev=59707&view=rev Log: [LWIP] - Indicate the graceful close before calling the FIN event handler Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Aug 12 04:58:22 2013 @@ -251,12 +251,15 @@ { Connection->SocketContext = NULL; tcp_arg(pcb, NULL); - TCPFinEventHandler(Connection, ERR_OK); } - else + + /* Indicate the graceful close event */ + TCPRecvEventHandler(arg); + + /* If the PCB is gone, clean up the connection */ + if (Connection->SendShutdown) { - /* Remotely initiated close */ - TCPRecvEventHandler(arg); + TCPFinEventHandler(Connection, ERR_CLSD); } }

1 0

[cgutman] 59706: [LWIP] - Ensure that the connection failure gets delivered if the socket is not yet ready to receive or has shutdown receive
by cgutman＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: cgutman Date: Mon Aug 12 04:08:20 2013 New Revision: 59706 URL: http://svn.reactos.org/svn/reactos?rev=59706&view=rev Log: [LWIP] - Ensure that the connection failure gets delivered if the socket is not yet ready to receive or has shutdown receive Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Mon Aug 12 04:08:20 2013 @@ -264,11 +264,9 @@ const NTSTATUS Status = TCPTranslateError(err); KIRQL OldIrql; + ASSERT(Connection->SocketContext == NULL); ASSERT(Connection->AddressFile); ASSERT(err != ERR_OK); - - /* First off all, remove the PCB pointer */ - Connection->SocketContext = NULL; /* Complete all outstanding requests now */ FlushAllQueues(Connection, Status); Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Aug 12 04:08:20 2013 @@ -251,10 +251,13 @@ { Connection->SocketContext = NULL; tcp_arg(pcb, NULL); + TCPFinEventHandler(Connection, ERR_OK); } - - /* Remotely initiated close */ - TCPRecvEventHandler(arg); + else + { + /* Remotely initiated close */ + TCPRecvEventHandler(arg); + } } return ERR_OK; @@ -299,16 +302,18 @@ PCONNECTION_ENDPOINT Connection = arg; /* Make sure the socket didn't get closed */ - if (!arg) return; + if (!arg || Connection->SocketContext == NULL) return; /* The PCB is dead now */ Connection->SocketContext = NULL; - /* Defer the error delivery until all data is gone */ + /* Give them one shot to receive the remaining data */ Connection->ReceiveShutdown = TRUE; Connection->ReceiveShutdownStatus = TCPTranslateError(err); - - TCPRecvEventHandler(arg); + TCPRecvEventHandler(Connection); + + /* Terminate the connection */ + TCPFinEventHandler(Connection, err); } static @@ -663,6 +668,7 @@ /* The PCB is not ours anymore */ msg->Input.Shutdown.Connection->SocketContext = NULL; tcp_arg(pcb, NULL); + TCPFinEventHandler(msg->Input.Shutdown.Connection, ERR_CLSD); } } @@ -724,8 +730,6 @@ /* Check if the PCB was already "closed" but the client doesn't know it yet */ if (!msg->Input.Close.Connection->SocketContext) { - if (msg->Input.Close.Callback) - TCPFinEventHandler(msg->Input.Close.Connection, ERR_CLSD); msg->Output.Close.Error = ERR_OK; goto done; }

1 0

[cgutman] 59705: [TCPIP] - Add logging of address files and connections (on temporarily for testing changes) [LWIP] - Drastically simplify the closing state machine - All connection objects (and as...
by cgutman＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: cgutman Date: Mon Aug 12 03:09:28 2013 New Revision: 59705 URL: http://svn.reactos.org/svn/reactos?rev=59705&view=rev Log: [TCPIP] - Add logging of address files and connections (on temporarily for testing changes) [LWIP] - Drastically simplify the closing state machine - All connection objects (and as a result address files too) are now getting properly reaped now - Tested with Firefox and Abyss Web Server Modified: trunk/reactos/drivers/network/tcpip/include/fileobjs.h trunk/reactos/drivers/network/tcpip/include/tcp.h trunk/reactos/drivers/network/tcpip/include/titypes.h trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/fileobjs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/fileobjs.h [iso-8859-1] Mon Aug 12 03:09:28 2013 @@ -35,4 +35,6 @@ NTSTATUS FileCloseControlChannel( PTDI_REQUEST Request); +VOID LogActiveObjects(VOID); + /* EOF */ Modified: trunk/reactos/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] Mon Aug 12 03:09:28 2013 @@ -211,3 +211,6 @@ FlushAllQueues(PCONNECTION_ENDPOINT Connection, NTSTATUS Status); VOID CompleteBucket(PCONNECTION_ENDPOINT Connection, PTDI_BUCKET Bucket, const BOOLEAN Synchronous); + +void +LibTCPDumpPcb(PVOID SocketContext); Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] Mon Aug 12 03:09:28 2013 @@ -281,6 +281,7 @@ BOOLEAN SendShutdown; BOOLEAN ReceiveShutdown; NTSTATUS ReceiveShutdownStatus; + BOOLEAN Closing; struct _CONNECTION_ENDPOINT *Next; /* Next connection in address file list */ } CONNECTION_ENDPOINT, *PCONNECTION_ENDPOINT; Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Mon Aug 12 03:09:28 2013 @@ -10,6 +10,8 @@ #include "precomp.h" +/* Uncomment for logging of connections and address files every 10 seconds */ +#define LOG_OBJECTS /* List of all address file objects managed by this driver */ LIST_ENTRY AddressFileListHead; @@ -97,6 +99,88 @@ } return FALSE; +} + +VOID +LogActiveObjects(VOID) +{ +#ifdef LOG_OBJECTS + PLIST_ENTRY CurrentEntry; + KIRQL OldIrql; + PADDRESS_FILE AddrFile; + PCONNECTION_ENDPOINT Conn; + + DbgPrint("----------- TCP/IP Active Object Dump -------------\n"); + + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + + CurrentEntry = AddressFileListHead.Flink; + while (CurrentEntry != &AddressFileListHead) + { + AddrFile = CONTAINING_RECORD(CurrentEntry, ADDRESS_FILE, ListEntry); + + DbgPrint("Address File (%s, %d, %d) @ 0x%p | Ref count: %d | Sharers: %d\n", + A2S(&AddrFile->Address), WN2H(AddrFile->Port), AddrFile->Protocol, + AddrFile, AddrFile->RefCount, AddrFile->Sharers); + DbgPrint("\tListener: "); + if (AddrFile->Listener == NULL) + DbgPrint("<None>\n"); + else + DbgPrint("0x%p\n", AddrFile->Listener); + DbgPrint("\tAssociated endpoints: "); + if (AddrFile->Connection == NULL) + DbgPrint("<None>\n"); + else + { + Conn = AddrFile->Connection; + while (Conn) + { + DbgPrint("0x%p ", Conn); + Conn = Conn->Next; + } + DbgPrint("\n"); + } + + CurrentEntry = CurrentEntry->Flink; + } + + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); + + TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); + + CurrentEntry = ConnectionEndpointListHead.Flink; + while (CurrentEntry != &ConnectionEndpointListHead) + { + Conn = CONTAINING_RECORD(CurrentEntry, CONNECTION_ENDPOINT, ListEntry); + + DbgPrint("Connection @ 0x%p | Ref count: %d\n", Conn, Conn->RefCount); + DbgPrint("\tPCB: "); + if (Conn->SocketContext == NULL) + DbgPrint("<None>\n"); + else + { + DbgPrint("0x%p\n", Conn->SocketContext); + LibTCPDumpPcb(Conn->SocketContext); + } + DbgPrint("\tPacket queue status: %s\n", IsListEmpty(&Conn->PacketQueue) ? "Empty" : "Not Empty"); + DbgPrint("\tRequest lists: Connect: %s | Recv: %s | Send: %s | Shutdown: %s | Listen: %s\n", + IsListEmpty(&Conn->ConnectRequest) ? "Empty" : "Not Empty", + IsListEmpty(&Conn->ReceiveRequest) ? "Empty" : "Not Empty", + IsListEmpty(&Conn->SendRequest) ? "Empty" : "Not Empty", + IsListEmpty(&Conn->ShutdownRequest) ? "Empty" : "Not Empty", + IsListEmpty(&Conn->ListenRequest) ? "Empty" : "Not Empty"); + DbgPrint("\tSend shutdown: %s\n", Conn->SendShutdown ? "Yes" : "No"); + DbgPrint("\tReceive shutdown: %s\n", Conn->ReceiveShutdown ? "Yes" : "No"); + if (Conn->ReceiveShutdown) DbgPrint("\tReceive shutdown status: 0x%x\n", Conn->ReceiveShutdownStatus); + DbgPrint("\tClosing: %s\n", Conn->Closing ? "Yes" : "No"); + + CurrentEntry = CurrentEntry->Flink; + } + + TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); + + DbgPrint("---------------------------------------------------\n"); +#endif } PADDRESS_FILE AddrFindShared( 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 Aug 12 03:09:28 2013 @@ -23,6 +23,8 @@ /* Work around calling timer at Dpc level */ IP_PROTOCOL_HANDLER ProtocolTable[IP_PROTOCOL_TABLE_SIZE]; + +ULONG IpTimerExpirations; VOID TCPRegisterInterface(PIP_INTERFACE IF); @@ -119,9 +121,16 @@ * SystemArgument1 = Unused * SystemArgument2 = Unused * NOTES: - * This routine is dispatched once in a while to do maintainance jobs - */ -{ + * This routine is dispatched once in a while to do maintenance jobs + */ +{ + IpTimerExpirations++; + + if ((IpTimerExpirations % 10) == 0) + { + LogActiveObjects(); + } + /* Check if datagram fragments have taken too long to assemble */ IPDatagramReassemblyTimeout(); Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Aug 12 03:09:28 2013 @@ -35,6 +35,21 @@ /* Required for ERR_T to NTSTATUS translation in receive error handling */ NTSTATUS TCPTranslateError(const err_t err); +void +LibTCPDumpPcb(PVOID SocketContext) +{ + struct tcp_pcb *pcb = (struct tcp_pcb*)SocketContext; + unsigned int addr = ntohl(pcb->remote_ip.addr); + + DbgPrint("\tState: %s\n", tcp_state_str[pcb->state]); + DbgPrint("\tRemote: (%d.%d.%d.%d, %d)\n", + (addr >> 24) & 0xFF, + (addr >> 16) & 0xFF, + (addr >> 8) & 0xFF, + addr & 0xFF, + pcb->remote_port); +} + static void LibTCPEmptyQueue(PCONNECTION_ENDPOINT Connection) @@ -231,18 +246,15 @@ Connection->ReceiveShutdown = TRUE; Connection->ReceiveShutdownStatus = STATUS_SUCCESS; - /* This code path executes for both remotely and locally initiated closures, - * and we need to distinguish between them */ - if (Connection->SocketContext) + /* If we already did a send shutdown, we're in TIME_WAIT so we can't use this PCB anymore */ + if (Connection->SendShutdown) { - /* Remotely initiated close */ - TCPRecvEventHandler(arg); + Connection->SocketContext = NULL; + tcp_arg(pcb, NULL); } - else - { - /* Locally initated close */ - TCPFinEventHandler(arg, ERR_CLSD); - } + + /* Remotely initiated close */ + TCPRecvEventHandler(arg); } return ERR_OK; @@ -285,30 +297,18 @@ InternalErrorEventHandler(void *arg, const err_t err) { PCONNECTION_ENDPOINT Connection = arg; - KIRQL OldIrql; /* Make sure the socket didn't get closed */ if (!arg) return; - /* Check if data is left to be read */ - LockObject(Connection, &OldIrql); - if (IsListEmpty(&Connection->PacketQueue)) - { - UnlockObject(Connection, OldIrql); - - /* Deliver the error now */ - TCPFinEventHandler(arg, err); - } - else - { - UnlockObject(Connection, OldIrql); - - /* Defer the error delivery until all data is gone */ - Connection->ReceiveShutdown = TRUE; - Connection->ReceiveShutdownStatus = TCPTranslateError(err); - - TCPRecvEventHandler(arg); - } + /* The PCB is dead now */ + Connection->SocketContext = NULL; + + /* Defer the error delivery until all data is gone */ + Connection->ReceiveShutdown = TRUE; + Connection->ReceiveShutdownStatus = TCPTranslateError(err); + + TCPRecvEventHandler(arg); } static @@ -633,7 +633,12 @@ goto done; } - /* These need to be called separately, otherwise we get a tcp_close() */ + /* LwIP makes the (questionable) assumption that SHUTDOWN_RDWR is equivalent to tcp_close(). + * This assumption holds even if the shutdown calls are done separately (even through multiple + * WinSock shutdown() calls). This assumption means that lwIP has the right to deallocate our + * PCB without telling us if we shutdown TX and RX. To avoid these problems, we'll clear the + * socket context if we have called shutdown for TX and RX. + */ if (msg->Input.Shutdown.shut_rx) { msg->Output.Shutdown.Error = tcp_shutdown(pcb, TRUE, FALSE); } @@ -651,6 +656,14 @@ if (msg->Input.Shutdown.shut_tx) msg->Input.Shutdown.Connection->SendShutdown = TRUE; + + if (msg->Input.Shutdown.Connection->ReceiveShutdown && + msg->Input.Shutdown.Connection->SendShutdown) + { + /* The PCB is not ours anymore */ + msg->Input.Shutdown.Connection->SocketContext = NULL; + tcp_arg(pcb, NULL); + } } done: @@ -697,37 +710,43 @@ /* Empty the queue even if we're already "closed" */ LibTCPEmptyQueue(msg->Input.Close.Connection); - if (!msg->Input.Close.Connection->SocketContext) + /* Check if we've already been closed */ + if (msg->Input.Close.Connection->Closing) { msg->Output.Close.Error = ERR_OK; goto done; } - /* Clear the PCB pointer */ + /* Enter "closing" mode if we're doing a normal close */ + if (msg->Input.Close.Callback) + msg->Input.Close.Connection->Closing = TRUE; + + /* Check if the PCB was already "closed" but the client doesn't know it yet */ + if (!msg->Input.Close.Connection->SocketContext) + { + if (msg->Input.Close.Callback) + TCPFinEventHandler(msg->Input.Close.Connection, ERR_CLSD); + msg->Output.Close.Error = ERR_OK; + goto done; + } + + /* Clear the PCB pointer and stop callbacks */ msg->Input.Close.Connection->SocketContext = NULL; - - switch (pcb->state) - { - case CLOSED: - case LISTEN: - case SYN_SENT: - msg->Output.Close.Error = tcp_close(pcb); - - if (!msg->Output.Close.Error && msg->Input.Close.Callback) - TCPFinEventHandler(msg->Input.Close.Connection, ERR_CLSD); - break; - - default: - /* Abort the socket */ - tcp_abort(pcb); - msg->Output.Close.Error = ERR_OK; - break; - } + tcp_arg(pcb, NULL); + + /* This may generate additional callbacks but we don't care, + * because they're too inconsistent to rely on */ + msg->Output.Close.Error = tcp_close(pcb); if (msg->Output.Close.Error) { /* Restore the PCB pointer */ msg->Input.Close.Connection->SocketContext = pcb; + msg->Input.Close.Connection->Closing = FALSE; + } + else if (msg->Input.Close.Callback) + { + TCPFinEventHandler(msg->Input.Close.Connection, ERR_CLSD); } done:

1 0

[cgutman] 59704: [CMAKE] - Define i386 on x86 MSVC builds - Probably fixes the infamous MSVC networking issues caused by tcpip.h assuming it was a big-endian platform and never byte-swapping anythi...
by cgutman＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: cgutman Date: Mon Aug 12 01:12:25 2013 New Revision: 59704 URL: http://svn.reactos.org/svn/reactos?rev=59704&view=rev Log: [CMAKE] - Define i386 on x86 MSVC builds - Probably fixes the infamous MSVC networking issues caused by tcpip.h assuming it was a big-endian platform and never byte-swapping anything [TCPIP][LAN] - Fix byteswapping on AMD64 and ARM builds too Modified: trunk/reactos/CMakeLists.txt trunk/reactos/drivers/network/lan/include/net_wh.h trunk/reactos/drivers/network/tcpip/include/tcpip.h Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=59704&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Mon Aug 12 01:12:25 2013 @@ -142,7 +142,7 @@ # Arch Options if(ARCH STREQUAL "i386") - add_definitions(-D_M_IX86 -D_X86_ -D__i386__) + add_definitions(-D_M_IX86 -D_X86_ -D__i386__ -Di386) elseif(ARCH STREQUAL "amd64") add_definitions(-D_M_AMD64 -D_AMD64_ -D__x86_64__ -D_WIN64) elseif(ARCH STREQUAL "arm") Modified: trunk/reactos/drivers/network/lan/include/net_wh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/lan/includ… ============================================================================== --- trunk/reactos/drivers/network/lan/include/net_wh.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/lan/include/net_wh.h [iso-8859-1] Mon Aug 12 01:12:25 2013 @@ -1,6 +1,6 @@ #pragma once -#ifdef i386 +#if defined(i386) || defined(_AMD64_) || defined(_ARM_) /* DWORD network to host byte order conversion for i386 */ #define DN2H(dw) \ @@ -26,7 +26,7 @@ ((((w) & 0xFF00) >> 8) | \ (((w) & 0x00FF) << 8)) -#else /* i386 */ +#else /* defined(i386) || defined(_AMD64_) || defined(_ARM_) */ /* DWORD network to host byte order conversion for other architectures */ #define DN2H(dw) \ @@ -44,4 +44,4 @@ #define WH2N(w) \ (w) -#endif /* i386 */ +#endif /* defined(i386) || defined(_AMD64_) || defined(_ARM_) */ Modified: trunk/reactos/drivers/network/tcpip/include/tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/tcpip.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/tcpip.h [iso-8859-1] Mon Aug 12 01:12:25 2013 @@ -65,7 +65,7 @@ #define NDIS_BUFFER_TAG FOURCC('n','b','u','f') #define NDIS_PACKET_TAG FOURCC('n','p','k','t') -#ifdef i386 +#if defined(i386) || defined(_AMD64_) || defined(_ARM_) /* DWORD network to host byte order conversion for i386 */ #define DN2H(dw) \ @@ -91,7 +91,7 @@ ((((w) & 0xFF00) >> 8) | \ (((w) & 0x00FF) << 8)) -#else /* i386 */ +#else /* defined(i386) || defined(_AMD64_) || defined(_ARM_) */ #error Unsupported architecture @@ -111,7 +111,7 @@ #define WH2N(w) \ (w) -#endif /* i386 */ +#endif /* defined(i386) || defined(_AMD64_) || defined(_ARM_) */ /* AF_INET and other things Arty likes to use ;) */ #define AF_INET 2

1 0

[cgutman] 59703: [TCPIP] - Use common macro for htons - Fail compilation if an unrecognized architecture is found (testing)
by cgutman＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: cgutman Date: Mon Aug 12 00:45:04 2013 New Revision: 59703 URL: http://svn.reactos.org/svn/reactos?rev=59703&view=rev Log: [TCPIP] - Use common macro for htons - Fail compilation if an unrecognized architecture is found (testing) Modified: trunk/reactos/drivers/network/tcpip/include/tcpip.h Modified: trunk/reactos/drivers/network/tcpip/include/tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/tcpip.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/tcpip.h [iso-8859-1] Mon Aug 12 00:45:04 2013 @@ -93,6 +93,8 @@ #else /* i386 */ +#error Unsupported architecture + /* DWORD network to host byte order conversion for other architectures */ #define DN2H(dw) \ (dw) @@ -148,7 +150,7 @@ } TDIEntityInfo; #ifndef htons -#define htons(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)) +#define htons(x) WH2N(x) #endif /* Global variable */

1 0

[cgutman] 59702: [SETUPAPI] - SetupDiRegisterDeviceInfo shouldn't fail if a device instance already exists - MSDN documentation for this function states: "If [SPRDI_FIND_DUPS] is not specified, the...
by cgutman＠svn.reactos.org 11 Aug '13

11 Aug '13

Author: cgutman Date: Sun Aug 11 21:19:35 2013 New Revision: 59702 URL: http://svn.reactos.org/svn/reactos?rev=59702&view=rev Log: [SETUPAPI] - SetupDiRegisterDeviceInfo shouldn't fail if a device instance already exists - MSDN documentation for this function states: "If [SPRDI_FIND_DUPS] is not specified, the device instance is registered regardless of whether a device instance already exists for it." Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Sun Aug 11 21:19:35 2013 @@ -1911,7 +1911,8 @@ ParentDevInst, CM_CREATE_DEVINST_NORMAL | CM_CREATE_DEVINST_DO_NOT_INSTALL, set->hMachine); - if (cr != CR_SUCCESS) + if (cr != CR_SUCCESS && + cr != CR_ALREADY_SUCH_DEVINST) { dwError = ERROR_NO_SUCH_DEVINST; }

1 0

[aandrejevic] 59701: [NTVDM] Fix bug in DosChangeDirectory.
by aandrejevic＠svn.reactos.org 11 Aug '13

11 Aug '13

Author: aandrejevic Date: Sun Aug 11 21:07:09 2013 New Revision: 59701 URL: http://svn.reactos.org/svn/reactos?rev=59701&view=rev Log: [NTVDM] Fix bug in DosChangeDirectory. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Sun Aug 11 21:07:09 2013 @@ -892,10 +892,16 @@ } /* Get the directory part of the path */ - Path = strchr(Directory, '\\') + 1; + Path = strchr(Directory, '\\'); + if (Path != NULL) + { + /* Skip the backslash */ + Path++; + } /* Set the directory for the drive */ - strcpy(CurrentDirectories[DriveNumber], Path); + if (Path != NULL) strcpy(CurrentDirectories[DriveNumber], Path); + else strcpy(CurrentDirectories[DriveNumber], ""); /* Return success */ return TRUE;

1 0

[aandrejevic] 59700: [NTVDM] Keep a list of current directories for all drives. Implement functions that change the default drive and current directory.
by aandrejevic＠svn.reactos.org 11 Aug '13

11 Aug '13

Author: aandrejevic Date: Sun Aug 11 20:54:07 2013 New Revision: 59700 URL: http://svn.reactos.org/svn/reactos?rev=59700&view=rev Log: [NTVDM] Keep a list of current directories for all drives. Implement functions that change the default drive and current directory. Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Sun Aug 11 20:54:07 2013 @@ -19,6 +19,9 @@ static WORD CurrentPsp = SYSTEM_PSP; static WORD DosLastError = 0; static DWORD DiskTransferArea; +static BYTE CurrentDrive; +static CHAR LastDrive = 'E'; +static CHAR CurrentDirectories[NUM_DRIVES][DOS_DIR_LENGTH]; static HANDLE DosSystemFileTable[DOS_SFT_SIZE]; static WORD DosSftRefCount[DOS_SFT_SIZE]; static BYTE DosAllocStrategy = DOS_ALLOC_BEST_FIT; @@ -820,6 +823,81 @@ /* Clear the entry in the JFT */ HandleTable[DosHandle] = 0xFF; + return TRUE; +} + +BOOLEAN DosChangeDrive(BYTE Drive) +{ + WCHAR DirectoryPath[DOS_CMDLINE_LENGTH]; + + /* Make sure the drive exists */ + if (Drive > (LastDrive - 'A')) return FALSE; + + /* Find the path to the new current directory */ + swprintf(DirectoryPath, L"%c\\%S", Drive + 'A', CurrentDirectories[Drive]); + + /* Change the current directory of the process */ + if (!SetCurrentDirectory(DirectoryPath)) return FALSE; + + /* Set the current drive */ + CurrentDrive = Drive; + + /* Return success */ + return TRUE; +} + +BOOLEAN DosChangeDirectory(LPSTR Directory) +{ + BYTE DriveNumber; + DWORD Attributes; + LPSTR Path; + + /* Make sure the directory path is not too long */ + if (strlen(Directory) >= DOS_DIR_LENGTH) + { + DosLastError = ERROR_PATH_NOT_FOUND; + return FALSE; + } + + /* Get the drive number */ + DriveNumber = Directory[0] - 'A'; + + /* Make sure the drive exists */ + if (DriveNumber > (LastDrive - 'A')) + { + DosLastError = ERROR_PATH_NOT_FOUND; + return FALSE; + } + + /* Get the file attributes */ + Attributes = GetFileAttributesA(Directory); + + /* Make sure the path exists and is a directory */ + if ((Attributes == INVALID_FILE_ATTRIBUTES) + || !(Attributes & FILE_ATTRIBUTE_DIRECTORY)) + { + DosLastError = ERROR_PATH_NOT_FOUND; + return FALSE; + } + + /* Check if this is the current drive */ + if (DriveNumber == CurrentDrive) + { + /* Change the directory */ + if (!SetCurrentDirectoryA(Directory)) + { + DosLastError = LOWORD(GetLastError()); + return FALSE; + } + } + + /* Get the directory part of the path */ + Path = strchr(Directory, '\\') + 1; + + /* Set the directory for the drive */ + strcpy(CurrentDirectories[DriveNumber], Path); + + /* Return success */ return TRUE; } @@ -1302,6 +1380,16 @@ break; } + /* Set Default Drive */ + case 0x0E: + { + DosChangeDrive(LOBYTE(Edx)); + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFFFF00) | (LastDrive - 'A' + 1)); + + break; + } + /* Set Disk Transfer Area */ case 0x1A: { @@ -1472,7 +1560,7 @@ String = (PCHAR)((ULONG_PTR)BaseAddress + TO_LINEAR(DataSegment, LOWORD(Edx))); - if (SetCurrentDirectoryA(String)) + if (DosChangeDirectory(String)) { Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } @@ -1480,7 +1568,7 @@ { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; EmulatorSetRegister(EMULATOR_REG_AX, - (Eax & 0xFFFF0000) | LOWORD(GetLastError())); + (Eax & 0xFFFF0000) | DosLastError); } break; @@ -1953,6 +2041,9 @@ LPSTR AsciiString; LPSTR DestPtr = (LPSTR)((ULONG_PTR)BaseAddress + TO_LINEAR(SYSTEM_ENV_BLOCK, 0)); DWORD AsciiSize; + CHAR CurrentDirectory[MAX_PATH]; + CHAR DosDirectory[DOS_DIR_LENGTH]; + LPSTR Path; /* Initialize the MCB */ Mcb->BlockType = 'Z'; @@ -2022,6 +2113,37 @@ /* Free the memory allocated for environment strings */ FreeEnvironmentStringsW(Environment); + /* Clear the current directory buffer */ + ZeroMemory(CurrentDirectories, sizeof(CurrentDirectories)); + + /* Get the current directory */ + if (!GetCurrentDirectoryA(MAX_PATH, CurrentDirectory)) + { + // TODO: Use some kind of default path? + return FALSE; + } + + /* Convert that to a DOS path */ + if (!GetShortPathNameA(CurrentDirectory, DosDirectory, DOS_DIR_LENGTH)) + { + // TODO: Use some kind of default path? + return FALSE; + } + + /* Set the drive */ + CurrentDrive = DosDirectory[0] - 'A'; + + /* Get the path */ + Path = strchr(DosDirectory, '\\'); + if (Path != NULL) + { + /* Skip the backslash */ + Path++; + } + + /* Set the directory */ + if (Path != NULL) strcpy(CurrentDirectories[CurrentDrive], Path); + /* Read CONFIG.SYS */ Stream = _wfopen(DOS_CONFIG_PATH, L"r"); if (Stream != NULL) Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Sun Aug 11 20:54:07 2013 @@ -34,6 +34,8 @@ #define DOS_ALLOC_HIGH 0x40 #define DOS_ALLOC_HIGH_LOW 0x80 #define DOS_CMDLINE_LENGTH 127 +#define DOS_DIR_LENGTH 64 +#define NUM_DRIVES ('Z' - 'A' + 1) enum DOS_ALLOC_STRATEGY {

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