Commit ca1bc866 authored by Michael Veksler's avatar Michael Veksler Committed by Alexandre Julliard

Moves more stuff from windows.h.

- include/winuser.h - interface relevant to user32.spec - include/wine/winuser16.h - the old 16 bit interface (internal use) - include/winbase.h - some minor updates to keep things coherent. - Lot of other files made to include wine/winuser16.h, which is no longer included from windows.h
parent 94401dc0
......@@ -7,7 +7,8 @@
#include "win.h"
#include "button.h"
#include "windows.h"
#include "winuser.h"
#include "wine/winuser16.h"
#include "tweak.h"
static void PB_Paint( WND *wndPtr, HDC32 hDC, WORD action );
......
......@@ -10,6 +10,7 @@
#include "win.h"
#include "desktop.h"
#include "heap.h"
#include "wine/winuser16.h"
/***********************************************************************
......
......@@ -7,7 +7,8 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include "windows.h"
#include "winuser.h"
#include "wine/winuser16.h"
#include "sysmetrics.h"
#include "win.h"
#include "desktop.h"
......
......@@ -5,7 +5,7 @@
*
*/
#include "windows.h"
#include "wine/winuser16.h"
#include "win.h"
#include "bitmap.h"
#include "cursoricon.h"
......
......@@ -23,6 +23,7 @@
#include "debugger.h"
#include "neexe.h"
#include "process.h"
#include "ts_xlib.h"
#include "expr.h"
......
......@@ -5,6 +5,7 @@
*/
#include <string.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "neexe.h"
#include "cursoricon.h"
#include "module.h"
......
......@@ -10,6 +10,7 @@
#include <unistd.h>
#include <ctype.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "winerror.h"
#include "file.h"
#include "shell.h"
......
......@@ -3,7 +3,7 @@
*
* Copyright 1998 Huw D M Davies
*/
#include "windows.h"
#include "wine/winuser16.h"
#include "psdrv.h"
#include "debug.h"
#include "print.h"
......
......@@ -6,6 +6,7 @@
*/
#include "windows.h"
#include "wine/winuser16.h"
#include "callback.h"
#include "resource.h"
#include "task.h"
......
......@@ -9,6 +9,7 @@
#include "wintypes.h"
#include "winnt.h"
#include "wine/winuser16.h"
extern int (*IF1632_CallLargeStack)( int (*func)(void), void *arg );
......
......@@ -8,6 +8,7 @@
#define __WINE_DISPLAY_H
#include "cursoricon.h"
#include "wine/winuser16.h"
#pragma pack(1)
typedef struct _CURSORINFO
......
......@@ -6,6 +6,8 @@
#ifndef __WINE_IMAGELIST_H
#define __WINE_IMAGELIST_H
#include "wingdi.h"
struct _IMAGELIST
{
......
......@@ -5,7 +5,7 @@
#ifndef __WINE_OLE_H
#define __WINE_OLE_H
#include "windows.h"
#include "wingdi.h"
typedef CHAR OLECHAR16;
typedef OLECHAR16 *BSTR16;
......
......@@ -7,6 +7,7 @@
#ifndef __WINE_QUEUE_H
#define __WINE_QUEUE_H
#include "wine/winuser16.h"
#include "windows.h"
/* Message as stored in the queue (contains the extraInfo field) */
......
......@@ -4,7 +4,7 @@
#ifndef __WINE_SHELL_H
#define __WINE_SHELL_H
#include "windows.h"
#include "wintypes.h"
#include "winreg.h"
#include "imagelist.h"
......
......@@ -2,6 +2,7 @@
#define __WINE_STORAGE_H
#include "objbase.h"
#include "windows.h"
/* Does this look like a cellar to you? */
......
......@@ -2,6 +2,7 @@
#ifndef __WINE__STRUCT32_H
#define __WINE__STRUCT32_H
#include "windows.h"
#include "queue.h"
extern void STRUCT32_MINMAXINFO32to16( const MINMAXINFO32*, MINMAXINFO16* );
extern void STRUCT32_MINMAXINFO16to32( const MINMAXINFO16*, MINMAXINFO32* );
......
#ifndef __WINE_WINBASE_H
#define __WINE_WINBASE_H
#include "windows.h"
#include "wintypes.h"
#pragma pack(1)
#ifdef __cplusplus
extern "C" {
......@@ -180,6 +183,113 @@ DECL_WINELIB_TYPE_AW(OSVERSIONINFO)
#define VER_PLATFORM_WIN32_WINDOWS 1
#define VER_PLATFORM_WIN32_NT 2
typedef struct tagCOMSTAT
{
BYTE status;
UINT16 cbInQue WINE_PACKED;
UINT16 cbOutQue WINE_PACKED;
} COMSTAT,*LPCOMSTAT;
typedef struct tagDCB16
{
BYTE Id;
UINT16 BaudRate WINE_PACKED;
BYTE ByteSize;
BYTE Parity;
BYTE StopBits;
UINT16 RlsTimeout;
UINT16 CtsTimeout;
UINT16 DsrTimeout;
UINT16 fBinary :1;
UINT16 fRtsDisable :1;
UINT16 fParity :1;
UINT16 fOutxCtsFlow :1;
UINT16 fOutxDsrFlow :1;
UINT16 fDummy :2;
UINT16 fDtrDisable :1;
UINT16 fOutX :1;
UINT16 fInX :1;
UINT16 fPeChar :1;
UINT16 fNull :1;
UINT16 fChEvt :1;
UINT16 fDtrflow :1;
UINT16 fRtsflow :1;
UINT16 fDummy2 :1;
CHAR XonChar;
CHAR XoffChar;
UINT16 XonLim;
UINT16 XoffLim;
CHAR PeChar;
CHAR EofChar;
CHAR EvtChar;
UINT16 TxDelay WINE_PACKED;
} DCB16, *LPDCB16;
typedef struct tagDCB32
{
DWORD DCBlength;
DWORD BaudRate;
DWORD fBinary :1;
DWORD fParity :1;
DWORD fOutxCtsFlow :1;
DWORD fOutxDsrFlow :1;
DWORD fDtrControl :2;
DWORD fDsrSensitivity :1;
DWORD fTXContinueOnXoff :1;
DWORD fOutX :1;
DWORD fInX :1;
DWORD fErrorChar :1;
DWORD fNull :1;
DWORD fRtsControl :2;
DWORD fAbortOnError :1;
DWORD fDummy2 :17;
WORD wReserved;
WORD XonLim;
WORD XoffLim;
BYTE ByteSize;
BYTE Parity;
BYTE StopBits;
char XonChar;
char XoffChar;
char ErrorChar;
char EofChar;
char EvtChar;
} DCB32, *LPDCB32;
DECL_WINELIB_TYPE(DCB)
DECL_WINELIB_TYPE(LPDCB)
typedef struct tagCOMMTIMEOUTS {
DWORD ReadIntervalTimeout;
DWORD ReadTotalTimeoutMultiplier;
DWORD ReadTotalTimeoutConstant;
DWORD WriteTotalTimeoutMultiplier;
DWORD WriteTotalTimeoutConstant;
} COMMTIMEOUTS,*LPCOMMTIMEOUTS;
#pragma pack(4)
BOOL32 WINAPI ClearCommError(INT32,LPDWORD,LPCOMSTAT);
BOOL32 WINAPI BuildCommDCB32A(LPCSTR,LPDCB32);
BOOL32 WINAPI BuildCommDCB32W(LPCWSTR,LPDCB32);
#define BuildCommDCB WINELIB_NAME_AW(BuildCommDCB)
BOOL32 WINAPI BuildCommDCBAndTimeouts32A(LPCSTR,LPDCB32,LPCOMMTIMEOUTS);
BOOL32 WINAPI BuildCommDCBAndTimeouts32W(LPCWSTR,LPDCB32,LPCOMMTIMEOUTS);
#define BuildCommDCBAndTimeouts WINELIB_NAME_AW(BuildCommDCBAndTimeouts)
BOOL32 WINAPI GetCommTimeouts(INT32,LPCOMMTIMEOUTS);
BOOL32 WINAPI SetCommTimeouts(INT32,LPCOMMTIMEOUTS);
BOOL32 WINAPI GetCommState32(INT32,LPDCB32);
#define GetCommState WINELIB_NAME(GetCommState)
BOOL32 WINAPI SetCommState32(INT32,LPDCB32);
#define SetCommState WINELIB_NAME(SetCommState)
BOOL32 WINAPI TransmitCommChar32(INT32,CHAR);
#define TransmitCommChar WINELIB_NAME(TransmitCommChar)
/*DWORD WINAPI GetVersion( void );*/
BOOL16 WINAPI GetVersionEx16(OSVERSIONINFO16*);
BOOL32 WINAPI GetVersionEx32A(OSVERSIONINFO32A*);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -4,7 +4,7 @@
#ifndef __WINE_WINREG_H
#define __WINE_WINREG_H
#include "windows.h"
#include "wintypes.h"
/* FIXME: should be in security.h or whereever */
#ifndef READ_CONTROL
......
......@@ -10,7 +10,7 @@
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "winerror.h"
#include "class.h"
#include "file.h"
......
......@@ -57,7 +57,7 @@
#include <sys/ioctl.h>
#include <unistd.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "comm.h"
#ifdef HAVE_SYS_MODEM_H
# include <sys/modem.h>
......
......@@ -8,7 +8,7 @@
#include <string.h>
#include <unistd.h>
#include <ctype.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "winerror.h"
#include "file.h"
#include "shell.h"
......
......@@ -17,7 +17,7 @@
#include "debug.h"
#include "gdi.h"
#include "options.h"
#include "windows.h"
#include "wine/winuser16.h"
#include "winerror.h"
#include "xmalloc.h"
......
......@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <string.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "win.h"
#include "module.h"
#include "options.h"
......
......@@ -44,6 +44,7 @@
#include <sys/errno.h>
#include <netdb.h>
#include <unistd.h>
#include <stdlib.h>
#include "winsock.h"
#include "windows.h"
......
......@@ -19,7 +19,7 @@
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "user.h"
#include "driver.h"
#include "multimedia.h"
......
......@@ -11,6 +11,7 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "user.h"
#include "driver.h"
#include "mmsystem.h"
......
......@@ -12,6 +12,7 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "user.h"
#include "driver.h"
#include "multimedia.h"
......
......@@ -21,7 +21,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "ldt.h"
#include "multimedia.h"
#include "user.h"
......
......@@ -19,7 +19,7 @@
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "user.h"
#include "driver.h"
#include "mmsystem.h"
......
......@@ -21,7 +21,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "ldt.h"
#include "multimedia.h"
#include "user.h"
......
......@@ -21,7 +21,7 @@
#include <fcntl.h>
#include <errno.h>
#include <sys/ioctl.h>
#include "windows.h"
#include "wine/winuser16.h"
#include "win.h"
#include "heap.h"
#include "ldt.h"
......
......@@ -8,6 +8,7 @@
#include "metafile.h"
#include "region.h"
#include "debug.h"
#include "wine/winuser16.h"
#define UPDATE_DIRTY_DC(dc) \
do { \
......
......@@ -11,6 +11,7 @@
#include "interfaces.h"
#include "oleobj.h"
#include "debug.h"
#include "windows.h"
#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
......
......@@ -23,6 +23,7 @@
#include "winproc.h"
#include "debug.h"
#include "winerror.h"
#include "wine/winuser16.h"
static CLASS *firstClass = NULL;
......
......@@ -26,6 +26,7 @@
#include "heap.h"
#include "sysmetrics.h"
#include "debug.h"
#include "wine/winuser16.h"
#define NB_DCE 5 /* Number of DCEs created at startup */
......
......@@ -5,7 +5,7 @@
*
*/
#include "windows.h"
#include "wine/winuser16.h"
#include "dialog.h"
#include "win.h"
#include "winproc.h"
......
......@@ -16,6 +16,7 @@
#include "debug.h"
#include "spy.h"
#include "tweak.h"
#include "wine/winuser16.h"
/* Last COLOR id */
#define COLOR_MAX COLOR_BTNHIGHLIGHT
......
......@@ -5,7 +5,7 @@
* Copyright 1998 Marcus Meissner
*/
#include "windows.h"
#include "wine/winuser16.h"
#include "heap.h"
#include "win.h"
#include "callback.h"
......
......@@ -4,7 +4,7 @@
* Copyright 1995 Bernd Schmidt
*/
#include "windows.h"
#include "wine/winuser16.h"
#include "dlgs.h"
#include "heap.h"
#include "module.h"
......
......@@ -14,6 +14,7 @@
#include "dce.h"
#include "heap.h"
#include "debug.h"
#include "wine/winuser16.h"
/* Last CTLCOLOR id */
#define CTLCOLOR_MAX CTLCOLOR_STATIC
......
......@@ -22,7 +22,6 @@
#include "message.h"
#include "module.h"
#include "miscemu.h"
#include "queue.h"
#include "shell.h"
#include "callback.h"
#include "x11drv.h"
......
......@@ -7,7 +7,7 @@
#include <string.h>
#include <unistd.h>
#include "debug.h"
#include "windows.h"
#include "wine/winuser16.h"
#include "heap.h"
#include "ldt.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment