Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cmihail] 52398: [AFD, FORMATTING] - get rid of unused OskitDumpBuffer - make the code in AFD better conform to ROS coding guidelines - fix some MSVC compilation errors (still not fully compiling w...
by cmihail＠svn.reactos.org 21 Jun '11

21 Jun '11

Author: cmihail Date: Tue Jun 21 11:46:47 2011 New Revision: 52398 URL: http://svn.reactos.org/svn/reactos?rev=52398&view=rev Log: [AFD, FORMATTING] - get rid of unused OskitDumpBuffer - make the code in AFD better conform to ROS coding guidelines - fix some MSVC compilation errors (still not fully compiling with MSVC yet) [IP] - Add a sanity check in the TCPAcceptEventHandler Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/context.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/info.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/select.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… 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…

1 0

[tkreuzer] 52397: [WINE] Add a hackfix for ntdll_winetest to fix compilation with MSVC
by tkreuzer＠svn.reactos.org 21 Jun '11

21 Jun '11

Author: tkreuzer Date: Tue Jun 21 09:32:41 2011 New Revision: 52397 URL: http://svn.reactos.org/svn/reactos?rev=52397&view=rev Log: [WINE] Add a hackfix for ntdll_winetest to fix compilation with MSVC Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Tue Jun 21 09:32:41 2011 @@ -610,4 +610,7 @@ #endif /* STANDALONE */ +// hack for ntdll winetest (this is defined in excpt.h) +#undef exception_info + #endif /* __WINE_WINE_TEST_H */

1 0

[cmihail] 52396: [lwIP] - Remove foreign identifier field from the tcp_pcb structure. This was added for some debugging purposes sometime ago but now it's useless and it was just polluting lwIP code.
by cmihail＠svn.reactos.org 21 Jun '11

21 Jun '11

Author: cmihail Date: Tue Jun 21 09:19:12 2011 New Revision: 52396 URL: http://svn.reactos.org/svn/reactos?rev=52396&view=rev Log: [lwIP] - Remove foreign identifier field from the tcp_pcb structure. This was added for some debugging purposes sometime ago but now it's useless and it was just polluting lwIP code. Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c [iso-8859-1] Tue Jun 21 09:19:12 2011 @@ -769,7 +769,7 @@ LWIP_ASSERT("tcp_slowtmr: active pcb->state != LISTEN\n", pcb->state != LISTEN); LWIP_ASSERT("tcp_slowtmr: active pcb->state != TIME-WAIT\n", pcb->state != TIME_WAIT); - LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: active pcb ports (%d -> %d) %d\n", pcb->local_port, pcb->remote_port, pcb->identifier)); + LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: active pcb = 0x%x ports (%d -> %d)\n", pcb, pcb->local_port, pcb->remote_port)); pcb_remove = 0; pcb_reset = 0; Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] Tue Jun 21 09:19:12 2011 @@ -298,7 +298,7 @@ if (pcb != NULL) { - LWIP_DEBUGF(TCP_DEBUG, ("tcp_input: pcb->id = %d is for active connection\n", pcb->identifier)); + LWIP_DEBUGF(TCP_DEBUG, ("tcp_input: pcb = 0x%x is for active connection\n", pcb)); /* The incoming segment belongs to a connection. */ #if TCP_INPUT_DEBUG #if TCP_DEBUG @@ -535,7 +535,6 @@ for it. */ TCP_REG(&tcp_active_pcbs, npcb); - npcb->identifier = 21912; LWIP_DEBUGF(TCP_DEBUG, ("TCP new pcb created with %"U16_F" -> %"U16_F".\n", npcb->local_port, npcb->remote_port)); /* Parse any options in the SYN. */ @@ -683,8 +682,8 @@ pcb->state = ESTABLISHED; LWIP_DEBUGF(TCP_DEBUG, - ("[tcp_process] (SYN_SENT) TCP connection established %"U16_F" -> %"U16_F", %"U16_F"\n", - pcb->local_port , pcb->remote_port, pcb->identifier)); + ("[tcp_process] (SYN_SENT) TCP connection established %"U16_F" -> %"U16_F"\n", + pcb->local_port , pcb->remote_port)); #if TCP_CALCULATE_EFF_SEND_MSS pcb->mss = tcp_eff_send_mss(pcb->mss, &(pcb->remote_ip)); @@ -734,11 +733,11 @@ u16_t old_cwnd; pcb->state = ESTABLISHED; LWIP_DEBUGF(TCP_DEBUG, - ("[tcp_process] (SYN_RCVD) TCP connection established %"U16_F" -> %"U16_F" for %"U16_F"\n", - inseg.tcphdr->src, inseg.tcphdr->dest, pcb->identifier)); + ("[tcp_process] (SYN_RCVD) TCP connection established %"U16_F" -> %"U16_F"\n", + inseg.tcphdr->src, inseg.tcphdr->dest)); LWIP_DEBUGF(TCP_DEBUG, - ("[tcp_process] (SYN_RCVD) TCP local port = %"U16_F" and ID = %"U16_F"\n", - pcb->local_port, pcb->identifier)); + ("[tcp_process] (SYN_RCVD) TCP local port = %"U16_F"\n", + pcb->local_port)); #if LWIP_CALLBACK_API LWIP_ASSERT("pcb->accept != NULL", pcb->accept != NULL); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h [iso-8859-1] Tue Jun 21 09:19:12 2011 @@ -277,7 +277,6 @@ /* KEEPALIVE counter */ u8_t keep_cnt_sent; - u16_t identifier; }; struct tcp_pcb_listen {

1 0

[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

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