update for HEAD-2003091401

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

diff --git a/ntoskrnl/io/buildirp.c b/ntoskrnl/io/buildirp.c
index ff676f9..6d12fed 100644 (file)
--- a/ntoskrnl/io/buildirp.c
+++ b/ntoskrnl/io/buildirp.c
@@ -14,6 +14,7 @@
 
 #include <ddk/ntddk.h>
 #include <internal/pool.h>
+#include <internal/io.h>
 
 #define NDEBUG
 #include <internal/debug.h>
@@ -70,6 +71,9 @@ NTSTATUS IoPrepareIrpBuffer(PIRP Irp,
 }
 
 
+/*
+ * @implemented
+ */
 PIRP STDCALL
 IoBuildAsynchronousFsdRequest(ULONG MajorFunction,
                              PDEVICE_OBJECT DeviceObject,
@@ -159,6 +163,9 @@ IoBuildAsynchronousFsdRequest(ULONG MajorFunction,
 }
 
 
+/*
+ * @implemented
+ */
 PIRP STDCALL
 IoBuildDeviceIoControlRequest(ULONG IoControlCode,
                              PDEVICE_OBJECT DeviceObject,
@@ -333,6 +340,9 @@ IoBuildDeviceIoControlRequest(ULONG IoControlCode,
 }
 
 
+/*
+ * @implemented
+ */
 PIRP STDCALL
 IoBuildSynchronousFsdRequest(ULONG MajorFunction,
                                  PDEVICE_OBJECT DeviceObject,
@@ -358,66 +368,24 @@ IoBuildSynchronousFsdRequest(ULONG MajorFunction,
  */
 {
    PIRP Irp;
-   PIO_STACK_LOCATION StackPtr;
    
    DPRINT("IoBuildSynchronousFsdRequest(MajorFunction %x, DeviceObject %x, "
          "Buffer %x, Length %x, StartingOffset %x, Event %x, "
          "IoStatusBlock %x\n",MajorFunction,DeviceObject,Buffer,Length,
          StartingOffset,Event,IoStatusBlock);
    
-   Irp = IoAllocateIrp(DeviceObject->StackSize,TRUE);
+   Irp = IoBuildAsynchronousFsdRequest(MajorFunction,
+                                       DeviceObject,
+                                       Buffer,
+                                       Length,
+                                       StartingOffset,
+                                       IoStatusBlock );
    if (Irp==NULL)
      {
        return(NULL);
      }
    
    Irp->UserEvent = Event;
-   Irp->UserIosb = IoStatusBlock;
-   DPRINT("Irp->UserIosb %x\n", Irp->UserIosb);
-   Irp->Tail.Overlay.Thread = PsGetCurrentThread();
-
-   StackPtr = IoGetNextIrpStackLocation(Irp);
-   StackPtr->MajorFunction = MajorFunction;
-   StackPtr->MinorFunction = 0;
-   StackPtr->Flags = 0;
-   StackPtr->Control = 0;
-   StackPtr->DeviceObject = DeviceObject;
-   StackPtr->FileObject = NULL;
-   StackPtr->CompletionRoutine = NULL;
-   
-   if (Buffer != NULL)
-     {
-       IoPrepareIrpBuffer(Irp,
-                          DeviceObject,
-                          Buffer,
-                          Length,
-                          MajorFunction);
-     }
-   
-   if (MajorFunction == IRP_MJ_READ)
-     {
-       if (StartingOffset != NULL)
-        {
-           StackPtr->Parameters.Read.ByteOffset = *StartingOffset;
-        }
-       else
-        {
-            StackPtr->Parameters.Read.ByteOffset.QuadPart = 0;
-        }
-       StackPtr->Parameters.Read.Length = Length;
-     }
-   else
-     {
-       if (StartingOffset!=NULL)
-        {
-           StackPtr->Parameters.Write.ByteOffset = *StartingOffset;
-        }
-       else
-        {
-            StackPtr->Parameters.Write.ByteOffset.QuadPart = 0;
-        }
-       StackPtr->Parameters.Write.Length = Length;
-     }
 
    return(Irp);
 }