From 75b8f88875050573a0565ff996cd09ea16ee566e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 17 Nov 2006 14:52:07 +0100 Subject: [PATCH] gdi32: Get rid of the gdi.h include. --- dlls/gdi32/bidi.c | 1 - dlls/gdi32/bitblt.c | 6 ++++- dlls/gdi32/bitmap.c | 6 +++-- dlls/gdi32/brush.c | 1 - dlls/gdi32/clipping.c | 1 - dlls/gdi32/dc.c | 1 - dlls/gdi32/dib.c | 1 - dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmetafile.c | 1 - dlls/gdi32/enhmfdrv/bitblt.c | 1 - dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 5 +++- dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/enhmfdrv/objects.c | 1 - dlls/gdi32/env.c | 6 ++++- dlls/gdi32/font.c | 1 - dlls/gdi32/freetype.c | 1 - dlls/gdi32/gdi16.c | 1 - dlls/gdi32/gdi_main.c | 1 - dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdiobj.c | 1 - dlls/gdi32/mapping.c | 6 ++++- dlls/gdi32/metafile.c | 5 +++- dlls/gdi32/metafile16.c | 1 - dlls/gdi32/mfdrv/bitblt.c | 1 - dlls/gdi32/mfdrv/graphics.c | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/gdi32/mfdrv/mapping.c | 1 - dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/mfdrv/objects.c | 1 - dlls/gdi32/opengl.c | 1 - dlls/gdi32/painting.c | 1 - dlls/gdi32/palette.c | 3 ++- dlls/gdi32/path.c | 1 - dlls/gdi32/pen.c | 1 - dlls/gdi32/printdrv.c | 1 - dlls/gdi32/region.c | 1 - dlls/gdi32/wing.c | 5 +++- dlls/winex11.drv/x11ddraw.c | 4 ++- dlls/winex11.drv/xrender.c | 1 - include/gdi.h | 39 ---------------------------- include/wingdi.h | 8 ++++++ 42 files changed, 47 insertions(+), 79 deletions(-) delete mode 100644 include/gdi.h diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 7d2a264b41f..ec8b36c5c32 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -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); diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index bc75fb9e64c..df387540fe6 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -18,7 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "gdi.h" +#include + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index d720ae451a9..752c6b363e0 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -19,12 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include #include #include +#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" diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 3c4d1b80780..8e636aeeaaa 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -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" diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index fca1db1bad5..40a556c14aa 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -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" diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3a39b8e0d10..644bd13bdf6 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -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" diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index c23e861ee86..049b343cb71 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -66,7 +66,6 @@ #include "windef.h" #include "winbase.h" -#include "gdi.h" #include "wownt32.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f08141cce31..9d472ef6ad9 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -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" diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index dbf658f1dad..5c1294fc23a 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -43,7 +43,6 @@ #include "wingdi.h" #include "winnls.h" #include "winerror.h" -#include "gdi.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 3c7e97ce402..c118da5703c 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -24,7 +24,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "gdi.h" #include "enhmetafiledrv.h" #include "wine/debug.h" diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index d75d0ab15d2..6d84d19684a 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.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 */ diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index cf4603b409f..4a695f240a0 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -21,10 +21,13 @@ #include "config.h" #include "wine/port.h" +#include #include #include -#include "gdi.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" #include "enhmfdrv/enhmetafiledrv.h" #include "wine/debug.h" diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 1191c720011..82d61c671ff 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -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" diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index b9bc12ca805..0a42af0e3f7 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -22,7 +22,6 @@ #include #include -#include "gdi.h" #include "enhmfdrv/enhmetafiledrv.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/env.c b/dlls/gdi32/env.c index ecac6f6c0f6..582edda23d8 100644 --- a/dlls/gdi32/env.c +++ b/dlls/gdi32/env.c @@ -23,10 +23,14 @@ #include "config.h" +#include #include #include -#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); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 24f16ddff9f..22ebd8a35ed 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -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" diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f7bc28f0b41..f77047e5d65 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -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" diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 0940f8bc8d2..b7d12937a4a 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -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" diff --git a/dlls/gdi32/gdi_main.c b/dlls/gdi32/gdi_main.c index 5a1da770c2e..4d834aa28c3 100644 --- a/dlls/gdi32/gdi_main.c +++ b/dlls/gdi32/gdi_main.c @@ -24,7 +24,6 @@ #include "winbase.h" #include "wingdi.h" #include "wine/winbase16.h" -#include "gdi.h" #include "gdi_private.h" /*********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f4d8900ff36..551b6275ac9 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -21,6 +21,9 @@ #ifndef __WINE_GDI_PRIVATE_H #define __WINE_GDI_PRIVATE_H +#include +#include "wine/wingdi16.h" + /* Metafile defines */ #define META_EOF 0x0000 /* values of mtType in METAHEADER. Note however that the disk image of a disk diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 6c57e9c9e02..772952d1e87 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -32,7 +32,6 @@ #include "winerror.h" #include "winternl.h" -#include "gdi.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index ea8184f8ecf..8aeb480fcd7 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -18,7 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "gdi.h" +#include + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" #include "wownt32.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 88a01d10242..13fce773604 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -47,10 +47,13 @@ #include "config.h" +#include #include #include -#include "gdi.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" #include "winreg.h" #include "winternl.h" #include "gdi_private.h" diff --git a/dlls/gdi32/metafile16.c b/dlls/gdi32/metafile16.c index 05768e164c8..11f84244a44 100644 --- a/dlls/gdi32/metafile16.c +++ b/dlls/gdi32/metafile16.c @@ -28,7 +28,6 @@ #include "wine/winbase16.h" #include "wine/wingdi16.h" -#include "gdi.h" #include "wownt32.h" #include "winreg.h" #include "winternl.h" diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index 1d7d0af1f04..578366d9fe4 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -20,7 +20,6 @@ #include -#include "gdi.h" #include "mfdrv/metafiledrv.h" #include "wine/debug.h" diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 94c85146082..c0c922c7943 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -21,7 +21,6 @@ #include #include -#include "gdi.h" #include "mfdrv/metafiledrv.h" #include "wine/debug.h" diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index ab3ec3e7d01..edd47d7feaf 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -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" diff --git a/dlls/gdi32/mfdrv/mapping.c b/dlls/gdi32/mfdrv/mapping.c index 90330b42355..d921eb145e6 100644 --- a/dlls/gdi32/mfdrv/mapping.c +++ b/dlls/gdi32/mfdrv/mapping.c @@ -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" diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index adf4392b88d..98d9e155c97 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/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 */ diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 98e3f323048..4dc809a430e 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -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" diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index d171c3db51f..fdf39f34e1b 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -33,7 +33,6 @@ #include "winerror.h" #include "winternl.h" #include "winnt.h" -#include "gdi.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index e10ea6e7f33..09b1432a898 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -31,7 +31,6 @@ #include "winbase.h" #include "wingdi.h" #include "winerror.h" -#include "gdi.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 98d6a696c8f..ecf98fc0585 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -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 */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 8d2a76c79fe..a045d7b8b37 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -37,7 +37,6 @@ #include "wingdi.h" #include "winerror.h" -#include "gdi.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index fae93152d94..fb84788851a 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -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" diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 412ccd274c6..f2e1951075c 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -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); diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 94fd929ca32..2df7b74bde1 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -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" diff --git a/dlls/gdi32/wing.c b/dlls/gdi32/wing.c index 4a8c2ae2069..7550fe20190 100644 --- a/dlls/gdi32/wing.c +++ b/dlls/gdi32/wing.c @@ -20,9 +20,12 @@ #include "config.h" +#include + #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" diff --git a/dlls/winex11.drv/x11ddraw.c b/dlls/winex11.drv/x11ddraw.c index f527f0fa9c4..3400b864578 100644 --- a/dlls/winex11.drv/x11ddraw.c +++ b/dlls/winex11.drv/x11ddraw.c @@ -20,6 +20,7 @@ #include "config.h" +#include #include #include @@ -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); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 1fe30f6e3fb..ca5c7c69c17 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -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" diff --git a/include/gdi.h b/include/gdi.h deleted file mode 100644 index a5ad7f4e9a0..00000000000 --- a/include/gdi.h +++ /dev/null @@ -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 -#include -#include -#include -#include -#include - -#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 */ diff --git a/include/wingdi.h b/include/wingdi.h index eb7986e0c32..008ba9e6383 100644 --- a/include/wingdi.h +++ b/include/wingdi.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