system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 05:50:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved private USER definitions to a new user_private.h header, and

Browse source 
removed the global user.h.
This commit is contained in:
Alexandre Julliard 2004-12-08 18:06:14 +00:00
parent 2c3de6db24
commit 6a78c16aac
49 changed files with 90 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/user/button.c
View file

@ -73,7 +73,7 @@
#include "wingdi.h"
#include "wine/winuser16.h"
#include "controls.h"
#include "user.h"
#include "user_private.h"
/* GetWindowLong offsets for window extra information */
#define STATE_GWL_OFFSET 0

1
dlls/user/combo.c
View file

@ -45,7 +45,6 @@
#include "wine/winuser16.h"
#include "wine/unicode.h"
#include "message.h"
#include "user.h"
#include "win.h"
#include "controls.h"
#include "winreg.h"

1
dlls/user/comm16.c
View file

@ -68,6 +68,7 @@
#include "winuser.h"
#include "wine/winuser16.h"
#include "win.h"
#include "user_private.h"
#include "winerror.h"
#include "wine/debug.h"

4
dlls/user/controls.h
View file

@ -46,6 +46,9 @@ struct builtin_class_descr
};
/* defwnd proc */
extern HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType );
/* desktop */
extern BOOL DESKTOP_SetPattern( LPCWSTR pattern );
@ -58,6 +61,7 @@ extern HWND MENU_IsMenuActive(void);
extern HMENU MENU_GetSysMenu(HWND hWndOwner, HMENU hSysPopup);
extern UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth,
INT orgX, INT orgY );
extern BOOL MENU_SetMenu(HWND, HMENU);
extern void MENU_TrackMouseMenuBar( HWND hwnd, INT ht, POINT pt );
extern void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar );
extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect,

1
dlls/user/desktop.c
View file

@ -30,7 +30,6 @@
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "user.h"
#include "controls.h"
#include "wine/winuser16.h"

2
dlls/user/dialog16.c
View file

@ -29,7 +29,7 @@
#include "wine/winuser16.h"
#include "controls.h"
#include "win.h"
#include "user.h"
#include "user_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(dialog);

2
dlls/user/display.c
View file

@ -23,7 +23,7 @@
#include "wine/debug.h"
#include "windef.h"
#include "winbase.h"
#include "user.h"
#include "user_private.h"
#include "wine/winuser16.h"
WINE_DEFAULT_DEBUG_CHANNEL(cursor);

2
dlls/user/edit.c
View file

@ -71,7 +71,7 @@
#include "controls.h"
#include "local.h"
#include "message.h"
#include "user.h"
#include "user_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(edit);

2
dlls/user/focus.c
View file

@ -31,7 +31,7 @@
#include "winerror.h"
#include "win.h"
#include "message.h"
#include "user.h"
#include "user_private.h"
#include "wine/server.h"
#include "wine/debug.h"

1
dlls/user/hook.c
View file

@ -73,6 +73,7 @@
#include "heap.h"
#include "message.h"
#include "win.h"
#include "user_private.h"
#include "wine/server.h"
#include "wine/unicode.h"
#include "wine/debug.h"

1
dlls/user/hook16.c
View file

@ -30,6 +30,7 @@
#include "wine/winuser16.h"
#include "message.h"
#include "win.h"
#include "user_private.h"
#include "winproc.h"
#include "wine/debug.h"

1
dlls/user/listbox.c
View file

@ -48,7 +48,6 @@
#include "winuser.h"
#include "winerror.h"
#include "message.h"
#include "user.h"
#include "controls.h"
#include "wine/debug.h"
#include "win.h"

2
dlls/user/menu.c
View file

@ -44,7 +44,7 @@
#include "win.h"
#include "controls.h"
#include "nonclient.h"
#include "user.h"
#include "user_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(menu);

2
dlls/user/message.c
View file

@ -35,7 +35,7 @@
#include "wine/unicode.h"
#include "wine/server.h"
#include "message.h"
#include "user.h"
#include "user_private.h"
#include "win.h"
#include "winproc.h"
#include "wine/debug.h"

