Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[cgutman] 35584: - Merge aicom-network-fixes up to r35583
by cgutman＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: cgutman Date: Sat Aug 23 20:53:58 2008 New Revision: 35584 URL: http://svn.reactos.org/svn/reactos?rev=35584&view=rev Log: - Merge aicom-network-fixes up to r35583 Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.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] Sat Aug 23 20:53:58 2008 @@ -70,6 +70,8 @@ TdiBuildConnectionInfo( &FCB->AddressFrom, FCB->LocalAddress ); + if( !FCB->AddressFrom ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + AFD_DbgPrint(MID_TRACE,("Calling TdiReceiveDatagram\n")); Status = TdiReceiveDatagram 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] Sat Aug 23 20:53:58 2008 @@ -33,7 +33,6 @@ } NTSTATUS MakeSocketIntoConnection( PAFD_FCB FCB ) { - NTSTATUS Status; /* Allocate the receive area and start receiving */ FCB->Recv.Window = @@ -51,16 +50,14 @@ FCB->State = SOCKET_STATE_CONNECTED; - Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); - - return Status; + return TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); } static NTSTATUS NTAPI StreamSocketConnectComplete @@ -84,15 +81,15 @@ if( NT_SUCCESS(Irp->IoStatus.Status) ) { FCB->PollState |= AFD_EVENT_CONNECT | AFD_EVENT_SEND; + AFD_DbgPrint(MID_TRACE,("Going to connected state %d\n", FCB->State)); FCB->State = SOCKET_STATE_CONNECTED; - AFD_DbgPrint(MID_TRACE,("Going to connected state %d\n", FCB->State)); - PollReeval( FCB->DeviceExt, FCB->FileObject ); } else { FCB->PollState |= AFD_EVENT_CONNECT_FAIL | AFD_EVENT_RECEIVE; AFD_DbgPrint(MID_TRACE,("Going to bound state\n")); FCB->State = SOCKET_STATE_BOUND; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } + } + + PollReeval( FCB->DeviceExt, FCB->FileObject ); /* Succeed pending irps on the FUNCTION_CONNECT list */ while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_CONNECT] ) ) { @@ -199,6 +196,11 @@ FCB->RemoteAddress = TaCopyTransportAddress( &ConnectReq->RemoteAddress ); + if( !FCB->RemoteAddress ) { + Status = STATUS_NO_MEMORY; + break; + } + if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { Status = STATUS_SUCCESS; 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] Sat Aug 23 20:53:58 2008 @@ -61,6 +61,13 @@ IPAddr = (PTA_IP_ADDRESS)&ListenReceive->Address; + if( !IPAddr ) { + if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + Irp->IoStatus.Status = STATUS_NO_MEMORY; + Irp->IoStatus.Information = 0; + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + } + AFD_DbgPrint(MID_TRACE,("IPAddr->TAAddressCount %d\n", IPAddr->TAAddressCount)); AFD_DbgPrint(MID_TRACE,("IPAddr->Address[0].AddressType %d\n", @@ -172,7 +179,7 @@ 0, NULL ); if( FCB->State != SOCKET_STATE_BOUND ) { - Status = STATUS_UNSUCCESSFUL; + Status = STATUS_INVALID_PARAMETER; AFD_DbgPrint(MID_TRACE,("Could not listen an unbound socket\n")); return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sat Aug 23 20:53:58 2008 @@ -130,9 +130,13 @@ if( LockFailed ) { IoFreeMdl( MapBuf[i].Mdl ); MapBuf[i].Mdl = NULL; - LockFailed = FALSE; + ExFreePool( NewBuf ); + return NULL; } - } + } else { + ExFreePool( NewBuf ); + return NULL; + } } } @@ -164,7 +168,7 @@ * pointers. This will allow the system to do proper alerting */ PAFD_HANDLE LockHandles( PAFD_HANDLE HandleArray, UINT HandleCount ) { UINT i; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PAFD_HANDLE FileObjects = ExAllocatePool ( NonPagedPool, HandleCount * sizeof(AFD_HANDLE) ); @@ -173,13 +177,21 @@ HandleArray[i].Status = 0; HandleArray[i].Events = HandleArray[i].Events; FileObjects[i].Handle = 0; - Status = ObReferenceObjectByHandle - ( (PVOID)HandleArray[i].Handle, - FILE_ALL_ACCESS, - NULL, - KernelMode, - (PVOID*)&FileObjects[i].Handle, - NULL ); + if( !HandleArray[i].Handle ) continue; + if( NT_SUCCESS(Status) ) { + Status = ObReferenceObjectByHandle + ( (PVOID)HandleArray[i].Handle, + FILE_ALL_ACCESS, + NULL, + KernelMode, + (PVOID*)&FileObjects[i].Handle, + NULL ); + } + } + + if( !NT_SUCCESS(Status) ) { + UnlockHandles( FileObjects, HandleCount ); + return NULL; } return FileObjects; @@ -312,12 +324,14 @@ } VOID SocketCalloutEnter( PAFD_FCB FCB ) { + ASSERT(!FCB->Critical); ASSERT(FCB->Locked); FCB->Critical = TRUE; SocketStateUnlock( FCB ); } VOID SocketCalloutLeave( PAFD_FCB FCB ) { + ASSERT(FCB->Critical); FCB->Critical = FALSE; SocketAcquireStateLock( FCB ); }

