[ion] 12681: Fix more old cruft.

Fix more old cruft.
Modified: trunk/reactos/include/ddk/iotypes.h
Modified: trunk/reactos/ntoskrnl/io/driver.c
Modified: trunk/reactos/ntoskrnl/io/fs.c
Modified: trunk/reactos/ntoskrnl/io/irp.c
  _____

Modified: trunk/reactos/include/ddk/iotypes.h
--- trunk/reactos/include/ddk/iotypes.h	2005-01-01 07:01:47 UTC (rev
12680)
+++ trunk/reactos/include/ddk/iotypes.h	2005-01-01 08:20:47 UTC (rev
12681)
@@ -1,4 +1,4 @@

-/* $Id: iotypes.h,v 1.73 2004/12/30 18:30:04 ion Exp $
+/* $Id$
  *
  */

@@ -85,6 +85,10 @@
    	   struct _IO_STATUS_BLOCK* IoStatusBlock,
    	   ULONG Reserved);

+typedef VOID (NTAPI *PDRIVER_FS_NOTIFICATION) (
+    IN struct _DEVICE_OBJECT* DeviceObject,
+    IN BOOLEAN        DriverActive
+);

/* STRUCTURE TYPES
***********************************************************/

@@ -886,7 +890,7 @@
 } FAST_IO_DISPATCH_TABLE, * PFAST_IO_DISPATCH_TABLE;
 #endif

-#define IO_DRIVER_OBJECT 4L
+#define IO_TYPE_DRIVER 4L
 #define DRVO_UNLOAD_INVOKED 0x1L
 #define DRVO_LEGACY_DRIVER  0x2L
 #define DRVO_BUILTIN_DRIVER 0x4L
  _____

Modified: trunk/reactos/ntoskrnl/io/driver.c
--- trunk/reactos/ntoskrnl/io/driver.c	2005-01-01 07:01:47 UTC (rev
12680)
+++ trunk/reactos/ntoskrnl/io/driver.c	2005-01-01 08:20:47 UTC (rev
12681)
@@ -1,4 +1,4 @@

-/* $Id: driver.c,v 1.58 2004/12/30 18:30:05 ion Exp $
+/* $Id$
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -1643,7 +1643,7 @@

/* Set up the Object */
     RtlZeroMemory(DriverObject, ObjectSize);
-    DriverObject->Type = IO_DRIVER_OBJECT;
+    DriverObject->Type = IO_TYPE_DRIVER;
     DriverObject->Size = sizeof(DRIVER_OBJECT);
     DriverObject->Flags = DRVO_BUILTIN_DRIVER;
     DriverObject->DriverExtension = (PDRIVER_EXTENSION)(DriverObject +
1);
  _____

Modified: trunk/reactos/ntoskrnl/io/fs.c
--- trunk/reactos/ntoskrnl/io/fs.c	2005-01-01 07:01:47 UTC (rev
12680)
+++ trunk/reactos/ntoskrnl/io/fs.c	2005-01-01 08:20:47 UTC (rev
12681)
@@ -27,7 +27,7 @@

{
   LIST_ENTRY FsChangeNotifyList;
   PDRIVER_OBJECT DriverObject;
-  PFSDNOTIFICATIONPROC FSDNotificationProc;
+  PDRIVER_FS_NOTIFICATION FSDNotificationProc;
 } FS_CHANGE_NOTIFY_ENTRY, *PFS_CHANGE_NOTIFY_ENTRY;

/* GLOBALS
******************************************************************/
@@ -730,7 +730,7 @@
  */
 NTSTATUS STDCALL
 IoRegisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject,
-			       IN PFSDNOTIFICATIONPROC
FSDNotificationProc)
+			       IN PDRIVER_FS_NOTIFICATION
FSDNotificationProc)
 {
   PFS_CHANGE_NOTIFY_ENTRY Entry;

@@ -756,7 +756,7 @@
  */
 VOID STDCALL
 IoUnregisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject,
-				 IN PFSDNOTIFICATIONPROC
FSDNotificationProc)
+				 IN PDRIVER_FS_NOTIFICATION
FSDNotificationProc)
 {
   PFS_CHANGE_NOTIFY_ENTRY ChangeEntry;
   PLIST_ENTRY Entry;
  _____

Modified: trunk/reactos/ntoskrnl/io/irp.c
--- trunk/reactos/ntoskrnl/io/irp.c	2005-01-01 07:01:47 UTC (rev
12680)
+++ trunk/reactos/ntoskrnl/io/irp.c	2005-01-01 08:20:47 UTC (rev
12681)
@@ -1,4 +1,4 @@

-/* $Id: irp.c,v 1.72 2004/12/26 21:18:34 gvg Exp $
+/* $Id$
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -212,7 +212,9 @@
   return
DriverObject->MajorFunction[Param->MajorFunction](DeviceObject, Irp);
 }

-
+#ifdef IoCallDriver
+#undef IoCallDriver
+#endif
 /*
  * @implemented
  */
@@ -277,7 +279,9 @@
   return(Irp);
 }

-
+#ifdef IoCompleteRequest
+#undef IoCompleteRequest
+#endif
 /*
  * @implemented
  */
@@ -326,7 +330,7 @@
       */
       if (Irp->CurrentLocation < Irp->StackCount - 1)
       {
-         IoSetPreviousIrpStackLocation(Irp);
+         IoSkipCurrentIrpStackLocation(Irp);
          DeviceObject =
IoGetCurrentIrpStackLocation(Irp)->DeviceObject;
       }
       else