Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[cmihail] 52395: [lwIP] - Abort the connection if the socket is not in LISTEN state, instead of closing it [TCPIP] - move redundant socket closure where so we don't try to free uninitialized variab...
by cmihail＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: cmihail Date: Mon Jun 20 21:37:32 2011 New Revision: 52395 URL: http://svn.reactos.org/svn/reactos?rev=52395&view=rev Log: [lwIP] - Abort the connection if the socket is not in LISTEN state, instead of closing it [TCPIP] - move redundant socket closure where so we don't try to free uninitialized variable - in case our socket got closed or for some reason doesn't exist return a default success Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c [iso-8859-1] Mon Jun 20 21:37:32 2011 @@ -281,7 +281,7 @@ AFD_DbgPrint(MID_TRACE,("Called: FCB %x, FO %x\n", Context, FCB->FileObject)); - DbgPrint("[StreamSocketConnectComplete] Called: FCB %x, FO %x\n", + DbgPrint("[AFD, StreamSocketConnectComplete] Called: FCB 0x%x, FO 0x%x\n", Context, FCB->FileObject); /* I was wrong about this before as we can have pending writes to a not @@ -333,7 +333,7 @@ NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); AFD_DbgPrint(MID_TRACE,("Completing connect %x\n", NextIrp)); - DbgPrint("[StreamSocketConnectComplete] Completing connect %x\n", NextIrp); + DbgPrint("[AFD, StreamSocketConnectComplete] Completing connect 0x%x\n", NextIrp); NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = NT_SUCCESS(Status) ? ((ULONG_PTR)FCB->Connection.Handle) : 0; @@ -410,7 +410,7 @@ 0 ); AFD_DbgPrint(MID_TRACE,("Connect request:\n")); - DbgPrint("[AfdStreamSocketConnect] Connect request:\n"); + DbgPrint("[AFD, AfdStreamSocketConnect] Connect request:\n"); #if 0 OskitDumpBuffer ( (PCHAR)ConnectReq, @@ -420,8 +420,7 @@ if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); - FCB->RemoteAddress = - TaCopyTransportAddress( &ConnectReq->RemoteAddress ); + FCB->RemoteAddress = TaCopyTransportAddress( &ConnectReq->RemoteAddress ); if( !FCB->RemoteAddress ) Status = STATUS_NO_MEMORY; @@ -440,10 +439,10 @@ case SOCKET_STATE_CONNECTING: return LeaveIrpUntilLater( FCB, Irp, FUNCTION_CONNECT ); - case SOCKET_STATE_CREATED: - if( FCB->LocalAddress ) ExFreePool( FCB->LocalAddress ); - FCB->LocalAddress = - TaBuildNullTransportAddress( ConnectReq->RemoteAddress.Address[0].AddressType ); + case SOCKET_STATE_CREATED: + if( FCB->LocalAddress ) ExFreePool( FCB->LocalAddress ); + FCB->LocalAddress = TaBuildNullTransportAddress( + ConnectReq->RemoteAddress.Address[0].AddressType); if( FCB->LocalAddress ) { @@ -460,9 +459,10 @@ /* Drop through to SOCKET_STATE_BOUND */ case SOCKET_STATE_BOUND: - if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); - FCB->RemoteAddress = - TaCopyTransportAddress( &ConnectReq->RemoteAddress ); + if( FCB->RemoteAddress ) + ExFreePool( FCB->RemoteAddress ); + + FCB->RemoteAddress = TaCopyTransportAddress( &ConnectReq->RemoteAddress ); if( !FCB->RemoteAddress ) { @@ -475,13 +475,10 @@ if( !NT_SUCCESS(Status) ) break; - Status = TdiBuildConnectionInfo - ( &FCB->ConnectInfo, - &ConnectReq->RemoteAddress ); + Status = TdiBuildConnectionInfo(&FCB->ConnectInfo, &ConnectReq->RemoteAddress); if( NT_SUCCESS(Status) ) - Status = TdiBuildConnectionInfo(&TargetAddress, - &ConnectReq->RemoteAddress); + Status = TdiBuildConnectionInfo(&TargetAddress, &ConnectReq->RemoteAddress); else break; if( NT_SUCCESS(Status) ) @@ -502,7 +499,7 @@ ExFreePool(TargetAddress); AFD_DbgPrint(MID_TRACE,("Queueing IRP %x\n", Irp)); - DbgPrint("[AfdStreamSocketConnect] Queueing IRP %x\n", Irp); + DbgPrint("[AFD, AfdStreamSocketConnect] Queueing IRP %x\n", Irp); if( Status == STATUS_PENDING ) { @@ -515,7 +512,7 @@ default: AFD_DbgPrint(MID_TRACE,("Inappropriate socket state %d for connect\n", FCB->State)); - DbgPrint("[AfdStreamSocketConnect] Inappropriate socket state %d for connect\n", + DbgPrint("[AFD, AfdStreamSocketConnect] Inappropriate socket state %d for connect\n", FCB->State); break; } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Mon Jun 20 21:37:32 2011 @@ -202,6 +202,10 @@ DbgPrint("[IP, TCPAcceptEventHandler] Trying to unlock Bucket->AssociatedEndpoint\n"); UnlockObject(Bucket->AssociatedEndpoint, OldIrql); + + /* free socket context created in FileOpenConnection, as we're using a new + one; we free it asynchornously because otherwise we create a dedlock */ + ChewCreate(SocketContextCloseWorker, OldSocketContext); } DereferenceObject(Bucket->AssociatedEndpoint); @@ -212,10 +216,6 @@ } DereferenceObject(Connection); - - /* free socket context created in FileOpenConnection, as we're using a new - one; we free it asynchornously because otherwise we create a dedlock */ - ChewCreate(SocketContextCloseWorker, OldSocketContext); } VOID Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Jun 20 21:37:32 2011 @@ -347,14 +347,23 @@ LockObject(Connection, &OldIrql); - if (Flags & TDI_DISCONNECT_RELEASE) - { - Status = LibTCPShutdown(Connection->SocketContext, 0, 1); - } - - if ((Flags & TDI_DISCONNECT_ABORT) || !Flags) - { - Status = LibTCPShutdown(Connection->SocketContext, 1, 1); + if (Connection->SocketContext) + { + if (Flags & TDI_DISCONNECT_RELEASE) + { + Status = TCPTranslateError(LibTCPShutdown(Connection->SocketContext, 0, 1)); + } + + if ((Flags & TDI_DISCONNECT_ABORT) || !Flags) + { + Status = TCPTranslateError(LibTCPShutdown(Connection->SocketContext, 1, 1)); + } + } + else + { + /* We already got closed by the other side so just return success */ + DbgPrint("[IP, TCPDisconnect] Socket was alraedy clsoed on the other side\n"); + Status = STATUS_SUCCESS; } DbgPrint("LibTCPShutdown: %x\n", Status); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Jun 20 21:37:32 2011 @@ -612,7 +612,17 @@ { struct close_callback_msg *msg = arg; - msg->Error = tcp_close(msg->Pcb); + if (msg->Pcb->state == LISTEN) + { + DbgPrint("[lwIP, LibTCPCloseCallback] Closing a listener\n"); + msg->Error = tcp_close(msg->Pcb); + } + else + { + DbgPrint("[lwIP, LibTCPCloseCallback] Aborting a connection\n"); + tcp_abort(msg->Pcb); + msg->Error = ERR_OK; + } KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); }

