Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 57191: [CMAKE/WIDL] - Add support for the wine COM interface registering
by jgardou＠svn.reactos.org 28 Aug '12

28 Aug '12

Author: jgardou Date: Tue Aug 28 19:02:29 2012 New Revision: 57191 URL: http://svn.reactos.org/svn/reactos?rev=57191&view=rev Log: [CMAKE/WIDL] - Add support for the wine COM interface registering Modified: trunk/reactos/cmake/widl-support.cmake Modified: trunk/reactos/cmake/widl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/widl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/widl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/widl-support.cmake [iso-8859-1] Tue Aug 28 19:02:29 2012 @@ -109,3 +109,21 @@ add_dependencies(${TARGET} psdk) set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL TRUE) endfunction() + +function(add_idl_reg_script IDL_FILE) + get_filename_component(FILE ${IDL_FILE} NAME) + if(FILE STREQUAL "${IDL_FILE}") + set(IDL_FILE_FULL "${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}") + else() + set(IDL_FILE_FULL ${IDL_FILE}) + endif() + get_includes(INCLUDES) + get_defines(DEFINES) + get_filename_component(NAME ${IDL_FILE} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_r.res + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -r -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_r.res ${IDL_FILE_FULL} + DEPENDS ${IDL_FILE_FULL} native-widl) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_r.res PROPERTIES + GENERATED TRUE EXTERNAL_OBJECT TRUE) +endfunction()

1 0

[jgardou] 57190: [WINGDI.H] - Add missing DMDO_* definitions
by jgardou＠svn.reactos.org 28 Aug '12

28 Aug '12

Author: jgardou Date: Tue Aug 28 09:27:07 2012 New Revision: 57190 URL: http://svn.reactos.org/svn/reactos?rev=57190&view=rev Log: [WINGDI.H] - Add missing DMDO_* definitions Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Tue Aug 28 09:27:07 2012 @@ -1232,6 +1232,11 @@ #if (WINVER >= 0x0501) #define DM_DISPLAYFIXEDOUTPUT 0x20000000 #endif + +#define DMDO_DEFAULT 0 +#define DMDO_90 1 +#define DMDO_180 2 +#define DMDO_270 3 #define DMICMMETHOD_NONE 1 #define DMICMMETHOD_SYSTEM 2

1 0

[cgutman] 57189: [LWIP] - Increase window size to 65535 so large sends work properly because send buffering still sucks
by cgutman＠svn.reactos.org 28 Aug '12

28 Aug '12

Author: cgutman Date: Tue Aug 28 00:36:47 2012 New Revision: 57189 URL: http://svn.reactos.org/svn/reactos?rev=57189&view=rev Log: [LWIP] - Increase window size to 65535 so large sends work properly because send buffering still sucks Modified: trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h Modified: trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h [iso-8859-1] Tue Aug 28 00:36:47 2012 @@ -64,7 +64,7 @@ * add support for other transport mediums */ #define TCP_MSS 1460 -#define TCP_WND (TCP_MSS * 6) +#define TCP_WND 0xFFFF #define TCP_SND_BUF TCP_WND

1 0

[cgutman] 57188: [AFD] - Fix handling pending writes in the TDI_SEND completion routine
by cgutman＠svn.reactos.org 28 Aug '12

28 Aug '12

