marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed a lot of unnecessary includes and fixed the compile errors.

oldstable
Patrik Stridvall 2000-03-08 18:26:56 +00:00 committed by Alexandre Julliard
parent 7e9913f463
commit 6cc47d4924
31 changed files with 93 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controls/button.c
View File

@ -8,6 +8,7 @@
#include <string.h>
#include "win.h"
#include "button.h"
#include "winbase.h"
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"

2
controls/edit.c
View File

@ -14,6 +14,8 @@
#include "config.h"
#include <string.h>
#include "winbase.h"
#include "winnt.h"
#include "win.h"
#include "wine/winbase16.h"

1
controls/menu.c
View File

@ -28,6 +28,7 @@
#include "nonclient.h"
#include "user.h"
#include "message.h"
#include "queue.h"
#include "tweak.h"
#include "debugtools.h"

3
debugger/stack.c
View File

@ -7,10 +7,13 @@
*/
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include "debugger.h"
#include "stackframe.h"
#include "winbase.h"
#ifdef __i386__
/*

2
dlls/comctl32/commctrl.c
View File

@ -6,6 +6,8 @@
*
*/
#include <string.h>
#include "winbase.h"
#include "heap.h"
#include "commctrl.h"

2
dlls/winsock/async.c
View File

@ -77,6 +77,8 @@
#endif
#include "wine/winbase16.h"
#include "wingdi.h"
#include "winuser.h"
#include "winsock.h"
#include "winnt.h"
#include "heap.h"

2
dlls/winsock/socket.c
View File

@ -71,6 +71,8 @@
#endif
#include "wine/winbase16.h"
#include "wingdi.h"
#include "winuser.h"
#include "winsock2.h"
#include "winnt.h"
#include "heap.h"

10
include/dce.h
View File

@ -7,7 +7,9 @@
#ifndef __WINE_DCE_H
#define __WINE_DCE_H
#include "win.h"
#include "windef.h"
struct tagWND;
/* additional DCX flags
*/
@ -49,9 +51,9 @@ typedef struct tagDCE
extern void DCE_Init(void);
extern DCE* DCE_AllocDCE( HWND hWnd, DCE_TYPE type );
extern DCE* DCE_FreeDCE( DCE *dce );
extern void DCE_FreeWindowDCE( WND* );
extern INT16 DCE_ExcludeRgn( HDC, WND*, HRGN );
extern void DCE_FreeWindowDCE( struct tagWND* );
extern INT16 DCE_ExcludeRgn( HDC, struct tagWND*, HRGN );
extern HRGN DCE_GetVisRgn( HWND, WORD, HWND, WORD );
extern BOOL DCE_InvalidateDCE( WND*, const RECT* );
extern BOOL DCE_InvalidateDCE( struct tagWND*, const RECT* );
#endif /* __WINE_DCE_H */

10
include/menu.h
View File

@ -5,7 +5,9 @@
#ifndef __WINE_MENU_H
#define __WINE_MENU_H
#include "win.h"
#include "windef.h"
struct tagWND;
LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam,
LPARAM lParam );
@ -15,9 +17,9 @@ extern BOOL 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_PatchResidentPopup( HQUEUE16, WND* );
extern void MENU_TrackMouseMenuBar( WND *wnd, INT ht, POINT pt );
extern void MENU_TrackKbdMenuBar( WND *wnd, UINT wParam, INT vkey );
extern BOOL MENU_PatchResidentPopup( HQUEUE16, struct tagWND* );
extern void MENU_TrackMouseMenuBar( struct tagWND *wnd, INT ht, POINT pt );
extern void MENU_TrackKbdMenuBar( struct tagWND *wnd, UINT wParam, INT vkey );
extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect,
HWND hwnd, BOOL suppress_draw );
extern UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget );

9
include/message.h
View File