1 0

[tkreuzer] 52394: [BROWSEUI] Set /EHa- option. Fixes MSVC build
by tkreuzer＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: tkreuzer Date: Mon Jun 20 20:30:05 2011 New Revision: 52394 URL: http://svn.reactos.org/svn/reactos?rev=52394&view=rev Log: [BROWSEUI] Set /EHa- option. Fixes MSVC build Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Mon Jun 20 20:30:05 2011 @@ -5,6 +5,10 @@ add_definitions( -D__WINESRC__ -DROS_Headers) + +if (MSVC) + add_compiler_flags(/EHa-) +endif() remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600)

1 0

[tkreuzer] 52393: [CMAKE/MSVC] Add /NODEFAULTLIBS linker flag to avoid conflicts between our and MS crt
by tkreuzer＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: tkreuzer Date: Mon Jun 20 19:21:09 2011 New Revision: 52393 URL: http://svn.reactos.org/svn/reactos?rev=52393&view=rev Log: [CMAKE/MSVC] Add /NODEFAULTLIBS linker flag to avoid conflicts between our and MS crt Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=52393… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon Jun 20 19:21:09 2011 @@ -17,9 +17,9 @@ add_definitions(-Dinline=__inline -D__STDC__=1) if(${_MACHINE_ARCH_FLAG} MATCHES X86) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") - set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB") endif() if(${ARCH} MATCHES amd64)