6
dlls/user/message.h
View file

@ -88,4 +88,10 @@ extern void SPY_ExitMessage( INT iFlag, HWND hwnd, UINT msg,
LRESULT lReturn, WPARAM wParam, LPARAM lParam );
extern int SPY_Init(void);
/* check if hwnd is a broadcast magic handle */
inline static BOOL is_broadcast( HWND hwnd )
{
return (hwnd == HWND_BROADCAST || hwnd == HWND_TOPMOST);
}
#endif /* __WINE_MESSAGE_H */

1
dlls/user/msg16.c
View file

@ -23,6 +23,7 @@
#include "winerror.h"
#include "message.h"
#include "win.h"
#include "user_private.h"
#include "winproc.h"
#include "wine/debug.h"

1
dlls/user/resource.c
View file

@ -28,7 +28,6 @@
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wownt32.h"
#include "user.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(resource);

2
dlls/user/scroll.c
View file

@ -42,7 +42,7 @@
#include "controls.h"
#include "win.h"
#include "wine/debug.h"
#include "user.h"
#include "user_private.h"
#include "message.h"
WINE_DEFAULT_DEBUG_CHANNEL(scroll);

2
dlls/user/static.c
View file

@ -56,7 +56,7 @@
#include "wownt32.h"
#include "cursoricon.h"
#include "controls.h"
#include "user.h"
#include "user_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(static);

1
dlls/user/text.c
View file

@ -39,7 +39,6 @@
#include "winerror.h"
#include "winnls.h"
#include "wownt32.h"
#include "user.h"
#include "controls.h"
#include "wine/debug.h"

2
dlls/user/uitools.c
View file

@ -26,7 +26,7 @@
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winuser.h"
#include "user.h"
#include "user_private.h"
#include "wine/unicode.h"
#include "wine/debug.h"

2
dlls/user/user16.c
View file

@ -24,7 +24,7 @@
#include "windef.h"
#include "winbase.h"
#include "wownt32.h"
#include "user.h"
#include "user_private.h"
#include "win.h"
#include "winproc.h"
#include "cursoricon.h"

2
dlls/user/user_main.c
View file

@ -31,7 +31,7 @@
#include "controls.h"
#include "cursoricon.h"
#include "message.h"
#include "user.h"
#include "user_private.h"
#include "win.h"
#include "wine/debug.h"

67
include/user.h → dlls/user/user_private.h
View file

