gdi32: Get rid of the gdi.h include.

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);

dlls/gdi32/bitblt.c

@@ -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"
 

dlls/gdi32/bitmap.c

@@ -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"
 

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"

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"
 

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"

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"

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"

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"
 

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"
 

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 */

dlls/gdi32/enhmfdrv/graphics.c

@@ -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"
 

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"

dlls/gdi32/enhmfdrv/objects.c

@@ -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"

dlls/gdi32/env.c

@@ -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);

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"

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"

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"
 

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"
 
 /***********************************************************************

dlls/gdi32/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

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"
 

dlls/gdi32/mapping.c

@@ -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"

dlls/gdi32/metafile.c

@@ -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"

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"

dlls/gdi32/mfdrv/bitblt.c

@@ -20,7 +20,6 @@
 
 #include <string.h>
 
-#include "gdi.h"
 #include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"
 

dlls/gdi32/mfdrv/graphics.c

@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gdi.h"
 #include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"
 

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"

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"
 

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 */

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"
 

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"
 

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"
 

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 */

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"
 

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"
 

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);

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"
 

dlls/gdi32/wing.c

@@ -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"

dlls/winex11.drv/x11ddraw.c

@@ -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);

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"

include/gdi.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 */

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