1 0

[akhaldi] 52392: [MSI/URLMON] * Guard wine attributes against widl.
by akhaldi＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: akhaldi Date: Mon Jun 20 19:13:34 2011 New Revision: 52392 URL: http://svn.reactos.org/svn/reactos?rev=52392&view=rev Log: [MSI/URLMON] * Guard wine attributes against widl. Modified: trunk/reactos/dll/win32/msi/msiserver.idl trunk/reactos/dll/win32/urlmon/urlmon_urlmon.idl Modified: trunk/reactos/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.id… ============================================================================== --- trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] Mon Jun 20 19:13:34 2011 @@ -22,6 +22,12 @@ import "wtypes.idl"; import "objidl.idl"; import "oaidl.idl"; + +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif cpp_quote("#if 0") typedef unsigned long MSIHANDLE; Modified: trunk/reactos/dll/win32/urlmon/urlmon_urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ur… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_urlmon.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_urlmon.idl [iso-8859-1] Mon Jun 20 19:13:34 2011 @@ -17,6 +17,12 @@ */ #include "urlmon.idl" + +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif [ helpstring("URL Moniker"),

1 0

[tkreuzer] 52391: [PSDK] - define _MIDL_USE_GUIDDEF_ when building iid libraries, so that the guids have declspec(selectany) - add xml_uuids library [MSXML3] - Add an include for MSVC to define mis...
by tkreuzer＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: tkreuzer Date: Mon Jun 20 18:34:57 2011 New Revision: 52391 URL: http://svn.reactos.org/svn/reactos?rev=52391&view=rev Log: [PSDK] - define _MIDL_USE_GUIDDEF_ when building iid libraries, so that the guids have declspec(selectany) - add xml_uuids library [MSXML3] - Add an include for MSVC to define missing IIDs - add CLSID_DOMDocument2 fixes build of msxml3 with MSVC Added: trunk/reactos/dll/win32/msxml3/msvc.h (with props) trunk/reactos/dll/win32/msxml3/msvc_uuid.c (with props) Modified: trunk/reactos/dll/win32/msxml3/CMakeLists.txt trunk/reactos/include/psdk/CMakeLists.txt Modified: trunk/reactos/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Mon Jun 20 18:34:57 2011 @@ -11,7 +11,7 @@ -DLIBXML_STATIC) if(MSVC) - add_compiler_flags(/FIwine/typeof.h) + add_compiler_flags(/FIwine/typeof.h /FImsvc.h) endif(MSVC) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -51,6 +51,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def) +if(MSVC) + list(APPEND SOURCE msvc_uuid.c) +endif() + add_library(msxml3 SHARED ${SOURCE}) set_module_type(msxml3 win32dll) @@ -60,6 +64,10 @@ uuid wine wineldr) + +if(MSVC) + target_link_libraries(msxml3 xml_uuids) +endif() add_importlibs(msxml3 msvcrt Added: trunk/reactos/dll/win32/msxml3/msvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msvc.h?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msvc.h (added) +++ trunk/reactos/dll/win32/msxml3/msvc.h [iso-8859-1] Mon Jun 20 18:34:57 2011 @@ -1,0 +1,6 @@ + +extern const struct _GUID CLSID_DOMDocument; +extern const struct _GUID CLSID_XMLDocument; +extern const struct _GUID CLSID_DOMFreeThreadedDocument; +extern const struct _GUID CLSID_XMLHTTPRequest; +extern const struct _GUID CLSID_XMLDSOControl; Propchange: trunk/reactos/dll/win32/msxml3/msvc.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msxml3/msvc_uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msvc_uuid… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msvc_uuid.c (added) +++ trunk/reactos/dll/win32/msxml3/msvc_uuid.c [iso-8859-1] Mon Jun 20 18:34:57 2011 @@ -1,0 +1,7 @@ + +#define INITGUID +#include <guiddef.h> + +// This is actually CLSID_DOMDocument, but on gcc builds its defined to be like this +DEFINE_GUID(CLSID_DOMDocument2, 0x2933bf90, 0x7b36, 0x11d2, 0xb2,0x0e, 0x00,0xc0,0x4f,0x98,0x3e,0x60); + Propchange: trunk/reactos/dll/win32/msxml3/msvc_uuid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Mon Jun 20 18:34:57 2011 @@ -1,3 +1,5 @@ + +add_definitions(-D_MIDL_USE_GUIDDEF_) list(APPEND SOURCE # access.idl @@ -113,5 +115,6 @@ add_typelib(stdole2 stdole2.idl) add_iid_library(wuguid wuapi.idl) +add_iid_library(xml_uuids msxml2.idl) generate_idl_iids(wincodec.idl)