Author: cgutman Date: Tue Aug 28 00:26:26 2012 New Revision: 57188 URL: http://svn.reactos.org/svn/reactos?rev=57188&view=rev Log: [AFD] - Fix handling pending writes in the TDI_SEND completion routine Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Tue Aug 28 00:26:26 2012 @@ -152,8 +152,8 @@ ASSERT(SendLength == 0); - while( !HaltSendQueue && !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { - NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + if ( !HaltSendQueue && !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { + NextIrpEntry = FCB->PendingIrpList[FUNCTION_SEND].Flink; NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); SendReq = GetLockedData(NextIrp, NextIrpSp); @@ -178,8 +178,7 @@ if (SendLength <= FCB->Send.Size && !((SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { FCB->PollState &= ~AFD_EVENT_SEND; - InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], - &NextIrp->Tail.Overlay.ListEntry); + NextIrp = NULL; } @@ -191,30 +190,31 @@ /* We should never be non-overlapped and get to this point */ ASSERT(SendReq->AfdFlags & AFD_OVERLAPPED); - InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], - &NextIrp->Tail.Overlay.ListEntry); NextIrp = NULL; } } - if (NextIrp == NULL) - break; - - for( i = 0; i < SendReq->BufferCount; i++ ) { - BytesCopied = MIN(SendReq->BufferArray[i].len, SpaceAvail); - - Map[i].BufferAddress = - MmMapLockedPages( Map[i].Mdl, KernelMode ); - - RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, - Map[i].BufferAddress, - BytesCopied ); - - MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); - - TotalBytesCopied += BytesCopied; - SpaceAvail -= BytesCopied; - FCB->Send.BytesUsed += BytesCopied; + if (NextIrp != NULL) + { + for( i = 0; i < SendReq->BufferCount; i++ ) { + BytesCopied = MIN(SendReq->BufferArray[i].len, SpaceAvail); + + Map[i].BufferAddress = + MmMapLockedPages( Map[i].Mdl, KernelMode ); + + RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, + Map[i].BufferAddress, + BytesCopied ); + + MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); + + TotalBytesCopied += BytesCopied; + SpaceAvail -= BytesCopied; + FCB->Send.BytesUsed += BytesCopied; + } + + NextIrp->IoStatus.Information = TotalBytesCopied; + NextIrp->Tail.Overlay.DriverContext[3] = (PVOID)NextIrp->IoStatus.Information; } }

1 0

[cgutman] 57187: [AFD] - Rewrite a large portion of the send code to have proper support for overlapped and non-blocking sockets
by cgutman＠svn.reactos.org 28 Aug '12

28 Aug '12

