Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[akhaldi] 52425: [CMAKE] * Skip more modules that do not compile, in MSVC build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 22 16:07:16 2011 New Revision: 52425 URL: http://svn.reactos.org/svn/reactos?rev=52425&view=rev Log: [CMAKE] * Skip more modules that do not compile, in MSVC build. Modified: trunk/reactos/base/applications/CMakeLists.txt trunk/reactos/base/applications/network/CMakeLists.txt trunk/reactos/base/system/CMakeLists.txt trunk/reactos/dll/cpl/CMakeLists.txt trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Wed Jun 22 16:07:16 2011 @@ -24,7 +24,9 @@ add_subdirectory(network) add_subdirectory(notepad) add_subdirectory(mspaint) -add_subdirectory(rapps) +if(NOT MSVC) + add_subdirectory(rapps) # FIXME: msvc build. +endif() add_subdirectory(regedit) add_subdirectory(regedt32) add_subdirectory(sc) Modified: trunk/reactos/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] Wed Jun 22 16:07:16 2011 @@ -1,6 +1,8 @@ add_subdirectory(arp) -add_subdirectory(dwnl) +if(NOT MSVC) + add_subdirectory(dwnl) # FIXME: fix msvc build +endif() add_subdirectory(finger) if(NOT MSVC) add_subdirectory(ftp) # FIXME: fix msvc build Modified: trunk/reactos/base/system/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/CMakeLists.txt… ============================================================================== --- trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] Wed Jun 22 16:07:16 2011 @@ -4,7 +4,9 @@ add_subdirectory(expand) add_subdirectory(format) add_subdirectory(lsass) -add_subdirectory(msiexec) +if(NOT MSVC) + add_subdirectory(msiexec) # FIXME: msvc build. +endif() add_subdirectory(regsvr32) add_subdirectory(rundll32) add_subdirectory(runonce) Modified: trunk/reactos/dll/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] Wed Jun 22 16:07:16 2011 @@ -4,7 +4,9 @@ add_subdirectory(console)#Warning: console\\/lang/cs-CZ.rc:143: unrecognized escape sequence add_subdirectory(desk) add_subdirectory(hdwwiz) -add_subdirectory(inetcpl) +if(NOT MSVC) + add_subdirectory(inetcpl) # FIXME: msvc build. +endif() add_subdirectory(input) add_subdirectory(intl) add_subdirectory(joy) Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Wed Jun 22 16:07:16 2011 @@ -27,7 +27,9 @@ add_subdirectory(cryptdlg) add_subdirectory(cryptdll) add_subdirectory(cryptnet) -add_subdirectory(cryptui) +if(NOT MSVC) + add_subdirectory(cryptui) # FIXME: msvc build. +endif() add_subdirectory(dbghelp) add_subdirectory(dciman32) add_subdirectory(devmgr) @@ -43,7 +45,9 @@ add_subdirectory(glu32) add_subdirectory(hhctrl.ocx) add_subdirectory(hid) -add_subdirectory(hlink) +if(NOT MSVC) + add_subdirectory(hlink) # FIXME: msvc build. +endif() add_subdirectory(hnetcfg) add_subdirectory(httpapi) add_subdirectory(iccvid) @@ -58,7 +62,9 @@ add_subdirectory(iphlpapi) #add_subdirectory(iprtprio) # not built in trunk add_subdirectory(itircl) -add_subdirectory(itss) +if(NOT MSVC) + add_subdirectory(itss) # FIXME: msvc build. +endif() add_subdirectory(jscript) add_subdirectory(kernel32) add_subdirectory(loadperf) @@ -111,7 +117,9 @@ add_subdirectory(msvfw32) add_subdirectory(msvidc32) add_subdirectory(mswsock) -add_subdirectory(msxml3) +if(NOT MSVC) + add_subdirectory(msxml3) # FIXME: msvc build. +endif() add_subdirectory(nddeapi) add_subdirectory(netapi32) add_subdirectory(netcfgx) @@ -128,7 +136,9 @@ add_subdirectory(odbccp32) add_subdirectory(ole32) add_subdirectory(oleacc) -add_subdirectory(oleaut32) +if(NOT MSVC) + add_subdirectory(oleaut32) # FIXME: msvc build. +endif() add_subdirectory(olecli32) add_subdirectory(oledlg) add_subdirectory(olepro32) @@ -141,7 +151,9 @@ add_subdirectory(printui) add_subdirectory(psapi) add_subdirectory(pstorec) -add_subdirectory(qmgr) +if(NOT MSVC) + add_subdirectory(qmgr) # FIXME: msvc build. +endif() add_subdirectory(qmgrprxy) add_subdirectory(query) add_subdirectory(rasadhlp) @@ -166,11 +178,15 @@ add_subdirectory(sfc) add_subdirectory(sfc_os) add_subdirectory(shdoclc) -add_subdirectory(shdocvw) +if(NOT MSVC) + add_subdirectory(shdocvw) # FIXME: msvc build. +endif() add_subdirectory(shell32) add_subdirectory(shfolder) add_subdirectory(shimgvw) -add_subdirectory(shlwapi) +if(NOT MSVC) + add_subdirectory(shlwapi) # FIXME: msvc build. +endif() add_subdirectory(slbcsp) add_subdirectory(smdll) add_subdirectory(sndblst)

13 years, 6 months

[cmihail] 52424: [AFD] - Hold on to the disconnect IRP until all pending sending IRPs are sent to the transport driver if a controlled disconnect was requested (merge of r52415) [TCPIP] - add some ...

by cmihail＠svn.reactos.org