@ -1,5 +1,5 @@
/*
* USER definitions
* USER private definitions
*
* Copyright 1993 Alexandre Julliard
*
@ -18,16 +18,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __WINE_USER_H
#define __WINE_USER_H
#ifndef __WINE_USER_PRIVATE_H
#define __WINE_USER_PRIVATE_H
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
#include <local.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "local.h"
extern WORD USER_HeapSel;
@ -43,14 +42,6 @@ extern WORD USER_HeapSel;
#define GET_WORD(ptr) (*(const WORD *)(ptr))
#define GET_DWORD(ptr) (*(const DWORD *)(ptr))
#define USUD_LOCALALLOC 0x0001
#define USUD_LOCALFREE 0x0002
#define USUD_LOCALCOMPACT 0x0003
#define USUD_LOCALHEAP 0x0004
#define USUD_FIRSTCLASS 0x0005
struct tagCURSORICONINFO;
/* internal messages codes */
enum wine_internal_message
{
@ -65,9 +56,7 @@ enum wine_internal_message
WM_WINE_MOUSE_LL_HOOK
};
/* internal SendInput codes (FIXME) */
#define WINE_INTERNAL_INPUT_MOUSE (16+INPUT_MOUSE)
#define WINE_INTERNAL_INPUT_KEYBOARD (16+INPUT_KEYBOARD)
struct tagCURSORICONINFO;
typedef struct tagUSER_DRIVER {
/* keyboard functions */
@ -128,37 +117,19 @@ typedef struct tagUSER_DRIVER {
extern USER_DRIVER USER_Driver;
extern HMODULE user32_module;
/* user lock */
extern void USER_Lock(void);
extern void USER_Unlock(void);
extern void USER_CheckNotLock(void);
extern BOOL USER_IsExitingThread( DWORD tid );
/* hook.c */
extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode );
extern BOOL HOOK_IsHooked( INT id );
/* input.c */
extern BYTE InputKeyStateTable[256];
extern BYTE AsyncKeyStateTable[256];
/* syscolor.c */
extern void SYSCOLOR_Init(void);
extern HPEN SYSCOLOR_GetPen( INT index );
/* sysmetrics.c */
extern void SYSMETRICS_Init(void);
extern INT SYSMETRICS_Set( INT index, INT value );
/* sysparams.c */
extern void SYSPARAMS_GetDoubleClickSize( INT *width, INT *height );
extern INT SYSPARAMS_GetMouseButtonSwap( void );
extern DWORD USER16_AlertableWait;
extern BOOL CLIPBOARD_ReleaseOwner(void);
extern DWORD USER16_AlertableWait;
extern BOOL FOCUS_MouseActivate( HWND hwnd );
extern BOOL HOOK_IsHooked( INT id );
extern void SYSCOLOR_Init(void);
extern HPEN SYSCOLOR_GetPen( INT index );
extern void SYSMETRICS_Init(void);
extern INT SYSMETRICS_Set( INT index, INT value );
extern void USER_CheckNotLock(void);
extern BOOL USER_IsExitingThread( DWORD tid );
/* HANDLE16 <-> HANDLE conversions */
#define HCURSOR_16(h32) (LOWORD(h32))
@ -170,4 +141,4 @@ extern DWORD USER16_AlertableWait;
#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16))
#define HMODULE_32(h16) ((HMODULE)(ULONG_PTR)(h16))
#endif /* __WINE_USER_H */
#endif /* __WINE_USER_PRIVATE_H */

2
dlls/user/wnd16.c
View file

@ -20,7 +20,7 @@
#include "wine/winuser16.h"
#include "wownt32.h"
#include "user.h"
#include "user_private.h"
#include "win.h"
#include "winproc.h"
#include "stackframe.h"

1
dlls/x11drv/x11drv.h
View file

@ -40,7 +40,6 @@ typedef int Status;
#include "windef.h"
#include "winbase.h"
#include "user.h"
#include "win.h"
#include "ddrawi.h"
#include "thread.h"

1
dlls/x11drv/x11drv_main.c
View file

@ -59,7 +59,6 @@
#include "wine/winbase16.h"
#include "winreg.h"
#include "user.h"
#include "win.h"
#include "x11drv.h"
#include "xvidmode.h"

36
include/win.h
View file

@ -28,8 +28,6 @@
#include <winuser.h>
#include <wine/windef16.h>
#include <user.h>
#define WND_MAGIC 0x444e4957 /* 'WIND' */
struct tagCLASS;
@ -68,14 +66,6 @@ typedef struct tagWND
DWORD wExtra[1]; /* Window extra bytes */
} WND;
typedef struct
{
RECT16 rectNormal;
POINT16 ptIconPos;
POINT16 ptMaxPos;
HWND hwndIconTitle;
} INTERNALPOS, *LPINTERNALPOS;
/* WND flags values */
#define WIN_RESTORE_MAX 0x0001 /* Maximize when restoring */
#define WIN_NEED_SIZE 0x0002 /* Internal WM_SIZE is needed */
@ -110,18 +100,20 @@ extern HWND *WIN_ListChildren( HWND hwnd );
extern BOOL WIN_InternalShowOwnedPopups( HWND owner, BOOL fShow, BOOL unmanagedOnly );
extern void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta );
/* internal SendInput codes (FIXME) */
#define WINE_INTERNAL_INPUT_MOUSE (16+INPUT_MOUSE)
#define WINE_INTERNAL_INPUT_KEYBOARD (16+INPUT_KEYBOARD)
/* user lock */
extern void USER_Lock(void);
extern void USER_Unlock(void);
inline static HWND WIN_GetFullHandle( HWND hwnd )
{
if (!HIWORD(hwnd) && hwnd) hwnd = WIN_Handle32( LOWORD(hwnd) );
return hwnd;
}
inline static WND *WIN_FindWndPtr16( HWND16 hwnd )
{
/* don't bother with full conversion */
return WIN_FindWndPtr( (HWND)(ULONG_PTR)hwnd );
}
/* to release pointers retrieved by WIN_GetPtr; do not confuse with WIN_ReleaseWndPtr!! */
inline static void WIN_ReleasePtr( WND *ptr )
{
@ -130,16 +122,6 @@ inline static void WIN_ReleasePtr( WND *ptr )
#define WND_OTHER_PROCESS ((WND *)1) /* returned by WIN_GetPtr on unknown window handles */
extern HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType ); /* windows/defwnd.c */
extern BOOL FOCUS_MouseActivate( HWND hwnd );
extern BOOL MENU_SetMenu(HWND, HMENU);
/* check if hwnd is a broadcast magic handle */
inline static BOOL is_broadcast( HWND hwnd )
{
return (hwnd == HWND_BROADCAST || hwnd == HWND_TOPMOST);
}
extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode );
#endif /* __WINE_WIN_H */