Author: cgutman Date: Tue Aug 28 00:14:08 2012 New Revision: 57187 URL: http://svn.reactos.org/svn/reactos?rev=57187&view=rev Log: [AFD] - Rewrite a large portion of the send code to have proper support for overlapped and non-blocking sockets Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Tue Aug 28 00:14:08 2012 @@ -21,6 +21,8 @@ PAFD_SEND_INFO SendReq = NULL; PAFD_MAPBUF Map; UINT TotalBytesCopied = 0, TotalBytesProcessed = 0, SpaceAvail, i; + UINT SendLength, BytesCopied; + BOOLEAN HaltSendQueue; /* * The Irp parameter passed in is the IRP of the stream between AFD and @@ -94,27 +96,48 @@ } RtlMoveMemory( FCB->Send.Window, - FCB->Send.Window + FCB->Send.BytesUsed, + FCB->Send.Window + Irp->IoStatus.Information, FCB->Send.BytesUsed - Irp->IoStatus.Information ); TotalBytesProcessed = 0; - while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && - TotalBytesProcessed != Irp->IoStatus.Information) { + SendLength = Irp->IoStatus.Information; + HaltSendQueue = FALSE; + while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && SendLength > 0) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); SendReq = GetLockedData(NextIrp, NextIrpSp); Map = (PAFD_MAPBUF)(SendReq->BufferArray + SendReq->BufferCount); - TotalBytesCopied = 0; - - for( i = 0; i < SendReq->BufferCount; i++ ) - TotalBytesCopied += SendReq->BufferArray[i].len; + TotalBytesCopied = (ULONG_PTR)NextIrp->Tail.Overlay.DriverContext[3]; + ASSERT(TotalBytesCopied != 0); + + /* If we didn't get enough, keep waiting */ + if (TotalBytesCopied > SendLength) + { + /* Update the bytes left to copy */ + TotalBytesCopied -= SendLength; + NextIrp->Tail.Overlay.DriverContext[3] = (PVOID)TotalBytesCopied; + + /* Update the state variables */ + FCB->Send.BytesUsed -= SendLength; + TotalBytesProcessed += SendLength; + SendLength = 0; + + /* Pend the IRP */ + InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], + &NextIrp->Tail.Overlay.ListEntry); + HaltSendQueue = TRUE; + break; + } + + ASSERT(NextIrp->IoStatus.Information != 0); NextIrp->IoStatus.Status = Irp->IoStatus.Status; - NextIrp->IoStatus.Information = TotalBytesCopied; - + + FCB->Send.BytesUsed -= TotalBytesCopied; TotalBytesProcessed += TotalBytesCopied; + SendLength -= TotalBytesCopied; (void)IoSetCancelRoutine(NextIrp, NULL); @@ -127,11 +150,9 @@ IoCompleteRequest(NextIrp, IO_NETWORK_INCREMENT); } - ASSERT(TotalBytesProcessed == Irp->IoStatus.Information); - - FCB->Send.BytesUsed -= TotalBytesProcessed; - - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { + ASSERT(SendLength == 0); + + while( !HaltSendQueue && !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); @@ -143,37 +164,62 @@ SpaceAvail = FCB->Send.Size - FCB->Send.BytesUsed; TotalBytesCopied = 0; + /* Count the total transfer size */ + SendLength = 0; + for (i = 0; i < SendReq->BufferCount; i++) + { + SendLength += SendReq->BufferArray[i].len; + } + + /* Make sure we've got the space */ + if (SendLength > SpaceAvail) + { + /* Blocking sockets have to wait here */ + if (SendLength <= FCB->Send.Size && !((SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) + { + FCB->PollState &= ~AFD_EVENT_SEND; + InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], + &NextIrp->Tail.Overlay.ListEntry); + NextIrp = NULL; + } + + /* Check if we can send anything */ + if (SpaceAvail == 0) + { + FCB->PollState &= ~AFD_EVENT_SEND; + + /* We should never be non-overlapped and get to this point */ + ASSERT(SendReq->AfdFlags & AFD_OVERLAPPED); + + InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], + &NextIrp->Tail.Overlay.ListEntry); + NextIrp = NULL; + } + } + + if (NextIrp == NULL) + break; + for( i = 0; i < SendReq->BufferCount; i++ ) { - if (SpaceAvail < SendReq->BufferArray[i].len) - { - InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], - &NextIrp->Tail.Overlay.ListEntry); - NextIrp = NULL; - break; - } + BytesCopied = MIN(SendReq->BufferArray[i].len, SpaceAvail); + Map[i].BufferAddress = MmMapLockedPages( Map[i].Mdl, KernelMode ); RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, Map[i].BufferAddress, - SendReq->BufferArray[i].len ); + BytesCopied ); MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); - TotalBytesCopied += SendReq->BufferArray[i].len; - SpaceAvail -= SendReq->BufferArray[i].len; - } - - if (NextIrp != NULL) - { - FCB->Send.BytesUsed += TotalBytesCopied; - } - else - break; - } - - if (FCB->Send.Size - FCB->Send.BytesUsed != 0 && - !FCB->SendClosed) + TotalBytesCopied += BytesCopied; + SpaceAvail -= BytesCopied; + FCB->Send.BytesUsed += BytesCopied; + } + } + + if (FCB->Send.Size - FCB->Send.BytesUsed != 0 && !FCB->SendClosed && + IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])) { FCB->PollState |= AFD_EVENT_SEND; FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; @@ -183,6 +229,7 @@ { FCB->PollState &= ~AFD_EVENT_SEND; } + /* Some data is still waiting */ if( FCB->Send.BytesUsed ) @@ -279,12 +326,13 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO SendReq; - UINT TotalBytesCopied = 0, i, SpaceAvail = 0; - BOOLEAN NoSpace = FALSE; + UINT TotalBytesCopied = 0, i, SpaceAvail = 0, BytesCopied, SendLength; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + + FCB->EventSelectDisabled &= ~AFD_EVENT_SEND; if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { @@ -316,7 +364,6 @@ Status = TdiBuildConnectionInfo( &TargetAddress, FCB->RemoteAddress ); if( NT_SUCCESS(Status) ) { - FCB->EventSelectDisabled &= ~AFD_EVENT_SEND; FCB->PollState &= ~AFD_EVENT_SEND; Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); @@ -371,7 +418,7 @@ if( !(SendReq = LockRequest( Irp, IrpSp, FALSE )) ) return UnlockAndMaybeComplete - ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied ); + ( FCB, STATUS_NO_MEMORY, Irp, 0 ); SendReq->BufferArray = LockBuffers( SendReq->BufferArray, SendReq->BufferCount, @@ -405,37 +452,62 @@ AFD_DbgPrint(MID_TRACE,("We can accept %d bytes\n", SpaceAvail)); - for( i = 0; FCB->Send.BytesUsed < FCB->Send.Size && - i < SendReq->BufferCount; i++ ) { - - if (SpaceAvail < SendReq->BufferArray[i].len) - { - if (TotalBytesCopied + SendReq->BufferArray[i].len > FCB->Send.Size) + /* Count the total transfer size */ + SendLength = 0; + for (i = 0; i < SendReq->BufferCount; i++) + { + SendLength += SendReq->BufferArray[i].len; + } + + /* Make sure we've got the space */ + if (SendLength > SpaceAvail) + { + /* Blocking sockets have to wait here */ + if (SendLength <= FCB->Send.Size && !((SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) + { + FCB->PollState &= ~AFD_EVENT_SEND; + return LeaveIrpUntilLater(FCB, Irp, FUNCTION_SEND); + } + + /* Check if we can send anything */ + if (SpaceAvail == 0) + { + FCB->PollState &= ~AFD_EVENT_SEND; + + /* Non-overlapped sockets will fail if we can send nothing */ + if (!(SendReq->AfdFlags & AFD_OVERLAPPED)) { - UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); - - return UnlockAndMaybeComplete(FCB, STATUS_BUFFER_OVERFLOW, Irp, 0); + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); + return UnlockAndMaybeComplete( FCB, STATUS_CANT_WAIT, Irp, 0 ); } - SpaceAvail += TotalBytesCopied; - NoSpace = TRUE; - break; - } + else + { + /* Overlapped sockets just pend */ + return LeaveIrpUntilLater(FCB, Irp, FUNCTION_SEND); + } + } + } + + for ( i = 0; SpaceAvail > 0 && i < SendReq->BufferCount; i++ ) + { + BytesCopied = MIN(SendReq->BufferArray[i].len, SpaceAvail); AFD_DbgPrint(MID_TRACE,("Copying Buffer %d, %x:%d to %x\n", i, SendReq->BufferArray[i].buf, - SendReq->BufferArray[i].len, + BytesCopied, FCB->Send.Window + FCB->Send.BytesUsed)); - RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, + RtlCopyMemory(FCB->Send.Window + FCB->Send.BytesUsed, SendReq->BufferArray[i].buf, - SendReq->BufferArray[i].len ); - - TotalBytesCopied += SendReq->BufferArray[i].len; - SpaceAvail -= SendReq->BufferArray[i].len; - } - - FCB->EventSelectDisabled &= ~AFD_EVENT_SEND; + BytesCopied); + + TotalBytesCopied += BytesCopied; + SpaceAvail -= BytesCopied; + FCB->Send.BytesUsed += BytesCopied; + } + + Irp->IoStatus.Information = TotalBytesCopied; if( TotalBytesCopied == 0 ) { AFD_DbgPrint(MID_TRACE,("Empty send\n")); @@ -455,40 +527,25 @@ FCB->PollState &= ~AFD_EVENT_SEND; } - if (!NoSpace) - { - FCB->Send.BytesUsed += TotalBytesCopied; - AFD_DbgPrint(MID_TRACE,("Copied %d bytes\n", TotalBytesCopied)); - - Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); - if (Status == STATUS_PENDING && !FCB->SendIrp.InFlightRequest) - { - TdiSend(&FCB->SendIrp.InFlightRequest, - FCB->Connection.Object, - 0, - FCB->Send.Window, - FCB->Send.BytesUsed, - &FCB->SendIrp.Iosb, - SendComplete, - FCB); - } - SocketStateUnlock(FCB); - - return STATUS_PENDING; - } - else - { - FCB->PollState &= ~AFD_EVENT_SEND; - if (!(SendReq->AfdFlags & AFD_OVERLAPPED) && - ((SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { - AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); - UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); - return UnlockAndMaybeComplete( FCB, STATUS_CANT_WAIT, Irp, 0 ); - } else { - AFD_DbgPrint(MID_TRACE,("Queuing request\n")); - return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); - } - } + /* We use the IRP tail for some temporary storage here */ + Irp->Tail.Overlay.DriverContext[3] = (PVOID)Irp->IoStatus.Information; + + Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); + if (Status == STATUS_PENDING && !FCB->SendIrp.InFlightRequest) + { + TdiSend(&FCB->SendIrp.InFlightRequest, + FCB->Connection.Object, + 0, + FCB->Send.Window, + FCB->Send.BytesUsed, + &FCB->SendIrp.Iosb, + SendComplete, + FCB); + } + + SocketStateUnlock(FCB); + + return STATUS_PENDING; } NTSTATUS NTAPI @@ -504,6 +561,8 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + FCB->EventSelectDisabled &= ~AFD_EVENT_SEND; + /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND && FCB->State != SOCKET_STATE_CREATED) @@ -562,7 +621,6 @@ /* Check the size of the Address given ... */ if( NT_SUCCESS(Status) ) { - FCB->EventSelectDisabled &= ~AFD_EVENT_SEND; FCB->PollState &= ~AFD_EVENT_SEND; Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND);

