Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 52539: [AFD] - Move the TdiReceiveDatagram call to WarmSocketForBind like it is done for connects
by cgutman＠svn.reactos.org 04 Jul '11

04 Jul '11

Author: cgutman Date: Mon Jul 4 19:13:45 2011 New Revision: 52539 URL: http://svn.reactos.org/svn/reactos?rev=52539&view=rev Log: [AFD] - Move the TdiReceiveDatagram call to WarmSocketForBind like it is done for connects Modified: trunk/reactos/drivers/network/afd/afd/bind.c Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Mon Jul 4 19:13:45 2011 @@ -37,13 +37,33 @@ if (FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS) { - Status = TdiQueryMaxDatagramLength(FCB->AddressFile.Object, - &FCB->Recv.Size); - if (NT_SUCCESS(Status)) + if (!FCB->Recv.Size) + { + Status = TdiQueryMaxDatagramLength(FCB->AddressFile.Object, + &FCB->Recv.Size); + } + + if (NT_SUCCESS(Status) && !FCB->Recv.Window) { FCB->Recv.Window = ExAllocatePool(PagedPool, FCB->Recv.Size); if (!FCB->Recv.Window) Status = STATUS_NO_MEMORY; + } + + if (NT_SUCCESS(Status)) + { + Status = TdiReceiveDatagram(&FCB->ReceiveIrp.InFlightRequest, + FCB->AddressFile.Object, + 0, + FCB->Recv.Window, + FCB->Recv.Size, + FCB->AddressFrom, + &FCB->ReceiveIrp.Iosb, + PacketSocketRecvComplete, + FCB); + + /* We don't want to wait for this read to complete. */ + if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; } } @@ -78,27 +98,6 @@ Status = WarmSocketForBind( FCB ); AFD_DbgPrint(MID_TRACE,("FCB->Flags %x\n", FCB->Flags)); - if( !NT_SUCCESS(Status) ) - return UnlockAndMaybeComplete(FCB, Status, Irp, 0); - - if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { - AFD_DbgPrint(MID_TRACE,("Calling TdiReceiveDatagram\n")); - - Status = TdiReceiveDatagram - ( &FCB->ReceiveIrp.InFlightRequest, - FCB->AddressFile.Object, - 0, - FCB->Recv.Window, - FCB->Recv.Size, - FCB->AddressFrom, - &FCB->ReceiveIrp.Iosb, - PacketSocketRecvComplete, - FCB ); - - /* We don't want to wait for this read to complete. */ - if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; - } - if (NT_SUCCESS(Status)) FCB->State = SOCKET_STATE_BOUND;

1 0

[cgutman] 52538: [AFD] - Add support for AFD_INFO_INLINING_MODE - Add support for setting AFD_INFO_RECEIVE_WINDOW_SIZE and AFD_INFO_SEND_WINDOW_SIZE - None of this is used by our current msafd but ...
by cgutman＠svn.reactos.org 04 Jul '11

04 Jul '11

