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

svn path=/trunk/; revision=17262

reactos/include/ndk/psfuncs.h

@@ -14,6 +14,12 @@
 
 /* PROTOTYPES ****************************************************************/
 
+struct _W32THREAD* STDCALL
+PsGetWin32Thread(VOID);
+
+struct _W32PROCESS* STDCALL
+PsGetWin32Process(VOID);
+
 PVOID
 STDCALL
 PsGetProcessWin32Process(PEPROCESS Process);

reactos/include/ndk/pstypes.h

@@ -91,6 +91,9 @@ typedef NTSTATUS
 
 /* TYPES *********************************************************************/
 
+struct _W32THREAD;
+struct _W32PROCESS;
+
 struct _ETHREAD;
 
 typedef struct _DESCRIPTOR_TABLE_ENTRY

reactos/subsys/win32k/include/win32.h

@@ -5,7 +5,7 @@
 
 typedef struct _W32THREAD
 {
-  PVOID MessageQueue;
+  struct _USER_MESSAGE_QUEUE* MessageQueue;
   FAST_MUTEX WindowListLock;
   LIST_ENTRY WindowListHead;
   LIST_ENTRY W32CallbackListHead;
@@ -35,9 +35,5 @@ typedef struct _W32PROCESS
   LONG UserObjects;
 } W32PROCESS, *PW32PROCESS;
 
-PW32THREAD STDCALL
-PsGetWin32Thread(VOID);
-PW32PROCESS STDCALL
-PsGetWin32Process(VOID);
 
 #endif /* __INCLUDE_NAPI_WIN32_H */

reactos/subsys/win32k/include/win32k.h

@@ -9,6 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 /* Internal Win32k Headers */
+#include <include/win32.h>
 #include <include/ssec.h>
 #include <include/accelerator.h>
 #include <include/callback.h>

reactos/subsys/win32k/w32k.h

@@ -39,7 +39,6 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
 
 /* External Win32K Header */
 #include <win32k/win32k.h>
-#include <win32k/win32.h>
 
 /* Internal Win32K Header */
 #include "include/win32k.h"