1 0

[cgutman] 57186: [TCPIP] - Implement proper support for partial sends on TCP sockets - This prevents a deadlock when a very very large packet is queued to be sent
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 23:58:40 2012 New Revision: 57186 URL: http://svn.reactos.org/svn/reactos?rev=57186&view=rev Log: [TCPIP] - Implement proper support for partial sends on TCP sockets - This prevents a deadlock when a very very large packet is queued to be sent Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/lwip/src/include/rosip.h trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Mon Aug 27 23:58:40 2012 @@ -383,6 +383,7 @@ PIRP Irp; NTSTATUS Status; PMDL Mdl; + ULONG BytesSent; ReferenceObject(Connection); @@ -412,9 +413,9 @@ Status = TCPTranslateError(LibTCPSend(Connection, SendBuffer, - SendLen, TRUE)); - - TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", SendLen)); + SendLen, &BytesSent, TRUE)); + + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", BytesSent)); if( Status == STATUS_PENDING ) { @@ -430,7 +431,7 @@ Bucket->Request, Status)); Bucket->Status = Status; - Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? SendLen : 0; + Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? BytesSent : 0; CompleteBucket(Connection, Bucket, FALSE); } 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] Mon Aug 27 23:58:40 2012 @@ -544,6 +544,7 @@ Status = TCPTranslateError(LibTCPSend(Connection, BufferData, SendLength, + BytesSent, FALSE)); TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Send: %x, %d\n", Status, SendLength)); @@ -562,18 +563,9 @@ Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; - *BytesSent = 0; InsertTailList( &Connection->SendRequest, &Bucket->Entry ); TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Queued write irp\n")); - } - else if (Status == STATUS_SUCCESS) - { - *BytesSent = SendLength; - } - else - { - *BytesSent = 0; } UnlockObject(Connection, OldIrql); Modified: trunk/reactos/lib/drivers/lwip/src/include/rosip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] Mon Aug 27 23:58:40 2012 @@ -72,6 +72,7 @@ } Listen; struct { err_t Error; + u32_t Information; } Send; struct { err_t Error; @@ -98,7 +99,7 @@ PTCP_PCB LibTCPSocket(void *arg); err_t LibTCPBind(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port); PTCP_PCB LibTCPListen(PCONNECTION_ENDPOINT Connection, const u8_t backlog); -err_t LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, const int safe); +err_t LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, u32_t *sent, const int safe); err_t LibTCPConnect(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port); err_t LibTCPShutdown(PCONNECTION_ENDPOINT Connection, const int shut_rx, const int shut_tx); err_t LibTCPClose(PCONNECTION_ENDPOINT Connection, const int safe, const int callback); Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Aug 27 23:58:40 2012 @@ -443,6 +443,9 @@ LibTCPSendCallback(void *arg) { struct lwip_callback_msg *msg = arg; + PTCP_PCB pcb = msg->Input.Send.Connection->SocketContext; + ULONG SendLength; + UCHAR SendFlags; ASSERT(msg); @@ -458,19 +461,37 @@ goto done; } - msg->Output.Send.Error = tcp_write((PTCP_PCB)msg->Input.Send.Connection->SocketContext, - msg->Input.Send.Data, - msg->Input.Send.DataLength, - TCP_WRITE_FLAG_COPY); - if (msg->Output.Send.Error == ERR_MEM) + SendFlags = TCP_WRITE_FLAG_COPY; + SendLength = msg->Input.Send.DataLength; + if (tcp_sndbuf(pcb) == 0) { /* No buffer space so return pending */ msg->Output.Send.Error = ERR_INPROGRESS; - } - else if (msg->Output.Send.Error == ERR_OK) + goto done; + } + else if (tcp_sndbuf(pcb) < SendLength) + { + /* We've got some room so let's send what we can */ + SendLength = tcp_sndbuf(pcb); + + /* Don't set the push flag */ + SendFlags |= TCP_WRITE_FLAG_MORE; + } + + msg->Output.Send.Error = tcp_write(pcb, + msg->Input.Send.Data, + SendLength, + SendFlags); + if (msg->Output.Send.Error == ERR_OK) { /* Queued successfully so try to send it */ tcp_output((PTCP_PCB)msg->Input.Send.Connection->SocketContext); + msg->Output.Send.Information = SendLength; + } + else if (msg->Output.Send.Error == ERR_MEM) + { + /* The queue is too long */ + msg->Output.Send.Error = ERR_INPROGRESS; } done: @@ -478,7 +499,7 @@ } err_t -LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, const int safe) +LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, u32_t *sent, const int safe) { err_t ret; struct lwip_callback_msg *msg; @@ -500,6 +521,11 @@ ret = msg->Output.Send.Error; else ret = ERR_CLSD; + + if (ret == ERR_OK) + *sent = msg->Output.Send.Information; + else + *sent = 0; ExFreeToNPagedLookasideList(&MessageLookasideList, msg);