Author: cmihail Date: Wed Jun 22 15:32:46 2011 New Revision: 52424 URL: http://svn.reactos.org/svn/reactos?rev=52424&view=rev Log: [AFD] - Hold on to the disconnect IRP until all pending sending IRPs are sent to the transport driver if a controlled disconnect was requested (merge of r52415) [TCPIP] - add some mroe debug statements to track new current sync problem - remove some old debug statements that are useless now [lwIP] - add some mroe debug statements to track new current sync problem Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.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/write.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.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] Wed Jun 22 15:32:46 2011 @@ -208,7 +208,7 @@ } -NTSTATUS WarmSocketForConnection( PAFD_FCB FCB ) +NTSTATUS WarmSocketForConnection(PAFD_FCB FCB) { NTSTATUS Status; @@ -240,18 +240,21 @@ Status = TdiQueryMaxDatagramLength(FCB->Connection.Object, &FCB->Send.Size); + + DbgPrint("[AFD, MakeSocketIntoConnection] Called\n"); + if (!NT_SUCCESS(Status)) return Status; FCB->Recv.Size = FCB->Send.Size; /* Allocate the receive area and start receiving */ - FCB->Recv.Window = ExAllocatePool(PagedPool, FCB->Recv.Size); + FCB->Recv.Window = (PCHAR)ExAllocatePool(PagedPool, FCB->Recv.Size); if (!FCB->Recv.Window) return STATUS_NO_MEMORY; - FCB->Send.Window = ExAllocatePool(PagedPool, FCB->Send.Size); + FCB->Send.Window = (PCHAR)ExAllocatePool(PagedPool, FCB->Send.Size); if (!FCB->Send.Window) { @@ -278,6 +281,8 @@ FCB->PollStatus[FD_CONNECT_BIT] = STATUS_SUCCESS; FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; PollReeval( FCB->DeviceExt, FCB->FileObject ); + + DbgPrint("[AFD, MakeSocketIntoConnection] Leaving\n"); return Status; } @@ -528,7 +533,7 @@ AFD_DbgPrint(MID_TRACE,("Queueing IRP %x\n", Irp)); DbgPrint("[AFD, AfdStreamSocketConnect] Queueing IRP %x\n", Irp); - if( Status == STATUS_PENDING ) + if (Status == STATUS_PENDING) { FCB->State = SOCKET_STATE_CONNECTING; return LeaveIrpUntilLater(FCB, Irp, FUNCTION_CONNECT); Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c [iso-8859-1] Wed Jun 22 15:32:46 2011 @@ -48,7 +48,8 @@ ASSERT(FCB->DisconnectOptions); - if (FCB->FilledDisconnectOptions < BufferSize) BufferSize = FCB->FilledDisconnectOptions; + if (FCB->FilledDisconnectOptions < BufferSize) + BufferSize = FCB->FilledDisconnectOptions; RtlCopyMemory(Irp->UserBuffer, FCB->DisconnectOptions, @@ -595,56 +596,42 @@ static NTSTATUS -NTAPI -AfdDisconnect(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp) -{ - PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = (PAFD_FCB)FileObject->FsContext; +DoDisconnect(PAFD_FCB FCB, PIRP CurrentIrp) +{ PAFD_DISCONNECT_INFO DisReq; IO_STATUS_BLOCK Iosb; PTDI_CONNECTION_INFORMATION ConnectionReturnInfo; - NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION CurrentIrpSp; USHORT Flags = 0; - - if (!SocketAcquireStateLock(FCB)) - return LostSocket(Irp); - - if (!(DisReq = LockRequest(Irp, IrpSp))) - return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); - - if ( DisReq->DisconnectType & AFD_DISCONNECT_SEND) + NTSTATUS Status; + + CurrentIrpSp = IoGetCurrentIrpStackLocation(CurrentIrp); + DisReq = GetLockedData(CurrentIrp, CurrentIrpSp); + + if (DisReq->DisconnectType & AFD_DISCONNECT_SEND) Flags |= TDI_DISCONNECT_RELEASE; - if ( DisReq->DisconnectType & AFD_DISCONNECT_RECV || + if (DisReq->DisconnectType & AFD_DISCONNECT_RECV || DisReq->DisconnectType & AFD_DISCONNECT_ABORT) Flags |= TDI_DISCONNECT_ABORT; - - if (!(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS)) - { - if (!FCB->ConnectInfo) - return UnlockAndMaybeComplete(FCB, STATUS_INVALID_PARAMETER, Irp, 0); - - ASSERT(FCB->RemoteAddress); - - Status = TdiBuildNullConnectionInfo - ( &ConnectionReturnInfo, FCB->RemoteAddress->Address[0].AddressType ); - - if (!NT_SUCCESS(Status)) - return UnlockAndMaybeComplete(FCB, Status, Irp, 0); - + + Status = TdiBuildNullConnectionInfo(&ConnectionReturnInfo, + FCB->RemoteAddress->Address[0].AddressType); + if (NT_SUCCESS(Status)) + { FCB->ConnectInfo->UserData = FCB->DisconnectData; FCB->ConnectInfo->UserDataLength = FCB->DisconnectDataSize; FCB->ConnectInfo->Options = FCB->DisconnectOptions; FCB->ConnectInfo->OptionsLength = FCB->DisconnectOptionsSize; - - Status = TdiDisconnect( FCB->Connection.Object, - &DisReq->Timeout, - Flags, - &Iosb, - NULL, - NULL, - FCB->ConnectInfo, - ConnectionReturnInfo); - + + Status = TdiDisconnect(FCB->Connection.Object, + &DisReq->Timeout, + Flags, + &Iosb, + NULL, + NULL, + FCB->ConnectInfo, + ConnectionReturnInfo); + if (NT_SUCCESS(Status)) { FCB->FilledDisconnectData = MIN(FCB->DisconnectDataSize, ConnectionReturnInfo->UserDataLength); @@ -654,7 +641,7 @@ ConnectionReturnInfo->UserData, FCB->FilledDisconnectData); } - + FCB->FilledDisconnectOptions = MIN(FCB->DisconnectOptionsSize, ConnectionReturnInfo->OptionsLength); if (FCB->FilledDisconnectOptions) { @@ -663,15 +650,92 @@ FCB->FilledDisconnectOptions); } } - - ExFreePool( ConnectionReturnInfo ); - + + ExFreePool(ConnectionReturnInfo); + if (Flags & TDI_DISCONNECT_RELEASE) FCB->PollState |= AFD_EVENT_DISCONNECT; else FCB->PollState |= AFD_EVENT_ABORT; - FCB->PollStatus[FD_CLOSE_BIT] = STATUS_SUCCESS; - PollReeval( FCB->DeviceExt, FCB->FileObject ); + + FCB->PollStatus[FD_CLOSE_BIT] = Status; + PollReeval(FCB->DeviceExt, FCB->FileObject); + } + + CurrentIrp->IoStatus.Status = Status; + CurrentIrp->IoStatus.Information = 0; + UnlockRequest(CurrentIrp, CurrentIrpSp); + (void)IoSetCancelRoutine(CurrentIrp, NULL); + + IoCompleteRequest(CurrentIrp, IO_NETWORK_INCREMENT); + + return Status; +} + +VOID +RetryDisconnectCompletion(PAFD_FCB FCB) +{ + if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])) + { + PIRP CurrentIrp; + PLIST_ENTRY CurrentEntry; + + ASSERT(FCB->RemoteAddress); + + while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_DISCONNECT])) + { + CurrentEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_DISCONNECT]); + CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); + + DoDisconnect(FCB, CurrentIrp); + } + } +} + +static +NTSTATUS +NTAPI +AfdDisconnect(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = (PAFD_FCB)FileObject->FsContext; + PAFD_DISCONNECT_INFO DisReq; + NTSTATUS Status = STATUS_SUCCESS; + USHORT Flags = 0; + + if (!SocketAcquireStateLock(FCB)) + return LostSocket(Irp); + + if (!(DisReq = LockRequest(Irp, IrpSp))) + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0); + + if (DisReq->DisconnectType & AFD_DISCONNECT_SEND) + Flags |= TDI_DISCONNECT_RELEASE; + if (DisReq->DisconnectType & AFD_DISCONNECT_RECV || + DisReq->DisconnectType & AFD_DISCONNECT_ABORT) + Flags |= TDI_DISCONNECT_ABORT; + + if (!(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS)) + { + if (!FCB->ConnectInfo) + return UnlockAndMaybeComplete(FCB, STATUS_INVALID_PARAMETER, Irp, 0); + + if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (Flags & TDI_DISCONNECT_ABORT)) + { + /* Go ahead an execute the disconnect because we're ready for it */ + Status = DoDisconnect(FCB, Irp); + + /* DoDisconnect takes care of the IRP */ + SocketStateUnlock(FCB); + + return Status; + } + else + { + /* We have a graceful disconnect waiting on pending sends to complete */ + return LeaveIrpUntilLater(FCB, Irp, FUNCTION_DISCONNECT); + } + } else { Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c [iso-8859-1] Wed Jun 22 15:32:46 2011 @@ -42,8 +42,7 @@ { UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; - return !BytesAvailable && - (FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_ABORT)); + return !BytesAvailable && (FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_ABORT)); } static VOID RefillSocketBuffer( PAFD_FCB FCB ) @@ -78,8 +77,7 @@ PUINT TotalBytesCopied ) { UINT i, BytesToCopy = 0, FcbBytesCopied = FCB->Recv.BytesUsed, - BytesAvailable = - FCB->Recv.Content - FCB->Recv.BytesUsed; + BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; PAFD_MAPBUF Map; *TotalBytesCopied = 0; @@ -174,8 +172,9 @@ TotalBytesCopied)); UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); - Status = NextIrp->IoStatus.Status = - FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; + //Status = NextIrp->IoStatus.Status = + // FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; + Status = NextIrp->IoStatus.Status = FCB->PollStatus[FD_CLOSE_BIT]; NextIrp->IoStatus.Information = 0; if (NextIrp == Irp) @@ -185,7 +184,7 @@ (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - FCB->Overread = TRUE; + //FCB->Overread = TRUE; } } else @@ -239,8 +238,8 @@ } } - if( FCB->Recv.Content - FCB->Recv.BytesUsed && - IsListEmpty(&FCB->PendingIrpList[FUNCTION_RECV]) ) + if (FCB->Recv.Content - FCB->Recv.BytesUsed && + IsListEmpty(&FCB->PendingIrpList[FUNCTION_RECV])) { FCB->PollState |= AFD_EVENT_RECEIVE; FCB->PollStatus[FD_READ_BIT] = STATUS_SUCCESS; Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c [iso-8859-1] Wed Jun 22 15:32:46 2011 @@ -68,6 +68,8 @@ (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } + + RetryDisconnectCompletion(FCB); SocketStateUnlock(FCB); return STATUS_FILE_CLOSED; @@ -97,6 +99,8 @@ (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } + + RetryDisconnectCompletion(FCB); SocketStateUnlock( FCB ); @@ -177,6 +181,8 @@ &FCB->SendIrp.Iosb, SendComplete, FCB ); + + RetryDisconnectCompletion(FCB); } else { @@ -433,6 +439,8 @@ AFD_DbgPrint(MID_TRACE,("Dismissing request: %x (%d)\n", Status, TotalBytesCopied)); } + + RetryDisconnectCompletion(FCB); return UnlockAndMaybeComplete(FCB, Status, Irp, TotalBytesCopied); } Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h [iso-8859-1] Wed Jun 22 15:32:46 2011 @@ -99,8 +99,9 @@ #define FUNCTION_SEND 2 #define FUNCTION_PREACCEPT 3 #define FUNCTION_ACCEPT 4 -#define FUNCTION_CLOSE 5 -#define MAX_FUNCTIONS 6 +#define FUNCTION_DISCONNECT 5 +#define FUNCTION_CLOSE 6 +#define MAX_FUNCTIONS 7 #define IN_FLIGHT_REQUESTS 4 @@ -304,11 +305,11 @@ /* main.c */ -VOID OskitDumpBuffer( PCHAR Buffer, UINT Len ); NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ); VOID DestroySocket( PAFD_FCB FCB ); VOID NTAPI AfdCancelHandler(PDEVICE_OBJECT DeviceObject, PIRP Irp); +VOID RetryDisconnectCompletion(PAFD_FCB FCB); /* read.c */ Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Wed Jun 22 15:32:46 2011 @@ -384,8 +384,7 @@ * RETURNS: * Status of operation */ -NTSTATUS FileCloseAddress( - PTDI_REQUEST Request) +NTSTATUS FileCloseAddress(PTDI_REQUEST Request) { PADDRESS_FILE AddrFile = Request->Handle.AddressHandle; KIRQL OldIrql; @@ -397,8 +396,6 @@ LockObject(AddrFile, &OldIrql); - DbgPrint("[TCPIP, FileCloseAddress] AddrFile->RefCount = %d before TCPClose\n", AddrFile->RefCount); - /* We have to close this listener because we started it */ if ( AddrFile->Listener ) { @@ -411,8 +408,6 @@ UnlockObject(AddrFile, OldIrql); DereferenceObject(AddrFile); - - DbgPrint("[TCPIP, FileCloseAddress] AddrFile->RefCount = %d after TCPClose\n", AddrFile->RefCount); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); DbgPrint("[TCPIP, FileCloseAddress] Leaving\n"); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Wed Jun 22 15:32:46 2011 @@ -15,7 +15,7 @@ NTSTATUS TCPCheckPeerForAccept(PVOID Context, PTDI_REQUEST_KERNEL Request) { - struct tcp_pcb *newpcb = Context; + struct tcp_pcb *newpcb = (struct tcp_pcb*)Context; NTSTATUS Status; PTDI_CONNECTION_INFORMATION WhoIsConnecting; PTA_IP_ADDRESS RemoteAddress; @@ -46,7 +46,7 @@ /* This listen is on a socket we keep as internal. That socket has the same * lifetime as the address file */ -NTSTATUS TCPListen( PCONNECTION_ENDPOINT Connection, UINT Backlog ) +NTSTATUS TCPListen(PCONNECTION_ENDPOINT Connection, UINT Backlog) { NTSTATUS Status = STATUS_SUCCESS; struct ip_addr AddressToBind; @@ -84,8 +84,9 @@ return Status; } -BOOLEAN TCPAbortListenForSocket( PCONNECTION_ENDPOINT Listener, - PCONNECTION_ENDPOINT Connection ) +BOOLEAN TCPAbortListenForSocket +( PCONNECTION_ENDPOINT Listener, + PCONNECTION_ENDPOINT Connection) { PLIST_ENTRY ListEntry; PTDI_BUCKET Bucket; @@ -97,7 +98,7 @@ LockObject(Listener, &OldIrql); ListEntry = Listener->ListenRequest.Flink; - while ( ListEntry != &Listener->ListenRequest ) + while (ListEntry != &Listener->ListenRequest) { Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); @@ -135,10 +136,11 @@ LockObject(Listener, &OldIrql); - Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), - TDI_BUCKET_TAG ); + Bucket = (PTDI_BUCKET)ExAllocatePoolWithTag(NonPagedPool, + sizeof(*Bucket), + TDI_BUCKET_TAG ); - if( Bucket ) + if (Bucket) { Bucket->AssociatedEndpoint = Connection; ReferenceObject(Bucket->AssociatedEndpoint); 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] Wed Jun 22 15:32:46 2011 @@ -34,10 +34,10 @@ VOID BucketCompletionWorker(PVOID Context) { - PTDI_BUCKET Bucket = Context; + PTDI_BUCKET Bucket = (PTDI_BUCKET)Context; PTCP_COMPLETION_ROUTINE Complete; - Complete = Bucket->Request.RequestNotifyObject; + Complete = (PTCP_COMPLETION_ROUTINE)Bucket->Request.RequestNotifyObject; Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); @@ -203,7 +203,7 @@ DbgPrint("[IP, TCPAcceptEventHandler] Trying to unlock Bucket->AssociatedEndpoint\n"); UnlockObject(Bucket->AssociatedEndpoint, OldIrql); - /* sanity assert...this should never be in a LISTEN state */ + /* sanity assert...this should never be in anything else but a CLOSED state */ ASSERT(((struct tcp_pcb*)OldSocketContext)->state == CLOSED); /* free socket context created in FileOpenConnection, as we're using a new one; we free it asynchornously because otherwise we create a dedlock */ @@ -251,6 +251,8 @@ TI_DbgPrint(DEBUG_TCP, ("Writing %d bytes to %x\n", SendLen, SendBuffer)); + DbgPrint("[IP, TCPSendEventHandler] Sending out &d bytes on pcb = 0x%x\n", + Connection->SocketContext); TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); TI_DbgPrint @@ -325,10 +327,7 @@ ("[IP, TCPRecvEventHandler] Reading %d bytes to %x\n", RecvLen, RecvBuffer)); TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); - TI_DbgPrint - (DEBUG_TCP, - ("[IP, TCPRecvEventHandler] Connection->SocketContext: %x\n", - Connection->SocketContext)); + TI_DbgPrint(DEBUG_TCP, ("[IP, TCPRecvEventHandler] Connection->SocketContext: %x\n", Connection->SocketContext)); TI_DbgPrint(DEBUG_TCP, ("[IP, TCPRecvEventHandler] RecvBuffer: %x\n", RecvBuffer)); RecvLen = MIN(p->tot_len, RecvLen); 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] Wed Jun 22 15:32:46 2011 @@ -65,6 +65,8 @@ if (!arg) return ERR_OK; TCPSendEventHandler(arg, space); + + DbgPrint("[lwIP, InternalSendEventHandler] Done\n"); return ERR_OK; } @@ -75,13 +77,17 @@ { u32_t len; - DbgPrint("[lwIP, InternalRecvEventHandler] RecvEvent (0x%x, 0x%x, 0x%x, %d)\n", + DbgPrint("[lwIP, InternalRecvEventHandler] RecvEvent (0x%x, pcb = 0x%x, pbuf = 0x%x, err = %d)\n", arg, pcb, p, (unsigned int)err); /* Make sure the socket didn't get closed */ if (!arg) { - if (p) pbuf_free(p); + if (p) + pbuf_free(p); + + DbgPrint("[lwIP, InternalRecvEventHandler] Done ERR_OK 0 - socket got closed on us\n"); + return ERR_OK; } @@ -96,6 +102,8 @@ tcp_recved(pcb, len); pbuf_free(p); + + DbgPrint("[lwIP, InternalRecvEventHandler] Done ERR_OK 1\n"); return ERR_OK; } @@ -106,12 +114,14 @@ tcp_recved(pcb, len); /* Possible memory leak of pbuf here? */ + DbgPrint("[lwIP, InternalRecvEventHandler] Done ERR_OK 2\n"); return ERR_OK; } else { /* We want lwIP to store the pbuf on its queue for later */ + DbgPrint("[lwIP, InternalRecvEventHandler] Done ERR_TIMEOUT\n"); return ERR_TIMEOUT; } } @@ -120,6 +130,8 @@ TCPFinEventHandler(arg, ERR_OK); tcp_close(pcb); } + + DbgPrint("[lwIP, InternalRecvEventHandler] Done ERR_OK 3\n"); return ERR_OK; } @@ -151,7 +163,7 @@ err_t InternalConnectEventHandler(void *arg, struct tcp_pcb *pcb, err_t err) { - DbgPrint("[lwIP, InternalConnectEventHandler] ConnectEvent(0x%x, 0x%x, %d)\n", + DbgPrint("[lwIP, InternalConnectEventHandler] ConnectEvent (0x%x, pcb = 0x%x, err = %d)\n", arg, pcb, (unsigned int)err); /* Make sure the socket didn't get closed */ @@ -159,6 +171,8 @@ return ERR_OK; TCPConnectEventHandler(arg, err); + + DbgPrint("[lwIP, InternalConnectEventHandler] Done\n"); return ERR_OK; } @@ -511,7 +525,11 @@ tcpip_callback_with_block(LibTCPConnectCallback, msg, 1); if (WaitForEventSafely(&msg->Event)) + { ret = msg->Error; + if (pcb->state != CLOSED && ret == ERR_INPROGRESS) + ret = ERR_OK; + } else ret = ERR_CLSD;

