Merge EXTENDED_IO_STACK_LOCATION into IO_STACK_LOCATION and fix the resulting errors.

reactos/drivers/fs/np

diff -u -r1.16 -r1.17
--- fsctrl.c	11 Oct 2004 12:37:04 -0000	1.16
+++ fsctrl.c	23 Dec 2004 12:38:16 -0000	1.17
@@ -1,4 +1,4 @@

-/* $Id: fsctrl.c,v 1.16 2004/10/11 12:37:04 ekohl Exp $

+/* $Id: fsctrl.c,v 1.17 2004/12/23 12:38:16 ekohl Exp $

  *
  * COPYRIGHT:  See COPYING in the top level directory
  * PROJECT:    ReactOS kernel

@@ -110,7 +110,7 @@

   DPRINT("NpfsDisconnectPipe()\n");
 
   if (Fcb->PipeState == FILE_PIPE_DISCONNECTED_STATE)

-    return(STATUS_SUCCESS);

+    return STATUS_SUCCESS;

 
   if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE)
     {

@@ -124,7 +124,7 @@

       Fcb->OtherSide = NULL;
 
       DPRINT("Pipe disconnected\n");

-      return(STATUS_SUCCESS);

+      return STATUS_SUCCESS;

     }
 
   if (Fcb->PipeState == FILE_PIPE_CLOSING_STATE)

@@ -135,10 +135,10 @@

       /* FIXME: remove data queue(s) */
 
       DPRINT("Pipe disconnected\n");

-      return(STATUS_SUCCESS);

+      return STATUS_SUCCESS;

     }
 

-  return(STATUS_UNSUCCESSFUL);

+  return STATUS_UNSUCCESSFUL;

 }
 
 

@@ -191,10 +191,6 @@

 }
 
 

-static NTSTATUS
-NpfsGetState(
-  PIRP Irp,
-  PIO_STACK_LOCATION IrpSp)

 /*
  * FUNCTION: Return current state of a pipe
  * ARGUMENTS:

@@ -203,6 +199,9 @@

  * RETURNS:
  *     Status of operation
  */

+static NTSTATUS
+NpfsGetState(PIRP Irp,
+	     PIO_STACK_LOCATION IrpSp)

 {
   ULONG OutputBufferLength;
   PNPFS_GET_STATE Reply;

@@ -214,10 +213,10 @@

 
   /* Validate parameters */
   if (OutputBufferLength >= sizeof(NPFS_GET_STATE))

-  {
-    Fcb = IrpSp->FileObject->FsContext;
-    Reply = (PNPFS_GET_STATE)Irp->AssociatedIrp.SystemBuffer;
-    Pipe = Fcb->Pipe;

+    {
+      Fcb = IrpSp->FileObject->FsContext;
+      Reply = (PNPFS_GET_STATE)Irp->AssociatedIrp.SystemBuffer;
+      Pipe = Fcb->Pipe;

 
     if (Pipe->PipeWriteMode == FILE_PIPE_MESSAGE_MODE)
     {

@@ -265,10 +264,6 @@

 }
 
 

-static NTSTATUS
-NpfsSetState(
-  PIRP Irp,
-  PIO_STACK_LOCATION IrpSp)

 /*
  * FUNCTION: Set state of a pipe
  * ARGUMENTS:

@@ -277,6 +272,9 @@

  * RETURNS:
  *     Status of operation
  */

+static NTSTATUS
+NpfsSetState(PIRP Irp,
+	     PIO_STACK_LOCATION IrpSp)

 {
   ULONG InputBufferLength;
   PNPFS_SET_STATE Request;

@@ -339,9 +337,6 @@

 }
 
 

-static NTSTATUS
-NpfsPeekPipe(PIRP Irp,
-	     PIO_STACK_LOCATION IoStack)

 /*
  * FUNCTION: Peek at a pipe (get information about messages)
  * ARGUMENTS:

@@ -350,6 +345,9 @@

  * RETURNS:
  *     Status of operation
  */

+static NTSTATUS
+NpfsPeekPipe(PIRP Irp,
+	     PIO_STACK_LOCATION IoStack)

 {
   ULONG OutputBufferLength;
   PNPFS_PIPE Pipe;

@@ -365,7 +363,7 @@

   if (OutputBufferLength < sizeof(FILE_PIPE_PEEK_BUFFER))
     {
       DPRINT("Buffer too small\n");

-      return(STATUS_INVALID_PARAMETER);

+      return STATUS_INVALID_PARAMETER;

     }
 
   Fcb = IoStack->FileObject->FsContext;

@@ -374,7 +372,7 @@

 
   Status = STATUS_NOT_IMPLEMENTED;
 

-  return(Status);

+  return Status;

 }
 
 

@@ -383,7 +381,7 @@

 NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject,
 		      PIRP Irp)
 {

-  PEXTENDED_IO_STACK_LOCATION IoStack;

+  PIO_STACK_LOCATION IoStack;

   PFILE_OBJECT FileObject;
   NTSTATUS Status;
   PNPFS_DEVICE_EXTENSION DeviceExt;

@@ -393,7 +391,7 @@

   DPRINT("NpfsFileSystemContol(DeviceObject %p Irp %p)\n", DeviceObject, Irp);
 
   DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension;

-  IoStack = (PEXTENDED_IO_STACK_LOCATION) IoGetCurrentIrpStackLocation(Irp);

+  IoStack = IoGetCurrentIrpStackLocation(Irp);

   DPRINT("IoStack: %p\n", IoStack);
   FileObject = IoStack->FileObject;
   DPRINT("FileObject: %p\n", FileObject);