1 0

[cgutman] 57185: [AFD] - Fix enabling of some event select triggers
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 22:18:29 2012 New Revision: 57185 URL: http://svn.reactos.org/svn/reactos?rev=57185&view=rev Log: [AFD] - Fix enabling of some event select triggers Modified: trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Mon Aug 27 22:18:29 2012 @@ -327,6 +327,8 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + FCB->EventSelectDisabled &= ~AFD_EVENT_ACCEPT; + for( PendingConn = FCB->PendingConnections.Flink; PendingConn != &FCB->PendingConnections; PendingConn = PendingConn->Flink ) { @@ -364,8 +366,6 @@ ExFreePool( PendingConnObj ); - FCB->EventSelectDisabled &= ~AFD_EVENT_ACCEPT; - if( !IsListEmpty( &FCB->PendingConnections ) ) { FCB->PollState |= AFD_EVENT_ACCEPT; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Mon Aug 27 22:18:29 2012 @@ -436,6 +436,8 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + FCB->EventSelectDisabled &= ~AFD_EVENT_RECEIVE; + if( !(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS) && FCB->State != SOCKET_STATE_CONNECTED && FCB->State != SOCKET_STATE_CONNECTING ) { @@ -460,8 +462,6 @@ return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, Irp, 0 ); } - - FCB->EventSelectDisabled &= ~AFD_EVENT_RECEIVE; if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { @@ -704,6 +704,8 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + FCB->EventSelectDisabled &= ~AFD_EVENT_RECEIVE; + /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) { @@ -732,8 +734,6 @@ return UnlockAndMaybeComplete(FCB, STATUS_ACCESS_VIOLATION, Irp, 0); } - FCB->EventSelectDisabled &= ~AFD_EVENT_RECEIVE; - if (!IsListEmpty(&FCB->DatagramList)) { ListEntry = RemoveHeadList(&FCB->DatagramList);