@ -7,13 +7,14 @@
#ifndef __WINE_MESSAGE_H
#define __WINE_MESSAGE_H
#include "win.h"
#include "queue.h"
#include "windef.h"
struct tagMSG;
extern DWORD MSG_WineStartTicks; /* Ticks at Wine startup */
/* message.c */
extern BOOL MSG_InternalGetMessage( int type, MSG *msg, HWND hwnd,
extern BOOL MSG_InternalGetMessage( int type, struct tagMSG *msg, HWND hwnd,
HWND hwndOwner, WPARAM code,
WORD flags, BOOL sendIdle, BOOL* idleSent );
@ -21,7 +22,7 @@ extern BOOL MSG_InternalGetMessage( int type, MSG *msg, HWND hwnd,
extern BOOL TIMER_Init( void );
extern void TIMER_RemoveWindowTimers( HWND hwnd );
extern void TIMER_RemoveQueueTimers( HQUEUE16 hqueue );
extern BOOL TIMER_GetTimerMsg( MSG *msg, HWND hwnd,
extern BOOL TIMER_GetTimerMsg( struct tagMSG *msg, HWND hwnd,
HQUEUE16 hQueue, BOOL remove );
/* event.c */

14
include/nonclient.h
View File

@ -7,18 +7,20 @@
#ifndef __WINE_NONCLIENT_H
#define __WINE_NONCLIENT_H
#include "win.h"
#include "windef.h"
struct tagWND;
extern LONG NC_HandleNCPaint( HWND hwnd , HRGN clip);
extern LONG NC_HandleNCActivate( WND *pwnd, WPARAM16 wParam );
extern LONG NC_HandleNCCalcSize( WND *pWnd, RECT *winRect );
extern LONG NC_HandleNCActivate( struct tagWND *pwnd, WPARAM16 wParam );
extern LONG NC_HandleNCCalcSize( struct tagWND *pWnd, RECT *winRect );
extern LONG NC_HandleNCHitTest( HWND hwnd, POINT16 pt );
extern LONG NC_HandleNCLButtonDown( WND* pWnd, WPARAM16 wParam, LPARAM lParam );
extern LONG NC_HandleNCLButtonDblClk( WND *pWnd, WPARAM16 wParam, LPARAM lParam);
extern LONG NC_HandleNCLButtonDown( struct tagWND* pWnd, WPARAM16 wParam, LPARAM lParam );
extern LONG NC_HandleNCLButtonDblClk( struct tagWND *pWnd, WPARAM16 wParam, LPARAM lParam);
extern LONG NC_HandleSysCommand( HWND hwnd, WPARAM16 wParam, POINT16 pt );
extern LONG NC_HandleSetCursor( HWND hwnd, WPARAM16 wParam, LPARAM lParam );
extern void NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down );
extern BOOL NC_DrawSysButton95( HWND hwnd, HDC hdc, BOOL down );
extern BOOL NC_GetSysPopupPos( WND* wndPtr, RECT* rect );
extern BOOL NC_GetSysPopupPos( struct tagWND* wndPtr, RECT* rect );
#endif /* __WINE_NONCLIENT_H */

1
include/queue.h
View File

@ -8,6 +8,7 @@
#define __WINE_QUEUE_H
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "thread.h"

2
include/stackframe.h
View File

@ -8,8 +8,10 @@
#define __WINE_STACKFRAME_H
#include <string.h>
#include "ldt.h"
#include "thread.h"
#include "winnt.h"
#include "pshpack1.h"

1
include/struct32.h
View File

@ -6,7 +6,6 @@
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "queue.h"
extern void STRUCT32_MINMAXINFO32to16( const MINMAXINFO*, MINMAXINFO16* );
extern void STRUCT32_MINMAXINFO16to32( const MINMAXINFO16*, MINMAXINFO* );

9
include/thread.h
View File

@ -8,12 +8,13 @@
#define __WINE_THREAD_H
#include "config.h"
#include "winbase.h"
#include "syslevel.h"
#include "ntdef.h" /* UNICODE_STRING */
struct _PDB;
struct __EXCEPTION_FRAME;
struct _SECURITY_ATTRIBUTES;
struct tagSYSLEVEL;
/* Thread exception block
@ -84,7 +85,7 @@ typedef struct _TEB
void *entry_arg; /* --3 1b4 Entry point arg (was: unknown) */
DWORD unknown5[4]; /* --n 1b8 Unknown */
DWORD sys_count[4]; /* --3 1c8 Syslevel mutex entry counters */
SYSLEVEL *sys_mutex[4]; /* --3 1d8 Syslevel mutex pointers */
struct tagSYSLEVEL *sys_mutex[4]; /* --3 1d8 Syslevel mutex pointers */
DWORD unknown6[5]; /* --n 1e8 Unknown */
/* The following are Wine-specific fields (NT: GDI stuff) */
@ -123,7 +124,7 @@ typedef struct _TEB
extern TEB *THREAD_CreateInitialThread( struct _PDB *pdb, int server_fd );
extern TEB *THREAD_Create( struct _PDB *pdb, int fd, DWORD flags,
DWORD stack_size, BOOL alloc_stack16,
LPSECURITY_ATTRIBUTES sa, int *server_handle );
struct _SECURITY_ATTRIBUTES *sa, int *server_handle );
extern BOOL THREAD_IsWin16( TEB *thdb );
extern TEB *THREAD_IdToTEB( DWORD id );

6
include/win.h
View File

@ -9,9 +9,8 @@
#include "windef.h"
#include "wingdi.h"
#include "winproc.h"
#include "winuser.h"
#include "queue.h"
#include "class.h"
#define WND_MAGIC 0x444e4957 /* 'WIND' */
@ -56,6 +55,7 @@ typedef enum
struct tagCLASS;
struct tagDCE;
struct tagDC;
struct tagMESSAGEQUEUE;
struct tagWND_DRIVER;
typedef struct tagWND
@ -220,7 +220,7 @@ extern HWND ICONTITLE_Create( WND* );
extern BOOL ICONTITLE_Init( void );
/* windows/focus.c */
extern void FOCUS_SwitchFocus( MESSAGEQUEUE *pMsgQ, HWND , HWND );
extern void FOCUS_SwitchFocus( struct tagMESSAGEQUEUE *pMsgQ, HWND , HWND );
/* windows/edit.c */
extern LRESULT WINAPI EditWndProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );

