update for HEAD-2003091401

[reactos.git] / include / ddk / pstypes.h

diff --git a/include/ddk/pstypes.h b/include/ddk/pstypes.h
index 9925904..3013760 100644 (file)
--- a/include/ddk/pstypes.h
+++ b/include/ddk/pstypes.h
@@ -3,7 +3,7 @@
 
 #include <ntos/ps.h>
 
-#include <ddk/i386/tss.h>
+#include <ntos/tss.h>
 #include <napi/teb.h>
 
 #ifndef TLS_MINIMUM_AVAILABLE
@@ -21,20 +21,33 @@ struct _KPROCESS;
 struct _ETHREAD;
 struct _KTHREAD;
 
-typedef NTSTATUS STDCALL_FUNC (*PKSTART_ROUTINE)(PVOID StartContext);
+typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD;
 
-typedef VOID STDCALL_FUNC (*PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE ParentId,
-                                                      HANDLE ProcessId,
-                                                      BOOLEAN Create);
+typedef VOID STDCALL_FUNC
+(*PKSTART_ROUTINE)(PVOID StartContext);
 
-typedef VOID STDCALL_FUNC (*PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE ProcessId,
-                                                     HANDLE ThreadId,
-                                                     BOOLEAN Create);
+typedef VOID STDCALL_FUNC
+(*PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE ParentId,
+                                 HANDLE ProcessId,
+                                 BOOLEAN Create);
+
+typedef VOID STDCALL_FUNC
+(*PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE ProcessId,
+                                HANDLE ThreadId,
+                                BOOLEAN Create);
+
+typedef NTSTATUS STDCALL_FUNC
+(*PW32_PROCESS_CALLBACK)(struct _EPROCESS *Process,
+                        BOOLEAN Create);
+
+typedef NTSTATUS STDCALL_FUNC
+(*PW32_THREAD_CALLBACK)(struct _ETHREAD *Thread,
+                       BOOLEAN Create);
 
 typedef struct _STACK_INFORMATION
 {
-       PVOID   BaseAddress;
-       PVOID   UpperAddress;
+  PVOID BaseAddress;
+  PVOID UpperAddress;
 } STACK_INFORMATION, *PSTACK_INFORMATION;
 
 typedef ULONG THREADINFOCLASS;
@@ -46,17 +59,4 @@ struct _KPROCESS;
 #define HIGH_PRIORITY (31)
 #define MAXIMUM_PRIORITY (32)
 
-
-#ifdef __NTOSKRNL__
-extern struct _EPROCESS* EXPORTED PsInitialSystemProcess;
-extern POBJECT_TYPE EXPORTED PsProcessType;
-extern POBJECT_TYPE EXPORTED PsThreadType;
-#else
-#ifdef __GNU__ // robd
-extern struct _EPROCESS* IMPORTED PsInitialSystemProcess;
-extern POBJECT_TYPE IMPORTED PsProcessType;
-extern POBJECT_TYPE IMPORTED PsThreadType;
-#endif
-#endif
-
 #endif /* __INCLUDE_DDK_PSTYPES_H */