1 0

[cgutman] 35583: - Skip ObReferenceObjectByHandle if HandleArray[i].Handle is NULL - Fail if ObReferenceObjectByHandle didn't succeed - Remove a bad ASSERT I added in my last commit
by cgutman＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: cgutman Date: Sat Aug 23 20:34:17 2008 New Revision: 35583 URL: http://svn.reactos.org/svn/reactos?rev=35583&view=rev Log: - Skip ObReferenceObjectByHandle if HandleArray[i].Handle is NULL - Fail if ObReferenceObjectByHandle didn't succeed - Remove a bad ASSERT I added in my last commit Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Sat Aug 23 20:34:17 2008 @@ -168,7 +168,7 @@ * pointers. This will allow the system to do proper alerting */ PAFD_HANDLE LockHandles( PAFD_HANDLE HandleArray, UINT HandleCount ) { UINT i; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PAFD_HANDLE FileObjects = ExAllocatePool ( NonPagedPool, HandleCount * sizeof(AFD_HANDLE) ); @@ -177,13 +177,21 @@ HandleArray[i].Status = 0; HandleArray[i].Events = HandleArray[i].Events; FileObjects[i].Handle = 0; - Status = ObReferenceObjectByHandle - ( (PVOID)HandleArray[i].Handle, - FILE_ALL_ACCESS, - NULL, - KernelMode, - (PVOID*)&FileObjects[i].Handle, - NULL ); + if( !HandleArray[i].Handle ) continue; + if( NT_SUCCESS(Status) ) { + Status = ObReferenceObjectByHandle + ( (PVOID)HandleArray[i].Handle, + FILE_ALL_ACCESS, + NULL, + KernelMode, + (PVOID*)&FileObjects[i].Handle, + NULL ); + } + } + + if( !NT_SUCCESS(Status) ) { + UnlockHandles( FileObjects, HandleCount ); + return NULL; } return FileObjects; @@ -324,7 +332,6 @@ VOID SocketCalloutLeave( PAFD_FCB FCB ) { ASSERT(FCB->Critical); - ASSERT(!FCB->Locked); FCB->Critical = FALSE; SocketAcquireStateLock( FCB ); }

1 0