26
include/winbase.h
View File

@ -158,7 +158,7 @@ typedef struct
#define DRIVE_RAMDISK 6
/* The security attributes structure */
typedef struct
typedef struct _SECURITY_ATTRIBUTES
{
DWORD nLength;
LPVOID lpSecurityDescriptor;
@ -1764,7 +1764,8 @@ INT WINAPI lstrcmpiW(LPCWSTR,LPCWSTR);
#if defined(__i386__) && defined(__GNUC__)
static inline PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare )
extern inline PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare );
extern inline PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare )
{
PVOID ret;
__asm__ __volatile__( "lock; cmpxchgl %2,(%1)"
@ -1772,7 +1773,8 @@ static inline PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg,
return ret;
}
static inline LONG WINAPI InterlockedExchange( PLONG dest, LONG val )
extern inline LONG WINAPI InterlockedExchange( PLONG dest, LONG val );
extern inline LONG WINAPI InterlockedExchange( PLONG dest, LONG val )
{
LONG ret;
__asm__ __volatile__( "lock; xchgl %0,(%1)"
@ -1780,7 +1782,8 @@ static inline LONG WINAPI InterlockedExchange( PLONG dest, LONG val )
return ret;
}
static inline LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr )
extern inline LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr );
extern inline LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr )
{
LONG ret;
__asm__ __volatile__( "lock; xaddl %0,(%1)"
@ -1788,31 +1791,36 @@ static inline LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr )
return ret;
}
static inline LONG WINAPI InterlockedIncrement( PLONG dest )
extern inline LONG WINAPI InterlockedIncrement( PLONG dest );
extern inline LONG WINAPI InterlockedIncrement( PLONG dest )
{
return InterlockedExchangeAdd( dest, 1 ) + 1;
}
static inline LONG WINAPI InterlockedDecrement( PLONG dest )
extern inline LONG WINAPI InterlockedDecrement( PLONG dest );
extern inline LONG WINAPI InterlockedDecrement( PLONG dest )
{
return InterlockedExchangeAdd( dest, -1 ) - 1;
}
static inline DWORD WINAPI GetLastError(void)
extern inline DWORD WINAPI GetLastError(void);
extern inline DWORD WINAPI GetLastError(void)
{
DWORD ret;
__asm__ __volatile__( ".byte 0x64\n\tmovl 0x60,%0" : "=r" (ret) );
return ret;
}
static inline DWORD WINAPI GetCurrentThreadId(void)
extern inline DWORD WINAPI GetCurrentThreadId(void);
extern inline DWORD WINAPI GetCurrentThreadId(void)
{
DWORD ret;
__asm__ __volatile__( ".byte 0x64\n\tmovl 0x24,%0" : "=r" (ret) );
return ret;
}
static inline void WINAPI SetLastError( DWORD err )
extern inline void WINAPI SetLastError( DWORD err );
extern inline void WINAPI SetLastError( DWORD err )
{
__asm__ __volatile__( ".byte 0x64\n\tmovl %0,0x60" : : "r" (err) : "memory" );
}

6
include/wine/winuser16.h
View File

@ -1,11 +1,9 @@
#ifndef __WINE_WINE_WINUSER16_H
#define __WINE_WINE_WINUSER16_H
#include "wine/wingdi16.h" /* wingdi.h needed for COLORREF */
#include "winuser.h" /* winuser.h needed for MSGBOXCALLBACK */
/* wingdi.h needed for COLORREF */
#include "wine/wingdi16.h"
#include "pshpack1.h"
typedef struct tagCOMSTAT16

20
include/winpos.h
View File

