(Re)move USER32 headers from include/user32.

svn path=/trunk/; revision=16097

reactos/include/user32/wininternal.h

@@ -1,14 +0,0 @@
-#ifndef __INCLUDE_USER32_WININTERNAL_H
-#define __INCLUDE_USER32_WININTERNAL_H
-
-#define WIN_NCACTIVATED  (0x0080)
-
-/* internal DCX flags */
-#define DCX_DCEEMPTY		0x00000800
-#define DCX_DCEBUSY		0x00001000
-#define DCX_DCEDIRTY		0x00002000
-#define DCX_WINDOWPAINT		0x00020000
-#define DCX_KEEPCLIPRGN		0x00040000
-#define DCX_NOCLIPCHILDREN      0x00080000
-
-#endif /* __INCLUDE_USER32_WININTERNAL_H */

reactos/lib/user32/controls/button.c

@@ -29,7 +29,6 @@
 #include <stdlib.h>
 
 #include "controls.h"
-#include "user32/regcontrol.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 

reactos/lib/user32/controls/combo.c

@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "controls.h"
-#include "user32/regcontrol.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
 

reactos/lib/user32/controls/edit.c

@@ -45,7 +45,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include "controls.h"
-#include "user32/regcontrol.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 

reactos/lib/user32/controls/icontitle.c

@@ -19,7 +19,6 @@
  */
 
 #include "user32.h"
-#include "user32/regcontrol.h"
 #include "controls.h"
 #include "wine/unicode.h"
 

reactos/lib/user32/controls/listbox.c

@@ -22,7 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include "controls.h"
-#include "user32/regcontrol.h"
 #include "wine/debug.h"
 
 #ifdef __REACTOS__

reactos/lib/user32/controls/regcontrol.c

@@ -11,7 +11,6 @@
 
 #include "user32.h"
 #include <wchar.h>
-#include "user32/regcontrol.h"
 #include "win32k/ntuser.h"
 
 static void RegisterBuiltinClass(const struct builtin_class_descr *Descr)

reactos/lib/user32/controls/scrollbar.c

@@ -36,7 +36,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <oleacc.h>
-#include <user32/regcontrol.h>
 #include <rosrtl/minmax.h>
 
 /* GLOBAL VARIABLES ***********************************************************/

reactos/lib/user32/controls/static.c

@@ -19,7 +19,6 @@
  */
 
 #include "user32.h"
-#include "user32/regcontrol.h"
 
 #ifndef __REACTOS__
 WINE_DEFAULT_DEBUG_CHANNEL(static);

reactos/lib/user32/include/user32.h

@@ -9,6 +9,8 @@
 #include <ntos.h>
 #include <win32k/win32k.h>
 
+#include "regcontrol.h"
+
 extern HINSTANCE User32Instance;
 
 typedef struct _USER32_THREAD_DATA

reactos/lib/user32/include/window.h

@@ -5,7 +5,6 @@
  * PURPOSE:     Window management definitions
  */
 #include <windows.h>
-#include <user32/wininternal.h>
 
 extern COLORREF SysColors[];
 extern HPEN SysPens[];

reactos/lib/user32/misc/dllmain.c

@@ -1,15 +1,11 @@
-#include <windows.h>
+#include "user32.h"
+#include "menu.h"
+#include "message.h"
+#include "accel.h"
+#include "strpool.h"
+#include <win32k/callback.h>
+
 #include <debug.h>
-#include <ddk/ntddk.h>
-#include <user32/callback.h>
-#include <user32/accel.h>
-#include <window.h>
-#include <menu.h>
-#include <message.h>
-#define _WIN32K_KAPI_H
-#include <user32.h>
-#include <strpool.h>
-#include <roscfg.h>
 
 /* FIXME: Belongs to some header. */
 WINBOOL STDCALL GdiDllInitialize(HANDLE, DWORD, LPVOID);

reactos/lib/user32/windows/accel.c

@@ -30,7 +30,7 @@
 /* INCLUDES ******************************************************************/
 
 #include "user32.h"
-#include <user32/accel.h>
+#include "accel.h"
 #include <win32k/ntuser.h>
 
 /* this is the 8 byte accel struct used in Win32 resources (internal only) */

reactos/lib/user32/windows/class.c

@@ -15,7 +15,6 @@
 #include <debug.h>
 #include <window.h>
 #include <strpool.h>