1 0

[cmihail] 52390: [MSAFD] - merge r52389
by cmihail＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: cmihail Date: Mon Jun 20 17:50:07 2011 New Revision: 52390 URL: http://svn.reactos.org/svn/reactos?rev=52390&view=rev Log: [MSAFD] - merge r52389 Modified: branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c Modified: branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/dll/win32… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Jun 20 17:50:07 2011 @@ -1047,6 +1047,7 @@ ULONG CallBack; WSAPROTOCOL_INFOW ProtocolInfo; SOCKET AcceptSocket; + PSOCKET_INFORMATION AcceptSocketInfo; UCHAR ReceiveBuffer[0x1A]; HANDLE SockEvent; @@ -1362,6 +1363,17 @@ MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); return INVALID_SOCKET; } + + AcceptSocketInfo = GetSocketStructure(AcceptSocket); + if (!AcceptSocketInfo) + { + NtClose(SockEvent); + WSPCloseSocket( AcceptSocket, lpErrno ); + MsafdReturnWithErrno( STATUS_INVALID_CONNECTION, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } + + AcceptSocketInfo->SharedData.State = SocketConnected; /* Return Address in SOCKADDR FORMAT */ if( SocketAddress )

1 0

[cgutman] 52389: [MSAFD] - Mark the accepted socket as connected - Fixes graceful disconnect on accepted sockets
by cgutman＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: cgutman Date: Mon Jun 20 17:35:02 2011 New Revision: 52389 URL: http://svn.reactos.org/svn/reactos?rev=52389&view=rev Log: [MSAFD] - Mark the accepted socket as connected - Fixes graceful disconnect on accepted sockets Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Jun 20 17:35:02 2011 @@ -1047,6 +1047,7 @@ ULONG CallBack; WSAPROTOCOL_INFOW ProtocolInfo; SOCKET AcceptSocket; + PSOCKET_INFORMATION AcceptSocketInfo; UCHAR ReceiveBuffer[0x1A]; HANDLE SockEvent; @@ -1362,6 +1363,17 @@ MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); return INVALID_SOCKET; } + + AcceptSocketInfo = GetSocketStructure(AcceptSocket); + if (!AcceptSocketInfo) + { + NtClose(SockEvent); + WSPCloseSocket( AcceptSocket, lpErrno ); + MsafdReturnWithErrno( STATUS_INVALID_CONNECTION, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } + + AcceptSocketInfo->SharedData.State = SocketConnected; /* Return Address in SOCKADDR FORMAT */ if( SocketAddress )

1 0