1 0

[cgutman] 57184: [AFD] - Mask out disabled events properly
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 21:53:09 2012 New Revision: 57184 URL: http://svn.reactos.org/svn/reactos?rev=57184&view=rev Log: [AFD] - Mask out disabled events properly Modified: trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Mon Aug 27 21:53:09 2012 @@ -1,4 +1,4 @@ -/* $Id$ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/select.c @@ -304,9 +304,6 @@ { AFD_DbgPrint(MID_TRACE,("Setting event %x\n", FCB->EventSelect)); - /* Disable the events that triggered the select until the reenabling function is called */ - FCB->EventSelectDisabled |= (FCB->PollState & (FCB->EventSelectTriggers & ~FCB->EventSelectDisabled)); - /* Set the application's event */ KeSetEvent( FCB->EventSelect, IO_NETWORK_INCREMENT, FALSE ); } @@ -353,11 +350,14 @@ KeClearEvent(UserEvent); ObDereferenceObject(UserEvent); - /* Copy the poll state */ - EnumReq->PollEvents = FCB->PollState; + /* Copy the poll state, masking out disabled events */ + EnumReq->PollEvents = (FCB->PollState & ~FCB->EventSelectDisabled); RtlCopyMemory( EnumReq->EventStatus, FCB->PollStatus, sizeof(EnumReq->EventStatus) ); + + /* Disable the events that triggered the select until the reenabling function is called */ + FCB->EventSelectDisabled |= (FCB->PollState & FCB->EventSelectTriggers); return UnlockAndMaybeComplete( FCB, STATUS_SUCCESS, Irp, 0 ); } @@ -431,9 +431,6 @@ { AFD_DbgPrint(MID_TRACE,("Setting event %x\n", FCB->EventSelect)); - /* Disable the events that triggered the select until the reenabling function is called */ - FCB->EventSelectDisabled |= (FCB->PollState & (FCB->EventSelectTriggers & ~FCB->EventSelectDisabled)); - /* Set the application's event */ KeSetEvent( FCB->EventSelect, IO_NETWORK_INCREMENT, FALSE ); }

