[ros-diffs] [cgutman] 57188: [AFD] - Fix handling pending writes in the TDI_SEND completion routine

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/wri...
==============================================================================
--- 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;
         }
     }