13 years, 6 months

[akhaldi] 52423: [SHELL32] * Fix msvc build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 22 15:18:05 2011 New Revision: 52423 URL: http://svn.reactos.org/svn/reactos?rev=52423&view=rev Log: [SHELL32] * Fix msvc build. Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/regsvr.c Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Wed Jun 22 15:18:05 2011 @@ -167,9 +167,7 @@ add_subdirectory(sfc_os) add_subdirectory(shdoclc) add_subdirectory(shdocvw) -if(NOT MSVC) - add_subdirectory(shell32) # FIXME: msvc build. -endif() +add_subdirectory(shell32) add_subdirectory(shfolder) add_subdirectory(shimgvw) add_subdirectory(shlwapi) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Wed Jun 22 15:18:05 2011 @@ -11,8 +11,6 @@ ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/lib/recyclebin ${REACTOS_SOURCE_DIR}) - -generate_idl_iids(shobjidl_local.idl) spec2def(shell32.dll shell32.spec) @@ -71,7 +69,6 @@ shv_item_new.c folder_options.c shell32.rc - ${CMAKE_CURRENT_BINARY_DIR}/shobjidl_local_i.c ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) @@ -99,7 +96,7 @@ kernel32 msvcrt ntdll) - + add_pch(shell32 precomp.h) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] Wed Jun 22 15:18:05 2011 @@ -28,6 +28,10 @@ const GUID CLSID_FontsFolderShortcut = {0xD20EA4E1, 0x3957, 0x11D2, {0xA4, 0x0B, 0x0C, 0x50, 0x20, 0x52, 0x41,0x52}}; const GUID SHELL32_AdvtShortcutProduct = {0x9db1186f, 0x40df, 0x11d1, {0xaa, 0x8c, 0x00, 0xc0, 0x4f, 0xb6, 0x78, 0x63}}; const GUID SHELL32_AdvtShortcutComponent = {0x9db1186e, 0x40df, 0x11d1, {0xaa, 0x8c, 0x00, 0xc0, 0x4f, 0xb6, 0x78, 0x63}}; + +#ifdef _MSC_VER +extern const GUID CLSID_ShellFolderViewOC; +#endif WINE_DEFAULT_DEBUG_CHANNEL(shell);