[cmihail] 52388: [MSAFD] - merge r52193 and rr52198 [IP] - fix memory leak when closing a connection endpoint
by cmihail＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: cmihail Date: Mon Jun 20 17:19:37 2011 New Revision: 52388 URL: http://svn.reactos.org/svn/reactos?rev=52388&view=rev Log: [MSAFD] - merge r52193 and rr52198 [IP] - fix memory leak when closing a connection endpoint Modified: branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/sndrcv.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c Modified: branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/dll/win32… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Jun 20 17:19:37 2011 @@ -401,6 +401,7 @@ HANDLE SockEvent; AFD_DISCONNECT_INFO DisconnectInfo; SOCKET_STATE OldState; + LONG LingerWait = -1; /* Create the Wait Event */ Status = NtCreateEvent(&SockEvent, @@ -453,7 +454,6 @@ /* FIXME: Should we do this on Datagram Sockets too? */ if ((OldState == SocketConnected) && (Socket->SharedData.LingerData.l_onoff)) { - ULONG LingerWait; ULONG SendsInProgress; ULONG SleepWait; @@ -477,7 +477,11 @@ /* Bail out if no more sends are pending */ if (!SendsInProgress) + { + LingerWait = -1; break; + } + /* * We have to execute a sleep, so it's kind of like * a block. If the socket is Nonblock, we cannot @@ -502,15 +506,14 @@ Sleep(SleepWait); LingerWait -= SleepWait; } - - /* - * We have reached the timeout or sends are over. - * Disconnect if the timeout has been reached. - */ + } + + if (OldState == SocketConnected) + { if (LingerWait <= 0) { DisconnectInfo.Timeout = RtlConvertLongToLargeInteger(0); - DisconnectInfo.DisconnectType = AFD_DISCONNECT_ABORT; + DisconnectInfo.DisconnectType = LingerWait < 0 ? AFD_DISCONNECT_SEND : AFD_DISCONNECT_ABORT; /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, @@ -1564,6 +1567,7 @@ if (Status != STATUS_SUCCESS) goto notify; + Socket->SharedData.State = SocketConnected; Socket->TdiConnectionHandle = (HANDLE)IOSB.Information; /* Get any pending connect data */ @@ -1742,6 +1746,13 @@ return SOCKET_ERROR; } + if (!Name || !NameLength) + { + NtClose(SockEvent); + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + /* Allocate a buffer for the address */ TdiAddressSize = sizeof(TRANSPORT_ADDRESS) + Socket->SharedData.SizeOfLocalAddress; @@ -1834,6 +1845,20 @@ NtClose(SockEvent); *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; + } + + if (Socket->SharedData.State != SocketConnected) + { + NtClose(SockEvent); + *lpErrno = WSAENOTCONN; + return SOCKET_ERROR; + } + + if (!Name || !NameLength) + { + NtClose(SockEvent); + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; } /* Allocate a buffer for the address */ Modified: branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/dll/win32… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Jun 20 17:19:37 2011 @@ -388,7 +388,14 @@ } /* Re-enable Async Event */ - SockReenableAsyncSelectEvent(Socket, FD_READ); + if (*ReceiveFlags & MSG_OOB) + { + SockReenableAsyncSelectEvent(Socket, FD_OOB); + } + else + { + SockReenableAsyncSelectEvent(Socket, FD_READ); + } return MsafdReturnWithErrno ( Status, lpErrno, IOSB->Information, lpNumberOfBytesRead ); } @@ -667,8 +674,7 @@ HeapFree(GlobalHeap, 0, BindAddress); } - if (Status != STATUS_PENDING) - SockReenableAsyncSelectEvent(Socket, FD_WRITE); + SockReenableAsyncSelectEvent(Socket, FD_WRITE); return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesSent); } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Mon Jun 20 17:19:37 2011 @@ -204,6 +204,8 @@ UnlockObject(Bucket->AssociatedEndpoint, OldIrql); } + DereferenceObject(Bucket->AssociatedEndpoint); + DbgPrint("[IP, TCPAcceptEventHandler] Done!\n"); CompleteBucket(Connection, Bucket, FALSE);

1 0

