Removed #include "wine/winuser16.h" and use "struct tag????" instead.
This commit is contained in:
parent
b4a5db5590
commit
9d14a001f7
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
#include "wingdi.h"
|
#include "wingdi.h"
|
||||||
#include "wine/winuser16.h"
|
#include "wine/wingdi16.h"
|
||||||
|
|
||||||
struct tagBITMAPOBJ;
|
struct tagBITMAPOBJ;
|
||||||
struct tagCLASS;
|
struct tagCLASS;
|
||||||
|
@ -15,6 +15,9 @@ struct tagDC;
|
||||||
struct tagDESKTOP;
|
struct tagDESKTOP;
|
||||||
struct tagPALETTEOBJ;
|
struct tagPALETTEOBJ;
|
||||||
struct tagWND;
|
struct tagWND;
|
||||||
|
struct tagCURSORICONINFO;
|
||||||
|
struct tagCREATESTRUCTA;
|
||||||
|
struct tagWINDOWPOS;
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
* TTY GDI driver
|
* TTY GDI driver
|
||||||
|
@ -139,7 +142,7 @@ extern void TTYDRV_MONITOR_SetScreenSaveTimeout(struct tagMONITOR *pMonitor, int
|
||||||
|
|
||||||
extern struct tagMOUSE_DRIVER TTYDRV_MOUSE_Driver;
|
extern struct tagMOUSE_DRIVER TTYDRV_MOUSE_Driver;
|
||||||
|
|
||||||
extern void TTYDRV_MOUSE_SetCursor(CURSORICONINFO *lpCursor);
|
extern void TTYDRV_MOUSE_SetCursor(struct tagCURSORICONINFO *lpCursor);
|
||||||
extern void TTYDRV_MOUSE_MoveCursor(WORD wAbsX, WORD wAbsY);
|
extern void TTYDRV_MOUSE_MoveCursor(WORD wAbsX, WORD wAbsY);
|
||||||
extern BOOL TTYDRV_MOUSE_EnableWarpPointer(BOOL bEnable);
|
extern BOOL TTYDRV_MOUSE_EnableWarpPointer(BOOL bEnable);
|
||||||
|
|
||||||
|
@ -150,11 +153,11 @@ extern struct tagWND_DRIVER TTYDRV_WND_Driver;
|
||||||
extern void TTYDRV_WND_Initialize(struct tagWND *wndPtr);
|
extern void TTYDRV_WND_Initialize(struct tagWND *wndPtr);
|
||||||
extern void TTYDRV_WND_Finalize(struct tagWND *wndPtr);
|
extern void TTYDRV_WND_Finalize(struct tagWND *wndPtr);
|
||||||
extern BOOL TTYDRV_WND_CreateDesktopWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, BOOL bUnicode);
|
extern BOOL TTYDRV_WND_CreateDesktopWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, BOOL bUnicode);
|
||||||
extern BOOL TTYDRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, CREATESTRUCTA *cs, BOOL bUnicode);
|
extern BOOL TTYDRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, struct tagCREATESTRUCTA *cs, BOOL bUnicode);
|
||||||
extern BOOL TTYDRV_WND_DestroyWindow(struct tagWND *pWnd);
|
extern BOOL TTYDRV_WND_DestroyWindow(struct tagWND *pWnd);
|
||||||
extern struct tagWND *TTYDRV_WND_SetParent(struct tagWND *wndPtr, struct tagWND *pWndParent);
|
extern struct tagWND *TTYDRV_WND_SetParent(struct tagWND *wndPtr, struct tagWND *pWndParent);
|
||||||
extern void TTYDRV_WND_ForceWindowRaise(struct tagWND *pWnd);
|
extern void TTYDRV_WND_ForceWindowRaise(struct tagWND *pWnd);
|
||||||
extern void TTYDRV_WND_SetWindowPos(struct tagWND *wndPtr, const WINDOWPOS *winpos, BOOL bSMC_SETXPOS);
|
extern void TTYDRV_WND_SetWindowPos(struct tagWND *wndPtr, const struct tagWINDOWPOS *winpos, BOOL bSMC_SETXPOS);
|
||||||
extern void TTYDRV_WND_SetText(struct tagWND *wndPtr, LPCSTR text);
|
extern void TTYDRV_WND_SetText(struct tagWND *wndPtr, LPCSTR text);
|
||||||
extern void TTYDRV_WND_SetFocus(struct tagWND *wndPtr);
|
extern void TTYDRV_WND_SetFocus(struct tagWND *wndPtr);
|
||||||
extern void TTYDRV_WND_PreSizeMove(struct tagWND *wndPtr);
|
extern void TTYDRV_WND_PreSizeMove(struct tagWND *wndPtr);
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#define __WINE_WINPOS_H
|
#define __WINE_WINPOS_H
|
||||||
|
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
#include "wine/winuser16.h" /* for WINDOWPOS16 */
|
|
||||||
|
|
||||||
#define DWP_MAGIC ((INT)('W' | ('P' << 8) | ('O' << 16) | ('S' << 24)))
|
#define DWP_MAGIC ((INT)('W' | ('P' << 8) | ('O' << 16) | ('S' << 24)))
|
||||||
|
|
||||||
|
@ -16,6 +15,8 @@
|
||||||
#define SWP_NOCLIENTSIZE 0x0800
|
#define SWP_NOCLIENTSIZE 0x0800
|
||||||
#define SWP_NOCLIENTMOVE 0x1000
|
#define SWP_NOCLIENTMOVE 0x1000
|
||||||
|
|
||||||
|
struct tagWINDOWPOS16;
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
INT actualCount;
|
INT actualCount;
|
||||||
|
@ -39,7 +40,7 @@ extern LONG WINPOS_SendNCCalcSize(HWND hwnd, BOOL calcValidRect,
|
||||||
RECT *newWindowRect, RECT *oldWindowRect,
|
RECT *newWindowRect, RECT *oldWindowRect,
|
||||||
RECT *oldClientRect, WINDOWPOS *winpos,
|
RECT *oldClientRect, WINDOWPOS *winpos,
|
||||||
RECT *newClientRect );
|
RECT *newClientRect );
|
||||||
extern LONG WINPOS_HandleWindowPosChanging16(WND *wndPtr, WINDOWPOS16 *winpos);
|
extern LONG WINPOS_HandleWindowPosChanging16(WND *wndPtr, struct tagWINDOWPOS16 *winpos);
|
||||||
extern LONG WINPOS_HandleWindowPosChanging(WND *wndPtr, WINDOWPOS *winpos);
|
extern LONG WINPOS_HandleWindowPosChanging(WND *wndPtr, WINDOWPOS *winpos);
|
||||||
extern INT16 WINPOS_WindowFromPoint( WND* scopeWnd, POINT16 pt, WND **ppWnd );
|
extern INT16 WINPOS_WindowFromPoint( WND* scopeWnd, POINT16 pt, WND **ppWnd );
|
||||||
extern void WINPOS_CheckInternalPos( WND* wndPtr );
|
extern void WINPOS_CheckInternalPos( WND* wndPtr );
|
||||||
|
|
|
@ -27,7 +27,7 @@ WORD WINAPI DISPLAY_Inquire(LPCURSORINFO lpCursorInfo)
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* DISPLAY_SetCursor (DISPLAY.102)
|
* DISPLAY_SetCursor (DISPLAY.102)
|
||||||
*/
|
*/
|
||||||
VOID WINAPI DISPLAY_SetCursor( CURSORICONINFO *lpCursor )
|
VOID WINAPI DISPLAY_SetCursor( struct tagCURSORICONINFO *lpCursor )
|
||||||
{
|
{
|
||||||
MOUSE_Driver->pSetCursor(lpCursor);
|
MOUSE_Driver->pSetCursor(lpCursor);
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "wine/winuser16.h"
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
#include "winpos.h"
|
#include "winpos.h"
|
||||||
#include "hook.h"
|
#include "hook.h"
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "wine/winuser16.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
#include "message.h"
|
#include "message.h"
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* TTYDRV_MOUSE_SetCursor
|
* TTYDRV_MOUSE_SetCursor
|
||||||
*/
|
*/
|
||||||
void TTYDRV_MOUSE_SetCursor( CURSORICONINFO *lpCursor )
|
void TTYDRV_MOUSE_SetCursor( struct tagCURSORICONINFO *lpCursor )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "wine/winbase16.h"
|
#include "wine/winbase16.h"
|
||||||
|
#include "wine/winuser16.h"
|
||||||
#include "options.h"
|
#include "options.h"
|
||||||
#include "class.h"
|
#include "class.h"
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include "wine/winuser16.h"
|
||||||
#include "sysmetrics.h"
|
#include "sysmetrics.h"
|
||||||
#include "heap.h"
|
#include "heap.h"
|
||||||
#include "module.h"
|
#include "module.h"
|
||||||
|
|
Loading…
Reference in New Issue