13 years, 6 months

[cgutman] 52422: [OSKITTCP] - Register for asynchronous buffer notifications from oskittcp which will fire when a packet is sent - Fixes sending pending packets that can't fit in the window and fix...

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Jun 22 14:05:01 2011 New Revision: 52422 URL: http://svn.reactos.org/svn/reactos?rev=52422&view=rev Log: [OSKITTCP] - Register for asynchronous buffer notifications from oskittcp which will fire when a packet is sent - Fixes sending pending packets that can't fit in the window and fixes the graceful shutdown hang Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Wed Jun 22 14:05:01 2011 @@ -118,6 +118,8 @@ { so->so_state |= SS_NBIO; so->so_options |= SO_DONTROUTE; + so->so_snd.sb_flags |= SB_SEL; + so->so_rcv.sb_flags |= SB_SEL; } /* From uipc_syscalls.c */

13 years, 6 months

[ilardig] 52421: [BOOTDATA] Missed USBDRIVER change from 52361.

by ilardig＠svn.reactos.org

Author: ilardig Date: Wed Jun 22 13:51:14 2011 New Revision: 52421 URL: http://svn.reactos.org/svn/reactos?rev=52421&view=rev Log: [BOOTDATA] Missed USBDRIVER change from 52361. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Wed Jun 22 13:51:14 2011 @@ -1415,11 +1415,11 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 ; USB uhci/ehci driver -HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ImagePath",0x00020000,"system32\drivers\usbdriver.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Type",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ErrorControl",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Group",0x00000000,"Base" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ImagePath",0x00020000,"system32\drivers\usbdriver.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Start",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Type",0x00010001,0x00000001 ; USB storage driver ;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000 Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Jun 22 13:51:14 2011 @@ -1709,11 +1709,11 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 ; USB uhci/ehci driver -HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ImagePath",0x00020000,"system32\drivers\usbdriver.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Type",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ErrorControl",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Group",0x00000000,"Base" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ImagePath",0x00020000,"system32\drivers\usbdriver.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Start",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Type",0x00010001,0x00000001 ; USB storage driver ;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000