-#include <user32/regcontrol.h>
 
 
 static BOOL GetClassInfoExCommon(

reactos/lib/user32/windows/defwnd.c

@@ -14,7 +14,6 @@
 #include "user32.h"
 #include <windowsx.h>
 #include <window.h>
-#include <user32/wininternal.h>
 #include <string.h>
 #include <cursor.h>
 #include <menu.h>

reactos/lib/user32/windows/dialog.c

@@ -39,9 +39,6 @@
 #include <limits.h>
 #include <debug.h>
 
-#include "user32/regcontrol.h"
-#include "../controls/controls.h"
-
 /* MACROS/DEFINITIONS ********************************************************/
 
 #define DF_END  0x0001

reactos/lib/user32/windows/hook.c

@@ -29,7 +29,7 @@
 /* INCLUDES ******************************************************************/
 
 #include "user32.h"
-#include <user32/callback.h>
+#include <win32k/callback.h>
 #define NDEBUG
 #include <debug.h>
 

reactos/lib/user32/windows/mdi.c

@@ -91,7 +91,7 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/unicode.h"
-#include "user32/regcontrol.h"
+#include "user32.h"
 #include <winnls.h>
 #include "wine/debug.h"
 #include "dlgs.h"

reactos/lib/user32/windows/menu.c

@@ -39,8 +39,7 @@
 #include <draw.h>
 #include <window.h>
 #include <strpool.h>
-#include <user32/callback.h>
-#include "user32/regcontrol.h"
+#include <win32k/callback.h>
 #include "../controls/controls.h"
 
 #define NDEBUG

reactos/lib/user32/windows/message.c

@@ -11,7 +11,7 @@
 #include "user32.h"
 #include <string.h>
 #include <debug.h>
-#include <user32/callback.h>
+#include <win32k/callback.h>
 #include <message.h>
 
 /* DDE message exchange

reactos/lib/user32/windows/nonclient.c

@@ -43,7 +43,6 @@ Already defined in makefile now.
 #include <string.h>
 #include <menu.h>
 #include <winpos.h>
-#include <user32/wininternal.h>
 #include <user32.h>
 #include "window.h"
 

reactos/lib/user32/windows/window.c

@@ -15,8 +15,7 @@
 #include <window.h>
 #include <string.h>
 #include <strpool.h>
-#include <user32/callback.h>
-#include <user32/regcontrol.h>
+#include <win32k/callback.h>
 #define NDEBUG
 #include <debug.h>
 

reactos/lib/user32/windows/winpos.c

@@ -13,9 +13,7 @@
 
 #include "user32.h"
 #include <window.h>
-#include <user32/callback.h>
-#include <user32/regcontrol.h>
-#include <user32/wininternal.h>
+#include <win32k/callback.h>
 #include <window.h>
 #define NDEBUG
 #include <debug.h>

reactos/subsys/win32k/include/dce.h

@@ -5,7 +5,6 @@
 
 typedef struct tagDCE *PDCE;
 
-#include <user32/wininternal.h>
 #include <include/window.h>
 
 typedef HANDLE HDCE;
@@ -36,6 +35,14 @@ typedef struct tagDCE
     HANDLE       Self;
 } DCE;  /* PDCE already declared at top of file */
 
+/* internal DCX flags */
+#define DCX_DCEEMPTY		0x00000800
+#define DCX_DCEBUSY		0x00001000
+#define DCX_DCEDIRTY		0x00002000
+#define DCX_WINDOWPAINT		0x00020000
+#define DCX_KEEPCLIPRGN		0x00040000
+#define DCX_NOCLIPCHILDREN      0x00080000
+
 #define  DCEOBJ_AllocDCE()  \
   ((HDCE) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_DCE))
 #define  DCEOBJ_FreeDCE(hDCE)  GDIOBJ_FreeObj((HGDIOBJ)hDCE, GDI_OBJECT_TYPE_DCE)

reactos/subsys/win32k/w32k.h

@@ -16,6 +16,7 @@
 #include <ddk/ntddmou.h>
 
 #include <win32k/win32k.h>
+#include <win32k/callback.h>
 #include <csrss/csrss.h>
 
 #include <internal/ntoskrnl.h>
@@ -33,7 +34,6 @@
 #include <windowsx.h>
 
 #include <rosrtl/string.h>
-#include <user32/callback.h>
 
 #include <include/ssec.h>
 #include <include/accelerator.h>