@ -7,7 +7,9 @@
#ifndef __WINE_WINPOS_H
#define __WINE_WINPOS_H
#include "win.h"
#include "windef.h"
struct tagWND;
#define DWP_MAGIC ((INT)('W' | ('P' << 8) | ('O' << 16) | ('S' << 24)))
@ -31,11 +33,11 @@ typedef struct
} DWP;
extern BOOL WINPOS_RedrawIconTitle( HWND hWnd );
extern BOOL WINPOS_ShowIconTitle( WND* pWnd, BOOL bShow );
extern void WINPOS_GetMinMaxInfo( WND* pWnd, POINT *maxSize,
extern BOOL WINPOS_ShowIconTitle( struct tagWND* pWnd, BOOL bShow );
extern void WINPOS_GetMinMaxInfo( struct tagWND* pWnd, POINT *maxSize,
POINT *maxPos, POINT *minTrack,
POINT *maxTrack );
extern UINT WINPOS_MinMaximize( WND* pWnd, UINT16 cmd, LPRECT16 lpPos);
extern UINT WINPOS_MinMaximize( struct tagWND* pWnd, UINT16 cmd, LPRECT16 lpPos);
extern BOOL WINPOS_SetActiveWindow( HWND hWnd, BOOL fMouse,
BOOL fChangeFocus );
extern BOOL WINPOS_ChangeActiveWindow( HWND hwnd, BOOL mouseMsg );
@ -43,11 +45,11 @@ extern LONG WINPOS_SendNCCalcSize(HWND hwnd, BOOL calcValidRect,
RECT *newWindowRect, RECT *oldWindowRect,
RECT *oldClientRect, WINDOWPOS *winpos,
RECT *newClientRect );
extern LONG WINPOS_HandleWindowPosChanging16(WND *wndPtr, struct tagWINDOWPOS16 *winpos);
extern LONG WINPOS_HandleWindowPosChanging(WND *wndPtr, WINDOWPOS *winpos);
extern INT16 WINPOS_WindowFromPoint( WND* scopeWnd, POINT16 pt, WND **ppWnd );
extern void WINPOS_CheckInternalPos( WND* wndPtr );
extern BOOL WINPOS_ActivateOtherWindow(WND* pWnd);
extern LONG WINPOS_HandleWindowPosChanging16(struct tagWND *wndPtr, struct tagWINDOWPOS16 *winpos);
extern LONG WINPOS_HandleWindowPosChanging(struct tagWND *wndPtr, WINDOWPOS *winpos);
extern INT16 WINPOS_WindowFromPoint( struct tagWND* scopeWnd, POINT16 pt, struct tagWND **ppWnd );
extern void WINPOS_CheckInternalPos( struct tagWND* wndPtr );
extern BOOL WINPOS_ActivateOtherWindow(struct tagWND* pWnd);
extern BOOL WINPOS_CreateInternalPosAtom(void);
#endif /* __WINE_WINPOS_H */

1
loader/module.c
View File

@ -25,6 +25,7 @@
#include "pe_image.h"
#include "dosexe.h"
#include "process.h"
#include "syslevel.h"
#include "thread.h"
#include "selectors.h"
#include "stackframe.h"

1
loader/ne/module.c
View File

@ -24,6 +24,7 @@
#include "global.h"
#include "process.h"
#include "snoop.h"
#include "syslevel.h"
#include "builtin16.h"
#include "stackframe.h"
#include "debugtools.h"

4
misc/debugstr.c
View File

@ -5,8 +5,10 @@
#include <ctype.h>
#include "debugtools.h"
#include "wtypes.h"
#include "thread.h"
#include "winbase.h"
#include "winnt.h"
#include "wtypes.h"
/* ---------------------------------------------------------------------- */

1
misc/error.c
View File

@ -8,6 +8,7 @@
#include <stdio.h>
#include <string.h>
#include "winbase.h"
#include "windef.h"
#include "stackframe.h"
#include "debugtools.h"

1
windows/defdlg.c
View File

@ -6,6 +6,7 @@
*/
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "dialog.h"

1
windows/defwnd.c
View File

@ -7,6 +7,7 @@
#include <string.h>
#include "class.h"
#include "win.h"
#include "user.h"
#include "heap.h"

1
windows/dialog.c
View File

@ -24,6 +24,7 @@
#include "user.h"
#include "winproc.h"
#include "message.h"
#include "queue.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(dialog);

1
windows/focus.c
View File

@ -14,6 +14,7 @@
#include "winpos.h"
#include "hook.h"
#include "message.h"
#include "queue.h"
#include "task.h"
#include "debugtools.h"

1
windows/input.c
View File

@ -27,6 +27,7 @@
#include "keyboard.h"
#include "mouse.h"
#include "message.h"
#include "queue.h"
#include "module.h"
#include "debugtools.h"
#include "struct32.h"

1
windows/user.c
View File

@ -15,6 +15,7 @@
#include "gdi.h"
#include "task.h"
#include "queue.h"
#include "class.h"
#include "win.h"
#include "clipboard.h"
#include "menu.h"

1
windows/x11drv/event.c
View File

@ -37,6 +37,7 @@
#include "options.h"
#include "queue.h"
#include "shell.h"
#include "win.h"
#include "winpos.h"
#include "services.h"
#include "file.h"

1
windows/x11drv/keyboard.c
View File

@ -29,6 +29,7 @@
#include "keyboard.h"
#include "message.h"
#include "winnls.h"
#include "win.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(keyboard)