(Re)move USER32 headers from include/user32. Deleted: trunk/reactos/include/user32/ Added: trunk/reactos/include/win32k/callback.h Modified: trunk/reactos/lib/user32/controls/button.c Modified: trunk/reactos/lib/user32/controls/combo.c Modified: trunk/reactos/lib/user32/controls/edit.c Modified: trunk/reactos/lib/user32/controls/icontitle.c Modified: trunk/reactos/lib/user32/controls/listbox.c Modified: trunk/reactos/lib/user32/controls/regcontrol.c Modified: trunk/reactos/lib/user32/controls/scrollbar.c Modified: trunk/reactos/lib/user32/controls/static.c Added: trunk/reactos/lib/user32/include/accel.h Added: trunk/reactos/lib/user32/include/regcontrol.h Modified: trunk/reactos/lib/user32/include/user32.h Modified: trunk/reactos/lib/user32/include/window.h Modified: trunk/reactos/lib/user32/misc/dllmain.c Modified: trunk/reactos/lib/user32/windows/accel.c Modified: trunk/reactos/lib/user32/windows/class.c Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/dialog.c Modified: trunk/reactos/lib/user32/windows/hook.c Modified: trunk/reactos/lib/user32/windows/mdi.c Modified: trunk/reactos/lib/user32/windows/menu.c Modified: trunk/reactos/lib/user32/windows/message.c Modified: trunk/reactos/lib/user32/windows/nonclient.c Modified: trunk/reactos/lib/user32/windows/window.c Modified: trunk/reactos/lib/user32/windows/winpos.c Modified: trunk/reactos/subsys/win32k/include/dce.h Modified: trunk/reactos/subsys/win32k/w32k.h _____
Copied: trunk/reactos/include/win32k/callback.h (from rev 16096, trunk/reactos/include/user32/callback.h) _____
Modified: trunk/reactos/lib/user32/controls/button.c --- trunk/reactos/lib/user32/controls/button.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/controls/button.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -29,7 +29,6 @@
#include <stdlib.h>
#include "controls.h" -#include "user32/regcontrol.h" #include "wine/unicode.h" #include "wine/debug.h"
_____
Modified: trunk/reactos/lib/user32/controls/combo.c --- trunk/reactos/lib/user32/controls/combo.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/controls/combo.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -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"
_____
Modified: trunk/reactos/lib/user32/controls/edit.c --- trunk/reactos/lib/user32/controls/edit.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/controls/edit.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -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"
_____
Modified: trunk/reactos/lib/user32/controls/icontitle.c --- trunk/reactos/lib/user32/controls/icontitle.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/controls/icontitle.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -19,7 +19,6 @@
*/
#include "user32.h" -#include "user32/regcontrol.h" #include "controls.h" #include "wine/unicode.h"
_____
Modified: trunk/reactos/lib/user32/controls/listbox.c --- trunk/reactos/lib/user32/controls/listbox.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/controls/listbox.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -22,7 +22,6 @@
#include <string.h> #include <stdlib.h> #include "controls.h" -#include "user32/regcontrol.h" #include "wine/debug.h"
#ifdef __REACTOS__ _____
Modified: trunk/reactos/lib/user32/controls/regcontrol.c --- trunk/reactos/lib/user32/controls/regcontrol.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/controls/regcontrol.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -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) _____
Modified: trunk/reactos/lib/user32/controls/scrollbar.c --- trunk/reactos/lib/user32/controls/scrollbar.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/controls/scrollbar.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -36,7 +36,6 @@
#include <stdlib.h> #include <string.h> #include <oleacc.h> -#include <user32/regcontrol.h> #include <rosrtl/minmax.h>
/* GLOBAL VARIABLES ***********************************************************/ _____
Modified: trunk/reactos/lib/user32/controls/static.c --- trunk/reactos/lib/user32/controls/static.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/controls/static.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -19,7 +19,6 @@
*/
#include "user32.h" -#include "user32/regcontrol.h"
#ifndef __REACTOS__ WINE_DEFAULT_DEBUG_CHANNEL(static); _____
Copied: trunk/reactos/lib/user32/include/accel.h (from rev 16096, trunk/reactos/include/user32/accel.h) _____
Copied: trunk/reactos/lib/user32/include/regcontrol.h (from rev 16096, trunk/reactos/include/user32/regcontrol.h) _____
Modified: trunk/reactos/lib/user32/include/user32.h --- trunk/reactos/lib/user32/include/user32.h 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/include/user32.h 2005-06-19 17:27:44 UTC (rev 16097) @@ -9,6 +9,8 @@
#include <ntos.h> #include <win32k/win32k.h>
+#include "regcontrol.h" + extern HINSTANCE User32Instance;
typedef struct _USER32_THREAD_DATA _____
Modified: trunk/reactos/lib/user32/include/window.h --- trunk/reactos/lib/user32/include/window.h 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/include/window.h 2005-06-19 17:27:44 UTC (rev 16097) @@ -5,7 +5,6 @@
* PURPOSE: Window management definitions */ #include <windows.h> -#include <user32/wininternal.h>
extern COLORREF SysColors[]; extern HPEN SysPens[]; _____
Modified: trunk/reactos/lib/user32/misc/dllmain.c --- trunk/reactos/lib/user32/misc/dllmain.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/misc/dllmain.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -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); _____
Modified: trunk/reactos/lib/user32/windows/accel.c --- trunk/reactos/lib/user32/windows/accel.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/windows/accel.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -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) */ _____
Modified: trunk/reactos/lib/user32/windows/class.c --- trunk/reactos/lib/user32/windows/class.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/windows/class.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -15,7 +15,6 @@
#include <debug.h> #include <window.h> #include <strpool.h> -#include <user32/regcontrol.h>
static BOOL GetClassInfoExCommon( _____
Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -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> _____
Modified: trunk/reactos/lib/user32/windows/dialog.c --- trunk/reactos/lib/user32/windows/dialog.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/windows/dialog.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -39,9 +39,6 @@
#include <limits.h> #include <debug.h>
-#include "user32/regcontrol.h" -#include "../controls/controls.h" - /* MACROS/DEFINITIONS ********************************************************/
#define DF_END 0x0001 _____
Modified: trunk/reactos/lib/user32/windows/hook.c --- trunk/reactos/lib/user32/windows/hook.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/windows/hook.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -29,7 +29,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h" -#include <user32/callback.h> +#include <win32k/callback.h> #define NDEBUG #include <debug.h>
_____
Modified: trunk/reactos/lib/user32/windows/mdi.c --- trunk/reactos/lib/user32/windows/mdi.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/windows/mdi.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -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" _____
Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/windows/menu.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -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 _____
Modified: trunk/reactos/lib/user32/windows/message.c --- trunk/reactos/lib/user32/windows/message.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/windows/message.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -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 _____
Modified: trunk/reactos/lib/user32/windows/nonclient.c --- trunk/reactos/lib/user32/windows/nonclient.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/windows/nonclient.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -43,7 +43,6 @@
#include <string.h> #include <menu.h> #include <winpos.h> -#include <user32/wininternal.h> #include <user32.h> #include "window.h"
_____
Modified: trunk/reactos/lib/user32/windows/window.c --- trunk/reactos/lib/user32/windows/window.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/windows/window.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -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>
_____
Modified: trunk/reactos/lib/user32/windows/winpos.c --- trunk/reactos/lib/user32/windows/winpos.c 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/lib/user32/windows/winpos.c 2005-06-19 17:27:44 UTC (rev 16097) @@ -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> _____
Modified: trunk/reactos/subsys/win32k/include/dce.h --- trunk/reactos/subsys/win32k/include/dce.h 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/subsys/win32k/include/dce.h 2005-06-19 17:27:44 UTC (rev 16097) @@ -5,7 +5,6 @@
typedef struct tagDCE *PDCE;
-#include <user32/wininternal.h> #include <include/window.h>
typedef HANDLE HDCE; @@ -36,6 +35,14 @@ 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) _____
Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-06-19 16:30:52 UTC (rev 16096) +++ trunk/reactos/subsys/win32k/w32k.h 2005-06-19 17:27:44 UTC (rev 16097) @@ -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>