[cmihail] 52387: [lwIP] - Fix crash bug when disconnecting after accepting a connection from a client. - Move the send and receive callback assignments to make the code more clear - Change variable...
by cmihail＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: cmihail Date: Mon Jun 20 15:59:49 2011 New Revision: 52387 URL: http://svn.reactos.org/svn/reactos?rev=52387&view=rev Log: [lwIP] - Fix crash bug when disconnecting after accepting a connection from a client. - Move the send and receive callback assignments to make the code more clear - Change variable types to avoid excessive casting Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Jun 20 15:59:49 2011 @@ -160,8 +160,6 @@ TCPConnectEventHandler(arg, err); - tcp_recv(pcb, InternalRecvEventHandler); - return ERR_OK; } @@ -187,7 +185,7 @@ PVOID Arg; /* Output */ - PVOID NewPcb; + struct tcp_pcb *NewPcb; }; static @@ -206,8 +204,8 @@ if (msg->NewPcb) { - tcp_arg((struct tcp_pcb*)msg->NewPcb, msg->Arg); - tcp_err((struct tcp_pcb*)msg->NewPcb, InternalErrorEventHandler); + tcp_arg(msg->NewPcb, msg->Arg); + tcp_err(msg->NewPcb, InternalErrorEventHandler); } KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); @@ -217,7 +215,7 @@ LibTCPSocket(void *arg) { struct socket_callback_msg *msg = ExAllocatePool(NonPagedPool, sizeof(struct socket_callback_msg)); - void *ret; + struct tcp_pcb *ret; DbgPrint("[lwIP, LibTCPSocket] Called\n"); @@ -239,7 +237,7 @@ ExFreePool(msg); - return (struct tcp_pcb*)ret; + return ret; } DbgPrint("[lwIP, LibTCPSocket] Done\n"); @@ -413,8 +411,6 @@ } else { - tcp_sent(msg->Pcb, InternalSendEventHandler); - msg->Error = tcp_write(msg->Pcb, msg->Data, msg->DataLength, TCP_WRITE_FLAG_COPY); tcp_output(msg->Pcb); @@ -480,6 +476,9 @@ DbgPrint("[lwIP, LibTCPConnectCallback] Called\n"); ASSERT(arg); + + tcp_recv(msg->Pcb, InternalRecvEventHandler); + tcp_sent(msg->Pcb, InternalSendEventHandler); msg->Error = tcp_connect(msg->Pcb, msg->IpAddress, ntohs(msg->Port), InternalConnectEventHandler); if (msg->Error == ERR_OK) @@ -695,6 +694,7 @@ tcp_arg(pcb, NULL); tcp_recv(pcb, InternalRecvEventHandler); tcp_sent(pcb, InternalSendEventHandler); + tcp_err(pcb, InternalErrorEventHandler); tcp_arg(pcb, arg); tcp_accepted(listen_pcb);

1 0

[tkreuzer] 52386: [PSDK] Add midl compatible include guard
by tkreuzer＠svn.reactos.org 20 Jun '11

20 Jun '11

Author: tkreuzer Date: Mon Jun 20 15:28:00 2011 New Revision: 52386 URL: http://svn.reactos.org/svn/reactos?rev=52386&view=rev Log: [PSDK] Add midl compatible include guard Modified: trunk/reactos/include/psdk/msxml2.idl trunk/reactos/include/psdk/msxml6.idl Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… ============================================================================== --- trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] Mon Jun 20 15:28:00 2011 @@ -107,9 +107,9 @@ cpp_quote("#define DOMDocument DOMDocument2") cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") -cpp_quote("#ifndef __WIDL_XMLDOM_H") -typedef enum tagDOMNodeType -{ +cpp_quote("#if !defined(__WIDL_XMLDOM_H) && !defined(__xmldom_h__)") +typedef enum tagDOMNodeType +{ NODE_INVALID = 0, NODE_ELEMENT = 1, NODE_ATTRIBUTE = 2, Modified: trunk/reactos/include/psdk/msxml6.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml6.idl?re… ============================================================================== --- trunk/reactos/include/psdk/msxml6.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msxml6.idl [iso-8859-1] Mon Jun 20 15:28:00 2011 @@ -113,7 +113,7 @@ cpp_quote("#define DOMDocument DOMDocument2") cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") -cpp_quote("#ifndef __WIDL_XMLDOM_H") +cpp_quote("#if !defined(__WIDL_XMLDOM_H) && !defined(__xmldom_h__)") typedef enum tagDOMNodeType { NODE_INVALID = 0,

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2011