mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-02 10:23:37 +00:00
gdi32: Get rid of the gdi.h include.
This commit is contained in:
parent
456891b377
commit
75b8f88875
|
@ -30,7 +30,6 @@
|
|||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "wine/debug.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(bidi);
|
||||
|
|
|
@ -18,7 +18,11 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "gdi.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -19,12 +19,14 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "wine/winbase16.h"
|
||||
#include "wine/wingdi16.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "wine/wingdi16.h"
|
||||
#include "gdi.h"
|
||||
#include "wownt32.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "wingdi.h"
|
||||
#include "wownt32.h"
|
||||
#include "wine/winuser16.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include "winerror.h"
|
||||
#include "wownt32.h"
|
||||
#include "wine/winuser16.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -66,7 +66,6 @@
|
|||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "gdi.h"
|
||||
#include "wownt32.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
#include "winbase.h"
|
||||
#include "winreg.h"
|
||||
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -43,7 +43,6 @@
|
|||
#include "wingdi.h"
|
||||
#include "winnls.h"
|
||||
#include "winerror.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "gdi.h"
|
||||
#include "enhmetafiledrv.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
|
||||
/* Enhanced Metafile driver physical DC */
|
||||
|
|
|
@ -21,10 +21,13 @@
|
|||
#include "config.h"
|
||||
#include "wine/port.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "gdi.h"
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "enhmfdrv/enhmetafiledrv.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "enhmfdrv/enhmetafiledrv.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "gdi.h"
|
||||
#include "enhmfdrv/enhmetafiledrv.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -23,10 +23,14 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "gdi.h"
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "wine/wingdi16.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(gdi);
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#include "winbase.h"
|
||||
#include "winnls.h"
|
||||
#include "wownt32.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
#include "winerror.h"
|
||||
#include "winreg.h"
|
||||
#include "wingdi.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "wingdi.h"
|
||||
#include "wownt32.h"
|
||||
#include "wine/wingdi16.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "wine/winbase16.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
|
||||
/***********************************************************************
|
||||
|
|
|
@ -21,6 +21,9 @@
|
|||
#ifndef __WINE_GDI_PRIVATE_H
|
||||
#define __WINE_GDI_PRIVATE_H
|
||||
|
||||
#include <math.h>
|
||||
#include "wine/wingdi16.h"
|
||||
|
||||
/* Metafile defines */
|
||||
#define META_EOF 0x0000
|
||||
/* values of mtType in METAHEADER. Note however that the disk image of a disk
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#include "winerror.h"
|
||||
#include "winternl.h"
|
||||
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -18,7 +18,11 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "gdi.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "wownt32.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -47,10 +47,13 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "gdi.h"
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "winreg.h"
|
||||
#include "winternl.h"
|
||||
#include "gdi_private.h"
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
|
||||
#include "wine/winbase16.h"
|
||||
#include "wine/wingdi16.h"
|
||||
#include "gdi.h"
|
||||
#include "wownt32.h"
|
||||
#include "winreg.h"
|
||||
#include "winternl.h"
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include "gdi.h"
|
||||
#include "mfdrv/metafiledrv.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "gdi.h"
|
||||
#include "mfdrv/metafiledrv.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wine/winbase16.h"
|
||||
#include "gdi.h"
|
||||
#include "wownt32.h"
|
||||
#include "gdi_private.h"
|
||||
#include "mfdrv/metafiledrv.h"
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "mfdrv/metafiledrv.h"
|
||||
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
|
||||
/* Metafile driver physical DC */
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include "wingdi.h"
|
||||
#include "wownt32.h"
|
||||
#include "mfdrv/metafiledrv.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
#include "winerror.h"
|
||||
#include "winternl.h"
|
||||
#include "winnt.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "winerror.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#include "wingdi.h"
|
||||
#include "wownt32.h"
|
||||
#include "wine/winuser16.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
#include "winerror.h"
|
||||
|
@ -70,6 +69,8 @@ static UINT SystemPaletteUse = SYSPAL_STATIC; /* currently not considered */
|
|||
static HPALETTE hPrimaryPalette = 0; /* used for WM_PALETTECHANGED */
|
||||
static HPALETTE hLastRealizedPalette = 0; /* UnrealizeObject() needs it */
|
||||
|
||||
#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */
|
||||
|
||||
static const PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS] =
|
||||
{
|
||||
/* first 10 entries in the system palette */
|
||||
|
|
|
@ -37,7 +37,6 @@
|
|||
#include "wingdi.h"
|
||||
#include "winerror.h"
|
||||
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "wine/wingdi16.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -48,7 +48,6 @@
|
|||
#include "winreg.h"
|
||||
#include "wownt32.h"
|
||||
#include "wine/debug.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(print);
|
||||
|
|
|
@ -100,7 +100,6 @@ SOFTWARE.
|
|||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
|
|
|
@ -20,9 +20,12 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "wownt32.h"
|
||||
#include "gdi.h"
|
||||
#include "gdi_private.h"
|
||||
#include "wine/wingdi16.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
|
@ -28,7 +29,8 @@
|
|||
#include "x11drv.h"
|
||||
|
||||
#include "windef.h"
|
||||
#include "gdi.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#include "winbase.h"
|
||||
#include "wownt32.h"
|
||||
#include "x11drv.h"
|
||||
#include "gdi.h"
|
||||
#include "winternl.h"
|
||||
#include "wine/library.h"
|
||||
#include "wine/unicode.h"
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
/*
|
||||
* GDI definitions
|
||||
*
|
||||
* Copyright 1993 Alexandre Julliard
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef __WINE_GDI_H
|
||||
#define __WINE_GDI_H
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <wingdi.h>
|
||||
#include <wine/wingdi16.h>
|
||||
#include <math.h>
|
||||
|
||||
#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */
|
||||
|
||||
/* GetGlyphOutline */
|
||||
#define WINE_GGO_GRAY16_BITMAP 0x7f
|
||||
|
||||
/* GetRasterizerCaps */
|
||||
#define WINE_TT_HINTER_ENABLED 0x8000
|
||||
|
||||
#endif /* __WINE_GDI_H */
|
|
@ -1287,6 +1287,10 @@ typedef struct
|
|||
#define GGO_GRAY8_BITMAP 6
|
||||
#define GGO_GLYPH_INDEX 0x80
|
||||
|
||||
#ifdef __WINESRC__
|
||||
#define WINE_GGO_GRAY16_BITMAP 0x7f
|
||||
#endif
|
||||
|
||||
typedef struct
|
||||
{
|
||||
WORD fract;
|
||||
|
@ -1410,6 +1414,10 @@ typedef struct
|
|||
#define TT_AVAILABLE 0x0001
|
||||
#define TT_ENABLED 0x0002
|
||||
|
||||
#ifdef __WINESRC__
|
||||
#define WINE_TT_HINTER_ENABLED 0x8000
|
||||
#endif
|
||||
|
||||
#define TT_PRIM_LINE 1
|
||||
#define TT_PRIM_QSPLINE 2
|
||||
#define TT_PRIM_CSPLINE 3
|
||||
|
|
Loading…
Reference in a new issue