From 52dd1df336ca71ff31b6b4e7c891e15461ae9ed9 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 14 Nov 2003 15:19:35 +0000
Subject: [PATCH] Added missing variables and moved variables in order to fix
 include order (declare types before use).

svn path=/trunk/; revision=6644
---
 reactos/include/ddk/exfuncs.h | 12 ++++++++++++
 reactos/include/ddk/extypes.h | 14 +-------------
 reactos/include/ddk/iofuncs.h | 26 +++++++++++++++++++++++++-
 reactos/include/ddk/iotypes.h | 17 +----------------
 4 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/reactos/include/ddk/exfuncs.h b/reactos/include/ddk/exfuncs.h
index a678ea3a526..589f3d7c7ce 100644
--- a/reactos/include/ddk/exfuncs.h
+++ b/reactos/include/ddk/exfuncs.h
@@ -3,6 +3,18 @@
 
 /* EXECUTIVE ROUTINES ******************************************************/
 
+#ifdef __NTOSKRNL__
+extern POBJECT_TYPE EXPORTED ExDesktopObjectType;
+extern POBJECT_TYPE EXPORTED ExEventObjectType;
+extern POBJECT_TYPE EXPORTED ExWindowStationObjectType;
+extern POBJECT_TYPE EXPORTED ExIoCompletionType;
+#else
+extern POBJECT_TYPE IMPORTED ExDesktopObjectType;
+extern POBJECT_TYPE IMPORTED ExEventObjectType;
+extern POBJECT_TYPE IMPORTED ExWindowStationObjectType;
+extern POBJECT_TYPE IMPORTED ExIoCompletionType;
+#endif
+
 #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
 
 VOID
diff --git a/reactos/include/ddk/extypes.h b/reactos/include/ddk/extypes.h
index f5608657949..9d9f82468a7 100644
--- a/reactos/include/ddk/extypes.h
+++ b/reactos/include/ddk/extypes.h
@@ -1,20 +1,8 @@
-/* $Id: extypes.h,v 1.20 2003/08/25 01:37:47 sedwards Exp $ */
+/* $Id: extypes.h,v 1.21 2003/11/14 15:19:35 ekohl Exp $ */
 
 #ifndef __INCLUDE_DDK_EXTYPES_H
 #define __INCLUDE_DDK_EXTYPES_H
 
-#ifdef __NTOSKRNL__
-extern POBJECT_TYPE EXPORTED ExDesktopObjectType;
-extern POBJECT_TYPE EXPORTED ExEventObjectType;
-extern POBJECT_TYPE EXPORTED ExWindowStationObjectType;
-extern POBJECT_TYPE EXPORTED ExIoCompletionType;
-#else
-extern POBJECT_TYPE IMPORTED ExDesktopObjectType;
-extern POBJECT_TYPE IMPORTED ExEventObjectType;
-extern POBJECT_TYPE IMPORTED ExWindowStationObjectType;
-extern POBJECT_TYPE IMPORTED ExIoCompletionType;
-#endif
-
 typedef ULONG INTERLOCKED_RESULT;
 typedef ULONG WORK_QUEUE_TYPE;
 
diff --git a/reactos/include/ddk/iofuncs.h b/reactos/include/ddk/iofuncs.h
index 6879ac76e0e..78193751ac7 100644
--- a/reactos/include/ddk/iofuncs.h
+++ b/reactos/include/ddk/iofuncs.h
@@ -1,6 +1,30 @@
 #ifndef _INCLUDE_DDK_IOFUNCS_H
 #define _INCLUDE_DDK_IOFUNCS_H
-/* $Id: iofuncs.h,v 1.39 2003/08/07 11:47:32 silverblade Exp $ */
+/* $Id: iofuncs.h,v 1.40 2003/11/14 15:19:35 ekohl Exp $ */
+
+#ifdef __NTOSKRNL__
+extern POBJECT_TYPE EXPORTED IoAdapterObjectType;
+extern POBJECT_TYPE EXPORTED IoDeviceHandlerObjectType;
+extern POBJECT_TYPE EXPORTED IoDeviceObjectType;
+extern POBJECT_TYPE EXPORTED IoDriverObjectType;
+extern POBJECT_TYPE EXPORTED IoFileObjectType;
+extern ULONG EXPORTED IoReadOperationCount;
+extern ULONGLONG EXPORTED IoReadTransferCount;
+extern ULONG EXPORTED IoWriteOperationCount;
+extern ULONGLONG EXPORTED IoWriteTransferCount;
+extern KSPIN_LOCK EXPORTED IoStatisticsLock;
+#else
+extern POBJECT_TYPE IMPORTED IoAdapterObjectType;
+extern POBJECT_TYPE IMPORTED IoDeviceHandlerObjectType;
+extern POBJECT_TYPE IMPORTED IoDeviceObjectType;
+extern POBJECT_TYPE IMPORTED IoDriverObjectType;
+extern POBJECT_TYPE IMPORTED IoFileObjectType;
+extern ULONG IMPORTED IoReadOperationCount;
+extern ULONGLONG IMPORTED IoReadTransferCount;
+extern ULONG IMPORTED IoWriteOperationCount;
+extern ULONGLONG IMPORTED IoWriteTransferCount;
+extern KSPIN_LOCK IMPORTED IoStatisticsLock;
+#endif
 
 /* --- EXPORTED BY NTOSKRNL --- */
 
diff --git a/reactos/include/ddk/iotypes.h b/reactos/include/ddk/iotypes.h
index c3b548710a8..7973f9ead49 100644
--- a/reactos/include/ddk/iotypes.h
+++ b/reactos/include/ddk/iotypes.h
@@ -1,4 +1,4 @@
-/* $Id: iotypes.h,v 1.57 2003/11/05 22:49:06 gvg Exp $
+/* $Id: iotypes.h,v 1.58 2003/11/14 15:19:35 ekohl Exp $
  *
  */
 
@@ -9,21 +9,6 @@
 #include <ntos/disk.h>
 #include <ntos/file.h>
 
-#ifdef __NTOSKRNL__
-extern POBJECT_TYPE EXPORTED IoAdapterObjectType;
-extern POBJECT_TYPE EXPORTED IoDeviceHandlerObjectType;
-extern POBJECT_TYPE EXPORTED IoDeviceObjectType;
-extern POBJECT_TYPE EXPORTED IoDriverObjectType;
-extern POBJECT_TYPE EXPORTED IoFileObjectType;
-#else
-extern POBJECT_TYPE IMPORTED IoAdapterObjectType;
-extern POBJECT_TYPE IMPORTED IoDeviceHandlerObjectType;
-extern POBJECT_TYPE IMPORTED IoDeviceObjectType;
-extern POBJECT_TYPE IMPORTED IoDriverObjectType;
-extern POBJECT_TYPE IMPORTED IoFileObjectType;
-#endif
-
-
 /* from winddk.h */
 #define POINTER_ALIGNMENT