Modified: trunk/reactos/include/ddk/extypes.h
Modified: trunk/reactos/include/ddk/iotypes.h
Modified: trunk/reactos/include/ddk/ketypes.h
Modified: trunk/reactos/include/ntdll/rtl.h
Modified: trunk/reactos/include/ntos/haltypes.h
Added: trunk/reactos/include/ntos/krnltypes.h
Modified: trunk/reactos/include/ntos/synch.h
Modified: trunk/reactos/include/ntos/zwtypes.h
Modified: trunk/reactos/include/ntos.h
--- trunk/reactos/include/ddk/extypes.h 2005-06-18 16:56:41 UTC (rev 16050)
+++ trunk/reactos/include/ddk/extypes.h 2005-06-18 17:17:52 UTC (rev 16051)
@@ -30,22 +30,6 @@
MaximumWorkQueue
} WORK_QUEUE_TYPE;
-typedef struct _EX_QUEUE_WORKER_INFO {
- UCHAR QueueDisabled:1;
- UCHAR MakeThreadsAsNecessary:1;
- UCHAR WaitMode:1;
- ULONG WorkerCount:29;
-} EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO;
-
-typedef struct _EX_WORK_QUEUE {
- KQUEUE WorkerQueue;
- ULONG DynamicThreadCount;
- ULONG WorkItemsProcessed;
- ULONG WorkItemsProcessedLastPass;
- ULONG QueueDepthLastPass;
- EX_QUEUE_WORKER_INFO Info;
-} EX_WORK_QUEUE, *PEX_WORK_QUEUE;
-
typedef ULONG_PTR ERESOURCE_THREAD, *PERESOURCE_THREAD;
typedef struct _OWNER_ENTRY
@@ -220,18 +204,6 @@
PGENERAL_LOOKASIDE L;
} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST;
-typedef enum _PP_NPAGED_LOOKASIDE_NUMBER
-{
- LookasideSmallIrpList = 0,
- LookasideLargeIrpList = 1,
- LookasideMdlList = 2,
- LookasideCreateInfoList = 3,
- LookasideNameBufferList = 4,
- LookasideTwilightList = 5,
- LookasideCompletionList = 6,
- LookasideMaximumList = 7
-} PP_NPAGED_LOOKASIDE_NUMBER;
-
typedef enum _EX_POOL_PRIORITY {
LowPoolPriority,
LowPoolPrioritySpecialPoolOverrun = 8,
--- trunk/reactos/include/ddk/iotypes.h 2005-06-18 16:56:41 UTC (rev 16050)
+++ trunk/reactos/include/ddk/iotypes.h 2005-06-18 17:17:52 UTC (rev 16051)
@@ -1181,12 +1181,6 @@
#define DRVO_BOOTREINIT_REGISTERED 0x20L
#define DRVO_LEGACY_RESOURCES 0x40L
-#define DOE_UNLOAD_PENDING 0x1
-#define DOE_DELETE_PENDING 0x2
-#define DOE_REMOVE_PENDING 0x4
-#define DOE_REMOVE_PROCESSED 0x8
-#define DOE_START_PENDING 0x10
-
typedef struct _DRIVER_OBJECT
{
CSHORT Type;
@@ -1234,18 +1228,6 @@
(*PIO_TIMER_ROUTINE)(PDEVICE_OBJECT DeviceObject,
PVOID Context);
-/*
- * PURPOSE: Special timer associated with each device
- */
-typedef struct _IO_TIMER {
- USHORT Type; /* Every IO Object has a Type */
- USHORT TimerEnabled; /* Tells us if the Timer is enabled or not */
- LIST_ENTRY IoTimerList; /* List of other Timers on the system */
- PIO_TIMER_ROUTINE TimerRoutine; /* The associated timer routine */
- PVOID Context; /* Context */
- PDEVICE_OBJECT DeviceObject; /* Driver that owns this IO Timer */
-} IO_TIMER, *PIO_TIMER;
-
typedef struct _IO_WORKITEM *PIO_WORKITEM;
typedef VOID (*PIO_WORKITEM_ROUTINE)(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context);
--- trunk/reactos/include/ddk/ketypes.h 2005-06-18 16:56:41 UTC (rev 16050)
+++ trunk/reactos/include/ddk/ketypes.h 2005-06-18 17:17:52 UTC (rev 16051)
@@ -46,35 +46,6 @@
MaximumMode
} MODE;
-typedef enum _KOBJECTS {
- EventNotificationObject = 0,
- EventSynchronizationObject = 1,
- MutantObject = 2,
- ProcessObject = 3,
- QueueObject = 4,
- SemaphoreObject = 5,
- ThreadObject = 6,
- GateObject = 7,
- TimerNotificationObject = 8,
- TimerSynchronizationObject = 9,
- Spare2Object = 10,
- Spare3Object = 11,
- Spare4Object = 12,
- Spare5Object = 13,
- Spare6Object = 14,
- Spare7Object = 15,
- Spare8Object = 16,
- Spare9Object = 17,
- ApcObject = 18,
- DpcObject = 19,
- DeviceQueueObject = 20,
- EventPairObject = 21,
- InterruptObject = 22,
- ProfileObject = 23,
- ThreadedDpcObject = 24,
- MaximumKernelObject = 25
-} KOBJECTS;
-
#include <pshpack1.h>
typedef struct _DISPATCHER_HEADER
@@ -336,45 +307,6 @@
typedef LONG FIX; /* fixed-point number */
-typedef struct _M128 {
- ULONGLONG Low;
- LONGLONG High;
-} M128, *PM128;
-
-typedef struct _KEXCEPTION_FRAME {
- ULONG64 P1Home;
- ULONG64 P2Home;
- ULONG64 P3Home;
- ULONG64 P4Home;
- ULONG64 P5;
- ULONG64 InitialStack;
- M128 Xmm6;
- M128 Xmm7;
- M128 Xmm8;
- M128 Xmm9;
- M128 Xmm10;
- M128 Xmm11;
- M128 Xmm12;
- M128 Xmm13;
- M128 Xmm14;
- M128 Xmm15;
- ULONG64 TrapFrame;
- ULONG64 CallbackStack;
- ULONG64 OutputBuffer;
- ULONG64 OutputLength;
- UCHAR ExceptionRecord[64];
- ULONG64 Fill1;
- ULONG64 Rbp;
- ULONG64 Rbx;
- ULONG64 Rdi;
- ULONG64 Rsi;
- ULONG64 R12;
- ULONG64 R13;
- ULONG64 R14;
- ULONG64 R15;
- ULONG64 Return;
-} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME;
-
/* copied from W32API */
typedef struct _KFLOATING_SAVE
{
--- trunk/reactos/include/ntdll/rtl.h 2005-06-18 16:56:41 UTC (rev 16050)
+++ trunk/reactos/include/ntdll/rtl.h 2005-06-18 17:17:52 UTC (rev 16051)
@@ -5,10 +5,9 @@
#ifndef __INCLUDE_NTDLL_RTL_H
#define __INCLUDE_NTDLL_RTL_H
+#include <ddk/ntifs.h>
#include <ntos/types.h>
#include <napi/teb.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
#ifdef __cplusplus
extern "C" {
--- trunk/reactos/include/ntos/haltypes.h 2005-06-18 16:56:41 UTC (rev 16050)
+++ trunk/reactos/include/ntos/haltypes.h 2005-06-18 17:17:52 UTC (rev 16051)
@@ -636,6 +636,8 @@
#define HalDereferenceBusHandler HALDISPATCH->HalDereferenceBusHandler
+#endif /* !__USE_W32API */
+
/* Hal private dispatch table */
typedef struct _HAL_PRIVATE_DISPATCH
@@ -649,8 +651,6 @@
extern PHAL_PRIVATE_DISPATCH IMPORTED HalPrivateDispatchTable;
#endif
-#endif /* !__USE_W32API */
-
#define HAL_PRIVATE_DISPATCH_VERSION 1
--- trunk/reactos/include/ntos/krnltypes.h 2005-06-18 16:56:41 UTC (rev 16050)
+++ trunk/reactos/include/ntos/krnltypes.h 2005-06-18 17:17:52 UTC (rev 16051)
@@ -0,0 +1,123 @@
+/*
+ * FIXME: *** NDK ***
+ */
+
+#ifndef __INCLUDE_NTOS_KRNLTYPES_H
+#define __INCLUDE_NTOS_KRNLTYPES_H
+
+#define DOE_UNLOAD_PENDING 0x1
+#define DOE_DELETE_PENDING 0x2
+#define DOE_REMOVE_PENDING 0x4
+#define DOE_REMOVE_PROCESSED 0x8
+#define DOE_START_PENDING 0x10
+
+/*
+ * PURPOSE: Special timer associated with each device
+ */
+typedef struct _IO_TIMER {
+ USHORT Type; /* Every IO Object has a Type */
+ USHORT TimerEnabled; /* Tells us if the Timer is enabled or not */
+ LIST_ENTRY IoTimerList; /* List of other Timers on the system */
+ PIO_TIMER_ROUTINE TimerRoutine; /* The associated timer routine */
+ PVOID Context; /* Context */
+ PDEVICE_OBJECT DeviceObject; /* Driver that owns this IO Timer */
+} IO_TIMER, *PIO_TIMER;
+
+typedef struct _EX_QUEUE_WORKER_INFO {
+ UCHAR QueueDisabled:1;
+ UCHAR MakeThreadsAsNecessary:1;
+ UCHAR WaitMode:1;
+ ULONG WorkerCount:29;
+} EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO;
+
+typedef struct _EX_WORK_QUEUE {
+ KQUEUE WorkerQueue;
+ ULONG DynamicThreadCount;
+ ULONG WorkItemsProcessed;
+ ULONG WorkItemsProcessedLastPass;
+ ULONG QueueDepthLastPass;
+ EX_QUEUE_WORKER_INFO Info;
+} EX_WORK_QUEUE, *PEX_WORK_QUEUE;
+
+typedef enum _PP_NPAGED_LOOKASIDE_NUMBER
+{
+ LookasideSmallIrpList = 0,
+ LookasideLargeIrpList = 1,
+ LookasideMdlList = 2,
+ LookasideCreateInfoList = 3,
+ LookasideNameBufferList = 4,
+ LookasideTwilightList = 5,
+ LookasideCompletionList = 6,
+ LookasideMaximumList = 7
+} PP_NPAGED_LOOKASIDE_NUMBER;
+
+typedef enum _KOBJECTS {
+ EventNotificationObject = 0,
+ EventSynchronizationObject = 1,
+ MutantObject = 2,
+ ProcessObject = 3,
+ QueueObject = 4,
+ SemaphoreObject = 5,
+ ThreadObject = 6,
+ GateObject = 7,
+ TimerNotificationObject = 8,
+ TimerSynchronizationObject = 9,
+ Spare2Object = 10,
+ Spare3Object = 11,
+ Spare4Object = 12,
+ Spare5Object = 13,
+ Spare6Object = 14,
+ Spare7Object = 15,
+ Spare8Object = 16,
+ Spare9Object = 17,
+ ApcObject = 18,
+ DpcObject = 19,
+ DeviceQueueObject = 20,
+ EventPairObject = 21,
+ InterruptObject = 22,
+ ProfileObject = 23,
+ ThreadedDpcObject = 24,
+ MaximumKernelObject = 25
+} KOBJECTS;
+
+typedef struct _M128 {
+ ULONGLONG Low;
+ LONGLONG High;
+} M128, *PM128;
+
+typedef struct _KEXCEPTION_FRAME {
+ ULONG64 P1Home;
+ ULONG64 P2Home;
+ ULONG64 P3Home;
+ ULONG64 P4Home;
+ ULONG64 P5;
+ ULONG64 InitialStack;
+ M128 Xmm6;
+ M128 Xmm7;
+ M128 Xmm8;
+ M128 Xmm9;
+ M128 Xmm10;
+ M128 Xmm11;
+ M128 Xmm12;
+ M128 Xmm13;
+ M128 Xmm14;
+ M128 Xmm15;
+ ULONG64 TrapFrame;
+ ULONG64 CallbackStack;
+ ULONG64 OutputBuffer;
+ ULONG64 OutputLength;
+ UCHAR ExceptionRecord[64];
+ ULONG64 Fill1;
+ ULONG64 Rbp;
+ ULONG64 Rbx;
+ ULONG64 Rdi;
+ ULONG64 Rsi;
+ ULONG64 R12;
+ ULONG64 R13;
+ ULONG64 R14;
+ ULONG64 R15;
+ ULONG64 Return;
+} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME;
+
+#endif /* __INCLUDE_NTOS_KRNLTYPES_H */
+
--- trunk/reactos/include/ntos/synch.h 2005-06-18 16:56:41 UTC (rev 16050)
+++ trunk/reactos/include/ntos/synch.h 2005-06-18 17:17:52 UTC (rev 16051)
@@ -17,7 +17,6 @@
#define EVENT_ALL_ACCESS (0x1f0003L)
#define EVENT_MODIFY_STATE (2)
#define EVENT_QUERY_STATE (1)
-#define EVENT_PAIR_ALL_ACCESS (0x1f0000L)
#define MUTEX_ALL_ACCESS (0x1f0001L)
#define MUTANT_ALL_ACCESS (0x1f0001L)
#define MUTANT_QUERY_STATE (1)
@@ -33,6 +32,7 @@
#endif /* !__USE_W32API */
+#define EVENT_PAIR_ALL_ACCESS (0x1f0000L)
#define MUTEX_QUERY_STATE (1)
#endif /* __INCLUDE_SYNCH_H */
--- trunk/reactos/include/ntos/zwtypes.h 2005-06-18 16:56:41 UTC (rev 16050)
+++ trunk/reactos/include/ntos/zwtypes.h 2005-06-18 17:17:52 UTC (rev 16051)
@@ -1720,11 +1720,11 @@
#define PORT_MESSAGE_TYPE(m) (LPC_TYPE)((m).Header.MessageType)
+#endif /* __USE_W32API */
+
#define PORT_MAX_DATA_LENGTH 0x104
#define PORT_MAX_MESSAGE_LENGTH 0x148
-#endif /* __USE_W32API */
-
#define MAX_MESSAGE_DATA (0x130)
#ifdef __USE_W32API
--- trunk/reactos/include/ntos.h 2005-06-18 16:56:41 UTC (rev 16050)
+++ trunk/reactos/include/ntos.h 2005-06-18 17:17:52 UTC (rev 16051)
@@ -90,6 +90,7 @@
#include "ntos/obtypes.h"
#include "ntos/setypes.h"
#include "ntos/sefuncs.h"
+#include "ntos/krnltypes.h"
#include "ntos/tss.h"
#include "rosrtl/thread.h"
#endif