13 years, 6 months

[akhaldi] 52420: [CMAKE] * Add /W3 to compiler flags, and use the proper macro.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 22 13:17:37 2011 New Revision: 52420 URL: http://svn.reactos.org/svn/reactos?rev=52420&view=rev Log: [CMAKE] * Add /W3 to compiler flags, and use the proper macro. 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=52420… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Jun 22 13:17:37 2011 @@ -17,8 +17,9 @@ add_definitions(/DWIN32 /D_WINDOWS) endif() -add_definitions(/X /GR- /GS- /Zl) add_definitions(/Dinline=__inline /D__STDC__=1) + +add_compiler_flags(/X /GR- /GS- /Zl /W3) if(${_MACHINE_ARCH_FLAG} MATCHES X86) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB")

13 years, 6 months

[akhaldi] 52419: [CMAKE] * Skip some modules that do not compile, in MSVC build. * Welcome, MSVC BootCD. I'm sure ros devs will fix the s.it out of you.. Right ?

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 22 11:51:02 2011 New Revision: 52419 URL: http://svn.reactos.org/svn/reactos?rev=52419&view=rev Log: [CMAKE] * Skip some modules that do not compile, in MSVC build. * Welcome, MSVC BootCD. I'm sure ros devs will fix the s.it out of you.. Right ? Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Wed Jun 22 11:51:02 2011 @@ -3,7 +3,9 @@ add_subdirectory(advapi32) add_subdirectory(advpack) -add_subdirectory(amstream) +if(NOT MSVC) + add_subdirectory(amstream) # FIXME: msvc build. +endif() add_subdirectory(atl) add_subdirectory(avifil32) add_subdirectory(browseui) @@ -22,7 +24,9 @@ add_subdirectory(gdiplus) add_subdirectory(hlink) add_subdirectory(icmp) -add_subdirectory(imagehlp) +if(NOT MSVC) + add_subdirectory(imagehlp) # FIXME: msvc build. +endif() add_subdirectory(imm32) add_subdirectory(inetcomm) add_subdirectory(inetmib1) @@ -38,13 +42,17 @@ add_subdirectory(msacm32) add_subdirectory(mscms) add_subdirectory(msctf) -add_subdirectory(mshtml) +if(NOT MSVC) + add_subdirectory(mshtml) # FIXME: msvc build. +endif() add_subdirectory(msi) add_subdirectory(mstask) add_subdirectory(msvcrt) add_subdirectory(msvcrtd) add_subdirectory(msvfw32) -add_subdirectory(msxml3) +if(NOT MSVC) + add_subdirectory(msxml3) # FIXME: msvc build. +endif() add_subdirectory(netapi32) add_subdirectory(ntdll) add_subdirectory(ntdsapi) @@ -52,7 +60,9 @@ add_subdirectory(odbccp32) add_subdirectory(ole32) add_subdirectory(oleacc) -add_subdirectory(oleaut32) +if(NOT MSVC) + add_subdirectory(oleaut32) # FIXME: msvc build. +endif() add_subdirectory(opengl32) add_subdirectory(pdh) add_subdirectory(powrprof) @@ -62,7 +72,9 @@ add_subdirectory(rasapi32) add_subdirectory(riched20) add_subdirectory(riched32) -add_subdirectory(rpcrt4) +if(NOT MSVC) + add_subdirectory(rpcrt4) # FIXME: msvc build. +endif() add_subdirectory(rsabase) add_subdirectory(rsaenh) add_subdirectory(schannel) @@ -75,7 +87,9 @@ add_subdirectory(snmpapi) add_subdirectory(spoolss) add_subdirectory(twain_32) -add_subdirectory(urlmon) +if(NOT MSVC) + add_subdirectory(urlmon) # FIXME: msvc build. +endif() add_subdirectory(user32) add_subdirectory(userenv) add_subdirectory(usp10)

