branch update for HEAD-2003021201

[reactos.git] / ntoskrnl / io / irp.c

diff --git a/ntoskrnl/io/irp.c b/ntoskrnl/io/irp.c
index 84e8e4d..e967145 100644 (file)
--- a/ntoskrnl/io/irp.c
+++ b/ntoskrnl/io/irp.c
@@ -74,6 +74,7 @@ IoMakeAssociatedIrp(PIRP Irp,
   
   AssocIrp = IoAllocateIrp(StackSize,FALSE);
   UNIMPLEMENTED;
+  return NULL;
 }
 
 #endif /* LIBCAPTIVE */
@@ -108,7 +109,6 @@ IofCallDriver(PDEVICE_OBJECT DeviceObject,
   * FUNCTION: Sends an IRP to the next lower driver
  */
 {
-  NTSTATUS Status;
   PDRIVER_OBJECT DriverObject;
   PIO_STACK_LOCATION Param;
   
@@ -121,22 +121,20 @@ IofCallDriver(PDEVICE_OBJECT DeviceObject,
 
   assert(DriverObject);
 
-  Param = IoGetNextIrpStackLocation(Irp);
+  IoSetNextIrpStackLocation(Irp);
+  Param = IoGetCurrentIrpStackLocation(Irp);
 
   DPRINT("IrpSp 0x%X\n", Param);
   
-  Irp->Tail.Overlay.CurrentStackLocation--;
-  Irp->CurrentLocation--;
-  
+  Param->DeviceObject = DeviceObject;
+
   DPRINT("MajorFunction %d\n", Param->MajorFunction);
   DPRINT("DriverObject->MajorFunction[Param->MajorFunction] %x\n",
-        DriverObject->MajorFunction[Param->MajorFunction]);
+    DriverObject->MajorFunction[Param->MajorFunction]);
+
   if (!DriverObject->MajorFunction[Param->MajorFunction])
     KeBugCheck(0);
-  Status = DriverObject->MajorFunction[Param->MajorFunction](DeviceObject,
-                                                            Irp);
-
-  return(Status);
+  return DriverObject->MajorFunction[Param->MajorFunction](DeviceObject, Irp);
 }
 
 
@@ -228,38 +226,66 @@ IofCompleteRequest(PIRP Irp,
  *                         thread making the request
  */
 {
-   int i;
-   NTSTATUS Status;
-   
+   ULONG             i;
+   NTSTATUS          Status;
+   PDEVICE_OBJECT    DeviceObject;
+
    DPRINT("IoCompleteRequest(Irp %x, PriorityBoost %d) Event %x THread %x\n",
-          Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread());
+      Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread());
 
-   for (i=Irp->CurrentLocation;i<(int)Irp->StackCount;i++)
+   assert(Irp->CancelRoutine == NULL);
+   assert(Irp->IoStatus.Status != STATUS_PENDING);
+
+   if (IoGetCurrentIrpStackLocation(Irp)->Control & SL_PENDING_RETURNED)
    {
-      if (Irp->Stack[i].CompletionRoutine != NULL)
+      Irp->PendingReturned = TRUE;
+   }
+
+   for (i=Irp->CurrentLocation;i<(ULONG)Irp->StackCount;i++)
+   {
+      /*
+      Completion routines expect the current irp stack location to be the same as when
+      IoSetCompletionRoutine was called to set them. A side effect is that completion
+      routines set by highest level drivers without their own stack location will receive
+      an invalid current stack location (at least it should be considered as invalid).
+      Since the DeviceObject argument passed is taken from the current stack, this value
+      is also invalid (NULL).
+      */
+      if (Irp->CurrentLocation < Irp->StackCount - 1)
       {
-        Status = Irp->Stack[i].CompletionRoutine(
-                                            Irp->Stack[i].DeviceObject,
-                                            Irp,
-                                            Irp->Stack[i].CompletionContext);
-        if (Status == STATUS_MORE_PROCESSING_REQUIRED)
-        {
+         IoSetPreviousIrpStackLocation(Irp);
+         DeviceObject = IoGetCurrentIrpStackLocation(Irp)->DeviceObject;
+      }
+      else
+      {
+         DeviceObject = NULL;
+      }
+
+      if (Irp->Stack[i].CompletionRoutine != NULL &&
+         ((NT_SUCCESS(Irp->IoStatus.Status) && (Irp->Stack[i].Control & SL_INVOKE_ON_SUCCESS)) ||
+         (!NT_SUCCESS(Irp->IoStatus.Status) && (Irp->Stack[i].Control & SL_INVOKE_ON_ERROR)) ||
+         (Irp->Cancel && (Irp->Stack[i].Control & SL_INVOKE_ON_CANCEL))))
+      {
+         Status = Irp->Stack[i].CompletionRoutine(DeviceObject,
+                                                  Irp,
+                                                  Irp->Stack[i].CompletionContext);
+
+         if (Status == STATUS_MORE_PROCESSING_REQUIRED)
+         {
            if (Irp->UserIosb)
               {
                  *Irp->UserIosb=Irp->IoStatus;
               }
-           return;
-        }
+            return;
+         }
       }
-      if (Irp->Stack[i].Control & SL_PENDING_RETURNED)
-      {
-        Irp->PendingReturned = TRUE;
-      }
-      if (Irp->CurrentLocation < Irp->StackCount - 1)
+   
+      if (IoGetCurrentIrpStackLocation(Irp)->Control & SL_PENDING_RETURNED)
       {
-        IoSkipCurrentIrpStackLocation(Irp);
+         Irp->PendingReturned = TRUE;
       }
    }
+
    if (Irp->PendingReturned)
      {
        DPRINT("Dispatching APC\n");