[cgutman] 35582: - Fail if MmProbeAndLockPages doesn't succeed - Fail if IoAllocateMdl returns NULL - Add some ASSERTs
by cgutman＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: cgutman Date: Sat Aug 23 20:09:48 2008 New Revision: 35582 URL: http://svn.reactos.org/svn/reactos?rev=35582&view=rev Log: - Fail if MmProbeAndLockPages doesn't succeed - Fail if IoAllocateMdl returns NULL - Add some ASSERTs Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Sat Aug 23 20:09:48 2008 @@ -130,9 +130,13 @@ if( LockFailed ) { IoFreeMdl( MapBuf[i].Mdl ); MapBuf[i].Mdl = NULL; - LockFailed = FALSE; + ExFreePool( NewBuf ); + return NULL; } - } + } else { + ExFreePool( NewBuf ); + return NULL; + } } } @@ -312,12 +316,15 @@ } VOID SocketCalloutEnter( PAFD_FCB FCB ) { + ASSERT(!FCB->Critical); ASSERT(FCB->Locked); FCB->Critical = TRUE; SocketStateUnlock( FCB ); } VOID SocketCalloutLeave( PAFD_FCB FCB ) { + ASSERT(FCB->Critical); + ASSERT(!FCB->Locked); FCB->Critical = FALSE; SocketAcquireStateLock( FCB ); }

1 0

[arty] 35581: Catch failure to release the cancel spinlock. Would've spotted my error in tcpip.sys.
by arty＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: arty Date: Sat Aug 23 18:04:15 2008 New Revision: 35581 URL: http://svn.reactos.org/svn/reactos?rev=35581&view=rev Log: Catch failure to release the cancel spinlock. Would've spotted my error in tcpip.sys. Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sat Aug 23 18:04:15 2008 @@ -970,12 +970,14 @@ IoCancelIrp(IN PIRP Irp) { KIRQL OldIrql; + KIRQL IrqlAtEntry; PDRIVER_CANCEL CancelRoutine; IOTRACE(IO_IRP_DEBUG, "%s - Canceling IRP %p\n", __FUNCTION__, Irp); ASSERT(Irp->Type == IO_TYPE_IRP); + IrqlAtEntry = KeGetCurrentIrql(); /* Acquire the cancel lock and cancel the IRP */ IoAcquireCancelSpinLock(&OldIrql); @@ -999,6 +1001,7 @@ /* Set the cancel IRQL And call the routine */ Irp->CancelIrql = OldIrql; CancelRoutine(IoGetCurrentIrpStackLocation(Irp)->DeviceObject, Irp); + ASSERT(IrqlAtEntry == KeGetCurrentIrql()); return TRUE; }

2 1

