From e14ef8a1c4ce4f47802fba17ec4732fae148a461 Mon Sep 17 00:00:00 2001 From: Casper Hornstrup Date: Sun, 15 Aug 2004 21:36:30 +0000 Subject: [PATCH] 2004-08-15 Casper S. Hornstrup * lib/user32/include/.cvsignore: New file. * lib/user32/Makefile (TARGET_PCH): Set to include/user32.h. * lib/user32/*/*.c: Use pre-compiled header. * include/wine/debug.h (FIXME): Override previous declaration is needed. svn path=/trunk/; revision=10562 --- reactos/ChangeLog | 7 +++++++ reactos/include/wine/debug.h | 3 +++ reactos/lib/user32/Makefile | 4 +++- reactos/lib/user32/controls/button.c | 2 +- reactos/lib/user32/controls/combo.c | 2 +- reactos/lib/user32/controls/edit.c | 3 +-- reactos/lib/user32/controls/icontitle.c | 2 +- reactos/lib/user32/controls/listbox.c | 3 +-- reactos/lib/user32/controls/regcontrol.c | 5 ++--- reactos/lib/user32/controls/scrollbar.c | 3 +-- reactos/lib/user32/controls/static.c | 2 +- reactos/lib/user32/include/.cvsignore | 2 ++ reactos/lib/user32/include/user32.h | 2 ++ reactos/lib/user32/misc/desktop.c | 6 +++--- reactos/lib/user32/misc/display.c | 6 ++---- reactos/lib/user32/misc/exit.c | 7 ++----- reactos/lib/user32/misc/misc.c | 5 ++--- reactos/lib/user32/misc/object.c | 5 ++--- reactos/lib/user32/misc/resources.c | 6 +----- reactos/lib/user32/misc/strpool.c | 5 +---- reactos/lib/user32/misc/stubs.c | 6 +++--- reactos/lib/user32/misc/timer.c | 5 ++--- reactos/lib/user32/misc/winhelp.c | 5 ++--- reactos/lib/user32/misc/winsta.c | 6 +++--- reactos/lib/user32/misc/wsprintf.c | 3 +-- reactos/lib/user32/windows/accel.c | 7 +++---- reactos/lib/user32/windows/bitmap.c | 7 ++----- reactos/lib/user32/windows/caret.c | 5 ++--- reactos/lib/user32/windows/class.c | 9 +++------ reactos/lib/user32/windows/clipboard.c | 6 ++---- reactos/lib/user32/windows/cursor.c | 7 ++----- reactos/lib/user32/windows/dc.c | 5 ++--- reactos/lib/user32/windows/defwnd.c | 5 ++--- reactos/lib/user32/windows/dialog.c | 9 +++------ reactos/lib/user32/windows/font.c | 5 ++--- reactos/lib/user32/windows/hook.c | 8 ++------ reactos/lib/user32/windows/icon.c | 7 ++----- reactos/lib/user32/windows/input.c | 5 ++--- reactos/lib/user32/windows/menu.c | 11 +++-------- reactos/lib/user32/windows/message.c | 8 +++----- reactos/lib/user32/windows/messagebox.c | 8 ++------ reactos/lib/user32/windows/paint.c | 5 ++--- reactos/lib/user32/windows/prop.c | 7 ++----- reactos/lib/user32/windows/rect.c | 5 ++--- reactos/lib/user32/windows/text.c | 10 +++------- reactos/lib/user32/windows/window.c | 8 ++------ reactos/lib/user32/windows/winpos.c | 6 ++---- 47 files changed, 100 insertions(+), 158 deletions(-) create mode 100644 reactos/lib/user32/include/.cvsignore diff --git a/reactos/ChangeLog b/reactos/ChangeLog index 7bc18a31ea8..b521f2e4258 100644 --- a/reactos/ChangeLog +++ b/reactos/ChangeLog @@ -1,3 +1,10 @@ +2004-08-15 Casper S. Hornstrup + + * lib/user32/include/.cvsignore: New file. + * lib/user32/Makefile (TARGET_PCH): Set to include/user32.h. + * lib/user32/*/*.c: Use pre-compiled header. + * include/wine/debug.h (FIXME): Override previous declaration is needed. + 2004-08-15 Casper S. Hornstrup * lib/userenv/.cvsignore: Add *.gch. diff --git a/reactos/include/wine/debug.h b/reactos/include/wine/debug.h index 3b453a4222a..6bb370b23e3 100644 --- a/reactos/include/wine/debug.h +++ b/reactos/include/wine/debug.h @@ -63,6 +63,9 @@ inline static const char *debugres_w( const wchar_t *s ) { return wine_dbgstr_wn #define WARN_ON(ch) 1 #endif +#ifdef FIXME +#undef FIXME +#endif #define FIXME DPRINT1 #define FIXME_(ch) DPRINT1 #ifdef NDEBUG diff --git a/reactos/lib/user32/Makefile b/reactos/lib/user32/Makefile index 569239727e2..19da778ab9f 100644 --- a/reactos/lib/user32/Makefile +++ b/reactos/lib/user32/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.38 2004/05/29 21:24:47 hbirr Exp $ +# $Id: Makefile,v 1.39 2004/08/15 21:36:25 chorns Exp $ PATH_TO_TOP = ../.. @@ -6,6 +6,8 @@ TARGET_TYPE = dynlink TARGET_NAME = user32 +TARGET_PCH = include/user32.h + TARGET_BASE = $(TARGET_BASE_LIB_USER32) TARGET_SDKLIBS = libwine.a ntdll.a kernel32.a gdi32.a rosrtl.a diff --git a/reactos/lib/user32/controls/button.c b/reactos/lib/user32/controls/button.c index 1b1d98623b0..84f8b77ec55 100644 --- a/reactos/lib/user32/controls/button.c +++ b/reactos/lib/user32/controls/button.c @@ -23,11 +23,11 @@ #define __USE_W32API #endif +#include "user32.h" #include #include #include -#include "windows.h" #include "controls.h" #include "user32/regcontrol.h" #include "wine/unicode.h" diff --git a/reactos/lib/user32/controls/combo.c b/reactos/lib/user32/controls/combo.c index 64e3beefa9a..38a7f489c67 100644 --- a/reactos/lib/user32/controls/combo.c +++ b/reactos/lib/user32/controls/combo.c @@ -20,6 +20,7 @@ * FIXME: roll up in Netscape 3.01. */ +#include "user32.h" #include #include @@ -27,7 +28,6 @@ #include #include #include -#include "windows.h" #include "controls.h" #include "user32/regcontrol.h" #include "wine/debug.h" diff --git a/reactos/lib/user32/controls/edit.c b/reactos/lib/user32/controls/edit.c index 058e82a0508..b5f7d05fa64 100644 --- a/reactos/lib/user32/controls/edit.c +++ b/reactos/lib/user32/controls/edit.c @@ -40,11 +40,10 @@ #define __USE_W32API #endif +#include "user32.h" #include #include #include - -#include "windows.h" #include "controls.h" #include "user32/regcontrol.h" #include "wine/unicode.h" diff --git a/reactos/lib/user32/controls/icontitle.c b/reactos/lib/user32/controls/icontitle.c index 428a0da3144..12b470092be 100644 --- a/reactos/lib/user32/controls/icontitle.c +++ b/reactos/lib/user32/controls/icontitle.c @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "windows.h" +#include "user32.h" #include "user32/regcontrol.h" #include "controls.h" #include "wine/unicode.h" diff --git a/reactos/lib/user32/controls/listbox.c b/reactos/lib/user32/controls/listbox.c index fd71f67d939..5fc9efc2134 100644 --- a/reactos/lib/user32/controls/listbox.c +++ b/reactos/lib/user32/controls/listbox.c @@ -17,11 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "user32.h" #define NDEBUG #include #include -//#include -#include "windows.h" #include "controls.h" #include "user32/regcontrol.h" #include "wine/debug.h" diff --git a/reactos/lib/user32/controls/regcontrol.c b/reactos/lib/user32/controls/regcontrol.c index aae954c25da..661498789dd 100644 --- a/reactos/lib/user32/controls/regcontrol.c +++ b/reactos/lib/user32/controls/regcontrol.c @@ -1,4 +1,4 @@ -/* $Id: regcontrol.c,v 1.19 2004/05/16 19:31:06 navaraf Exp $ +/* $Id: regcontrol.c,v 1.20 2004/08/15 21:36:26 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS User32 @@ -9,9 +9,8 @@ * NOTES: Adapted from Wine */ -#include +#include "user32.h" #include -#include #include "user32/regcontrol.h" #include "win32k/ntuser.h" diff --git a/reactos/lib/user32/controls/scrollbar.c b/reactos/lib/user32/controls/scrollbar.c index 34f5bf3303a..a2fe8c16d3e 100644 --- a/reactos/lib/user32/controls/scrollbar.c +++ b/reactos/lib/user32/controls/scrollbar.c @@ -30,8 +30,7 @@ /* INCLUDES *******************************************************************/ -#include -#include +#include "user32.h" #include #include #include diff --git a/reactos/lib/user32/controls/static.c b/reactos/lib/user32/controls/static.c index 7fb28b5bef6..450557aa206 100644 --- a/reactos/lib/user32/controls/static.c +++ b/reactos/lib/user32/controls/static.c @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "windows.h" +#include "user32.h" #include "user32/regcontrol.h" #ifndef __REACTOS__ diff --git a/reactos/lib/user32/include/.cvsignore b/reactos/lib/user32/include/.cvsignore new file mode 100644 index 00000000000..a62c258e052 --- /dev/null +++ b/reactos/lib/user32/include/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.gch diff --git a/reactos/lib/user32/include/user32.h b/reactos/lib/user32/include/user32.h index eea38430263..498856815db 100644 --- a/reactos/lib/user32/include/user32.h +++ b/reactos/lib/user32/include/user32.h @@ -5,6 +5,8 @@ * PURPOSE: Global user32 definitions */ #include +#define NTOS_MODE_USER +#include #include extern HINSTANCE User32Instance; diff --git a/reactos/lib/user32/misc/desktop.c b/reactos/lib/user32/misc/desktop.c index 51915bdc1ae..cb9abb42b61 100644 --- a/reactos/lib/user32/misc/desktop.c +++ b/reactos/lib/user32/misc/desktop.c @@ -1,4 +1,4 @@ -/* $Id: desktop.c,v 1.31 2004/03/07 11:59:43 navaraf Exp $ +/* $Id: desktop.c,v 1.32 2004/08/15 21:36:27 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -8,9 +8,9 @@ * UPDATE HISTORY: * 06-06-2001 CSH Created */ + +#include "user32.h" #include -#include -#include #include #include #include diff --git a/reactos/lib/user32/misc/display.c b/reactos/lib/user32/misc/display.c index ec2ffcd9ef8..e2c9272efa8 100644 --- a/reactos/lib/user32/misc/display.c +++ b/reactos/lib/user32/misc/display.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: display.c,v 1.11 2004/07/18 00:36:33 blight Exp $ +/* $Id: display.c,v 1.12 2004/08/15 21:36:28 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/dde.c @@ -28,9 +28,7 @@ /* INCLUDES ******************************************************************/ -#include -#define NTOS_MODE_USER -#include +#include "user32.h" #include #include #define NDEBUG diff --git a/reactos/lib/user32/misc/exit.c b/reactos/lib/user32/misc/exit.c index 138d68cae46..f69a3237849 100644 --- a/reactos/lib/user32/misc/exit.c +++ b/reactos/lib/user32/misc/exit.c @@ -1,4 +1,4 @@ -/* $Id: exit.c,v 1.5 2004/07/12 20:09:34 gvg Exp $ +/* $Id: exit.c,v 1.6 2004/08/15 21:36:28 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -7,10 +7,7 @@ * PROGRAMMER: Eric Kohl (ekohl@rz-online.de) */ -#include -#include -#define NTOS_MODE_USER -#include +#include "user32.h" #include /* diff --git a/reactos/lib/user32/misc/misc.c b/reactos/lib/user32/misc/misc.c index 6327c48bc25..8114ba71503 100644 --- a/reactos/lib/user32/misc/misc.c +++ b/reactos/lib/user32/misc/misc.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: misc.c,v 1.7 2004/07/12 20:09:34 gvg Exp $ +/* $Id: misc.c,v 1.8 2004/08/15 21:36:28 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/misc.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include #include diff --git a/reactos/lib/user32/misc/object.c b/reactos/lib/user32/misc/object.c index 572afd56fc1..ff12ad74986 100644 --- a/reactos/lib/user32/misc/object.c +++ b/reactos/lib/user32/misc/object.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: object.c,v 1.7 2004/05/15 22:50:04 weiden Exp $ +/* $Id: object.c,v 1.8 2004/08/15 21:36:28 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/dde.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/misc/resources.c b/reactos/lib/user32/misc/resources.c index 9fea0102490..b10f8fb7b5b 100644 --- a/reactos/lib/user32/misc/resources.c +++ b/reactos/lib/user32/misc/resources.c @@ -1,9 +1,5 @@ +#include "user32.h" #include -#include -#include -#define NTOS_MODE_USER -#include -/*#include */ /* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which does not seem to work properly for stack address space. */ diff --git a/reactos/lib/user32/misc/strpool.c b/reactos/lib/user32/misc/strpool.c index bb7e5af773f..7cc9d34c5b5 100644 --- a/reactos/lib/user32/misc/strpool.c +++ b/reactos/lib/user32/misc/strpool.c @@ -1,9 +1,6 @@ // strpool.c -#include -#include -#define NTOS_MODE_USER -#include +#include "user32.h" #include #include diff --git a/reactos/lib/user32/misc/stubs.c b/reactos/lib/user32/misc/stubs.c index c0f0e938164..0a0b8610828 100644 --- a/reactos/lib/user32/misc/stubs.c +++ b/reactos/lib/user32/misc/stubs.c @@ -1,4 +1,4 @@ -/* $Id: stubs.c,v 1.64 2004/07/12 22:34:27 gvg Exp $ +/* $Id: stubs.c,v 1.65 2004/08/15 21:36:28 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -9,11 +9,11 @@ * UPDATE HISTORY: * 08-05-2001 CSH Created */ -#include + +#include "user32.h" #include #include #include -#include #ifdef __USE_W32API typedef PVOID LPIMEPROW, LPIMEPROA; #endif diff --git a/reactos/lib/user32/misc/timer.c b/reactos/lib/user32/misc/timer.c index 63bee116fb6..326887b3f1a 100644 --- a/reactos/lib/user32/misc/timer.c +++ b/reactos/lib/user32/misc/timer.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: timer.c,v 1.11 2004/01/23 23:38:26 ekohl Exp $ +/* $Id: timer.c,v 1.12 2004/08/15 21:36:28 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/dde.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/misc/winhelp.c b/reactos/lib/user32/misc/winhelp.c index d90f791d863..6586fee0df3 100644 --- a/reactos/lib/user32/misc/winhelp.c +++ b/reactos/lib/user32/misc/winhelp.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: winhelp.c,v 1.6 2004/01/23 23:38:26 ekohl Exp $ +/* $Id: winhelp.c,v 1.7 2004/08/15 21:36:28 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/winhelp.c @@ -28,9 +28,8 @@ /* INCLUDES ******************************************************************/ +#include "user32.h" #include -#include -#include #include /* WinHelp internal structure */ diff --git a/reactos/lib/user32/misc/winsta.c b/reactos/lib/user32/misc/winsta.c index 93fcb70cd50..bf8045404e0 100644 --- a/reactos/lib/user32/misc/winsta.c +++ b/reactos/lib/user32/misc/winsta.c @@ -1,4 +1,4 @@ -/* $Id: winsta.c,v 1.15 2004/04/09 20:03:14 navaraf Exp $ +/* $Id: winsta.c,v 1.16 2004/08/15 21:36:28 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -8,8 +8,8 @@ * UPDATE HISTORY: * 04-06-2001 CSH Created */ -#include -#include + +#include "user32.h" #include diff --git a/reactos/lib/user32/misc/wsprintf.c b/reactos/lib/user32/misc/wsprintf.c index c541b9435b7..dea08c5aa15 100644 --- a/reactos/lib/user32/misc/wsprintf.c +++ b/reactos/lib/user32/misc/wsprintf.c @@ -31,11 +31,10 @@ * NOTES: Adapted from Wine */ +#include "user32.h" #include #include #include -#include -#include #include "strpool.h" #define WPRINTF_LEFTALIGN 0x0001 /* Align output on the left ('-' prefix) */ diff --git a/reactos/lib/user32/windows/accel.c b/reactos/lib/user32/windows/accel.c index 2ddc8377a72..8cc77931593 100644 --- a/reactos/lib/user32/windows/accel.c +++ b/reactos/lib/user32/windows/accel.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: accel.c,v 1.14 2004/04/09 20:03:14 navaraf Exp $ +/* $Id: accel.c,v 1.15 2004/08/15 21:36:28 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/input.c @@ -28,11 +28,10 @@ */ /* INCLUDES ******************************************************************/ -#include + +#include "user32.h" #include #include -#define NTOS_MODE_USER -#include /* this is the 8 byte accel struct used in Win32 resources (internal only) */ typedef struct diff --git a/reactos/lib/user32/windows/bitmap.c b/reactos/lib/user32/windows/bitmap.c index 166dbfa546c..299a13677e5 100644 --- a/reactos/lib/user32/windows/bitmap.c +++ b/reactos/lib/user32/windows/bitmap.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: bitmap.c,v 1.31 2004/07/14 20:52:13 navaraf Exp $ +/* $Id: bitmap.c,v 1.32 2004/08/15 21:36:28 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/input.c @@ -28,13 +28,10 @@ /* INCLUDES ******************************************************************/ +#include "user32.h" #include -#include -#include #include #include -#define NTOS_MODE_USER -#include /*forward declerations... actualy in user32\windows\icon.c but usful here****/ HICON ICON_CreateCursorFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot); diff --git a/reactos/lib/user32/windows/caret.c b/reactos/lib/user32/windows/caret.c index 1673565c2c7..3381a6fbd32 100644 --- a/reactos/lib/user32/windows/caret.c +++ b/reactos/lib/user32/windows/caret.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: caret.c,v 1.7 2004/01/26 08:44:51 weiden Exp $ +/* $Id: caret.c,v 1.8 2004/08/15 21:36:29 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/caret.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/class.c b/reactos/lib/user32/windows/class.c index 9730f0caf28..47026f0c26b 100644 --- a/reactos/lib/user32/windows/class.c +++ b/reactos/lib/user32/windows/class.c @@ -1,4 +1,4 @@ -/* $Id: class.c,v 1.50 2004/07/03 17:40:23 navaraf Exp $ +/* $Id: class.c,v 1.51 2004/08/15 21:36:29 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -8,17 +8,14 @@ * UPDATE HISTORY: * 09-05-2001 CSH Created */ -#include -#include + +#include "user32.h" #include #include #include #include #include #include -#define NTOS_MODE_USER -#include - static BOOL GetClassInfoExCommon( diff --git a/reactos/lib/user32/windows/clipboard.c b/reactos/lib/user32/windows/clipboard.c index 35791228665..9365e8e75e2 100644 --- a/reactos/lib/user32/windows/clipboard.c +++ b/reactos/lib/user32/windows/clipboard.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: clipboard.c,v 1.13 2004/01/26 08:44:51 weiden Exp $ +/* $Id: clipboard.c,v 1.14 2004/08/15 21:36:29 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/clipboard.c @@ -28,10 +28,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include - #define NDEBUG #include diff --git a/reactos/lib/user32/windows/cursor.c b/reactos/lib/user32/windows/cursor.c index a2b840b8445..35e1354b767 100644 --- a/reactos/lib/user32/windows/cursor.c +++ b/reactos/lib/user32/windows/cursor.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: cursor.c,v 1.21 2004/05/01 09:31:59 weiden Exp $ +/* $Id: cursor.c,v 1.22 2004/08/15 21:36:29 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/cursor.c @@ -28,12 +28,9 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include #include -#define NTOS_MODE_USER -#include #undef CopyCursor HBITMAP diff --git a/reactos/lib/user32/windows/dc.c b/reactos/lib/user32/windows/dc.c index f01527bc4d1..4f8c8e30815 100644 --- a/reactos/lib/user32/windows/dc.c +++ b/reactos/lib/user32/windows/dc.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: dc.c,v 1.15 2004/01/26 08:44:51 weiden Exp $ +/* $Id: dc.c,v 1.16 2004/08/15 21:36:29 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/input.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/defwnd.c b/reactos/lib/user32/windows/defwnd.c index 0aef56d7b1f..4554f17a332 100644 --- a/reactos/lib/user32/windows/defwnd.c +++ b/reactos/lib/user32/windows/defwnd.c @@ -1,4 +1,4 @@ -/* $Id: defwnd.c,v 1.143 2004/07/19 12:13:45 weiden Exp $ +/* $Id: defwnd.c,v 1.144 2004/08/15 21:36:29 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -11,9 +11,8 @@ /* INCLUDES ******************************************************************/ -#include +#include "user32.h" #include -#include #include #include #include diff --git a/reactos/lib/user32/windows/dialog.c b/reactos/lib/user32/windows/dialog.c index 29605fe97ff..b25f8ae8715 100644 --- a/reactos/lib/user32/windows/dialog.c +++ b/reactos/lib/user32/windows/dialog.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: dialog.c,v 1.26 2004/05/16 19:31:07 navaraf Exp $ +/* $Id: dialog.c,v 1.27 2004/08/15 21:36:29 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/dialog.c @@ -31,15 +31,12 @@ /* INCLUDES ******************************************************************/ -#define __NTAPP__ -#include +#include "user32.h" #include -#include #include #include +#include #include -#define NTOS_MODE_USER -#include #include #include "user32/regcontrol.h" diff --git a/reactos/lib/user32/windows/font.c b/reactos/lib/user32/windows/font.c index a18f3091b1b..2a68e7ba1c0 100644 --- a/reactos/lib/user32/windows/font.c +++ b/reactos/lib/user32/windows/font.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: font.c,v 1.10 2004/06/27 11:24:06 navaraf Exp $ +/* $Id: font.c,v 1.11 2004/08/15 21:36:29 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/input.c @@ -28,9 +28,8 @@ /* INCLUDES ******************************************************************/ -#include +#include "user32.h" #include -#include #include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/hook.c b/reactos/lib/user32/windows/hook.c index 26cecad1dcc..df510862dea 100644 --- a/reactos/lib/user32/windows/hook.c +++ b/reactos/lib/user32/windows/hook.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: hook.c,v 1.15 2004/04/09 20:03:14 navaraf Exp $ +/* $Id: hook.c,v 1.16 2004/08/15 21:36:29 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/input.c @@ -28,12 +28,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include -#define NTOS_MODE_USER -#include - #define NDEBUG #include diff --git a/reactos/lib/user32/windows/icon.c b/reactos/lib/user32/windows/icon.c index 8d8f70f1c2d..048c074f929 100644 --- a/reactos/lib/user32/windows/icon.c +++ b/reactos/lib/user32/windows/icon.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: icon.c,v 1.21 2004/04/09 20:03:14 navaraf Exp $ +/* $Id: icon.c,v 1.22 2004/08/15 21:36:29 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/icon.c @@ -28,12 +28,9 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include #include -#define NTOS_MODE_USER -#include #include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/input.c b/reactos/lib/user32/windows/input.c index 88c168edff2..a32b786cd8b 100644 --- a/reactos/lib/user32/windows/input.c +++ b/reactos/lib/user32/windows/input.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: input.c,v 1.24 2004/04/29 20:26:35 weiden Exp $ +/* $Id: input.c,v 1.25 2004/08/15 21:36:29 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/input.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include #include diff --git a/reactos/lib/user32/windows/menu.c b/reactos/lib/user32/windows/menu.c index 6471972b90c..92268fe58d6 100644 --- a/reactos/lib/user32/windows/menu.c +++ b/reactos/lib/user32/windows/menu.c @@ -21,7 +21,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: menu.c,v 1.69 2004/06/05 18:39:46 navaraf Exp $ +/* $Id: menu.c,v 1.70 2004/08/15 21:36:30 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/menu.c @@ -33,17 +33,12 @@ /* INCLUDES ******************************************************************/ -#define __NTAPP__ - -#include -#include +#include "user32.h" +#include #include #include #include #include -#define NTOS_MODE_USER -#include - #include #include "user32/regcontrol.h" #include "../controls/controls.h" diff --git a/reactos/lib/user32/windows/message.c b/reactos/lib/user32/windows/message.c index b3b6131faca..e08f7fc58ba 100644 --- a/reactos/lib/user32/windows/message.c +++ b/reactos/lib/user32/windows/message.c @@ -1,4 +1,4 @@ -/* $Id: message.c,v 1.41 2004/06/16 06:18:14 gvg Exp $ +/* $Id: message.c,v 1.42 2004/08/15 21:36:30 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -8,14 +8,12 @@ * UPDATE HISTORY: * 06-06-2001 CSH Created */ -#include -#include + +#include "user32.h" #include #include #include #include -#define NTOS_MODE_USER -#include /* DDE message exchange * diff --git a/reactos/lib/user32/windows/messagebox.c b/reactos/lib/user32/windows/messagebox.c index 4b2e4a550de..7cd5ad33229 100644 --- a/reactos/lib/user32/windows/messagebox.c +++ b/reactos/lib/user32/windows/messagebox.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: messagebox.c,v 1.26 2004/07/22 02:32:53 navaraf Exp $ +/* $Id: messagebox.c,v 1.27 2004/08/15 21:36:30 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/messagebox.c @@ -31,18 +31,14 @@ /* INCLUDES ******************************************************************/ -#include +#include "user32.h" #include -#include #include -#define NTOS_MODE_USER -#include #include #include #include #include "resource.h" -//typedef UINT *LPUINT; #include /* DEFINES *******************************************************************/ diff --git a/reactos/lib/user32/windows/paint.c b/reactos/lib/user32/windows/paint.c index b1fde155683..6e4b8e29d4b 100644 --- a/reactos/lib/user32/windows/paint.c +++ b/reactos/lib/user32/windows/paint.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: paint.c,v 1.26 2004/04/09 20:03:15 navaraf Exp $ +/* $Id: paint.c,v 1.27 2004/08/15 21:36:30 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/paint.c @@ -28,9 +28,8 @@ /* INCLUDES ******************************************************************/ -#include +#include "user32.h" #include -#include #define NDEBUG #include diff --git a/reactos/lib/user32/windows/prop.c b/reactos/lib/user32/windows/prop.c index ffee05974b4..4b8749e910e 100644 --- a/reactos/lib/user32/windows/prop.c +++ b/reactos/lib/user32/windows/prop.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: prop.c,v 1.12 2004/04/09 20:03:15 navaraf Exp $ +/* $Id: prop.c,v 1.13 2004/08/15 21:36:30 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/input.c @@ -28,11 +28,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include -#define NTOS_MODE_USER -#include #include typedef struct _PROPLISTITEM diff --git a/reactos/lib/user32/windows/rect.c b/reactos/lib/user32/windows/rect.c index 1093582a884..b0f6386c7bc 100644 --- a/reactos/lib/user32/windows/rect.c +++ b/reactos/lib/user32/windows/rect.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: rect.c,v 1.15 2004/05/14 17:02:40 navaraf Exp $ +/* $Id: rect.c,v 1.16 2004/08/15 21:36:30 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/input.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/text.c b/reactos/lib/user32/windows/text.c index bcd6e52c81d..d586eabeb80 100644 --- a/reactos/lib/user32/windows/text.c +++ b/reactos/lib/user32/windows/text.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: text.c,v 1.9 2004/04/09 20:03:15 navaraf Exp $ +/* $Id: text.c,v 1.10 2004/08/15 21:36:30 chorns Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/input.c @@ -28,12 +28,8 @@ /* INCLUDES ******************************************************************/ -#define __NTAPP__ - -#include -#include -#define NTOS_MODE_USER -#include +#include "user32.h" +#include #include const unsigned short wctype_table[] = diff --git a/reactos/lib/user32/windows/window.c b/reactos/lib/user32/windows/window.c index 921e8885971..3e818fa98f1 100644 --- a/reactos/lib/user32/windows/window.c +++ b/reactos/lib/user32/windows/window.c @@ -1,4 +1,4 @@ -/* $Id: window.c,v 1.119 2004/05/23 14:04:58 weiden Exp $ +/* $Id: window.c,v 1.120 2004/08/15 21:36:30 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -11,16 +11,12 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include #include #include #include #include -#define NTOS_MODE_USER -#include - #define NDEBUG #include diff --git a/reactos/lib/user32/windows/winpos.c b/reactos/lib/user32/windows/winpos.c index bc400365b4e..de0dc603a4d 100644 --- a/reactos/lib/user32/windows/winpos.c +++ b/reactos/lib/user32/windows/winpos.c @@ -1,4 +1,4 @@ -/* $Id: winpos.c,v 1.10 2003/12/26 13:06:34 weiden Exp $ +/* $Id: winpos.c,v 1.11 2004/08/15 21:36:30 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -11,14 +11,12 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include "user32.h" #include #include #include #include #include - #define NDEBUG #include