2
windows/class.c
View file

@ -34,7 +34,7 @@
#include "wine/winuser16.h"
#include "wine/unicode.h"
#include "win.h"
#include "user.h"
#include "user_private.h"
#include "controls.h"
#include "dce.h"
#include "winproc.h"

2
windows/clipboard.c
View file

@ -49,7 +49,7 @@
#include "wine/winuser16.h"
#include "wine/winbase16.h"
#include "heap.h"
#include "user.h"
#include "user_private.h"
#include "win.h"
#include "wine/debug.h"

2
windows/cursoricon.c
View file

@ -63,7 +63,7 @@
#include "cursoricon.h"
#include "module.h"
#include "wine/debug.h"
#include "user.h"
#include "user_private.h"
#include "message.h"
WINE_DEFAULT_DEBUG_CHANNEL(cursor);

2
windows/dce.c
View file

@ -34,7 +34,7 @@
#include <assert.h>
#include "dce.h"
#include "win.h"
#include "user.h"
#include "user_private.h"
#include "wine/debug.h"
#include "windef.h"
#include "wingdi.h"

2
windows/defwnd.c
View file

@ -31,7 +31,7 @@
#include "winnls.h"
#include "imm.h"
#include "win.h"
#include "user.h"
#include "user_private.h"
#include "controls.h"
#include "nonclient.h"
#include "winpos.h"

2
windows/dialog.c
View file

@ -39,7 +39,7 @@
#include "controls.h"
#include "win.h"
#include "winpos.h"
#include "user.h"
#include "user_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(dialog);

1
windows/input.c
View file

@ -42,6 +42,7 @@
#include "wine/server.h"
#include "win.h"
#include "message.h"
#include "user_private.h"
#include "winternl.h"
#include "wine/debug.h"
#include "winerror.h"

2
windows/mdi.c
View file

@ -97,7 +97,7 @@
#include "nonclient.h"
#include "controls.h"
#include "message.h"
#include "user.h"
#include "user_private.h"
#include "wine/debug.h"
#include "dlgs.h"

2
windows/message.c
View file

@ -41,7 +41,7 @@
#include "controls.h"
#include "dde.h"
#include "message.h"
#include "user.h"
#include "user_private.h"
#include "win.h"
#include "winpos.h"
#include "winproc.h"

2
windows/msgbox.c
View file

@ -30,7 +30,7 @@
#include "winreg.h"
#include "winternl.h"
#include "dlgs.h"
#include "user.h"
#include "user_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(dialog);

2
windows/nonclient.c
View file

@ -28,7 +28,7 @@
#include "wine/winuser16.h"
#include "wownt32.h"
#include "win.h"
#include "user.h"
#include "user_private.h"
#include "dce.h"
#include "controls.h"
#include "cursoricon.h"