13 years, 6 months

[akhaldi] 52418: [CMAKE] * Add WIN32 and _WINDOWS definitions for i386 msvc builds. * Skip some modules that do not compile, in msvc build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 22 11:31:01 2011 New Revision: 52418 URL: http://svn.reactos.org/svn/reactos?rev=52418&view=rev Log: [CMAKE] * Add WIN32 and _WINDOWS definitions for i386 msvc builds. * Skip some modules that do not compile, in msvc build. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=52418&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Wed Jun 22 11:31:01 2011 @@ -47,7 +47,10 @@ add_definitions(-DTARGET_${ARCH}) if(MSVC) - add_definitions(-Dinline=__inline) + if(ARCH MATCHES i386) + add_definitions(/DWIN32 /D_WINDOWS) + endif() + add_definitions(/Dinline=__inline) else() add_compiler_flags(-fshort-wchar) endif() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=52418… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Jun 22 11:31:01 2011 @@ -13,8 +13,12 @@ add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-) endif() +if(ARCH MATCHES i386) + add_definitions(/DWIN32 /D_WINDOWS) +endif() + add_definitions(/X /GR- /GS- /Zl) -add_definitions(-Dinline=__inline -D__STDC__=1) +add_definitions(/Dinline=__inline /D__STDC__=1) if(${_MACHINE_ARCH_FLAG} MATCHES X86) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB") @@ -23,7 +27,7 @@ endif() if(${ARCH} MATCHES amd64) - add_definitions(-D__x86_64) + add_definitions(/D__x86_64) set(SPEC2DEF_ARCH x86_64) else() set(SPEC2DEF_ARCH i386) Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Wed Jun 22 11:31:01 2011 @@ -89,9 +89,12 @@ add_subdirectory(msg711.acm) add_subdirectory(msgina) add_subdirectory(msgsm32.acm) -add_subdirectory(mshtml) +if(NOT MSVC) + #FIXME: msvc build. + add_subdirectory(mshtml) + add_subdirectory(msi) +endif() add_subdirectory(mshtml.tlb) -add_subdirectory(msi) add_subdirectory(msimg32) add_subdirectory(msimtf) add_subdirectory(msisip) @@ -164,7 +167,9 @@ add_subdirectory(sfc_os) add_subdirectory(shdoclc) add_subdirectory(shdocvw) -add_subdirectory(shell32) +if(NOT MSVC) + add_subdirectory(shell32) # FIXME: msvc build. +endif() add_subdirectory(shfolder) add_subdirectory(shimgvw) add_subdirectory(shlwapi) @@ -176,7 +181,9 @@ add_subdirectory(spoolss) add_subdirectory(srclient) add_subdirectory(stdole2.tlb) -add_subdirectory(stdole32.tlb) +if(NOT MSVC) + add_subdirectory(stdole32.tlb) # FIXME: msvc build. +endif() add_subdirectory(sti) add_subdirectory(sxs) add_subdirectory(syssetup) @@ -192,7 +199,9 @@ add_subdirectory(untfs) add_subdirectory(updspapi) add_subdirectory(url) -add_subdirectory(urlmon) +if(NOT MSVC) + add_subdirectory(urlmon) # FIXME: msvc build. +endif() add_subdirectory(user32) add_subdirectory(userenv) add_subdirectory(usp10)