[cgutman] 35580: - Enable the failure debug prints in MsafdReturnWithErrno - They shouldn't spam the debug log and they're a great way to tell if something is going wrong in the network stack
by cgutman＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cgutman Date: Sat Aug 23 17:42:44 2008 New Revision: 35580 URL: http://svn.reactos.org/svn/reactos?rev=35580&view=rev Log: - Enable the failure debug prints in MsafdReturnWithErrno - They shouldn't spam the debug log and they're a great way to tell if something is going wrong in the network stack Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Aug 23 17:42:44 2008 @@ -285,12 +285,12 @@ if( ReturnedBytes ) *ReturnedBytes = Received; break; case STATUS_END_OF_FILE: *Errno = WSAESHUTDOWN; break; case STATUS_PENDING: *Errno = WSA_IO_PENDING; break; - case STATUS_BUFFER_OVERFLOW: AFD_DbgPrint(MID_TRACE,("MSAFD: STATUS_BUFFER_TOO_SMALL/STATUS_BUFFER_OVERFLOW\n")); *Errno = WSAEMSGSIZE; break; + case STATUS_BUFFER_OVERFLOW: DbgPrint("MSAFD: STATUS_BUFFER_TOO_SMALL/STATUS_BUFFER_OVERFLOW\n"); *Errno = WSAEMSGSIZE; break; case STATUS_NO_MEMORY: /* Fall through to STATUS_INSUFFICIENT_RESOURCES */ - case STATUS_INSUFFICIENT_RESOURCES: AFD_DbgPrint(MID_TRACE,("MSAFD: STATUS_NO_MEMORY/STATUS_INSUFFICIENT_RESOURCES\n")); *Errno = WSA_NOT_ENOUGH_MEMORY; break; - case STATUS_INVALID_CONNECTION: AFD_DbgPrint(MID_TRACE,("MSAFD: STATUS_INVALID_CONNECTION\n")); *Errno = WSAEAFNOSUPPORT; break; - case STATUS_REMOTE_NOT_LISTENING: AFD_DbgPrint(MID_TRACE, ("MSAFD: STATUS_REMOTE_NOT_LISTENING\n")); *Errno = WSAECONNRESET; break; - case STATUS_FILE_CLOSED: AFD_DbgPrint(MID_TRACE, ("MSAFD: STATUS_FILE_CLOSED\n")); *Errno = WSAENOTSOCK; break; + case STATUS_INSUFFICIENT_RESOURCES: DbgPrint("MSAFD: STATUS_NO_MEMORY/STATUS_INSUFFICIENT_RESOURCES\n"); *Errno = WSA_NOT_ENOUGH_MEMORY; break; + case STATUS_INVALID_CONNECTION: DbgPrint("MSAFD: STATUS_INVALID_CONNECTION\n"); *Errno = WSAEAFNOSUPPORT; break; + case STATUS_REMOTE_NOT_LISTENING: DbgPrint("MSAFD: STATUS_REMOTE_NOT_LISTENING\n"); *Errno = WSAECONNRESET; break; + case STATUS_FILE_CLOSED: DbgPrint("MSAFD: STATUS_FILE_CLOSED\n"); *Errno = WSAENOTSOCK; break; case STATUS_INVALID_PARAMETER: DbgPrint("MSAFD: STATUS_INVALID_PARAMETER\n"); *Errno = WSAEINVAL; break; default: DbgPrint("MSAFD: Error %x is unknown\n", Status);

1 0

[cgutman] 35579: - Make sure IPAddr is non-NULL - Change STATUS_UNSUCCESSFUL to STATUS_INVALID_PARAMETER
by cgutman＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cgutman Date: Sat Aug 23 17:06:49 2008 New Revision: 35579 URL: http://svn.reactos.org/svn/reactos?rev=35579&view=rev Log: - Make sure IPAddr is non-NULL - Change STATUS_UNSUCCESSFUL to STATUS_INVALID_PARAMETER Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Aug 23 17:06:49 2008 @@ -61,6 +61,13 @@ IPAddr = (PTA_IP_ADDRESS)&ListenReceive->Address; + if( !IPAddr ) { + if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + Irp->IoStatus.Status = STATUS_NO_MEMORY; + Irp->IoStatus.Information = 0; + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + } + AFD_DbgPrint(MID_TRACE,("IPAddr->TAAddressCount %d\n", IPAddr->TAAddressCount)); AFD_DbgPrint(MID_TRACE,("IPAddr->Address[0].AddressType %d\n", @@ -172,7 +179,7 @@ 0, NULL ); if( FCB->State != SOCKET_STATE_BOUND ) { - Status = STATUS_UNSUCCESSFUL; + Status = STATUS_INVALID_PARAMETER; AFD_DbgPrint(MID_TRACE,("Could not listen an unbound socket\n")); return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); }

1 0

