Commit in reactos/ntoskrnl/io on MAIN
cleanup.c+2-21.52 -> 1.53
dir.c+6-61.25 -> 1.26
fs.c+2-21.45 -> 1.46
lock.c+4-41.13 -> 1.14
vpb.c+3-31.26 -> 1.27
+17-17
5 modified files
Merge EXTENDED_IO_STACK_LOCATION into IO_STACK_LOCATION and fix the resulting errors.

reactos/ntoskrnl/io
cleanup.c 1.52 -> 1.53
diff -u -r1.52 -r1.53
--- cleanup.c	12 Nov 2004 18:50:53 -0000	1.52
+++ cleanup.c	23 Dec 2004 12:34:59 -0000	1.53
@@ -26,9 +26,9 @@
    if (IoStack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL)
      {
        IoControlCode = 
-	 ((PEXTENDED_IO_STACK_LOCATION)IoStack)->Parameters.FileSystemControl.FsControlCode;
+	 IoStack->Parameters.FileSystemControl.FsControlCode;
        OutputBufferLength = 
-	 ((PEXTENDED_IO_STACK_LOCATION)IoStack)->Parameters.FileSystemControl.OutputBufferLength;
+	 IoStack->Parameters.FileSystemControl.OutputBufferLength;
      }
    else
      {

reactos/ntoskrnl/io
dir.c 1.25 -> 1.26
diff -u -r1.25 -r1.26
--- dir.c	24 Aug 2004 17:08:18 -0000	1.25
+++ dir.c	23 Dec 2004 12:34:59 -0000	1.26
@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.25 2004/08/24 17:08:18 navaraf Exp $
+/* $Id: dir.c,v 1.26 2004/12/23 12:34:59 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -40,7 +40,7 @@
    PDEVICE_OBJECT DeviceObject;
    PFILE_OBJECT FileObject;
    NTSTATUS Status;
-   PEXTENDED_IO_STACK_LOCATION IoStack;
+   PIO_STACK_LOCATION IoStack;
    KPROCESSOR_MODE PreviousMode;
    
    DPRINT("NtNotifyChangeDirectoryFile()\n");
@@ -83,7 +83,7 @@
    Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine;
    Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext;
    
-   IoStack = (PEXTENDED_IO_STACK_LOCATION) IoGetNextIrpStackLocation(Irp);
+   IoStack = IoGetNextIrpStackLocation(Irp);
    
    IoStack->MajorFunction = IRP_MJ_DIRECTORY_CONTROL;
    IoStack->MinorFunction = IRP_MN_NOTIFY_CHANGE_DIRECTORY;
@@ -104,7 +104,7 @@
 
    /* FIXME: Should we wait here or not for synchronously opened files? */
 
-   return(Status);
+   return Status;
 }
 
 
@@ -157,7 +157,7 @@
    PDEVICE_OBJECT DeviceObject;
    PFILE_OBJECT FileObject;
    NTSTATUS Status;
-   PEXTENDED_IO_STACK_LOCATION IoStack;
+   PIO_STACK_LOCATION IoStack;
    KPROCESSOR_MODE PreviousMode;
    
    DPRINT("NtQueryDirectoryFile()\n");
@@ -195,7 +195,7 @@
    Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine;
    Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext;
    
-   IoStack = (PEXTENDED_IO_STACK_LOCATION) IoGetNextIrpStackLocation(Irp);
+   IoStack = IoGetNextIrpStackLocation(Irp);
    
    IoStack->MajorFunction = IRP_MJ_DIRECTORY_CONTROL;
    IoStack->MinorFunction = IRP_MN_QUERY_DIRECTORY;

reactos/ntoskrnl/io
fs.c 1.45 -> 1.46
diff -u -r1.45 -r1.46
--- fs.c	22 Oct 2004 20:25:53 -0000	1.45
+++ fs.c	23 Dec 2004 12:34:59 -0000	1.46
@@ -83,7 +83,7 @@
   PFILE_OBJECT FileObject;
   PDEVICE_OBJECT DeviceObject;
   PIRP Irp;
-  PEXTENDED_IO_STACK_LOCATION StackPtr;
+  PIO_STACK_LOCATION StackPtr;
   PKEVENT ptrEvent;
   KPROCESSOR_MODE PreviousMode;
 
