From 8b3da072ddc58842d9bd8d1e6504d6f98bda9afd Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Sun, 19 Jun 2005 18:06:53 +0000 Subject: [PATCH] Cleanup header usage in USER32. svn path=/trunk/; revision=16099 --- reactos/lib/user32/controls/button.c | 7 ++--- reactos/lib/user32/controls/combo.c | 3 +- reactos/lib/user32/controls/edit.c | 7 ++--- reactos/lib/user32/controls/listbox.c | 5 ++-- reactos/lib/user32/controls/regcontrol.c | 4 +-- reactos/lib/user32/controls/scrollbar.c | 13 ++++----- reactos/lib/user32/controls/static.c | 2 +- reactos/lib/user32/include/user32.h | 25 +++++++++++++++- reactos/lib/user32/misc/dde.c | 4 --- reactos/lib/user32/misc/desktop.c | 7 +---- reactos/lib/user32/misc/display.c | 5 +--- reactos/lib/user32/misc/dllmain.c | 9 +----- reactos/lib/user32/misc/exit.c | 2 +- reactos/lib/user32/misc/exticon.c | 9 ------ reactos/lib/user32/misc/misc.c | 3 +- reactos/lib/user32/misc/object.c | 3 +- reactos/lib/user32/misc/resources.c | 3 +- reactos/lib/user32/misc/strpool.c | 4 +-- reactos/lib/user32/misc/stubs.c | 5 +--- reactos/lib/user32/misc/timer.c | 3 +- reactos/lib/user32/misc/winhelp.c | 4 +-- reactos/lib/user32/misc/winsta.c | 4 +-- reactos/lib/user32/misc/wsprintf.c | 6 +--- reactos/lib/user32/windows/accel.c | 4 +-- reactos/lib/user32/windows/bitmap.c | 5 +--- reactos/lib/user32/windows/caret.c | 3 +- reactos/lib/user32/windows/class.c | 8 +---- reactos/lib/user32/windows/clipboard.c | 5 +--- reactos/lib/user32/windows/cursor.c | 4 +-- reactos/lib/user32/windows/dc.c | 3 +- reactos/lib/user32/windows/defwnd.c | 12 +------- reactos/lib/user32/windows/dialog.c | 37 +++++------------------- reactos/lib/user32/windows/draw.c | 16 ++-------- reactos/lib/user32/windows/font.c | 4 +-- reactos/lib/user32/windows/hook.c | 5 +--- reactos/lib/user32/windows/icon.c | 5 +--- reactos/lib/user32/windows/input.c | 4 +-- reactos/lib/user32/windows/mdi.c | 2 ++ reactos/lib/user32/windows/menu.c | 11 +------ reactos/lib/user32/windows/message.c | 6 +--- reactos/lib/user32/windows/messagebox.c | 9 +----- reactos/lib/user32/windows/nonclient.c | 17 ----------- reactos/lib/user32/windows/paint.c | 5 +--- reactos/lib/user32/windows/prop.c | 4 +-- reactos/lib/user32/windows/rect.c | 3 +- reactos/lib/user32/windows/text.c | 5 +--- reactos/lib/user32/windows/window.c | 8 +---- reactos/lib/user32/windows/winpos.c | 7 +---- 48 files changed, 88 insertions(+), 241 deletions(-) diff --git a/reactos/lib/user32/controls/button.c b/reactos/lib/user32/controls/button.c index 42a21e90564..91d9fa2ae2e 100644 --- a/reactos/lib/user32/controls/button.c +++ b/reactos/lib/user32/controls/button.c @@ -19,11 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __USE_W32API -#define __USE_W32API -#endif - -#include "user32.h" +#define __WINE__ +#include #include #include #include diff --git a/reactos/lib/user32/controls/combo.c b/reactos/lib/user32/controls/combo.c index 4f8a2c50d9d..6b19500745a 100644 --- a/reactos/lib/user32/controls/combo.c +++ b/reactos/lib/user32/controls/combo.c @@ -20,7 +20,8 @@ * FIXME: roll up in Netscape 3.01. */ -#include "user32.h" +#define __WINE__ +#include #include #include diff --git a/reactos/lib/user32/controls/edit.c b/reactos/lib/user32/controls/edit.c index 7b3974062b0..fbf10b0e81c 100644 --- a/reactos/lib/user32/controls/edit.c +++ b/reactos/lib/user32/controls/edit.c @@ -36,11 +36,8 @@ * */ -#ifndef __USE_W32API -#define __USE_W32API -#endif - -#include "user32.h" +#define __WINE__ +#include #include #include #include diff --git a/reactos/lib/user32/controls/listbox.c b/reactos/lib/user32/controls/listbox.c index 4912b26538d..ee260a93d9b 100644 --- a/reactos/lib/user32/controls/listbox.c +++ b/reactos/lib/user32/controls/listbox.c @@ -17,8 +17,9 @@ * 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 + +#define __WINE__ +#include #include #include #include "controls.h" diff --git a/reactos/lib/user32/controls/regcontrol.c b/reactos/lib/user32/controls/regcontrol.c index 32736e69247..5bb862078ce 100644 --- a/reactos/lib/user32/controls/regcontrol.c +++ b/reactos/lib/user32/controls/regcontrol.c @@ -9,9 +9,7 @@ * NOTES: Adapted from Wine */ -#include "user32.h" -#include -#include "win32k/ntuser.h" +#include static void RegisterBuiltinClass(const struct builtin_class_descr *Descr) { diff --git a/reactos/lib/user32/controls/scrollbar.c b/reactos/lib/user32/controls/scrollbar.c index 90aa49250af..3a0a9e4a089 100644 --- a/reactos/lib/user32/controls/scrollbar.c +++ b/reactos/lib/user32/controls/scrollbar.c @@ -30,13 +30,8 @@ /* INCLUDES *******************************************************************/ -#include "user32.h" -#include -#include -#include -#include +#include #include -#include /* GLOBAL VARIABLES ***********************************************************/ @@ -655,7 +650,11 @@ IntScrollGetThumbVal(HWND Wnd, INT SBType, PSCROLLBARINFO ScrollBarInfo, return si.nMin; } - Pos = RtlRosMax(0, Pos - ScrollBarInfo->dxyLineButton); + Pos = Pos - ScrollBarInfo->dxyLineButton; + if (Pos < 0) + { + Pos = 0; + } if (Pixels < Pos) { Pos = Pixels; diff --git a/reactos/lib/user32/controls/static.c b/reactos/lib/user32/controls/static.c index 5d0f5dddc8b..ed03a0424d4 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 "user32.h" +#include #ifndef __REACTOS__ WINE_DEFAULT_DEBUG_CHANNEL(static); diff --git a/reactos/lib/user32/include/user32.h b/reactos/lib/user32/include/user32.h index ec6a5f4ad20..8770624cbea 100644 --- a/reactos/lib/user32/include/user32.h +++ b/reactos/lib/user32/include/user32.h @@ -4,12 +4,34 @@ * FILE: include/user32.h * PURPOSE: Global user32 definitions */ + +#ifndef USER32_H +#define USER32_H + +#include +#include +#include #include +#include #define NTOS_MODE_USER #include #include - +#include +#include "accel.h" +#include "cursor.h" +#ifndef __WINE__ +#include "debug.h" +#endif +#include "draw.h" +#include "menu.h" +#include "message.h" #include "regcontrol.h" +#include "resource.h" +#include "scroll.h" +#include "strpool.h" +#include "window.h" +#include "winpos.h" +#include "winsta.h" extern HINSTANCE User32Instance; @@ -131,3 +153,4 @@ NTSTATUS STDCALL ZwCallbackReturn(PVOID Result, #define NtUserEnableProcessWindowGhosting(bEnable) \ NtUserCallOneParam((DWORD)bEnable, ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING) +#endif /* USER32_H */ diff --git a/reactos/lib/user32/misc/dde.c b/reactos/lib/user32/misc/dde.c index 71c6b5bbbf6..75f48955013 100644 --- a/reactos/lib/user32/misc/dde.c +++ b/reactos/lib/user32/misc/dde.c @@ -22,10 +22,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __USE_W32API -#define __USE_W32API -#endif - #include "wine/config.h" #include "wine/port.h" diff --git a/reactos/lib/user32/misc/desktop.c b/reactos/lib/user32/misc/desktop.c index 8bc5626825d..2b0b97aa1e4 100644 --- a/reactos/lib/user32/misc/desktop.c +++ b/reactos/lib/user32/misc/desktop.c @@ -9,14 +9,9 @@ * 06-06-2001 CSH Created */ -#include "user32.h" -#include "winsta.h" -#include -#include +#include #include #include -#include -#include /* * @implemented diff --git a/reactos/lib/user32/misc/display.c b/reactos/lib/user32/misc/display.c index 9dfdd33ffab..3eeb8332054 100644 --- a/reactos/lib/user32/misc/display.c +++ b/reactos/lib/user32/misc/display.c @@ -28,11 +28,8 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" +#include #include -#include -#define NDEBUG -#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/misc/dllmain.c b/reactos/lib/user32/misc/dllmain.c index cc13cf3d2f3..2270a942378 100644 --- a/reactos/lib/user32/misc/dllmain.c +++ b/reactos/lib/user32/misc/dllmain.c @@ -1,11 +1,4 @@ -#include "user32.h" -#include "menu.h" -#include "message.h" -#include "accel.h" -#include "strpool.h" -#include - -#include +#include /* FIXME: Belongs to some header. */ WINBOOL STDCALL GdiDllInitialize(HANDLE, DWORD, LPVOID); diff --git a/reactos/lib/user32/misc/exit.c b/reactos/lib/user32/misc/exit.c index 61c673c7c9f..b28299018d9 100644 --- a/reactos/lib/user32/misc/exit.c +++ b/reactos/lib/user32/misc/exit.c @@ -7,7 +7,7 @@ * PROGRAMMER: Eric Kohl (ekohl@rz-online.de) */ -#include "user32.h" +#include #include /* diff --git a/reactos/lib/user32/misc/exticon.c b/reactos/lib/user32/misc/exticon.c index 9c0d3636c11..61ef35b602a 100644 --- a/reactos/lib/user32/misc/exticon.c +++ b/reactos/lib/user32/misc/exticon.c @@ -22,15 +22,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* Remove this once w32api conversion is done */ -#ifndef __USE_W32API -#define __USE_W32API -#define _WIN32_IE 0x600 -#define _WIN32_WINNT 0x501 -#define WINVER 0x501 -#define __need_offsetof -#endif /* __USE_W32API */ - #include #include #include /* abs() */ diff --git a/reactos/lib/user32/misc/misc.c b/reactos/lib/user32/misc/misc.c index 531d912098a..b5180d76452 100644 --- a/reactos/lib/user32/misc/misc.c +++ b/reactos/lib/user32/misc/misc.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include +#include #include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/misc/object.c b/reactos/lib/user32/misc/object.c index 7a568086ce6..a2d72871104 100644 --- a/reactos/lib/user32/misc/object.c +++ b/reactos/lib/user32/misc/object.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/misc/resources.c b/reactos/lib/user32/misc/resources.c index 9861ff025a8..36e26afbada 100644 --- a/reactos/lib/user32/misc/resources.c +++ b/reactos/lib/user32/misc/resources.c @@ -1,5 +1,4 @@ -#include "user32.h" -#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 26bbc2caee0..88ea190abe2 100644 --- a/reactos/lib/user32/misc/strpool.c +++ b/reactos/lib/user32/misc/strpool.c @@ -1,8 +1,6 @@ // strpool.c -#include "user32.h" -#include -#include +#include typedef struct tagHEAP_STRING_POOLA { diff --git a/reactos/lib/user32/misc/stubs.c b/reactos/lib/user32/misc/stubs.c index a083aedde8c..18d39a4e48f 100644 --- a/reactos/lib/user32/misc/stubs.c +++ b/reactos/lib/user32/misc/stubs.c @@ -10,10 +10,7 @@ * 08-F05-2001 CSH Created */ -#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 96d98979e08..6b88e0477b4 100644 --- a/reactos/lib/user32/misc/timer.c +++ b/reactos/lib/user32/misc/timer.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/misc/winhelp.c b/reactos/lib/user32/misc/winhelp.c index 91b0937cdec..3a8c553881b 100644 --- a/reactos/lib/user32/misc/winhelp.c +++ b/reactos/lib/user32/misc/winhelp.c @@ -28,9 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include +#include /* WinHelp internal structure */ typedef struct diff --git a/reactos/lib/user32/misc/winsta.c b/reactos/lib/user32/misc/winsta.c index d4b23ee987a..1595abdc42b 100644 --- a/reactos/lib/user32/misc/winsta.c +++ b/reactos/lib/user32/misc/winsta.c @@ -9,9 +9,7 @@ * 04-06-2001 CSH Created */ -#include "user32.h" -#include - +#include /* * @implemented diff --git a/reactos/lib/user32/misc/wsprintf.c b/reactos/lib/user32/misc/wsprintf.c index faf4edafb6d..89933c63855 100644 --- a/reactos/lib/user32/misc/wsprintf.c +++ b/reactos/lib/user32/misc/wsprintf.c @@ -31,11 +31,7 @@ * NOTES: Adapted from Wine */ -#include "user32.h" -#include -#include -#include -#include "strpool.h" +#include #define WPRINTF_LEFTALIGN 0x0001 /* Align output on the left ('-' prefix) */ #define WPRINTF_PREFIX_HEX 0x0002 /* Prefix hex with 0x ('#' prefix) */ diff --git a/reactos/lib/user32/windows/accel.c b/reactos/lib/user32/windows/accel.c index 4ee46d85def..4d6e93b6022 100644 --- a/reactos/lib/user32/windows/accel.c +++ b/reactos/lib/user32/windows/accel.c @@ -29,9 +29,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include "accel.h" -#include +#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 a0ebd97483c..54326a4a370 100644 --- a/reactos/lib/user32/windows/bitmap.c +++ b/reactos/lib/user32/windows/bitmap.c @@ -28,10 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include -#include +#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 d53a3c64b3e..a461bfafe4a 100644 --- a/reactos/lib/user32/windows/caret.c +++ b/reactos/lib/user32/windows/caret.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/class.c b/reactos/lib/user32/windows/class.c index 47253ed7726..de26575246b 100644 --- a/reactos/lib/user32/windows/class.c +++ b/reactos/lib/user32/windows/class.c @@ -9,13 +9,7 @@ * 09-05-2001 CSH Created */ -#include "user32.h" -#include -#include -#include -#include -#include - +#include static BOOL GetClassInfoExCommon( HINSTANCE hInst, diff --git a/reactos/lib/user32/windows/clipboard.c b/reactos/lib/user32/windows/clipboard.c index ebf27e1457c..ec1d007bce6 100644 --- a/reactos/lib/user32/windows/clipboard.c +++ b/reactos/lib/user32/windows/clipboard.c @@ -28,10 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#define NDEBUG -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/cursor.c b/reactos/lib/user32/windows/cursor.c index aba4ba66793..4887c39597f 100644 --- a/reactos/lib/user32/windows/cursor.c +++ b/reactos/lib/user32/windows/cursor.c @@ -28,9 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include +#include #undef CopyCursor HBITMAP diff --git a/reactos/lib/user32/windows/dc.c b/reactos/lib/user32/windows/dc.c index 07d4b6bb792..7b935850ef7 100644 --- a/reactos/lib/user32/windows/dc.c +++ b/reactos/lib/user32/windows/dc.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/defwnd.c b/reactos/lib/user32/windows/defwnd.c index c1d91083d65..409c2517e9f 100644 --- a/reactos/lib/user32/windows/defwnd.c +++ b/reactos/lib/user32/windows/defwnd.c @@ -11,17 +11,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include -#include -#include -#include -#include -#include - -#define NDEBUG -#include +#include #ifndef WM_SETVISIBLE #define WM_SETVISIBLE 9 diff --git a/reactos/lib/user32/windows/dialog.c b/reactos/lib/user32/windows/dialog.c index 25946416993..770fd72c0e0 100644 --- a/reactos/lib/user32/windows/dialog.c +++ b/reactos/lib/user32/windows/dialog.c @@ -31,13 +31,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include -#include -#include -#include -#include +#include /* MACROS/DEFINITIONS ********************************************************/ @@ -1235,24 +1229,6 @@ static INT DIALOG_DlgDirList( HWND hDlg, LPSTR spec, INT idLBox, #undef SENDMSG } -/* Hack - We dont define this anywhere and we shouldn't - * Its only used to port buggy WINE code in to our buggy code. - * Make it go away - sedwards - */ -/* strdup macros */ -/* DO NOT USE IT!! it will go away soon */ -inline static LPSTR HEAP_strdupWtoA( HANDLE heap, DWORD flags, LPCWSTR str ) -{ - LPSTR ret; - INT len; - - if (!str) return NULL; - len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); - ret = RtlAllocateHeap(GetProcessHeap(), flags, len ); - if(ret) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); - return ret; -} - /********************************************************************** * DIALOG_DlgDirListW * @@ -1263,11 +1239,14 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, { if (spec) { - LPSTR specA = HEAP_strdupWtoA( GetProcessHeap(), 0, spec ); - INT ret = DIALOG_DlgDirList( hDlg, specA, idLBox, idStatic, - attrib, combo ); + LPSTR specA; + INT ret; + + HEAP_strdupWtoA ( &specA, spec, lstrlenW(spec) ); + ret = DIALOG_DlgDirList( hDlg, specA, idLBox, idStatic, + attrib, combo ); MultiByteToWideChar( CP_ACP, 0, specA, -1, spec, 0x7fffffff ); - HeapFree( GetProcessHeap(), 0, specA ); + HEAP_free( specA ); return ret; } return DIALOG_DlgDirList( hDlg, NULL, idLBox, idStatic, attrib, combo ); diff --git a/reactos/lib/user32/windows/draw.c b/reactos/lib/user32/windows/draw.c index be7d352f72e..ac690cb78e3 100644 --- a/reactos/lib/user32/windows/draw.c +++ b/reactos/lib/user32/windows/draw.c @@ -28,17 +28,7 @@ /* INCLUDES *******************************************************************/ -#ifndef __USE_W32API -#define __USE_W32API -#define _WIN32_WINNT 0x0500 -#define WINVER 0x0500 -#endif - -#include -#include -#include #include -#include /* GLOBALS *******************************************************************/ @@ -1388,7 +1378,7 @@ IntGrayString( if (unicode) nCount = lstrlenW((WCHAR*)lpData); else - nCount = strlen((CHAR*)lpData); + nCount = lstrlenA((CHAR*)lpData); } if (! nWidth || ! nHeight) @@ -1545,9 +1535,9 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp, if((opcode == DST_TEXT || opcode == DST_PREFIXTEXT) && !len) /* The string is '\0' terminated */ { if(unicode) - len = strlenW((LPWSTR)lp); + len = lstrlenW((LPWSTR)lp); else - len = strlen((LPSTR)lp); + len = lstrlenA((LPSTR)lp); } /* Find out what size the image has if not given by caller */ diff --git a/reactos/lib/user32/windows/font.c b/reactos/lib/user32/windows/font.c index 8d801fd70b4..d0f5bef20b4 100644 --- a/reactos/lib/user32/windows/font.c +++ b/reactos/lib/user32/windows/font.c @@ -28,9 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/hook.c b/reactos/lib/user32/windows/hook.c index 5fd79873bcf..a2b20380094 100644 --- a/reactos/lib/user32/windows/hook.c +++ b/reactos/lib/user32/windows/hook.c @@ -28,10 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#define NDEBUG -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/icon.c b/reactos/lib/user32/windows/icon.c index 711a6151104..eb82e4b12d6 100644 --- a/reactos/lib/user32/windows/icon.c +++ b/reactos/lib/user32/windows/icon.c @@ -28,10 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/input.c b/reactos/lib/user32/windows/input.c index 35be047e19d..3d8df9ce9c9 100644 --- a/reactos/lib/user32/windows/input.c +++ b/reactos/lib/user32/windows/input.c @@ -28,9 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/mdi.c b/reactos/lib/user32/windows/mdi.c index bb3611a5a16..b9bd974bfd9 100644 --- a/reactos/lib/user32/windows/mdi.c +++ b/reactos/lib/user32/windows/mdi.c @@ -80,6 +80,8 @@ * */ +#define __WINE__ + #include #include #include diff --git a/reactos/lib/user32/windows/menu.c b/reactos/lib/user32/windows/menu.c index 1dbc2af59ef..a28099066a1 100644 --- a/reactos/lib/user32/windows/menu.c +++ b/reactos/lib/user32/windows/menu.c @@ -33,18 +33,9 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include -#include -#include -#include -#include +#include #include "../controls/controls.h" -#define NDEBUG -#include - /* internal popup menu window messages */ #define MM_SETMENUHANDLE (WM_USER + 0) #define MM_GETMENUHANDLE (WM_USER + 1) diff --git a/reactos/lib/user32/windows/message.c b/reactos/lib/user32/windows/message.c index 7d3c32a51e7..264b0155138 100644 --- a/reactos/lib/user32/windows/message.c +++ b/reactos/lib/user32/windows/message.c @@ -8,11 +8,7 @@ * 06-06-2001 CSH Created */ -#include "user32.h" -#include -#include -#include -#include +#include /* DDE message exchange * diff --git a/reactos/lib/user32/windows/messagebox.c b/reactos/lib/user32/windows/messagebox.c index 022300f5470..4ecde509544 100644 --- a/reactos/lib/user32/windows/messagebox.c +++ b/reactos/lib/user32/windows/messagebox.c @@ -31,14 +31,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include -#include -#include -#include "resource.h" - -#include +#include /* DEFINES *******************************************************************/ diff --git a/reactos/lib/user32/windows/nonclient.c b/reactos/lib/user32/windows/nonclient.c index f9525584b13..848f4818f98 100644 --- a/reactos/lib/user32/windows/nonclient.c +++ b/reactos/lib/user32/windows/nonclient.c @@ -30,24 +30,7 @@ Already defined in makefile now. #define __REACTOS__ */ -/* - * Use w32api headers - */ -/* -#define __USE_W32API -#define _WIN32_WINNT 0x0501 -*/ - -#include -#include -#include -#include -#include #include -#include "window.h" - -#define NDEBUG -#include #define HAS_DLGFRAME(Style, ExStyle) \ (((ExStyle) & WS_EX_DLGMODALFRAME) || \ diff --git a/reactos/lib/user32/windows/paint.c b/reactos/lib/user32/windows/paint.c index b44446031b2..43a40b1f113 100644 --- a/reactos/lib/user32/windows/paint.c +++ b/reactos/lib/user32/windows/paint.c @@ -28,10 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#define NDEBUG -#include +#include static HBRUSH FrameBrushes[13]; static HBITMAP hHatch; diff --git a/reactos/lib/user32/windows/prop.c b/reactos/lib/user32/windows/prop.c index 91e81837113..6ba07a31b4b 100644 --- a/reactos/lib/user32/windows/prop.c +++ b/reactos/lib/user32/windows/prop.c @@ -28,9 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include +#include typedef struct _PROPLISTITEM { diff --git a/reactos/lib/user32/windows/rect.c b/reactos/lib/user32/windows/rect.c index 9094a4d2eac..c4f1eb1c95f 100644 --- a/reactos/lib/user32/windows/rect.c +++ b/reactos/lib/user32/windows/rect.c @@ -28,8 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/text.c b/reactos/lib/user32/windows/text.c index 831d5b4b9d1..e1bfce0bf5c 100644 --- a/reactos/lib/user32/windows/text.c +++ b/reactos/lib/user32/windows/text.c @@ -28,10 +28,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include - +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/user32/windows/window.c b/reactos/lib/user32/windows/window.c index b03aba6a5e6..4648e24281d 100644 --- a/reactos/lib/user32/windows/window.c +++ b/reactos/lib/user32/windows/window.c @@ -11,13 +11,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include -#include -#include -#define NDEBUG -#include +#include BOOL ControlsInitialized = FALSE; diff --git a/reactos/lib/user32/windows/winpos.c b/reactos/lib/user32/windows/winpos.c index 5181101ac6c..c0e7d512f9b 100644 --- a/reactos/lib/user32/windows/winpos.c +++ b/reactos/lib/user32/windows/winpos.c @@ -11,12 +11,7 @@ /* INCLUDES ******************************************************************/ -#include "user32.h" -#include -#include -#include -#define NDEBUG -#include +#include /* FUNCTIONS *****************************************************************/