1 0

[jgardou] 57183: [MSVCRTEX] - Better fix for DLLs not providing a DllMain function, as per Timo's remarks.
by jgardou＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: jgardou Date: Mon Aug 27 21:34:42 2012 New Revision: 57183 URL: http://svn.reactos.org/svn/reactos?rev=57183&view=rev Log: [MSVCRTEX] - Better fix for DLLs not providing a DllMain function, as per Timo's remarks. Added: trunk/reactos/lib/sdk/crt/startup/dllmain.c - copied unchanged from r57179, trunk/reactos/lib/sdk/crt/startup/mscdllmain.c Removed: trunk/reactos/lib/sdk/crt/startup/mscdllmain.c Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/lib/sdk/crt/startup/crtdll.c Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Mon Aug 27 21:34:42 2012 @@ -21,6 +21,7 @@ startup/charmax.c startup/merr.c startup/atonexit.c + startup/dllmain.c startup/txtmode.c startup/pesect.c startup/tlsmcrt.c @@ -66,9 +67,7 @@ endif() if(MSVC) - list(APPEND MSVCRTEX_SOURCE - startup/mscmain.c - startup/mscdllmain.c) + list(APPEND MSVCRTEX_SOURCE startup/mscmain.c) else() list(APPEND MSVCRTEX_SOURCE startup/gccmain.c) endif() Modified: trunk/reactos/lib/sdk/crt/startup/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtdll… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] Mon Aug 27 21:34:42 2012 @@ -50,19 +50,7 @@ extern int mingw_app_type; -/* - * It is possible that a DLL provides no DllMain entry point. - * Mark it as a weak symbol for GCC. - * Tests show that at link time, MSVC looks for a function first in the object files provided, and then - * in the libraries. This means that we must provide a basic implementation in msvcrtex, which will be used - * if none is found in the object files provided to link.exe. - * This also means that we can't rely on a DllMain function implemented in a static library when linking a DLL. - */ -#ifdef __GNUC__ -extern WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) __attribute__((weak)); -#else extern WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved); -#endif extern WINBOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID); @@ -210,12 +198,10 @@ } if (dwReason == DLL_PROCESS_ATTACH) __main (); - if(DllMain) - retcode = DllMain(hDllHandle,dwReason,lpreserved); + retcode = DllMain(hDllHandle,dwReason,lpreserved); if (dwReason == DLL_PROCESS_ATTACH && ! retcode) { - if(DllMain) - DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); DllEntryPoint (hDllHandle, DLL_PROCESS_DETACH, lpreserved); _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved); } Removed: trunk/reactos/lib/sdk/crt/startup/mscdllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscdll… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscdllmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscdllmain.c (removed) @@ -1,11 +1,0 @@ -#include <oscalls.h> -#define _DECL_DLLMAIN -#include <process.h> - -WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) -{ - /* If the DLL provides no DllMain, then chances are that it doesn't bother with thread initialization */ - if(dwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hDllHandle); - return TRUE; -}

