ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Remove the rest of the code that sets the wrong IRP's status

Browse Source 
svn path=/trunk/; revision=40357
This commit is contained in:
Cameron Gutman
2009-04-04 00:36:43 +00:00
parent 36f48eb147
commit 8f9cc82b53
4 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/drivers/network/afd/afd/connect.c
+1 -12
View File
@@ -84,11 +84,8 @@ static NTSTATUS NTAPI StreamSocketConnectComplete
/* I was wrong about this before as we can have pending writes to a not
* yet connected socket */
if( !SocketAcquireStateLock( FCB ) ) {
Irp->IoStatus.Status = STATUS_FILE_CLOSED;
Irp->IoStatus.Information = 0;
if( !SocketAcquireStateLock( FCB ) )
return STATUS_FILE_CLOSED;
}
AFD_DbgPrint(MID_TRACE,("Irp->IoStatus.Status = %x\n",
Irp->IoStatus.Status));
@@ -136,8 +133,6 @@ static NTSTATUS NTAPI StreamSocketConnectComplete
Status = MakeSocketIntoConnection( FCB );
if( !NT_SUCCESS(Status) ) {
Irp->IoStatus.Status = Status;
Irp->IoStatus.Information = 0;
SocketStateUnlock( FCB );
return Status;
}
@@ -158,12 +153,6 @@ static NTSTATUS NTAPI StreamSocketConnectComplete
Status = STATUS_SUCCESS;
}
if (!NT_SUCCESS(Status))
{
Irp->IoStatus.Status = Status;
Irp->IoStatus.Information = 0;
}
SocketStateUnlock( FCB );
AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status));
reactos/drivers/network/afd/afd/listen.c
+1 -4
View File
@@ -98,11 +98,8 @@ static NTSTATUS NTAPI ListenComplete
PLIST_ENTRY NextIrpEntry, QeltEntry;
PIRP NextIrp;
if( !SocketAcquireStateLock( FCB ) ) {
Irp->IoStatus.Status = STATUS_FILE_CLOSED;
Irp->IoStatus.Information = 0;
if( !SocketAcquireStateLock( FCB ) )
return STATUS_FILE_CLOSED;
}
FCB->ListenIrp.InFlightRequest = NULL;
reactos/drivers/network/afd/afd/read.c
+1 -8
View File
@@ -260,8 +260,6 @@ NTSTATUS NTAPI ReceiveComplete
return STATUS_FILE_CLOSED;
} else if( FCB->State == SOCKET_STATE_LISTENING ) {
AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n"));
Irp->IoStatus.Status = STATUS_INVALID_PARAMETER;
Irp->IoStatus.Information = 0;
SocketStateUnlock( FCB );
return STATUS_INVALID_PARAMETER;
}
@@ -464,11 +462,8 @@ PacketSocketRecvComplete(
AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB));
if( !SocketAcquireStateLock( FCB ) ) {
Irp->IoStatus.Status = STATUS_FILE_CLOSED;
Irp->IoStatus.Information = 0;
if( !SocketAcquireStateLock( FCB ) )
return STATUS_FILE_CLOSED;
}
FCB->ReceiveIrp.InFlightRequest = NULL;
@@ -514,8 +509,6 @@ PacketSocketRecvComplete(
} else Status = STATUS_NO_MEMORY;
if( !NT_SUCCESS( Status ) ) {
Irp->IoStatus.Status = Status;
Irp->IoStatus.Information = 0;
if( DatagramRecv ) ExFreePool( DatagramRecv );
SocketStateUnlock( FCB );
return Status;
reactos/drivers/network/afd/afd/write.c
+2 -4
View File
@@ -40,9 +40,8 @@ static NTSTATUS NTAPI SendComplete
ASSERT_IRQL(APC_LEVEL);
if( !SocketAcquireStateLock( FCB ) ) {
if( !SocketAcquireStateLock( FCB ) )
return STATUS_FILE_CLOSED;
}
FCB->SendIrp.InFlightRequest = NULL;
/* Request is not in flight any longer */
@@ -179,9 +178,8 @@ static NTSTATUS NTAPI PacketSocketSendComplete
Irp->IoStatus.Status,
Irp->IoStatus.Information));
if( !SocketAcquireStateLock( FCB ) ) {
if( !SocketAcquireStateLock( FCB ) )
return STATUS_FILE_CLOSED;
}
FCB->SendIrp.InFlightRequest = NULL;
/* Request is not in flight any longer */