Author: cgutman Date: Mon Jul 4 18:07:55 2011 New Revision: 52538 URL: http://svn.reactos.org/svn/reactos?rev=52538&view=rev Log: [AFD] - Add support for AFD_INFO_INLINING_MODE - Add support for setting AFD_INFO_RECEIVE_WINDOW_SIZE and AFD_INFO_SEND_WINDOW_SIZE - None of this is used by our current msafd but mswsock_new uses it Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Mon Jul 4 18:07:55 2011 @@ -223,26 +223,33 @@ ASSERT(!FCB->Recv.Window); ASSERT(!FCB->Send.Window); - Status = TdiQueryMaxDatagramLength(FCB->Connection.Object, - &FCB->Send.Size); - if (!NT_SUCCESS(Status)) - return Status; - - FCB->Recv.Size = FCB->Send.Size; + if (!FCB->Recv.Size) + { + Status = TdiQueryMaxDatagramLength(FCB->Connection.Object, + &FCB->Recv.Size); + if (!NT_SUCCESS(Status)) + return Status; + } + + if (!FCB->Send.Size) + { + Status = TdiQueryMaxDatagramLength(FCB->Connection.Object, + &FCB->Send.Size); + if (!NT_SUCCESS(Status)) + return Status; + } /* Allocate the receive area and start receiving */ - FCB->Recv.Window = - ExAllocatePool( PagedPool, FCB->Recv.Size ); - - if( !FCB->Recv.Window ) return STATUS_NO_MEMORY; - - FCB->Send.Window = - ExAllocatePool( PagedPool, FCB->Send.Size ); - - if( !FCB->Send.Window ) { - ExFreePool( FCB->Recv.Window ); - FCB->Recv.Window = NULL; - return STATUS_NO_MEMORY; + if (!FCB->Recv.Window) + { + FCB->Recv.Window = ExAllocatePool( PagedPool, FCB->Recv.Size ); + if( !FCB->Recv.Window ) return STATUS_NO_MEMORY; + } + + if (!FCB->Send.Window) + { + FCB->Send.Window = ExAllocatePool( PagedPool, FCB->Send.Size ); + if( !FCB->Send.Window ) return STATUS_NO_MEMORY; } FCB->State = SOCKET_STATE_CONNECTED; Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Mon Jul 4 18:07:55 2011 @@ -50,6 +50,10 @@ case AFD_INFO_BLOCKING_MODE: InfoReq->Information.Boolean = FCB->NonBlocking; break; + + case AFD_INFO_INLINING_MODE: + InfoReq->Information.Boolean = FCB->OobInline; + break; case AFD_INFO_RECEIVE_CONTENT_SIZE: /* Only touch InfoReq if a socket has been set up. @@ -106,6 +110,7 @@ PAFD_INFO InfoReq = LockRequest(Irp, IrpSp); PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; + PCHAR NewBuffer; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -117,6 +122,61 @@ case AFD_INFO_BLOCKING_MODE: AFD_DbgPrint(MID_TRACE,("Blocking mode set to %d\n", InfoReq->Information.Boolean)); FCB->NonBlocking = InfoReq->Information.Boolean; + break; + case AFD_INFO_INLINING_MODE: + FCB->OobInline = InfoReq->Information.Boolean; + break; + case AFD_INFO_RECEIVE_WINDOW_SIZE: + NewBuffer = ExAllocatePool(PagedPool, InfoReq->Information.Ulong); + if (NewBuffer) + { + if (FCB->Recv.Content > InfoReq->Information.Ulong) + FCB->Recv.Content = InfoReq->Information.Ulong; + + if (FCB->Recv.Window) + { + RtlCopyMemory(NewBuffer, + FCB->Recv.Window, + FCB->Recv.Content); + + ExFreePool(FCB->Recv.Window); + } + + FCB->Recv.Size = InfoReq->Information.Ulong; + FCB->Recv.Window = NewBuffer; + + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_NO_MEMORY; + } + break; + case AFD_INFO_SEND_WINDOW_SIZE: + NewBuffer = ExAllocatePool(PagedPool, InfoReq->Information.Ulong); + if (NewBuffer) + { + if (FCB->Send.BytesUsed > InfoReq->Information.Ulong) + FCB->Send.BytesUsed = InfoReq->Information.Ulong; + + if (FCB->Send.Window) + { + RtlCopyMemory(NewBuffer, + FCB->Send.Window, + FCB->Send.BytesUsed); + + ExFreePool(FCB->Send.Window); + } + + FCB->Send.Size = InfoReq->Information.Ulong; + FCB->Send.Window = NewBuffer; + + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_NO_MEMORY; + } break; default: AFD_DbgPrint(MIN_TRACE,("Unknown request %d\n", InfoReq->InformationClass)); Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Mon Jul 4 18:07:55 2011 @@ -173,7 +173,7 @@ } AFD_STORED_DATAGRAM, *PAFD_STORED_DATAGRAM; typedef struct _AFD_FCB { - BOOLEAN Locked, Critical, Overread, NonBlocking; + BOOLEAN Locked, Critical, Overread, NonBlocking, OobInline; UINT State, Flags, GroupID, GroupType; KIRQL OldIrql; UINT LockCount;

1 0

[cgutman] 52537: [MSAFD/AFD] - Pass the non-blocking information as a boolean (mswsock_new does this too) [AFD] - Don't block waiting for a connection to accept on a non-blocking listener
by cgutman＠svn.reactos.org 04 Jul '11

04 Jul '11

