Added missing variables and moved variables in order to fix include order (declare types before use).

svn path=/trunk/; revision=6644
This commit is contained in:
Eric Kohl 2003-11-14 15:19:35 +00:00
parent 41cf5bc8f7
commit 52dd1df336
4 changed files with 39 additions and 30 deletions

View file

@ -3,6 +3,18 @@
/* EXECUTIVE ROUTINES ******************************************************/ /* 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)) #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
VOID VOID

View file

@ -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 #ifndef __INCLUDE_DDK_EXTYPES_H
#define __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 INTERLOCKED_RESULT;
typedef ULONG WORK_QUEUE_TYPE; typedef ULONG WORK_QUEUE_TYPE;

View file

@ -1,6 +1,30 @@
#ifndef _INCLUDE_DDK_IOFUNCS_H #ifndef _INCLUDE_DDK_IOFUNCS_H
#define _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 --- */ /* --- EXPORTED BY NTOSKRNL --- */

View file

@ -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/disk.h>
#include <ntos/file.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 */ /* from winddk.h */
#define POINTER_ALIGNMENT #define POINTER_ALIGNMENT