[cgutman] 35578: - Code cleanup - Make sure FCB->RemoteAddress is non-NULL
by cgutman＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cgutman Date: Sat Aug 23 16:53:37 2008 New Revision: 35578 URL: http://svn.reactos.org/svn/reactos?rev=35578&view=rev Log: - Code cleanup - Make sure FCB->RemoteAddress is non-NULL Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Aug 23 16:53:37 2008 @@ -33,7 +33,6 @@ } NTSTATUS MakeSocketIntoConnection( PAFD_FCB FCB ) { - NTSTATUS Status; /* Allocate the receive area and start receiving */ FCB->Recv.Window = @@ -51,16 +50,14 @@ FCB->State = SOCKET_STATE_CONNECTED; - Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); - - return Status; + return TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); } static NTSTATUS NTAPI StreamSocketConnectComplete @@ -84,15 +81,15 @@ if( NT_SUCCESS(Irp->IoStatus.Status) ) { FCB->PollState |= AFD_EVENT_CONNECT | AFD_EVENT_SEND; + AFD_DbgPrint(MID_TRACE,("Going to connected state %d\n", FCB->State)); FCB->State = SOCKET_STATE_CONNECTED; - AFD_DbgPrint(MID_TRACE,("Going to connected state %d\n", FCB->State)); - PollReeval( FCB->DeviceExt, FCB->FileObject ); } else { FCB->PollState |= AFD_EVENT_CONNECT_FAIL | AFD_EVENT_RECEIVE; AFD_DbgPrint(MID_TRACE,("Going to bound state\n")); FCB->State = SOCKET_STATE_BOUND; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } + } + + PollReeval( FCB->DeviceExt, FCB->FileObject ); /* Succeed pending irps on the FUNCTION_CONNECT list */ while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_CONNECT] ) ) { @@ -199,6 +196,11 @@ FCB->RemoteAddress = TaCopyTransportAddress( &ConnectReq->RemoteAddress ); + if( !FCB->RemoteAddress ) { + Status = STATUS_NO_MEMORY; + break; + } + if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { Status = STATUS_SUCCESS;

1 0

[cgutman] 35577: - Make sure FCB->AddressFrom is non-NULL
by cgutman＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cgutman Date: Sat Aug 23 16:41:10 2008 New Revision: 35577 URL: http://svn.reactos.org/svn/reactos?rev=35577&view=rev Log: - Make sure FCB->AddressFrom is non-NULL Modified: branches/aicom-network-fixes/drivers/network/afd/afd/bind.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/bind.c [iso-8859-1] Sat Aug 23 16:41:10 2008 @@ -70,6 +70,8 @@ TdiBuildConnectionInfo( &FCB->AddressFrom, FCB->LocalAddress ); + if( !FCB->AddressFrom ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + AFD_DbgPrint(MID_TRACE,("Calling TdiReceiveDatagram\n")); Status = TdiReceiveDatagram

1 0

[cgutman] 35576: - Remove a hack not needed because of r35575
by cgutman＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cgutman Date: Sat Aug 23 15:27:26 2008 New Revision: 35576 URL: http://svn.reactos.org/svn/reactos?rev=35576&view=rev Log: - Remove a hack not needed because of r35575 Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Aug 23 15:27:26 2008 @@ -155,7 +155,6 @@ VOID DestroySocket( PAFD_FCB FCB ) { UINT i; BOOLEAN ReturnEarly = FALSE; - KIRQL Irql = KeGetCurrentIrql(); PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; AFD_DbgPrint(MIN_TRACE,("Called (%x)\n", FCB)); @@ -193,7 +192,6 @@ i, InFlightRequest[i]->InFlightRequest)); IoCancelIrp(InFlightRequest[i]->InFlightRequest); InFlightRequest[i]->InFlightRequest = NULL; - IoReleaseCancelSpinLock(Irql); } }

1 0

[cgutman] 35575: - Release the cancel spin lock before returning - Revert some unintentional changes made in r35485
by cgutman＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cgutman Date: Sat Aug 23 15:21:15 2008 New Revision: 35575 URL: http://svn.reactos.org/svn/reactos?rev=35575&view=rev Log: - Release the cancel spin lock before returning - Revert some unintentional changes made in r35485 Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c 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] Sat Aug 23 15:21:15 2008 @@ -179,17 +179,21 @@ if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE), DispDoDisconnect, &DisType ) ) ASSERT(0); + + IoReleaseCancelSpinLock(Irp->CancelIrql); return; case TDI_SEND_DATAGRAM: if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_SEND_DATAGRAM, but no address file.\n")); + break; } break; case TDI_RECEIVE_DATAGRAM: if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_RECEIVE_DATAGRAM, but no address file.\n")); + break; } DGRemoveIRP(TranContext->Handle.AddressHandle, Irp);

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008