Author: cgutman Date: Mon Jul 4 17:37:45 2011 New Revision: 52537 URL: http://svn.reactos.org/svn/reactos?rev=52537&view=rev Log: [MSAFD/AFD] - Pass the non-blocking information as a boolean (mswsock_new does this too) [AFD] - Don't block waiting for a connection to accept on a non-blocking listener Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c trunk/reactos/dll/win32/msafd/msafd.h trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h 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 Jul 4 17:37:45 2011 @@ -264,7 +264,7 @@ /* Save Group Info */ if (g != 0) { - GetSocketInformation(Socket, AFD_INFO_GROUP_ID_TYPE, 0, &GroupData); + GetSocketInformation(Socket, AFD_INFO_GROUP_ID_TYPE, NULL, NULL, &GroupData); Socket->SharedData.GroupID = GroupData.u.LowPart; Socket->SharedData.GroupType = GroupData.u.HighPart; } @@ -272,11 +272,13 @@ /* Get Window Sizes and Save them */ GetSocketInformation (Socket, AFD_INFO_SEND_WINDOW_SIZE, + NULL, &Socket->SharedData.SizeOfSendBuffer, NULL); GetSocketInformation (Socket, AFD_INFO_RECEIVE_WINDOW_SIZE, + NULL, &Socket->SharedData.SizeOfRecvBuffer, NULL); @@ -467,6 +469,7 @@ /* Find out how many Sends are in Progress */ if (GetSocketInformation(Socket, AFD_INFO_SENDS_IN_PROGRESS, + NULL, &SendsInProgress, NULL)) { @@ -1951,6 +1954,7 @@ { PSOCKET_INFORMATION Socket = NULL; BOOLEAN NeedsCompletion; + BOOLEAN NonBlocking; /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); @@ -1970,8 +1974,9 @@ *lpErrno = WSAEFAULT; return SOCKET_ERROR; } - Socket->SharedData.NonBlocking = *((PULONG)lpvInBuffer) ? 1 : 0; - *lpErrno = SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, (PULONG)lpvInBuffer, NULL); + NonBlocking = *((PULONG)lpvInBuffer) ? TRUE : FALSE; + Socket->SharedData.NonBlocking = NonBlocking ? 1 : 0; + *lpErrno = SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &NonBlocking, NULL, NULL); if (*lpErrno != NO_ERROR) return SOCKET_ERROR; else @@ -1982,7 +1987,7 @@ *lpErrno = WSAEFAULT; return SOCKET_ERROR; } - *lpErrno = GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, (PULONG)lpvOutBuffer, NULL); + *lpErrno = GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, NULL, (PULONG)lpvOutBuffer, NULL); if (*lpErrno != NO_ERROR) return SOCKET_ERROR; else @@ -2258,6 +2263,7 @@ int GetSocketInformation(PSOCKET_INFORMATION Socket, ULONG AfdInformationClass, + PBOOLEAN Boolean OPTIONAL, PULONG Ulong OPTIONAL, PLARGE_INTEGER LargeInteger OPTIONAL) { @@ -2309,6 +2315,10 @@ { *LargeInteger = InfoData.Information.LargeInteger; } + if (Boolean != NULL) + { + *Boolean = InfoData.Information.Boolean; + } NtClose( SockEvent ); @@ -2319,7 +2329,8 @@ int SetSocketInformation(PSOCKET_INFORMATION Socket, - ULONG AfdInformationClass, + ULONG AfdInformationClass, + PBOOLEAN Boolean OPTIONAL, PULONG Ulong OPTIONAL, PLARGE_INTEGER LargeInteger OPTIONAL) { @@ -2348,6 +2359,10 @@ if (LargeInteger != NULL) { InfoData.Information.LargeInteger = *LargeInteger; + } + if (Boolean != NULL) + { + InfoData.Information.Boolean = *Boolean; } AFD_DbgPrint(MID_TRACE,("XXX Info %x (Data %x)\n", Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Mon Jul 4 17:37:45 2011 @@ -26,7 +26,7 @@ AFD_EVENT_SELECT_INFO EventSelectInfo; PSOCKET_INFORMATION Socket = NULL; NTSTATUS Status; - ULONG BlockMode; + BOOLEAN BlockMode; HANDLE SockEvent; Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, @@ -44,8 +44,8 @@ } /* Set Socket to Non-Blocking */ - BlockMode = 1; - SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &BlockMode, NULL); + BlockMode = TRUE; + SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &BlockMode, NULL, NULL); Socket->SharedData.NonBlocking = TRUE; /* Deactivate Async Select if there is one */ Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Jul 4 17:37:45 2011 @@ -25,7 +25,7 @@ PSOCKET_INFORMATION Socket = NULL; PASYNC_DATA AsyncData; NTSTATUS Status; - ULONG BlockMode; + BOOLEAN BlockMode; /* Get the Socket Structure associated to this Socket */ Socket = GetSocketStructure(Handle); @@ -44,8 +44,8 @@ } /* Change the Socket to Non Blocking */ - BlockMode = 1; - SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &BlockMode, NULL); + BlockMode = TRUE; + SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &BlockMode, NULL, NULL); Socket->SharedData.NonBlocking = TRUE; /* Deactive WSPEventSelect */ Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Mon Jul 4 17:37:45 2011 @@ -417,14 +417,16 @@ int GetSocketInformation( PSOCKET_INFORMATION Socket, ULONG AfdInformationClass, - PULONG Ulong OPTIONAL, + PBOOLEAN Boolean OPTIONAL, + PULONG Ulong OPTIONAL, PLARGE_INTEGER LargeInteger OPTIONAL ); int SetSocketInformation( PSOCKET_INFORMATION Socket, ULONG AfdInformationClass, - PULONG Ulong OPTIONAL, + PBOOLEAN Boolean OPTIONAL, + PULONG Ulong OPTIONAL, PLARGE_INTEGER LargeInteger OPTIONAL ); Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Mon Jul 4 17:37:45 2011 @@ -48,7 +48,7 @@ break; case AFD_INFO_BLOCKING_MODE: - InfoReq->Information.Ulong = FCB->BlockingMode; + InfoReq->Information.Boolean = FCB->NonBlocking; break; case AFD_INFO_RECEIVE_CONTENT_SIZE: @@ -115,8 +115,8 @@ _SEH2_TRY { switch (InfoReq->InformationClass) { case AFD_INFO_BLOCKING_MODE: - AFD_DbgPrint(MID_TRACE,("Blocking mode set to %d\n", InfoReq->Information.Ulong)); - FCB->BlockingMode = InfoReq->Information.Ulong; + AFD_DbgPrint(MID_TRACE,("Blocking mode set to %d\n", InfoReq->Information.Boolean)); + FCB->NonBlocking = InfoReq->Information.Boolean; break; default: AFD_DbgPrint(MIN_TRACE,("Unknown request %d\n", InfoReq->InformationClass)); 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 Jul 4 17:37:45 2011 @@ -315,6 +315,10 @@ SocketStateUnlock( FCB ); return Status; + } else if (FCB->NonBlocking) { + AFD_DbgPrint(MID_TRACE,("No connection ready on a non-blocking socket\n")); + + return UnlockAndMaybeComplete(FCB, STATUS_CANT_WAIT, Irp, 0); } else { AFD_DbgPrint(MID_TRACE,("Holding\n")); 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 Jul 4 17:37:45 2011 @@ -346,7 +346,8 @@ Status = ReceiveActivity( FCB, Irp ); - if( Status == STATUS_PENDING && (RecvReq->AfdFlags & AFD_IMMEDIATE) ) { + if( Status == STATUS_PENDING && + ((RecvReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking)) ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; TotalBytesCopied = 0; @@ -690,7 +691,7 @@ return UnlockAndMaybeComplete ( FCB, Status, Irp, Irp->IoStatus.Information ); } - } else if( RecvReq->AfdFlags & AFD_IMMEDIATE ) { + } else if( (RecvReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking) ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; FCB->PollState &= ~AFD_EVENT_RECEIVE; 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] Mon Jul 4 17:37:45 2011 @@ -340,7 +340,7 @@ AFD_DbgPrint(MID_TRACE,("Socket state %d\n", FCB->State)); if( FCB->State != SOCKET_STATE_CONNECTED ) { - if( SendReq->AfdFlags & AFD_IMMEDIATE ) { + if( (SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking) ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); return UnlockAndMaybeComplete @@ -404,7 +404,7 @@ else { FCB->PollState &= ~AFD_EVENT_SEND; - if( SendReq->AfdFlags & AFD_IMMEDIATE ) { + if( (SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking) ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); return UnlockAndMaybeComplete Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Mon Jul 4 17:37:45 2011 @@ -173,8 +173,8 @@ } AFD_STORED_DATAGRAM, *PAFD_STORED_DATAGRAM; typedef struct _AFD_FCB { - BOOLEAN Locked, Critical, Overread; - UINT State, Flags, BlockingMode, GroupID, GroupType; + BOOLEAN Locked, Critical, Overread, NonBlocking; + UINT State, Flags, GroupID, GroupType; KIRQL OldIrql; UINT LockCount; PVOID CurrentThread;

