ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-01 19:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup header usage in USER32.

Browse Source 
svn path=/trunk/; revision=16099
This commit is contained in:
Filip Navara
2005-06-19 18:06:53 +00:00
parent 3dcd5f1ff6
commit 8b3da072dd
48 changed files with 88 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/lib/user32/controls/button.c
+2 -5
View File
@@ -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 <user32.h>
#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
reactos/lib/user32/controls/combo.c
+2 -1
View File
@@ -20,7 +20,8 @@
* FIXME: roll up in Netscape 3.01.
*/
#include "user32.h"
#define __WINE__
#include <user32.h>
#include <stdarg.h>
#include <string.h>
reactos/lib/user32/controls/edit.c
+2 -5
View File
@@ -36,11 +36,8 @@
*
*/
#ifndef __USE_W32API
#define __USE_W32API
#endif
#include "user32.h"
#define __WINE__
#include <user32.h>
#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
reactos/lib/user32/controls/listbox.c
+3 -2
View File
@@ -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 <user32.h>
#include <string.h>
#include <stdlib.h>
#include "controls.h"
reactos/lib/user32/controls/regcontrol.c
+1 -3
View File
@@ -9,9 +9,7 @@
* NOTES: Adapted from Wine
*/
#include "user32.h"
#include <wchar.h>
#include "win32k/ntuser.h"
#include <user32.h>
static void RegisterBuiltinClass(const struct builtin_class_descr *Descr)
{
reactos/lib/user32/controls/scrollbar.c
+6 -7
View File
@@ -30,13 +30,8 @@
/* INCLUDES *******************************************************************/
#include "user32.h"
#include <debug.h>
#include <draw.h>
#include <stdlib.h>
#include <string.h>
#include <user32.h>
#include <oleacc.h>
#include <rosrtl/minmax.h>
/* 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;
reactos/lib/user32/controls/static.c
+1 -1
View File
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "user32.h"
#include <user32.h>
#ifndef __REACTOS__
WINE_DEFAULT_DEBUG_CHANNEL(static);
reactos/lib/user32/include/user32.h
+24 -1
View File
@@ -4,12 +4,34 @@
* FILE: include/user32.h
* PURPOSE: Global user32 definitions
*/
#ifndef USER32_H
#define USER32_H
#include <ctype.h>
#include <stdio.h>
#include <limits.h>
#include <windows.h>
#include <windowsx.h>
#define NTOS_MODE_USER
#include <ntos.h>
#include <win32k/win32k.h>
#include <win32k/callback.h>
#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 */
reactos/lib/user32/misc/dde.c
-4
View File
@@ -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"
reactos/lib/user32/misc/desktop.c
+1 -6
View File
@@ -9,14 +9,9 @@
* 06-06-2001 CSH Created
*/
#include "user32.h"
#include "winsta.h"
#include <string.h>
#include <debug.h>
#include <user32.h>
#include <rosrtl/devmode.h>
#include <rosrtl/logfont.h>
#include <malloc.h>
#include <math.h>
/*
* @implemented
reactos/lib/user32/misc/display.c
+1 -4
View File
@@ -28,11 +28,8 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <user32.h>
#include <rosrtl/devmode.h>
#include <win32k/ntuser.h>
#define NDEBUG
#include <debug.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/misc/dllmain.c
+1 -8
View File
@@ -1,11 +1,4 @@
#include "user32.h"
#include "menu.h"
#include "message.h"
#include "accel.h"
#include "strpool.h"
#include <win32k/callback.h>
#include <debug.h>
#include <user32.h>
/* FIXME: Belongs to some header. */
WINBOOL STDCALL GdiDllInitialize(HANDLE, DWORD, LPVOID);
reactos/lib/user32/misc/exit.c
+1 -1
View File
@@ -7,7 +7,7 @@
* PROGRAMMER: Eric Kohl ([email protected])
*/
#include "user32.h"
#include <user32.h>
#include <ntdll/csr.h>
/*
reactos/lib/user32/misc/exticon.c
-9
View File
@@ -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 <stdarg.h>
#include <string.h>
#include <stdlib.h> /* abs() */
reactos/lib/user32/misc/misc.c
+1 -2
View File
@@ -28,8 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <debug.h>
#include <user32.h>
#include <ntdll/csr.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/misc/object.c
+1 -2
View File
@@ -28,8 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <debug.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/misc/resources.c
+1 -2
View File
@@ -1,5 +1,4 @@
#include "user32.h"
#include <string.h>
#include <user32.h>
/* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which
does not seem to work properly for stack address space. */
reactos/lib/user32/misc/strpool.c
+1 -3
View File
@@ -1,8 +1,6 @@
// strpool.c
#include "user32.h"
#include <strpool.h>
#include <string.h>
#include <user32.h>
typedef struct tagHEAP_STRING_POOLA
{
reactos/lib/user32/misc/stubs.c
+1 -4
View File
@@ -10,10 +10,7 @@
* 08-F05-2001 CSH Created
*/
#include "user32.h"
#include <debug.h>
#include <string.h>
#include <mmsystem.h>
#include <user32.h>
#ifdef __USE_W32API
typedef PVOID LPIMEPROW, LPIMEPROA;
#endif
reactos/lib/user32/misc/timer.c
+1 -2
View File
@@ -28,8 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <debug.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/misc/winhelp.c
+1 -3
View File
@@ -28,9 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <string.h>
#include <debug.h>
#include <user32.h>
/* WinHelp internal structure */
typedef struct
reactos/lib/user32/misc/winsta.c
+1 -3
View File
@@ -9,9 +9,7 @@
* 04-06-2001 CSH Created
*/
#include "user32.h"
#include <debug.h>
#include <user32.h>
/*
* @implemented
reactos/lib/user32/misc/wsprintf.c
+1 -5
View File
@@ -31,11 +31,7 @@
* NOTES: Adapted from Wine
*/
#include "user32.h"
#include <stdarg.h>
#include <string.h>
#include <stdio.h>
#include "strpool.h"
#include <user32.h>
#define WPRINTF_LEFTALIGN 0x0001 /* Align output on the left ('-' prefix) */
#define WPRINTF_PREFIX_HEX 0x0002 /* Prefix hex with 0x ('#' prefix) */
reactos/lib/user32/windows/accel.c
+1 -3
View File
@@ -29,9 +29,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include "accel.h"
#include <win32k/ntuser.h>
#include <user32.h>
/* this is the 8 byte accel struct used in Win32 resources (internal only) */
typedef struct
reactos/lib/user32/windows/bitmap.c
+1 -4
View File
@@ -28,10 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <string.h>
#include <debug.h>
#include <stdlib.h>
#include <user32.h>
/*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);
reactos/lib/user32/windows/caret.c
+1 -2
View File
@@ -28,8 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <debug.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/windows/class.c
+1 -7
View File
@@ -9,13 +9,7 @@
* 09-05-2001 CSH Created
*/
#include "user32.h"
#include <string.h>
#include <stdlib.h>
#include <debug.h>
#include <window.h>
#include <strpool.h>
#include <user32.h>
static BOOL GetClassInfoExCommon(
HINSTANCE hInst,
reactos/lib/user32/windows/clipboard.c
+1 -4
View File
@@ -28,10 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <strpool.h>
#define NDEBUG
#include <debug.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/windows/cursor.c
+1 -3
View File
@@ -28,9 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <string.h>
#include <debug.h>
#include <user32.h>
#undef CopyCursor
HBITMAP
reactos/lib/user32/windows/dc.c
+1 -2
View File
@@ -28,8 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <debug.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/windows/defwnd.c
+1 -11
View File
@@ -11,17 +11,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <windowsx.h>
#include <window.h>
#include <string.h>
#include <cursor.h>
#include <menu.h>
#include <scroll.h>
#include <winpos.h>
#define NDEBUG
#include <debug.h>
#include <user32.h>
#ifndef WM_SETVISIBLE
#define WM_SETVISIBLE 9
reactos/lib/user32/windows/dialog.c
+8 -29
View File
@@ -31,13 +31,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <limits.h>
#include <debug.h>
#include <user32.h>
/* 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 );
reactos/lib/user32/windows/draw.c
+3 -13
View File
@@ -28,17 +28,7 @@
/* INCLUDES *******************************************************************/
#ifndef __USE_W32API
#define __USE_W32API
#define _WIN32_WINNT 0x0500
#define WINVER 0x0500
#endif
#include <windows.h>
#include <string.h>
#include <wine/unicode.h>
#include <user32.h>
#include <debug.h>
/* 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 */
reactos/lib/user32/windows/font.c
+1 -3
View File
@@ -28,9 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <string.h>
#include <debug.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/windows/hook.c
+1 -4
View File
@@ -28,10 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <win32k/callback.h>
#define NDEBUG
#include <debug.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/windows/icon.c
+1 -4
View File
@@ -28,10 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <string.h>
#include <stdlib.h>
#include <debug.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/windows/input.c
+1 -3
View File
@@ -28,9 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <debug.h>
#include <wchar.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/windows/mdi.c
+2
View File
@@ -80,6 +80,8 @@
*
*/
#define __WINE__
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
reactos/lib/user32/windows/menu.c
+1 -10
View File
@@ -33,18 +33,9 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <ctype.h>
#include <string.h>
#include <draw.h>
#include <window.h>
#include <strpool.h>
#include <win32k/callback.h>
#include <user32.h>
#include "../controls/controls.h"
#define NDEBUG
#include <debug.h>
/* internal popup menu window messages */
#define MM_SETMENUHANDLE (WM_USER + 0)
#define MM_GETMENUHANDLE (WM_USER + 1)
reactos/lib/user32/windows/message.c
+1 -5
View File
@@ -8,11 +8,7 @@
* 06-06-2001 CSH Created
*/
#include "user32.h"
#include <string.h>
#include <debug.h>
#include <win32k/callback.h>
#include <message.h>
#include <user32.h>
/* DDE message exchange
*
reactos/lib/user32/windows/messagebox.c
+1 -8
View File
@@ -31,14 +31,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <debug.h>
#include "resource.h"
#include <mmsystem.h>
#include <user32.h>
/* DEFINES *******************************************************************/
reactos/lib/user32/windows/nonclient.c
-17
View File
@@ -30,24 +30,7 @@ Already defined in makefile now.
#define __REACTOS__
*/
/*
* Use w32api headers
*/
/*
#define __USE_W32API
#define _WIN32_WINNT 0x0501
*/
#include <windows.h>
#include <windowsx.h>
#include <string.h>
#include <menu.h>
#include <winpos.h>
#include <user32.h>
#include "window.h"
#define NDEBUG
#include <debug.h>
#define HAS_DLGFRAME(Style, ExStyle) \
(((ExStyle) & WS_EX_DLGMODALFRAME) || \
reactos/lib/user32/windows/paint.c
+1 -4
View File
@@ -28,10 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <resource.h>
#define NDEBUG
#include <debug.h>
#include <user32.h>
static HBRUSH FrameBrushes[13];
static HBITMAP hHatch;
reactos/lib/user32/windows/prop.c
+1 -3
View File
@@ -28,9 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <strpool.h>
#include <debug.h>
#include <user32.h>
typedef struct _PROPLISTITEM
{
reactos/lib/user32/windows/rect.c
+1 -2
View File
@@ -28,8 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <debug.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/windows/text.c
+1 -4
View File
@@ -28,10 +28,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <ctype.h>
#include <debug.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/
reactos/lib/user32/windows/window.c
+1 -7
View File
@@ -11,13 +11,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <window.h>
#include <string.h>
#include <strpool.h>
#include <win32k/callback.h>
#define NDEBUG
#include <debug.h>
#include <user32.h>
BOOL ControlsInitialized = FALSE;
reactos/lib/user32/windows/winpos.c
+1 -6
View File
@@ -11,12 +11,7 @@
/* INCLUDES ******************************************************************/
#include "user32.h"
#include <window.h>
#include <win32k/callback.h>
#include <window.h>
#define NDEBUG
#include <debug.h>
#include <user32.h>
/* FUNCTIONS *****************************************************************/