2
windows/queue.c
View file

@ -33,7 +33,7 @@
#include "wine/winuser16.h"
#include "message.h"
#include "win.h"
#include "user.h"
#include "user_private.h"
#include "thread.h"
#include "wine/debug.h"
#include "wine/server.h"

2
windows/scroll.c
View file

@ -27,7 +27,7 @@
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winuser.h"
#include "user.h"
#include "user_private.h"
#include "win.h"
#include "wine/debug.h"

1
windows/spy.c
View file

@ -30,6 +30,7 @@
#include "wownt32.h"
#include "wine/unicode.h"
#include "win.h"
#include "user_private.h"
#include "wine/debug.h"
#include "message.h"
#include "winnls.h"

3
windows/syscolor.c
View file

@ -33,7 +33,6 @@
#include "wownt32.h"
#include "winreg.h"
#include "local.h"
#include "user.h"
#include "gdi.h" /* sic */
#include "wine/debug.h"
@ -157,7 +156,7 @@ void SYSCOLOR_Init(void)
if (!bNoReg)
{
DWORD dwDataSize = sizeof(buffer);
if (!(RegQueryValueExA(hKey,(LPSTR)DefSysColors[i*2], 0, 0, buffer, &dwDataSize)))
if (!(RegQueryValueExA(hKey,DefSysColors[i*2], 0, 0, buffer, &dwDataSize)))
if (sscanf( buffer, "%d %d %d", &r, &g, &b ) == 3)
bOk = TRUE;
}

2
windows/sysmetrics.c
View file

@ -29,7 +29,7 @@
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
#include "user.h"
#include "user_private.h"
static int sysMetrics[SM_CMETRICS+1];
static HDC display_dc;

2
windows/sysparams.c
View file

@ -33,7 +33,7 @@
#include "winerror.h"
#include "controls.h"
#include "user.h"
#include "user_private.h"
#include "wine/unicode.h"
#include "wine/debug.h"

8
windows/user.c
View file

@ -31,7 +31,7 @@
#include "winreg.h"
#include "winternl.h"
#include "tlhelp32.h"
#include "user.h"
#include "user_private.h"
#include "win.h"
#include "controls.h"
#include "cursoricon.h"
@ -71,6 +71,12 @@ static SYSLEVEL USER_SysLevel = { { &critsect_debug, -1, 0, 0, 0, 0 }, 2 };
#define USIG_PROCESS_RUNNING 0x0500
#define USIG_PROCESS_LOADED 0x0600
/* UserSeeUserDo parameters */
#define USUD_LOCALALLOC 0x0001
#define USUD_LOCALFREE 0x0002
#define USUD_LOCALCOMPACT 0x0003
#define USUD_LOCALHEAP 0x0004
#define USUD_FIRSTCLASS 0x0005
/***********************************************************************
* GetFreeSystemResources (USER.284)

2
windows/win.c
View file

@ -33,7 +33,7 @@
#include "wine/server.h"
#include "wine/unicode.h"
#include "win.h"
#include "user.h"
#include "user_private.h"
#include "dce.h"
#include "controls.h"
#include "cursoricon.h"

10
windows/winpos.c
View file

@ -33,7 +33,7 @@
#include "wine/winuser16.h"
#include "wine/server.h"
#include "controls.h"
#include "user.h"
#include "user_private.h"
#include "win.h"
#include "message.h"
#include "winpos.h"
@ -69,6 +69,14 @@ typedef struct
WINDOWPOS winPos[1];
} DWP;
typedef struct
{
RECT16 rectNormal;
POINT16 ptIconPos;
POINT16 ptMaxPos;
HWND hwndIconTitle;
} INTERNALPOS, *LPINTERNALPOS;
/* ----- internal variables ----- */
static LPCSTR atomInternalPos;

1
windows/winproc.c
View file

@ -37,6 +37,7 @@
#include "win.h"
#include "winproc.h"
#include "message.h"
#include "user_private.h"
#include "thread.h"
#include "dde.h"
#include "winternl.h"