@@ -148,7 +148,7 @@
   Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine;
   Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext;
 
-  StackPtr = (PEXTENDED_IO_STACK_LOCATION) IoGetNextIrpStackLocation(Irp);
+  StackPtr = IoGetNextIrpStackLocation(Irp);
   StackPtr->FileObject = FileObject;
   StackPtr->DeviceObject = DeviceObject;
   StackPtr->Parameters.FileSystemControl.InputBufferLength = InputBufferSize;

reactos/ntoskrnl/io
lock.c 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- lock.c	15 Aug 2004 16:39:03 -0000	1.13
+++ lock.c	23 Dec 2004 12:34:59 -0000	1.14
@@ -53,7 +53,7 @@
   PLARGE_INTEGER LocalLength = NULL;
   PKEVENT Event = NULL;
   PIRP Irp = NULL;
-  PEXTENDED_IO_STACK_LOCATION StackPtr;
+  PIO_STACK_LOCATION StackPtr;
   PDEVICE_OBJECT DeviceObject;
   KPROCESSOR_MODE PreviousMode;
   NTSTATUS Status;
@@ -118,7 +118,7 @@
   Irp->UserIosb = IoStatusBlock;
   Irp->Tail.Overlay.Thread = PsGetCurrentThread();
 
-  StackPtr = (PEXTENDED_IO_STACK_LOCATION) IoGetNextIrpStackLocation(Irp);
+  StackPtr = IoGetNextIrpStackLocation(Irp);
   StackPtr->MajorFunction = IRP_MJ_LOCK_CONTROL;
   StackPtr->MinorFunction = IRP_MN_LOCK;
   StackPtr->FileObject = FileObject;
@@ -209,7 +209,7 @@
   PFILE_OBJECT FileObject = NULL;
   PLARGE_INTEGER LocalLength = NULL;
   PIRP Irp = NULL;
-  PEXTENDED_IO_STACK_LOCATION StackPtr;
+  PIO_STACK_LOCATION StackPtr;
   PDEVICE_OBJECT DeviceObject;
   KPROCESSOR_MODE PreviousMode;
   NTSTATUS Status;
@@ -254,7 +254,7 @@
   Irp->UserIosb = IoStatusBlock;
   Irp->Tail.Overlay.Thread = PsGetCurrentThread();
 
-  StackPtr = (PEXTENDED_IO_STACK_LOCATION) IoGetNextIrpStackLocation(Irp);
+  StackPtr = IoGetNextIrpStackLocation(Irp);
   StackPtr->MajorFunction = IRP_MJ_LOCK_CONTROL;
   StackPtr->MinorFunction = IRP_MN_UNLOCK_SINGLE;
   StackPtr->DeviceObject = DeviceObject;

reactos/ntoskrnl/io
vpb.c 1.26 -> 1.27
diff -u -r1.26 -r1.27
--- vpb.c	22 Oct 2004 20:25:54 -0000	1.26
+++ vpb.c	23 Dec 2004 12:34:59 -0000	1.27
@@ -1,4 +1,4 @@
-/* $Id: vpb.c,v 1.26 2004/10/22 20:25:54 ekohl Exp $
+/* $Id: vpb.c,v 1.27 2004/12/23 12:34:59 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -281,7 +281,7 @@
    PDEVICE_OBJECT DeviceObject;
    PIRP Irp;
    NTSTATUS Status;
-   PEXTENDED_IO_STACK_LOCATION StackPtr;
+   PIO_STACK_LOCATION StackPtr;
    PVOID SystemBuffer;
    KPROCESSOR_MODE PreviousMode;
 
@@ -333,7 +333,7 @@
    Irp->UserIosb = IoStatusBlock;
    Irp->Tail.Overlay.Thread = PsGetCurrentThread();
    
-   StackPtr = (PEXTENDED_IO_STACK_LOCATION) IoGetNextIrpStackLocation(Irp);
+   StackPtr = IoGetNextIrpStackLocation(Irp);
    StackPtr->MajorFunction = IRP_MJ_SET_VOLUME_INFORMATION;
    StackPtr->MinorFunction = 0;
    StackPtr->Flags = 0;
CVSspam 0.2.8