1 0

[tkreuzer] 52536: [RTL] - Fix RtlFindSetBits to search for bits before the HintIndex as well - Remove a wrong (and commented out) ASSERT - Fix MSVC warnings
by tkreuzer＠svn.reactos.org 04 Jul '11

04 Jul '11

Author: tkreuzer Date: Mon Jul 4 16:30:45 2011 New Revision: 52536 URL: http://svn.reactos.org/svn/reactos?rev=52536&view=rev Log: [RTL] - Fix RtlFindSetBits to search for bits before the HintIndex as well - Remove a wrong (and commented out) ASSERT - Fix MSVC warnings Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=52536… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Mon Jul 4 16:30:45 2011 @@ -152,11 +152,11 @@ if (BitScanReverse(&Position, Value >> 32)) { - return Position + 32; + return (CCHAR)(Position + 32); } else if (BitScanReverse(&Position, (ULONG)Value)) { - return Position; + return (CCHAR)Position; } return -1; @@ -170,11 +170,11 @@ if (BitScanForward(&Position, (ULONG)Value)) { - return Position; + return (CCHAR)Position; } else if (BitScanForward(&Position, Value >> 32)) { - return Position + 32; + return (CCHAR)(Position + 32); } return -1; @@ -187,9 +187,6 @@ IN PULONG BitMapBuffer, IN ULONG SizeOfBitMap) { - // FIXME: some bugger here! - //ASSERT(SizeOfBitMap > 0); - /* Setup the bitmap header */ BitMapHeader->SizeOfBitMap = SizeOfBitMap; BitMapHeader->Buffer = BitMapBuffer; @@ -212,7 +209,7 @@ IN OUT PRTL_BITMAP BitMapHeader) { ULONG LengthInUlongs; - + LengthInUlongs = (BitMapHeader->SizeOfBitMap + 31) >> 5; RtlFillMemoryUlong(BitMapHeader->Buffer, LengthInUlongs << 2, ~0); } @@ -481,7 +478,7 @@ IN ULONG NumberToFind, IN ULONG HintIndex) { - ULONG CurrentBit, CurrentLength; + ULONG CurrentBit, Margin, CurrentLength; /* Check for valid parameters */ if (!BitMapHeader || NumberToFind > BitMapHeader->SizeOfBitMap) @@ -495,12 +492,15 @@ return HintIndex; } + /* First margin is end of bitmap */ + Margin = BitMapHeader->SizeOfBitMap; + +retry: /* Start with hint index, length is 0 */ CurrentBit = HintIndex; - CurrentLength = 0; /* Loop until something is found or the end is reached */ - while (CurrentBit + NumberToFind <= BitMapHeader->SizeOfBitMap) + while (CurrentBit + NumberToFind <= Margin) { /* Search for the next set run, by skipping a clear run */ CurrentBit += RtlpGetLengthOfRunClear(BitMapHeader, @@ -522,6 +522,15 @@ CurrentBit += CurrentLength; } + /* Did we start at a hint? */ + if (HintIndex) + { + /* Retry at the start */ + Margin = min(HintIndex + NumberToFind, BitMapHeader->SizeOfBitMap); + HintIndex = 0; + goto retry; + } + /* Nothing found */ return MAXULONG; } @@ -641,7 +650,7 @@ for (Run = 0; Run < SizeOfRunArray; Run++) { /* Look for a run */ - NumberOfBits = RtlFindNextForwardRunClear(BitMapHeader, + NumberOfBits = RtlFindNextForwardRunClear(BitMapHeader, FromIndex, &StartingIndex); @@ -672,7 +681,7 @@ while (1) { /* Look for a run */ - NumberOfBits = RtlFindNextForwardRunClear(BitMapHeader, + NumberOfBits = RtlFindNextForwardRunClear(BitMapHeader, FromIndex, &StartingIndex); @@ -716,7 +725,7 @@ while (1) { /* Look for a run */ - NumberOfBits = RtlFindNextForwardRunClear(BitMapHeader, + NumberOfBits = RtlFindNextForwardRunClear(BitMapHeader, FromIndex, &Index); @@ -749,7 +758,7 @@ while (1) { /* Look for a run */ - NumberOfBits = RtlFindNextForwardRunSet(BitMapHeader, + NumberOfBits = RtlFindNextForwardRunSet(BitMapHeader, FromIndex, &Index);