13 years, 6 months

[akhaldi] 52417: [CMAKE] * Properly set CMAKE_C_FLAGS_INIT and CMAKE_CXX_FLAGS_INIT.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 22 10:14:41 2011 New Revision: 52417 URL: http://svn.reactos.org/svn/reactos?rev=52417&view=rev Log: [CMAKE] * Properly set CMAKE_C_FLAGS_INIT and CMAKE_CXX_FLAGS_INIT. Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-cl.… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] Wed Jun 22 10:14:41 2011 @@ -210,11 +210,11 @@ SET(CMAKE_BUILD_TYPE_INIT Debug) SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") SET(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") -SET(CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc") +SET(CMAKE_CXX_FLAGS_INIT "") SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") SET(CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") -SET(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") +SET(CMAKE_C_FLAGS_INIT "") SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") SET(CMAKE_C_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1")

13 years, 6 months

[cgutman] 52416: [TCPIP/IP] - Wait until the all pending sends are serviced before shutting down the socket on a graceful disconnect - Cancel pending sends and receives on abortive disconnect - Rem...

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Jun 22 00:41:40 2011 New Revision: 52416 URL: http://svn.reactos.org/svn/reactos?rev=52416&view=rev Log: [TCPIP/IP] - Wait until the all pending sends are serviced before shutting down the socket on a graceful disconnect - Cancel pending sends and receives on abortive disconnect - Remove the nasty hack that was the completion queue and replace it with async completions like the lwIP implementation does - There is a bug with the graceful disconnects which occurs if the graceful disconnect cannot be serviced immediately (a very rare case in my testing) and results in the shutdown() call stalling forever because oskittcp never indicates that send is possible again (which would allow pending send IRPs to be serviced and the shutdown IRP to be completed) Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c 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] Wed Jun 22 00:41:40 2011 @@ -266,7 +266,7 @@ LIST_ENTRY ListenRequest; /* Queued listen requests */ LIST_ENTRY ReceiveRequest; /* Queued receive requests */ LIST_ENTRY SendRequest; /* Queued send requests */ - LIST_ENTRY CompletionQueue;/* Completed requests to finish */ + LIST_ENTRY ShutdownRequest;/* Queued shutdown requests */ /* Signals */ UINT SignalState; /* Active signals from oskit */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Wed Jun 22 00:41:40 2011 @@ -169,6 +169,10 @@ break; case TDI_CONNECT: + DequeuedIrp = TCPRemoveIRP(TranContext->Handle.ConnectionContext, Irp); + break; + + case TDI_DISCONNECT: DequeuedIrp = TCPRemoveIRP(TranContext->Handle.ConnectionContext, Irp); break; Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Wed Jun 22 00:41:40 2011 @@ -18,6 +18,33 @@ PORT_SET TCPPorts; CLIENT_DATA ClientInfo; +VOID +CompleteBucketWorker(PVOID Context) +{ + PTDI_BUCKET Bucket = Context; + PCONNECTION_ENDPOINT Connection; + PTCP_COMPLETION_ROUTINE Complete; + + ASSERT(Bucket); + + Connection = Bucket->AssociatedEndpoint; + Complete = Bucket->Request.RequestNotifyObject; + + Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); + + ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + + DereferenceObject(Connection); +} + +VOID +CompleteBucket(PCONNECTION_ENDPOINT Connection, PTDI_BUCKET Bucket) +{ + Bucket->AssociatedEndpoint = Connection; + ReferenceObject(Connection); + ChewCreate(CompleteBucketWorker, Bucket); +} + VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection) { PTDI_BUCKET Bucket; @@ -25,8 +52,6 @@ NTSTATUS Status; PIRP Irp; PMDL Mdl; - KIRQL OldIrql; - PTCP_COMPLETION_ROUTINE Complete; if (ClientInfo.Unlocked) LockObjectAtDpcLevel(Connection); @@ -44,7 +69,7 @@ Bucket->Status = (Connection->SignalState & SEL_CONNECT) ? STATUS_SUCCESS : STATUS_CANCELLED; Bucket->Information = 0; - InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); + CompleteBucket(Connection, Bucket); } } @@ -91,7 +116,7 @@ Bucket->Information = 0; DereferenceObject(Bucket->AssociatedEndpoint); - InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); + CompleteBucket(Connection, Bucket); } } } @@ -155,7 +180,7 @@ Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Received : 0; - InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); + CompleteBucket(Connection, Bucket); } } } @@ -216,49 +241,60 @@ Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Sent : 0; - InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); + CompleteBucket(Connection, Bucket); } } } - - ReferenceObject(Connection); - if (ClientInfo.Unlocked) - { - UnlockObjectFromDpcLevel(Connection); - KeReleaseSpinLock(&ClientInfo.Lock, ClientInfo.OldIrql); + if( Connection->SignalState & (SEL_WRITE | SEL_FIN) ) { + while (!IsListEmpty(&Connection->ShutdownRequest)) { + Entry = RemoveHeadList( &Connection->ShutdownRequest ); + + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + if (!(Connection->SignalState & SEL_FIN)) + { + /* See if we can satisfy this after the events */ + if (IsListEmpty(&Connection->SendRequest)) + { + /* Send queue is empty so we're good to go */ + Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE)); + } + else + { + /* We still have to wait */ + Status = STATUS_PENDING; + } + } + else + { + /* We were cancelled by a FIN */ + Status = STATUS_CANCELLED; + } + + if( Status == STATUS_PENDING ) { + InsertHeadList( &Connection->ShutdownRequest, &Bucket->Entry ); + break; + } else { + TI_DbgPrint(DEBUG_TCP, + ("Completing shutdown request: %x %x\n", + Bucket->Request, Status)); + + Bucket->Status = Status; + Bucket->Information = 0; + + CompleteBucket(Connection, Bucket); + } + } } - else - { - UnlockObject(Connection, Connection->OldIrql); - } - - while ((Entry = ExInterlockedRemoveHeadList(&Connection->CompletionQueue, - &Connection->Lock))) - { - Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry); - Complete = Bucket->Request.RequestNotifyObject; - - Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); - - ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); - } - - if (!ClientInfo.Unlocked) - { - LockObject(Connection, &OldIrql); - } - else - { - KeAcquireSpinLock(&ClientInfo.Lock, &ClientInfo.OldIrql); - } - DereferenceObject(Connection); - - /* If the socket is dead, remove the reference we added for oskit */ + if (Connection->SignalState & SEL_FIN) { Connection->SocketContext = NULL; DereferenceObject(Connection); } + + if (ClientInfo.Unlocked) + UnlockObjectFromDpcLevel(Connection); } VOID ConnectionFree(PVOID Object) { @@ -291,12 +327,12 @@ InitializeListHead(&Connection->ListenRequest); InitializeListHead(&Connection->ReceiveRequest); InitializeListHead(&Connection->SendRequest); - InitializeListHead(&Connection->CompletionQueue); + InitializeListHead(&Connection->ShutdownRequest); /* Save client context pointer */ Connection->ClientContext = ClientContext; - /* Add an extra reference for oskit */ + Connection->RefCount = 2; Connection->Free = ConnectionFree; @@ -662,23 +698,96 @@ PTCP_COMPLETION_ROUTINE Complete, PVOID Context ) { NTSTATUS Status = STATUS_INVALID_PARAMETER; + PTDI_BUCKET Bucket; KIRQL OldIrql; + PLIST_ENTRY Entry; TI_DbgPrint(DEBUG_TCP,("started\n")); LockObject(Connection, &OldIrql); if (Flags & TDI_DISCONNECT_RELEASE) - Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE)); + { + /* See if we can satisfy this right now */ + if (IsListEmpty(&Connection->SendRequest)) + { + /* Send queue is empty so we're good to go */ + Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE)); + + UnlockObject(Connection, OldIrql); + + return Status; + } + + /* Otherwise we wait for the send queue to be empty */ + } if ((Flags & TDI_DISCONNECT_ABORT) || !Flags) + { + /* This request overrides any pending graceful disconnects */ + while (!IsListEmpty(&Connection->ShutdownRequest)) + { + Entry = RemoveHeadList(&Connection->ShutdownRequest); + + Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry); + + Bucket->Information = 0; + Bucket->Status = STATUS_FILE_CLOSED; + + CompleteBucket(Connection, Bucket); + } + + /* Also kill any pending reads and writes */ + while (!IsListEmpty(&Connection->SendRequest)) + { + Entry = RemoveHeadList(&Connection->SendRequest); + + Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry); + + Bucket->Information = 0; + Bucket->Status = STATUS_FILE_CLOSED; + + CompleteBucket(Connection, Bucket); + } + + while (!IsListEmpty(&Connection->ReceiveRequest)) + { + Entry = RemoveHeadList(&Connection->ReceiveRequest); + + Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry); + + Bucket->Information = 0; + Bucket->Status = STATUS_FILE_CLOSED; + + CompleteBucket(Connection, Bucket); + } + + /* An abort never pends; we just drop everything and complete */ Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE | FREAD)); + + UnlockObject(Connection, OldIrql); + + return Status; + } + + /* We couldn't complete the request now because we need to wait for outstanding I/O */ + Bucket = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG); + if (!Bucket) + { + UnlockObject(Connection, OldIrql); + return STATUS_NO_MEMORY; + } + + Bucket->Request.RequestNotifyObject = (PVOID)Complete; + Bucket->Request.RequestContext = Context; + + InsertTailList(&Connection->ShutdownRequest, &Bucket->Entry); UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP,("finished %x\n", Status)); - return Status; + return STATUS_PENDING; } NTSTATUS TCPClose @@ -887,7 +996,7 @@ BOOLEAN TCPRemoveIRP( PCONNECTION_ENDPOINT Endpoint, PIRP Irp ) { PLIST_ENTRY Entry; - PLIST_ENTRY ListHead[4]; + PLIST_ENTRY ListHead[5]; KIRQL OldIrql; PTDI_BUCKET Bucket; UINT i = 0; @@ -897,10 +1006,11 @@ ListHead[1] = &Endpoint->ReceiveRequest; ListHead[2] = &Endpoint->ConnectRequest; ListHead[3] = &Endpoint->ListenRequest; + ListHead[4] = &Endpoint->ShutdownRequest; LockObject(Endpoint, &OldIrql); - for( i = 0; i < 4; i++ ) + for( i = 0; i < 5; i++ ) { for( Entry = ListHead[i]->Flink; Entry != ListHead[i];

13 years, 6 months

← Newer
1
...
5
6
7
8
9
10
11
...
46
Older →

Jump to page:

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