1 0

[akhaldi] 57182: [HAL] * Don't compile lib_hal_pic for x64. Brought to you by Hermès Bélusca. See issue #7309 for more details.
by akhaldi＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: akhaldi Date: Mon Aug 27 21:24:22 2012 New Revision: 57182 URL: http://svn.reactos.org/svn/reactos?rev=57182&view=rev Log: [HAL] * Don't compile lib_hal_pic for x64. Brought to you by Hermès Bélusca. See issue #7309 for more details. Modified: trunk/reactos/hal/halx86/CMakeLists.txt Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Mon Aug 27 21:24:22 2012 @@ -83,18 +83,6 @@ add_library(lib_hal_up OBJECT ${HAL_UP_SOURCE}) endif() -list(APPEND HAL_PIC_SOURCE - generic/profil.c - generic/timer.c - generic/systimer.S - generic/trap.S - up/halinit_up.c - up/pic.c) - -if(CMAKE_VERSION VERSION_GREATER 2.8.7) - add_library(lib_hal_pic OBJECT ${HAL_PIC_SOURCE}) -endif() - list(APPEND HAL_APIC_SOURCE apic/apic.c apic/apictimer.c @@ -105,6 +93,18 @@ apic/tsccal.S) if(ARCH STREQUAL "i386") + list(APPEND HAL_PIC_SOURCE + generic/profil.c + generic/timer.c + generic/systimer.S + generic/trap.S + up/halinit_up.c + up/pic.c) + + if(CMAKE_VERSION VERSION_GREATER 2.8.7) + add_library(lib_hal_pic OBJECT ${HAL_PIC_SOURCE}) + endif() + list(APPEND MINI_HAL_SOURCE generic/portio.c generic/systimer.S

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