1 0

[tkreuzer] 52535: [NTOSKRNL] - Initialize an uninitialized variable - MI_GET_NEXT_COLOR() doesn't have an argument - Fix a warning on MSVC
by tkreuzer＠svn.reactos.org 04 Jul '11

04 Jul '11

Author: tkreuzer Date: Mon Jul 4 16:26:52 2011 New Revision: 52535 URL: http://svn.reactos.org/svn/reactos?rev=52535&view=rev Log: [NTOSKRNL] - Initialize an uninitialized variable - MI_GET_NEXT_COLOR() doesn't have an argument - Fix a warning on MSVC Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/miavl.h trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Jul 4 16:26:52 2011 @@ -244,7 +244,7 @@ // Returns the color of a page // #define MI_GET_PAGE_COLOR(x) ((x) & MmSecondaryColorMask) -#define MI_GET_NEXT_COLOR(x) (MI_GET_PAGE_COLOR(++MmSystemPageColor)) +#define MI_GET_NEXT_COLOR() (MI_GET_PAGE_COLOR(++MmSystemPageColor)) #define MI_GET_NEXT_PROCESS_COLOR(x) (MI_GET_PAGE_COLOR(++(x)->NextPageColor)) #ifndef _M_AMD64 Modified: trunk/reactos/ntoskrnl/mm/ARM3/miavl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miavl.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miavl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miavl.h [iso-8859-1] Mon Jul 4 16:26:52 2011 @@ -20,7 +20,7 @@ * * The other difference is that the AVL package for Rtl has custom callbacks for * comparison purposes (which would access some internal, opaque, user data) while - * the Mm package stores the user-data inline as StartingVpn and EndingVpn. So + * the Mm package stores the user-data inline as StartingVpn and EndingVpn. So * when a compare is being made, RtlpAvlCompareRoutine is called, which will either * perform the Mm work, or call the user-specified callback in the Rtl case. */ @@ -54,7 +54,7 @@ { return GenericEqual; } - else + else { return GenericGreaterThan; } @@ -80,7 +80,7 @@ FORCEINLINE RtlBalance(IN PRTL_BALANCED_LINKS Node) { - return Node->u1.Balance; + return (SCHAR)Node->u1.Balance; } PRTL_BALANCED_LINKS Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Mon Jul 4 16:26:52 2011 @@ -2086,7 +2086,7 @@ PIMAGE_NT_HEADERS NtHeaders; PIMAGE_SECTION_HEADER Section; PFN_NUMBER DriverPages; - ULONG CurrentProtection, SectionProtection, CombinedProtection, ProtectionMask; + ULONG CurrentProtection, SectionProtection, CombinedProtection = 0, ProtectionMask; ULONG Sections, Size; ULONG_PTR BaseAddress, CurrentAddress; PMMPTE PointerPte, StartPte, LastPte, CurrentPte, ComboPte = NULL;

