move W32PROCESS/W32THREAD into win32\include bcause they are win32k private structs

Modified: trunk/reactos/include/ndk/psfuncs.h
Modified: trunk/reactos/include/ndk/pstypes.h

Deleted: trunk/reactos/include/win32k/win32.h

Added: trunk/reactos/subsys/win32k/include/win32.h

Modified: trunk/reactos/subsys/win32k/include/win32k.h
Modified: trunk/reactos/subsys/win32k/w32k.h

--- trunk/reactos/include/ndk/psfuncs.h	2005-08-10 17:49:57 UTC (rev 17261)
+++ trunk/reactos/include/ndk/psfuncs.h	2005-08-10 18:09:44 UTC (rev 17262)
@@ -14,6 +14,12 @@

 
 /* PROTOTYPES ****************************************************************/
 

+struct _W32THREAD* STDCALL
+PsGetWin32Thread(VOID);
+
+struct _W32PROCESS* STDCALL
+PsGetWin32Process(VOID);
+

 PVOID
 STDCALL
 PsGetProcessWin32Process(PEPROCESS Process);

--- trunk/reactos/include/ndk/pstypes.h	2005-08-10 17:49:57 UTC (rev 17261)
+++ trunk/reactos/include/ndk/pstypes.h	2005-08-10 18:09:44 UTC (rev 17262)
@@ -91,6 +91,9 @@

 
 /* TYPES *********************************************************************/
 

+struct _W32THREAD;
+struct _W32PROCESS;
+

 struct _ETHREAD;
 
 typedef struct _DESCRIPTOR_TABLE_ENTRY

--- trunk/reactos/include/win32k/win32.h	2005-08-10 17:49:57 UTC (rev 17261)
+++ trunk/reactos/include/win32k/win32.h	2005-08-10 18:09:44 UTC (rev 17262)
@@ -1,43 +0,0 @@

-#ifndef __INCLUDE_NAPI_WIN32_H
-#define __INCLUDE_NAPI_WIN32_H
-
-#include <pshpack1.h>
-
-typedef struct _W32THREAD
-{
-  PVOID MessageQueue;
-  FAST_MUTEX WindowListLock;
-  LIST_ENTRY WindowListHead;
-  LIST_ENTRY W32CallbackListHead;
-  struct _KBDTABLES* KeyboardLayout;
-  struct _DESKTOP_OBJECT* Desktop;
-  HANDLE hDesktop;
-  DWORD MessagePumpHookValue;
-  BOOLEAN IsExiting;
-} W32THREAD, *PW32THREAD;
-
-#include <poppack.h>
-
-
-typedef struct _W32PROCESS
-{
-  FAST_MUTEX ClassListLock;
-  LIST_ENTRY ClassListHead;
-  FAST_MUTEX MenuListLock;
-  LIST_ENTRY MenuListHead;
-  FAST_MUTEX PrivateFontListLock;
-  LIST_ENTRY PrivateFontListHead;
-  FAST_MUTEX DriverObjListLock;
-  LIST_ENTRY DriverObjListHead;
-  struct _KBDTABLES* KeyboardLayout;
-  ULONG Flags;
-  LONG GDIObjects;
-  LONG UserObjects;
-} W32PROCESS, *PW32PROCESS;
-
-PW32THREAD STDCALL
-PsGetWin32Thread(VOID);
-PW32PROCESS STDCALL
-PsGetWin32Process(VOID);
-
-#endif /* __INCLUDE_NAPI_WIN32_H */

--- trunk/reactos/include/win32k/win32.h	2005-08-09 00:02:24 UTC (rev 17221)
+++ trunk/reactos/subsys/win32k/include/win32.h	2005-08-10 18:09:44 UTC (rev 17262)
@@ -0,0 +1,39 @@

+#ifndef __INCLUDE_NAPI_WIN32_H
+#define __INCLUDE_NAPI_WIN32_H
+
+#include <pshpack1.h>
+
+typedef struct _W32THREAD
+{
+  struct _USER_MESSAGE_QUEUE* MessageQueue;
+  FAST_MUTEX WindowListLock;
+  LIST_ENTRY WindowListHead;
+  LIST_ENTRY W32CallbackListHead;
+  struct _KBDTABLES* KeyboardLayout;
+  struct _DESKTOP_OBJECT* Desktop;
+  HANDLE hDesktop;
+  DWORD MessagePumpHookValue;
+  BOOLEAN IsExiting;
+} W32THREAD, *PW32THREAD;
+
+#include <poppack.h>
+
+
+typedef struct _W32PROCESS
+{
+  FAST_MUTEX ClassListLock;
+  LIST_ENTRY ClassListHead;
+  FAST_MUTEX MenuListLock;
+  LIST_ENTRY MenuListHead;
+  FAST_MUTEX PrivateFontListLock;
+  LIST_ENTRY PrivateFontListHead;
+  FAST_MUTEX DriverObjListLock;
+  LIST_ENTRY DriverObjListHead;
+  struct _KBDTABLES* KeyboardLayout;
+  ULONG Flags;
+  LONG GDIObjects;
+  LONG UserObjects;
+} W32PROCESS, *PW32PROCESS;
+
+
+#endif /* __INCLUDE_NAPI_WIN32_H */

--- trunk/reactos/subsys/win32k/include/win32k.h	2005-08-10 17:49:57 UTC (rev 17261)
+++ trunk/reactos/subsys/win32k/include/win32k.h	2005-08-10 18:09:44 UTC (rev 17262)
@@ -9,6 +9,7 @@

 /* INCLUDES ******************************************************************/
 
 /* Internal Win32k Headers */

+#include <include/win32.h>

 #include <include/ssec.h>
 #include <include/accelerator.h>
 #include <include/callback.h>

--- trunk/reactos/subsys/win32k/w32k.h	2005-08-10 17:49:57 UTC (rev 17261)
+++ trunk/reactos/subsys/win32k/w32k.h	2005-08-10 18:09:44 UTC (rev 17262)
@@ -39,7 +39,6 @@

 
 /* External Win32K Header */
 #include <win32k/win32k.h>

-#include <win32k/win32.h>

 
 /* Internal Win32K Header */
 #include "include/win32k.h"