1 0

[cgutman] 52534: - Small fix for my last commit to prevent problems if ExAllocatePool fails
by cgutman＠svn.reactos.org 04 Jul '11

04 Jul '11

Author: cgutman Date: Mon Jul 4 15:45:58 2011 New Revision: 52534 URL: http://svn.reactos.org/svn/reactos?rev=52534&view=rev Log: - Small fix for my last commit to prevent problems if ExAllocatePool fails Modified: trunk/reactos/drivers/network/afd/afd/read.c 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 Jul 4 15:45:58 2011 @@ -513,8 +513,6 @@ SocketStateUnlock(FCB); return Irp->IoStatus.Status; } - - FCB->Recv.Content += Irp->IoStatus.Information; DatagramRecv = ExAllocatePool( NonPagedPool, DGSize ); @@ -536,6 +534,7 @@ SocketStateUnlock( FCB ); return Status; } else { + FCB->Recv.Content += DatagramRecv->Len; InsertTailList( &FCB->DatagramList, &DatagramRecv->ListEntry ); }

1 0

[cgutman] 52533: [AFD] - Fix FIONREAD for datagram sockets
by cgutman＠svn.reactos.org 04 Jul '11

04 Jul '11

Author: cgutman Date: Mon Jul 4 15:35:16 2011 New Revision: 52533 URL: http://svn.reactos.org/svn/reactos?rev=52533&view=rev Log: [AFD] - Fix FIONREAD for datagram sockets Modified: trunk/reactos/drivers/network/afd/afd/read.c 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 Jul 4 15:35:16 2011 @@ -448,6 +448,7 @@ if (!(RecvReq->TdiFlags & TDI_RECEIVE_PEEK)) { + FCB->Recv.Content -= *TotalBytesCopied; ExFreePool( DatagramRecv->Address ); ExFreePool( DatagramRecv ); } @@ -512,6 +513,8 @@ SocketStateUnlock(FCB); return Irp->IoStatus.Status; } + + FCB->Recv.Content += Irp->IoStatus.Information; DatagramRecv = ExAllocatePool( NonPagedPool, DGSize );

1 0

[cgutman] 52532: [AFD] - Fix a check so FIONREAD works for accepted sockets too
by cgutman＠svn.reactos.org 04 Jul '11

04 Jul '11

Author: cgutman Date: Mon Jul 4 00:30:04 2011 New Revision: 52532 URL: http://svn.reactos.org/svn/reactos?rev=52532&view=rev Log: [AFD] - Fix a check so FIONREAD works for accepted sockets too Modified: trunk/reactos/drivers/network/afd/afd/info.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Mon Jul 4 00:30:04 2011 @@ -54,7 +54,7 @@ case AFD_INFO_RECEIVE_CONTENT_SIZE: /* Only touch InfoReq if a socket has been set up. Behaviour was verified under WinXP SP2. */ - if(FCB->AddressFile.Object) + if(FCB->AddressFile.Object || FCB->Connection.Object) InfoReq->Information.Ulong = FCB->Recv.Content - FCB->Recv.BytesUsed; break;

1 0

[rharabien] 52531: - Fix build
by rharabien＠svn.reactos.org 03 Jul '11

03 Jul '11

Author: rharabien Date: Sun Jul 3 23:32:00 2011 New Revision: 52531 URL: http://svn.reactos.org/svn/reactos?rev=52531&view=rev Log: - Fix build Modified: trunk/reactos/dll/nls/normaliz/normaliz.rbuild Modified: trunk/reactos/dll/nls/normaliz/normaliz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz/normaliz.… ============================================================================== --- trunk/reactos/dll/nls/normaliz/normaliz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/nls/normaliz/normaliz.rbuild [iso-8859-1] Sun Jul 3 23:32:00 2011 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="normaliz" type="win32dll" entrypoint="0"> - <importlibrary definition="normaliz.def" /> + <importlibrary definition="normaliz.spec" /> <file>dummy.c</file> </module>

1 0

[rharabien] 52530: [NORMALIZ] - Remove .def file - we already have spec2def
by rharabien＠svn.reactos.org 03 Jul '11

03 Jul '11

Author: rharabien Date: Sun Jul 3 23:25:59 2011 New Revision: 52530 URL: http://svn.reactos.org/svn/reactos?rev=52530&view=rev Log: [NORMALIZ] - Remove .def file - we already have spec2def Removed: trunk/reactos/dll/nls/normaliz/normaliz.def Removed: trunk/reactos/dll/nls/normaliz/normaliz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz/normaliz.… ============================================================================== --- trunk/reactos/dll/nls/normaliz/normaliz.def [iso-8859-1] (original) +++ trunk/reactos/dll/nls/normaliz/normaliz.def (removed) @@ -1,37 +1,0 @@ -; Copyright (c) 2008, KJK::Hyperion -; All rights reserved. -; -; Redistribution and use in source and binary forms, with or without -; modification, are permitted provided that the following conditions are met: -; -; - Redistributions of source code must retain the above copyright notice, -; this list of conditions and the following disclaimer. -; -; - Redistributions in binary form must reproduce the above copyright notice, -; this list of conditions and the following disclaimer in the documentation -; and/or other materials provided with the distribution. -; -; - Neither the name of the ReactOS Foundation nor the names of its -; contributors may be used to endorse or promote products derived from this -; software without specific prior written permission. -; -; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -; ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -; POSSIBILITY OF SUCH DAMAGE. - -LIBRARY "normaliz.dll" - -EXPORTS - IdnToAscii@20 = kernel32.IdnToAscii @1 - IdnToNameprepUnicode@20 = kernel32.IdnToNameprepUnicode @2 - IdnToUnicode@20 = kernel32.IdnToUnicode @3 - IsNormalizedString@12 = kernel32.IsNormalizedString @4 - NormalizeString@20 = kernel32.NormalizeString @5

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