Moved a bunch of definitions from gdi.h into a new gdi_private.h to
make sure we don't use them outside of gdi32.
diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c
index a013c7c..fd565c4 100644
--- a/dlls/gdi/driver.c
+++ b/dlls/gdi/driver.c
@@ -28,6 +28,7 @@
#include "winreg.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/dlls/gdi/enhmfdrv/init.c b/dlls/gdi/enhmfdrv/init.c
index e22df0f..30b017f 100644
--- a/dlls/gdi/enhmfdrv/init.c
+++ b/dlls/gdi/enhmfdrv/init.c
@@ -25,6 +25,7 @@
#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/gdi/enhmfdrv/objects.c b/dlls/gdi/enhmfdrv/objects.c
index b5b388b..6bae1ea 100644
--- a/dlls/gdi/enhmfdrv/objects.c
+++ b/dlls/gdi/enhmfdrv/objects.c
@@ -24,6 +24,7 @@
#include "bitmap.h"
#include "enhmfdrv/enhmetafiledrv.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index 67775f9..e03e4ba 100644
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#include "config.h"
+#include "wine/port.h"
#include <stdarg.h>
#include <stdlib.h>
@@ -36,10 +36,10 @@
#include "winerror.h"
#include "winreg.h"
#include "wingdi.h"
-#include "wine/unicode.h"
-#include "wine/port.h"
-#include "wine/debug.h"
#include "gdi.h"
+#include "gdi_private.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(font);
diff --git a/dlls/gdi/gdi16.c b/dlls/gdi/gdi16.c
index aa3084f..ed9472d 100644
--- a/dlls/gdi/gdi16.c
+++ b/dlls/gdi/gdi16.c
@@ -26,6 +26,7 @@
#include "wownt32.h"
#include "wine/wingdi16.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/dlls/gdi/gdi_main.c b/dlls/gdi/gdi_main.c
index eff53e8..36987e4 100644
--- a/dlls/gdi/gdi_main.c
+++ b/dlls/gdi/gdi_main.c
@@ -24,8 +24,8 @@
#include "winbase.h"
#include "wingdi.h"
#include "wine/winbase16.h"
-
#include "gdi.h"
+#include "gdi_private.h"
/***********************************************************************
* GDI initialisation routine
diff --git a/dlls/gdi/gdi_private.h b/dlls/gdi/gdi_private.h
new file mode 100644
index 0000000..72a3d99
--- /dev/null
+++ b/dlls/gdi/gdi_private.h
@@ -0,0 +1,292 @@
+/*
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __WINE_GDI_PRIVATE_H
+#define __WINE_GDI_PRIVATE_H
+
+/* Metafile defines */
+#define META_EOF 0x0000
+/* values of mtType in METAHEADER. Note however that the disk image of a disk
+ based metafile has mtType == 1 */
+#define METAFILE_MEMORY 1
+#define METAFILE_DISK 2
+
+struct gdi_obj_funcs
+{
+ HGDIOBJ (*pSelectObject)( HGDIOBJ handle, void *obj, HDC hdc );
+ INT (*pGetObject16)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer );
+ INT (*pGetObjectA)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer );
+ INT (*pGetObjectW)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer );
+ BOOL (*pUnrealizeObject)( HGDIOBJ handle, void *obj );
+ BOOL (*pDeleteObject)( HGDIOBJ handle, void *obj );
+};
+
+struct hdc_list
+{
+ HDC hdc;
+ struct hdc_list *next;
+};
+
+/* Device functions for the Wine driver interface */
+
+typedef struct tagDC_FUNCS
+{
+ INT (*pAbortDoc)(PHYSDEV);
+ BOOL (*pAbortPath)(PHYSDEV);
+ BOOL (*pAngleArc)(PHYSDEV,INT,INT,DWORD,FLOAT,FLOAT);
+ BOOL (*pArc)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
+ BOOL (*pArcTo)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
+ BOOL (*pBeginPath)(PHYSDEV);
+ BOOL (*pBitBlt)(PHYSDEV,INT,INT,INT,INT,PHYSDEV,INT,INT,DWORD);
+ INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *);
+ BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
+ BOOL (*pCloseFigure)(PHYSDEV);
+ BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP);
+ BOOL (*pCreateDC)(DC *,PHYSDEV *,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
+ HBITMAP (*pCreateDIBSection)(PHYSDEV,BITMAPINFO *,UINT,LPVOID *,HANDLE,DWORD,DWORD);
+ BOOL (*pDeleteBitmap)(HBITMAP);
+ BOOL (*pDeleteDC)(PHYSDEV);
+ BOOL (*pDeleteObject)(PHYSDEV,HGDIOBJ);
+ INT (*pDescribePixelFormat)(PHYSDEV,INT,UINT,PIXELFORMATDESCRIPTOR *);
+ DWORD (*pDeviceCapabilities)(LPSTR,LPCSTR,LPCSTR,WORD,LPSTR,LPDEVMODEA);
+ BOOL (*pEllipse)(PHYSDEV,INT,INT,INT,INT);
+ INT (*pEndDoc)(PHYSDEV);
+ INT (*pEndPage)(PHYSDEV);
+ BOOL (*pEndPath)(PHYSDEV);
+ BOOL (*pEnumDeviceFonts)(PHYSDEV,LPLOGFONTW,DEVICEFONTENUMPROC,LPARAM);
+ INT (*pExcludeClipRect)(PHYSDEV,INT,INT,INT,INT);
+ INT (*pExtDeviceMode)(LPSTR,HWND,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD);
+ INT (*pExtEscape)(PHYSDEV,INT,INT,LPCVOID,INT,LPVOID);
+ BOOL (*pExtFloodFill)(PHYSDEV,INT,INT,COLORREF,UINT);
+ INT (*pExtSelectClipRgn)(PHYSDEV,HRGN,INT);
+ BOOL (*pExtTextOut)(PHYSDEV,INT,INT,UINT,const RECT*,LPCWSTR,UINT,const INT*);
+ BOOL (*pFillPath)(PHYSDEV);
+ BOOL (*pFillRgn)(PHYSDEV,HRGN,HBRUSH);
+ BOOL (*pFlattenPath)(PHYSDEV);
+ BOOL (*pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT);
+ BOOL (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*);
+ LONG (*pGetBitmapBits)(HBITMAP,void*,LONG);
+ BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT);
+ BOOL (*pGetDCOrgEx)(PHYSDEV,LPPOINT);
+ UINT (*pGetDIBColorTable)(PHYSDEV,UINT,UINT,RGBQUAD*);
+ INT (*pGetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPVOID,BITMAPINFO*,UINT);
+ INT (*pGetDeviceCaps)(PHYSDEV,INT);
+ BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID);
+ COLORREF (*pGetNearestColor)(PHYSDEV,COLORREF);
+ COLORREF (*pGetPixel)(PHYSDEV,INT,INT);
+ INT (*pGetPixelFormat)(PHYSDEV);
+ UINT (*pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY);
+ BOOL (*pGetTextExtentPoint)(PHYSDEV,LPCWSTR,INT,LPSIZE);
+ BOOL (*pGetTextMetrics)(PHYSDEV,TEXTMETRICW*);
+ INT (*pIntersectClipRect)(PHYSDEV,INT,INT,INT,INT);
+ BOOL (*pInvertRgn)(PHYSDEV,HRGN);
+ BOOL (*pLineTo)(PHYSDEV,INT,INT);
+ BOOL (*pModifyWorldTransform)(PHYSDEV,const XFORM*,INT);
+ BOOL (*pMoveTo)(PHYSDEV,INT,INT);
+ INT (*pOffsetClipRgn)(PHYSDEV,INT,INT);
+ INT (*pOffsetViewportOrg)(PHYSDEV,INT,INT);
+ INT (*pOffsetWindowOrg)(PHYSDEV,INT,INT);
+ BOOL (*pPaintRgn)(PHYSDEV,HRGN);
+ BOOL (*pPatBlt)(PHYSDEV,INT,INT,INT,INT,DWORD);
+ BOOL (*pPie)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
+ BOOL (*pPolyBezier)(PHYSDEV,const POINT*,DWORD);
+ BOOL (*pPolyBezierTo)(PHYSDEV,const POINT*,DWORD);
+ BOOL (*pPolyDraw)(PHYSDEV,const POINT*,const BYTE *,DWORD);
+ BOOL (*pPolyPolygon)(PHYSDEV,const POINT*,const INT*,UINT);
+ BOOL (*pPolyPolyline)(PHYSDEV,const POINT*,const DWORD*,DWORD);
+ BOOL (*pPolygon)(PHYSDEV,const POINT*,INT);
+ BOOL (*pPolyline)(PHYSDEV,const POINT*,INT);
+ BOOL (*pPolylineTo)(PHYSDEV,const POINT*,INT);
+ UINT (*pRealizeDefaultPalette)(PHYSDEV);
+ UINT (*pRealizePalette)(PHYSDEV,HPALETTE,BOOL);
+ BOOL (*pRectangle)(PHYSDEV,INT,INT,INT,INT);
+ HDC (*pResetDC)(PHYSDEV,const DEVMODEW*);
+ BOOL (*pRestoreDC)(PHYSDEV,INT);
+ BOOL (*pRoundRect)(PHYSDEV,INT,INT,INT,INT,INT,INT);
+ INT (*pSaveDC)(PHYSDEV);
+ INT (*pScaleViewportExt)(PHYSDEV,INT,INT,INT,INT);
+ INT (*pScaleWindowExt)(PHYSDEV,INT,INT,INT,INT);
+ HBITMAP (*pSelectBitmap)(PHYSDEV,HBITMAP);
+ HBRUSH (*pSelectBrush)(PHYSDEV,HBRUSH);
+ BOOL (*pSelectClipPath)(PHYSDEV,INT);
+ HFONT (*pSelectFont)(PHYSDEV,HFONT);
+ HPALETTE (*pSelectPalette)(PHYSDEV,HPALETTE,BOOL);
+ HPEN (*pSelectPen)(PHYSDEV,HPEN);
+ INT (*pSetArcDirection)(PHYSDEV,INT);
+ LONG (*pSetBitmapBits)(HBITMAP,const void*,LONG);
+ COLORREF (*pSetBkColor)(PHYSDEV,COLORREF);
+ INT (*pSetBkMode)(PHYSDEV,INT);
+ COLORREF (*pSetDCBrushColor)(PHYSDEV, COLORREF);
+ DWORD (*pSetDCOrg)(PHYSDEV,INT,INT);
+ COLORREF (*pSetDCPenColor)(PHYSDEV, COLORREF);
+ UINT (*pSetDIBColorTable)(PHYSDEV,UINT,UINT,const RGBQUAD*);
+ INT (*pSetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT);
+ INT (*pSetDIBitsToDevice)(PHYSDEV,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,
+ const BITMAPINFO*,UINT);
+ VOID (*pSetDeviceClipping)(PHYSDEV,HRGN);
+ BOOL (*pSetDeviceGammaRamp)(PHYSDEV,LPVOID);
+ INT (*pSetMapMode)(PHYSDEV,INT);
+ DWORD (*pSetMapperFlags)(PHYSDEV,DWORD);
+ COLORREF (*pSetPixel)(PHYSDEV,INT,INT,COLORREF);
+ BOOL (*pSetPixelFormat)(PHYSDEV,INT,const PIXELFORMATDESCRIPTOR *);
+ INT (*pSetPolyFillMode)(PHYSDEV,INT);
+ INT (*pSetROP2)(PHYSDEV,INT);
+ INT (*pSetRelAbs)(PHYSDEV,INT);
+ INT (*pSetStretchBltMode)(PHYSDEV,INT);
+ UINT (*pSetTextAlign)(PHYSDEV,UINT);
+ INT (*pSetTextCharacterExtra)(PHYSDEV,INT);
+ DWORD (*pSetTextColor)(PHYSDEV,DWORD);
+ INT (*pSetTextJustification)(PHYSDEV,INT,INT);
+ INT (*pSetViewportExt)(PHYSDEV,INT,INT);
+ INT (*pSetViewportOrg)(PHYSDEV,INT,INT);
+ INT (*pSetWindowExt)(PHYSDEV,INT,INT);
+ INT (*pSetWindowOrg)(PHYSDEV,INT,INT);
+ BOOL (*pSetWorldTransform)(PHYSDEV,const XFORM*);
+ INT (*pStartDoc)(PHYSDEV,const DOCINFOA*);
+ INT (*pStartPage)(PHYSDEV);
+ BOOL (*pStretchBlt)(PHYSDEV,INT,INT,INT,INT,PHYSDEV,INT,INT,INT,INT,DWORD);
+ INT (*pStretchDIBits)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT,const void *,
+ const BITMAPINFO*,UINT,DWORD);
+ BOOL (*pStrokeAndFillPath)(PHYSDEV);
+ BOOL (*pStrokePath)(PHYSDEV);
+ BOOL (*pSwapBuffers)(PHYSDEV);
+ BOOL (*pWidenPath)(PHYSDEV);
+} DC_FUNCTIONS;
+
+ /* DC flags */
+#define DC_SAVED 0x0002 /* It is a saved DC */
+#define DC_DIRTY 0x0004 /* hVisRgn has to be updated */
+
+/* Certain functions will do no further processing if the driver returns this.
+ Used by mfdrv for example. */
+#define GDI_NO_MORE_WORK 2
+
+/* bidi.c */
+
+/* Wine_GCPW Flags */
+/* Directionality -
+ * LOOSE means that the paragraph dir is only set if there is no strong character.
+ * FORCE means override the characters in the paragraph.
+ */
+#define WINE_GCPW_FORCE_LTR 0
+#define WINE_GCPW_FORCE_RTL 1
+#define WINE_GCPW_LOOSE_LTR 2
+#define WINE_GCPW_LOOSE_RTL 3
+#define WINE_GCPW_DIR_MASK 3
+extern BOOL BIDI_Reorder( LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags,
+ LPWSTR lpOutString, INT uCountOut, UINT *lpOrder );
+extern BOOL BidiAvail;
+
+/* clipping.c */
+extern void CLIPPING_UpdateGCRegion( DC * dc );
+
+/* dc.c */
+extern DC * DC_AllocDC( const DC_FUNCTIONS *funcs, WORD magic );
+extern DC * DC_GetDCUpdate( HDC hdc );
+extern DC * DC_GetDCPtr( HDC hdc );
+extern void DC_InitDC( DC * dc );
+extern void DC_UpdateXforms( DC * dc );
+
+/* driver.c */
+extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name );
+extern const DC_FUNCTIONS *DRIVER_get_driver( const DC_FUNCTIONS *funcs );
+extern void DRIVER_release_driver( const DC_FUNCTIONS *funcs );
+extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size );
+
+/* enhmetafile.c */
+extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk );
+
+/* freetype.c */
+extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID);
+extern GdiFont WineEngCreateFontInstance(DC*, HFONT);
+extern BOOL WineEngDestroyFontInstance(HFONT handle);
+extern DWORD WineEngEnumFonts(LPLOGFONTW, DEVICEFONTENUMPROC, LPARAM);
+extern BOOL WineEngGetCharWidth(GdiFont, UINT, UINT, LPINT);
+extern DWORD WineEngGetFontData(GdiFont, DWORD, DWORD, LPVOID, DWORD);
+extern DWORD WineEngGetGlyphIndices(GdiFont font, LPCWSTR lpstr, INT count,
+ LPWORD pgi, DWORD flags);
+extern DWORD WineEngGetGlyphOutline(GdiFont, UINT glyph, UINT format,
+ LPGLYPHMETRICS, DWORD buflen, LPVOID buf,
+ const MAT2*);
+extern UINT WineEngGetOutlineTextMetrics(GdiFont, UINT, LPOUTLINETEXTMETRICW);
+extern UINT WineEngGetTextCharsetInfo(GdiFont font, LPFONTSIGNATURE fs, DWORD flags);
+extern BOOL WineEngGetTextExtentPoint(GdiFont, LPCWSTR, INT, LPSIZE);
+extern BOOL WineEngGetTextExtentPointI(GdiFont, const WORD *, INT, LPSIZE);
+extern INT WineEngGetTextFace(GdiFont, INT, LPWSTR);
+extern BOOL WineEngGetTextMetrics(GdiFont, LPTEXTMETRICW);
+extern BOOL WineEngInit(void);
+extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID);
+
+/* gdiobj.c */
+extern BOOL GDI_Init(void);
+extern void *GDI_AllocObject( WORD, WORD, HGDIOBJ *, const struct gdi_obj_funcs *funcs );
+extern void *GDI_ReallocObject( WORD, HGDIOBJ, void *obj );
+extern BOOL GDI_FreeObject( HGDIOBJ, void *obj );
+extern void GDI_CheckNotLock(void);
+extern BOOL GDI_hdc_using_object(HGDIOBJ obj, HDC hdc);
+extern BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc);
+
+/* metafile.c */
+extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh);
+extern HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh);
+extern METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mr, LPCSTR filename);
+
+/* path.c */
+
+#define PATH_IsPathOpen(path) ((path).state==PATH_Open)
+/* Returns TRUE if the specified path is in the open state, i.e. in the
+ * state where points will be added to the path, or FALSE otherwise. This
+ * function is implemented as a macro for performance reasons.
+ */
+
+extern void PATH_InitGdiPath(GdiPath *pPath);
+extern void PATH_DestroyGdiPath(GdiPath *pPath);
+extern BOOL PATH_AssignGdiPath(GdiPath *pPathDest, const GdiPath *pPathSrc);
+
+extern BOOL PATH_MoveTo(DC *dc);
+extern BOOL PATH_LineTo(DC *dc, INT x, INT y);
+extern BOOL PATH_Rectangle(DC *dc, INT x1, INT y1, INT x2, INT y2);
+extern BOOL PATH_Ellipse(DC *dc, INT x1, INT y1, INT x2, INT y2);
+extern BOOL PATH_Arc(DC *dc, INT x1, INT y1, INT x2, INT y2,
+ INT xStart, INT yStart, INT xEnd, INT yEnd, INT lines);
+extern BOOL PATH_PolyBezierTo(DC *dc, const POINT *pt, DWORD cbCount);
+extern BOOL PATH_PolyBezier(DC *dc, const POINT *pt, DWORD cbCount);
+extern BOOL PATH_PolylineTo(DC *dc, const POINT *pt, DWORD cbCount);
+extern BOOL PATH_Polyline(DC *dc, const POINT *pt, DWORD cbCount);
+extern BOOL PATH_Polygon(DC *dc, const POINT *pt, DWORD cbCount);
+extern BOOL PATH_PolyPolyline(DC *dc, const POINT *pt, const DWORD *counts, DWORD polylines);
+extern BOOL PATH_PolyPolygon(DC *dc, const POINT *pt, const INT *counts, UINT polygons);
+extern BOOL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height);
+extern BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags);
+
+/* painting.c */
+extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut );
+
+/* palette.c */
+extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg);
+extern UINT WINAPI GDIRealizePalette( HDC hdc );
+
+/* region.c */
+extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y );
+
+/* text.c */
+extern LPWSTR FONT_mbtowc(HDC, LPCSTR, INT, INT*, UINT*);
+
+#endif /* __WINE_GDI_PRIVATE_H */
diff --git a/dlls/gdi/mfdrv/init.c b/dlls/gdi/mfdrv/init.c
index 35c5de1..7e358cf 100644
--- a/dlls/gdi/mfdrv/init.c
+++ b/dlls/gdi/mfdrv/init.c
@@ -26,6 +26,7 @@
#include "wine/winbase16.h"
#include "gdi.h"
#include "wownt32.h"
+#include "gdi_private.h"
#include "mfdrv/metafiledrv.h"
#include "wine/debug.h"
diff --git a/dlls/gdi/mfdrv/mapping.c b/dlls/gdi/mfdrv/mapping.c
index 5ce953f..89450bd 100644
--- a/dlls/gdi/mfdrv/mapping.c
+++ b/dlls/gdi/mfdrv/mapping.c
@@ -19,6 +19,7 @@
*/
#include "gdi.h"
+#include "gdi_private.h"
#include "mfdrv/metafiledrv.h"
diff --git a/dlls/gdi/mfdrv/objects.c b/dlls/gdi/mfdrv/objects.c
index adcf7b4f..0618a6b 100644
--- a/dlls/gdi/mfdrv/objects.c
+++ b/dlls/gdi/mfdrv/objects.c
@@ -25,6 +25,7 @@
#include "bitmap.h"
#include "wownt32.h"
#include "mfdrv/metafiledrv.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(metafile);
diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c
index a9c3b47..73e5f44 100644
--- a/dlls/gdi/printdrv.c
+++ b/dlls/gdi/printdrv.c
@@ -49,6 +49,7 @@
#include "wownt32.h"
#include "wine/debug.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(print);
diff --git a/dlls/gdi/wing.c b/dlls/gdi/wing.c
index 042330f..ab4611e 100644
--- a/dlls/gdi/wing.c
+++ b/dlls/gdi/wing.c
@@ -23,7 +23,6 @@
#include "wine/winuser16.h"
#include "bitmap.h"
#include "wine/debug.h"
-#include "palette.h"
#include "windef.h"
#include "wownt32.h"
diff --git a/dlls/x11drv/bitblt.c b/dlls/x11drv/bitblt.c
index 1ded2b7..5daf99d 100644
--- a/dlls/x11drv/bitblt.c
+++ b/dlls/x11drv/bitblt.c
@@ -31,7 +31,6 @@
#include "wingdi.h"
#include "winreg.h"
#include "winuser.h"
-#include "bitmap.h"
#include "gdi.h"
#include "x11drv.h"
#include "wine/debug.h"
diff --git a/dlls/x11drv/bitmap.c b/dlls/x11drv/bitmap.c
index 0e4f7c1..b43cf38 100644
--- a/dlls/x11drv/bitmap.c
+++ b/dlls/x11drv/bitmap.c
@@ -37,7 +37,7 @@
GC BITMAP_monoGC = 0, BITMAP_colorGC = 0;
Pixmap BITMAP_stock_pixmap; /* pixmap for the default stock bitmap */
-extern const DC_FUNCTIONS *X11DRV_DC_Funcs; /* hack */
+extern const struct tagDC_FUNCS *X11DRV_DC_Funcs; /* hack */
/***********************************************************************
* X11DRV_BITMAP_Init
diff --git a/dlls/x11drv/graphics.c b/dlls/x11drv/graphics.c
index 8aaef6e..0b6a5cc 100644
--- a/dlls/x11drv/graphics.c
+++ b/dlls/x11drv/graphics.c
@@ -38,9 +38,7 @@
#include "x11drv.h"
#include "x11font.h"
-#include "bitmap.h"
#include "gdi.h"
-#include "palette.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(graphics);
diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c
index e26c8c1..bd10202 100644
--- a/dlls/x11drv/init.c
+++ b/dlls/x11drv/init.c
@@ -25,7 +25,6 @@
#include "windef.h"
#include "winbase.h"
-#include "bitmap.h"
#include "x11drv.h"
#include "x11font.h"
#include "ddrawi.h"
@@ -33,7 +32,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
-const DC_FUNCTIONS *X11DRV_DC_Funcs = NULL; /* hack */
+const struct tagDC_FUNCS *X11DRV_DC_Funcs = NULL; /* hack */
Display *gdi_display; /* display to use for all GDI functions */
diff --git a/dlls/x11drv/text.c b/dlls/x11drv/text.c
index 7083065..93c3e46 100644
--- a/dlls/x11drv/text.c
+++ b/dlls/x11drv/text.c
@@ -30,7 +30,6 @@
#include "wownt32.h"
#include "gdi.h"
#include "x11font.h"
-#include "bitmap.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(text);
diff --git a/dlls/x11drv/xrender.c b/dlls/x11drv/xrender.c
index 423c87e..eebb743 100644
--- a/dlls/x11drv/xrender.c
+++ b/dlls/x11drv/xrender.c
@@ -32,7 +32,6 @@
#include "winbase.h"
#include "wownt32.h"
#include "x11drv.h"
-#include "bitmap.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/graphics/bitblt.c b/graphics/bitblt.c
index 69d1ad6..82b94f5 100644
--- a/graphics/bitblt.c
+++ b/graphics/bitblt.c
@@ -19,6 +19,7 @@
*/
#include "gdi.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(bitblt);
diff --git a/graphics/escape.c b/graphics/escape.c
index a269a17..af504cb 100644
--- a/graphics/escape.c
+++ b/graphics/escape.c
@@ -25,6 +25,7 @@
#include "winbase.h"
#include "wingdi.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(driver);
diff --git a/graphics/mapping.c b/graphics/mapping.c
index 43038da..507c789 100644
--- a/graphics/mapping.c
+++ b/graphics/mapping.c
@@ -20,6 +20,7 @@
#include "gdi.h"
#include "wownt32.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/graphics/painting.c b/graphics/painting.c
index a7c37c2..5ee1a1c 100644
--- a/graphics/painting.c
+++ b/graphics/painting.c
@@ -33,6 +33,7 @@
#include "winerror.h"
#include "gdi.h"
#include "bitmap.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/graphics/path.c b/graphics/path.c
index d99fa7b..b19ec71 100644
--- a/graphics/path.c
+++ b/graphics/path.c
@@ -36,6 +36,7 @@
#include "winerror.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/include/gdi.h b/include/gdi.h
index 2a8f9a7..6f11508 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -54,21 +54,8 @@
#define GDIMAGIC(magic) ((magic) & ~(OBJECT_PRIVATE|OBJECT_NOSYSTEM))
-struct gdi_obj_funcs
-{
- HGDIOBJ (*pSelectObject)( HGDIOBJ handle, void *obj, HDC hdc );
- INT (*pGetObject16)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer );
- INT (*pGetObjectA)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer );
- INT (*pGetObjectW)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer );
- BOOL (*pUnrealizeObject)( HGDIOBJ handle, void *obj );
- BOOL (*pDeleteObject)( HGDIOBJ handle, void *obj );
-};
-
-struct hdc_list
-{
- HDC hdc;
- struct hdc_list *next;
-};
+struct gdi_obj_funcs;
+struct hdc_list;
typedef struct tagGDIOBJHDR
{
@@ -174,164 +161,11 @@
BOOL vport2WorldValid; /* Is xformVport2World valid? */
} DC;
-/* Device functions for the Wine driver interface */
-
-typedef INT (*DEVICEFONTENUMPROC)(LPENUMLOGFONTEXW,NEWTEXTMETRICEXW *,DWORD,
- LPARAM);
-
-typedef struct tagDC_FUNCS
-{
- INT (*pAbortDoc)(PHYSDEV);
- BOOL (*pAbortPath)(PHYSDEV);
- BOOL (*pAngleArc)(PHYSDEV,INT,INT,DWORD,FLOAT,FLOAT);
- BOOL (*pArc)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
- BOOL (*pArcTo)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
- BOOL (*pBeginPath)(PHYSDEV);
- BOOL (*pBitBlt)(PHYSDEV,INT,INT,INT,INT,PHYSDEV,INT,INT,DWORD);
- INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *);
- BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
- BOOL (*pCloseFigure)(PHYSDEV);
- BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP);
- BOOL (*pCreateDC)(DC *,PHYSDEV *,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
- HBITMAP (*pCreateDIBSection)(PHYSDEV,BITMAPINFO *,UINT,LPVOID *,HANDLE,DWORD,DWORD);
- BOOL (*pDeleteBitmap)(HBITMAP);
- BOOL (*pDeleteDC)(PHYSDEV);
- BOOL (*pDeleteObject)(PHYSDEV,HGDIOBJ);
- INT (*pDescribePixelFormat)(PHYSDEV,INT,UINT,PIXELFORMATDESCRIPTOR *);
- DWORD (*pDeviceCapabilities)(LPSTR,LPCSTR,LPCSTR,WORD,LPSTR,LPDEVMODEA);
- BOOL (*pEllipse)(PHYSDEV,INT,INT,INT,INT);
- INT (*pEndDoc)(PHYSDEV);
- INT (*pEndPage)(PHYSDEV);
- BOOL (*pEndPath)(PHYSDEV);
- BOOL (*pEnumDeviceFonts)(PHYSDEV,LPLOGFONTW,DEVICEFONTENUMPROC,LPARAM);
- INT (*pExcludeClipRect)(PHYSDEV,INT,INT,INT,INT);
- INT (*pExtDeviceMode)(LPSTR,HWND,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD);
- INT (*pExtEscape)(PHYSDEV,INT,INT,LPCVOID,INT,LPVOID);
- BOOL (*pExtFloodFill)(PHYSDEV,INT,INT,COLORREF,UINT);
- INT (*pExtSelectClipRgn)(PHYSDEV,HRGN,INT);
- BOOL (*pExtTextOut)(PHYSDEV,INT,INT,UINT,const RECT*,LPCWSTR,UINT,const INT*);
- BOOL (*pFillPath)(PHYSDEV);
- BOOL (*pFillRgn)(PHYSDEV,HRGN,HBRUSH);
- BOOL (*pFlattenPath)(PHYSDEV);
- BOOL (*pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT);
- BOOL (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*);
- LONG (*pGetBitmapBits)(HBITMAP,void*,LONG);
- BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT);
- BOOL (*pGetDCOrgEx)(PHYSDEV,LPPOINT);
- UINT (*pGetDIBColorTable)(PHYSDEV,UINT,UINT,RGBQUAD*);
- INT (*pGetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPVOID,BITMAPINFO*,UINT);
- INT (*pGetDeviceCaps)(PHYSDEV,INT);
- BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID);
- COLORREF (*pGetNearestColor)(PHYSDEV,COLORREF);
- COLORREF (*pGetPixel)(PHYSDEV,INT,INT);
- INT (*pGetPixelFormat)(PHYSDEV);
- UINT (*pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY);
- BOOL (*pGetTextExtentPoint)(PHYSDEV,LPCWSTR,INT,LPSIZE);
- BOOL (*pGetTextMetrics)(PHYSDEV,TEXTMETRICW*);
- INT (*pIntersectClipRect)(PHYSDEV,INT,INT,INT,INT);
- BOOL (*pInvertRgn)(PHYSDEV,HRGN);
- BOOL (*pLineTo)(PHYSDEV,INT,INT);
- BOOL (*pModifyWorldTransform)(PHYSDEV,const XFORM*,INT);
- BOOL (*pMoveTo)(PHYSDEV,INT,INT);
- INT (*pOffsetClipRgn)(PHYSDEV,INT,INT);
- INT (*pOffsetViewportOrg)(PHYSDEV,INT,INT);
- INT (*pOffsetWindowOrg)(PHYSDEV,INT,INT);
- BOOL (*pPaintRgn)(PHYSDEV,HRGN);
- BOOL (*pPatBlt)(PHYSDEV,INT,INT,INT,INT,DWORD);
- BOOL (*pPie)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
- BOOL (*pPolyBezier)(PHYSDEV,const POINT*,DWORD);
- BOOL (*pPolyBezierTo)(PHYSDEV,const POINT*,DWORD);
- BOOL (*pPolyDraw)(PHYSDEV,const POINT*,const BYTE *,DWORD);
- BOOL (*pPolyPolygon)(PHYSDEV,const POINT*,const INT*,UINT);
- BOOL (*pPolyPolyline)(PHYSDEV,const POINT*,const DWORD*,DWORD);
- BOOL (*pPolygon)(PHYSDEV,const POINT*,INT);
- BOOL (*pPolyline)(PHYSDEV,const POINT*,INT);
- BOOL (*pPolylineTo)(PHYSDEV,const POINT*,INT);
- UINT (*pRealizeDefaultPalette)(PHYSDEV);
- UINT (*pRealizePalette)(PHYSDEV,HPALETTE,BOOL);
- BOOL (*pRectangle)(PHYSDEV,INT,INT,INT,INT);
- HDC (*pResetDC)(PHYSDEV,const DEVMODEW*);
- BOOL (*pRestoreDC)(PHYSDEV,INT);
- BOOL (*pRoundRect)(PHYSDEV,INT,INT,INT,INT,INT,INT);
- INT (*pSaveDC)(PHYSDEV);
- INT (*pScaleViewportExt)(PHYSDEV,INT,INT,INT,INT);
- INT (*pScaleWindowExt)(PHYSDEV,INT,INT,INT,INT);
- HBITMAP (*pSelectBitmap)(PHYSDEV,HBITMAP);
- HBRUSH (*pSelectBrush)(PHYSDEV,HBRUSH);
- BOOL (*pSelectClipPath)(PHYSDEV,INT);
- HFONT (*pSelectFont)(PHYSDEV,HFONT);
- HPALETTE (*pSelectPalette)(PHYSDEV,HPALETTE,BOOL);
- HPEN (*pSelectPen)(PHYSDEV,HPEN);
- INT (*pSetArcDirection)(PHYSDEV,INT);
- LONG (*pSetBitmapBits)(HBITMAP,const void*,LONG);
- COLORREF (*pSetBkColor)(PHYSDEV,COLORREF);
- INT (*pSetBkMode)(PHYSDEV,INT);
- COLORREF (*pSetDCBrushColor)(PHYSDEV, COLORREF);
- DWORD (*pSetDCOrg)(PHYSDEV,INT,INT);
- COLORREF (*pSetDCPenColor)(PHYSDEV, COLORREF);
- UINT (*pSetDIBColorTable)(PHYSDEV,UINT,UINT,const RGBQUAD*);
- INT (*pSetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT);
- INT (*pSetDIBitsToDevice)(PHYSDEV,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,
- const BITMAPINFO*,UINT);
- VOID (*pSetDeviceClipping)(PHYSDEV,HRGN);
- BOOL (*pSetDeviceGammaRamp)(PHYSDEV,LPVOID);
- INT (*pSetMapMode)(PHYSDEV,INT);
- DWORD (*pSetMapperFlags)(PHYSDEV,DWORD);
- COLORREF (*pSetPixel)(PHYSDEV,INT,INT,COLORREF);
- BOOL (*pSetPixelFormat)(PHYSDEV,INT,const PIXELFORMATDESCRIPTOR *);
- INT (*pSetPolyFillMode)(PHYSDEV,INT);
- INT (*pSetROP2)(PHYSDEV,INT);
- INT (*pSetRelAbs)(PHYSDEV,INT);
- INT (*pSetStretchBltMode)(PHYSDEV,INT);
- UINT (*pSetTextAlign)(PHYSDEV,UINT);
- INT (*pSetTextCharacterExtra)(PHYSDEV,INT);
- DWORD (*pSetTextColor)(PHYSDEV,DWORD);
- INT (*pSetTextJustification)(PHYSDEV,INT,INT);
- INT (*pSetViewportExt)(PHYSDEV,INT,INT);
- INT (*pSetViewportOrg)(PHYSDEV,INT,INT);
- INT (*pSetWindowExt)(PHYSDEV,INT,INT);
- INT (*pSetWindowOrg)(PHYSDEV,INT,INT);
- BOOL (*pSetWorldTransform)(PHYSDEV,const XFORM*);
- INT (*pStartDoc)(PHYSDEV,const DOCINFOA*);
- INT (*pStartPage)(PHYSDEV);
- BOOL (*pStretchBlt)(PHYSDEV,INT,INT,INT,INT,PHYSDEV,INT,INT,INT,INT,DWORD);
- INT (*pStretchDIBits)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT,const void *,
- const BITMAPINFO*,UINT,DWORD);
- BOOL (*pStrokeAndFillPath)(PHYSDEV);
- BOOL (*pStrokePath)(PHYSDEV);
- BOOL (*pSwapBuffers)(PHYSDEV);
- BOOL (*pWidenPath)(PHYSDEV);
-} DC_FUNCTIONS;
-
-/* Certain functions will do no further processing if the driver returns this.
- Used by mfdrv for example. */
-#define GDI_NO_MORE_WORK 2
-
- /* DC hook codes */
-#define DCHC_INVALIDVISRGN 0x0001
-#define DCHC_DELETEDC 0x0002
-
-#define DCHF_INVALIDATEVISRGN 0x0001
-#define DCHF_VALIDATEVISRGN 0x0002
-
- /* DC flags */
-#define DC_SAVED 0x0002 /* It is a saved DC */
-#define DC_DIRTY 0x0004 /* hVisRgn has to be updated */
-#define DC_THUNKHOOK 0x0008 /* DC hook is in the 16-bit code */
-
-#define GDI_HEAP_SIZE 0xffe0
+typedef INT (*DEVICEFONTENUMPROC)(LPENUMLOGFONTEXW,NEWTEXTMETRICEXW *,DWORD,LPARAM);
/* extra stock object: default 1x1 bitmap for memory DCs */
#define DEFAULT_BITMAP (STOCK_LAST+1)
-/* Metafile defines */
-
-#define META_EOF 0x0000
-/* values of mtType in METAHEADER. Note however that the disk image of a disk
- based metafile has mtType == 1 */
-#define METAFILE_MEMORY 1
-#define METAFILE_DISK 2
-
/* Rounds a floating point number to integer. The world-to-viewport
* transformation process is done in floating point internally. This function
* is then used to round these coordinates to integer values.
@@ -344,15 +178,6 @@
/* World -> Device size conversion */
/* Performs a world-to-viewport transformation on the specified width (which
- * is in floating point format).
- */
-static inline void WINE_UNUSED INTERNAL_XWSTODS_FLOAT(DC *dc, FLOAT *width)
-{
- /* Perform the transformation */
- *width = *width * dc->xformWorld2Vport.eM11;
-}
-
-/* Performs a world-to-viewport transformation on the specified width (which
* is in integer format).
*/
static inline INT WINE_UNUSED INTERNAL_XWSTODS(DC *dc, INT width)
@@ -360,23 +185,11 @@
FLOAT floatWidth;
/* Perform operation with floating point */
- floatWidth = (FLOAT)width;
- INTERNAL_XWSTODS_FLOAT(dc, &floatWidth);
-
+ floatWidth = (FLOAT)width * dc->xformWorld2Vport.eM11;
/* Round to integers */
return GDI_ROUND(floatWidth);
}
-
-/* Performs a world-to-viewport transformation on the specified size (which
- * is in floating point format).
- */
-static inline void WINE_UNUSED INTERNAL_YWSTODS_FLOAT(DC *dc, FLOAT *height)
-{
- /* Perform the transformation */
- *height = *height * dc->xformWorld2Vport.eM22;
-}
-
/* Performs a world-to-viewport transformation on the specified size (which
* is in integer format).
*/
@@ -385,188 +198,15 @@
FLOAT floatHeight;
/* Perform operation with floating point */
- floatHeight = (FLOAT)height;
- INTERNAL_YWSTODS_FLOAT(dc, &floatHeight);
-
+ floatHeight = (FLOAT)height * dc->xformWorld2Vport.eM22;
/* Round to integers */
return GDI_ROUND(floatHeight);
}
-
- /* Device -> World size conversion */
-
-/* Performs a device to world transformation on the specified width (which
- * is in floating point format).
- */
-static inline void INTERNAL_XDSTOWS_FLOAT(DC *dc, FLOAT *width)
-{
- /* Perform the transformation */
- *width = *width * dc->xformVport2World.eM11;
-}
-
-/* Performs a device to world transformation on the specified width (which
- * is in integer format).
- */
-static inline INT INTERNAL_XDSTOWS(DC *dc, INT width)
-{
- FLOAT floatWidth;
-
- /* Perform operation with floating point */
- floatWidth = (FLOAT)width;
- INTERNAL_XDSTOWS_FLOAT(dc, &floatWidth);
-
- /* Round to integers */
- return GDI_ROUND(floatWidth);
-}
-
-
-/* Performs a device to world transformation on the specified size (which
- * is in floating point format).
- */
-static inline void INTERNAL_YDSTOWS_FLOAT(DC *dc, FLOAT *height)
-{
- /* Perform the transformation */
- *height = *height * dc->xformVport2World.eM22;
-}
-
-/* Performs a device to world transformation on the specified size (which
- * is in integer format).
- */
-static inline INT INTERNAL_YDSTOWS(DC *dc, INT height)
-{
- FLOAT floatHeight;
-
- /* Perform operation with floating point */
- floatHeight = (FLOAT)height;
- INTERNAL_YDSTOWS_FLOAT(dc, &floatHeight);
-
- /* Round to integers */
- return GDI_ROUND(floatHeight);
-}
-
-
- /* Device <-> logical size conversion */
-
-#define XDSTOLS(dc,x) \
- MulDiv((x), (dc)->wndExtX, (dc)->vportExtX)
-#define YDSTOLS(dc,y) \
- MulDiv((y), (dc)->wndExtY, (dc)->vportExtY)
-#define XLSTODS(dc,x) \
- MulDiv((x), (dc)->vportExtX, (dc)->wndExtX)
-#define YLSTODS(dc,y) \
- MulDiv((y), (dc)->vportExtY, (dc)->wndExtY)
-
/* GDI local heap */
-extern BOOL GDI_Init(void);
-extern void *GDI_AllocObject( WORD, WORD, HGDIOBJ *, const struct gdi_obj_funcs *funcs );
-extern void *GDI_ReallocObject( WORD, HGDIOBJ, void *obj );
-extern BOOL GDI_FreeObject( HGDIOBJ, void *obj );
extern void *GDI_GetObjPtr( HGDIOBJ, WORD );
extern void GDI_ReleaseObj( HGDIOBJ );
-extern void GDI_CheckNotLock(void);
-
-extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name );
-extern const DC_FUNCTIONS *DRIVER_get_driver( const DC_FUNCTIONS *funcs );
-extern void DRIVER_release_driver( const DC_FUNCTIONS *funcs );
-extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size );
-
-extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut );
-
-extern DC * DC_AllocDC( const DC_FUNCTIONS *funcs, WORD magic );
-extern DC * DC_GetDCPtr( HDC hdc );
-extern DC * DC_GetDCUpdate( HDC hdc );
-extern void DC_InitDC( DC * dc );
-extern void DC_UpdateXforms( DC * dc );
-
-BOOL GDI_hdc_using_object(HGDIOBJ obj, HDC hdc);
-BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc);
-
-/* bidi.c */
-
-/* Wine_GCPW Flags */
-/* Directionality -
- * LOOSE means that the paragraph dir is only set if there is no strong character.
- * FORCE means override the characters in the paragraph.
- */
-#define WINE_GCPW_FORCE_LTR 0
-#define WINE_GCPW_FORCE_RTL 1
-#define WINE_GCPW_LOOSE_LTR 2
-#define WINE_GCPW_LOOSE_RTL 3
-#define WINE_GCPW_DIR_MASK 3
-extern BOOL BIDI_Reorder( LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags,
- LPWSTR lpOutString, INT uCountOut, UINT *lpOrder );
-extern BOOL BidiAvail;
-
-/* clipping.c */
-extern void CLIPPING_UpdateGCRegion( DC * dc );
-
-/* enhmetafile.c */
-extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk );
-
-/* freetype.c */
-extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID);
-extern GdiFont WineEngCreateFontInstance(DC*, HFONT);
-extern BOOL WineEngDestroyFontInstance(HFONT handle);
-extern DWORD WineEngEnumFonts(LPLOGFONTW, DEVICEFONTENUMPROC, LPARAM);
-extern BOOL WineEngGetCharWidth(GdiFont, UINT, UINT, LPINT);
-extern DWORD WineEngGetFontData(GdiFont, DWORD, DWORD, LPVOID, DWORD);
-extern DWORD WineEngGetGlyphIndices(GdiFont font, LPCWSTR lpstr, INT count,
- LPWORD pgi, DWORD flags);
-extern DWORD WineEngGetGlyphOutline(GdiFont, UINT glyph, UINT format,
- LPGLYPHMETRICS, DWORD buflen, LPVOID buf,
- const MAT2*);
-extern UINT WineEngGetOutlineTextMetrics(GdiFont, UINT, LPOUTLINETEXTMETRICW);
-extern UINT WineEngGetTextCharsetInfo(GdiFont font, LPFONTSIGNATURE fs, DWORD flags);
-extern BOOL WineEngGetTextExtentPoint(GdiFont, LPCWSTR, INT, LPSIZE);
-extern BOOL WineEngGetTextExtentPointI(GdiFont, const WORD *, INT, LPSIZE);
-extern INT WineEngGetTextFace(GdiFont, INT, LPWSTR);
-extern BOOL WineEngGetTextMetrics(GdiFont, LPTEXTMETRICW);
-extern BOOL WineEngInit(void);
-extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID);
-
-/* metafile.c */
-extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh);
-extern HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh);
-extern METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mr, LPCSTR filename);
-
-/* region.c */
-extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y );
-
-/* palette.c */
-extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg);
-extern UINT WINAPI GDIRealizePalette( HDC hdc );
-
-/* path.c */
-
-#define PATH_IsPathOpen(path) ((path).state==PATH_Open)
-/* Returns TRUE if the specified path is in the open state, i.e. in the
- * state where points will be added to the path, or FALSE otherwise. This
- * function is implemented as a macro for performance reasons.
- */
-
-extern void PATH_InitGdiPath(GdiPath *pPath);
-extern void PATH_DestroyGdiPath(GdiPath *pPath);
-extern BOOL PATH_AssignGdiPath(GdiPath *pPathDest, const GdiPath *pPathSrc);
-
-extern BOOL PATH_MoveTo(DC *dc);
-extern BOOL PATH_LineTo(DC *dc, INT x, INT y);
-extern BOOL PATH_Rectangle(DC *dc, INT x1, INT y1, INT x2, INT y2);
-extern BOOL PATH_Ellipse(DC *dc, INT x1, INT y1, INT x2, INT y2);
-extern BOOL PATH_Arc(DC *dc, INT x1, INT y1, INT x2, INT y2,
- INT xStart, INT yStart, INT xEnd, INT yEnd, INT lines);
-extern BOOL PATH_PolyBezierTo(DC *dc, const POINT *pt, DWORD cbCount);
-extern BOOL PATH_PolyBezier(DC *dc, const POINT *pt, DWORD cbCount);
-extern BOOL PATH_PolylineTo(DC *dc, const POINT *pt, DWORD cbCount);
-extern BOOL PATH_Polyline(DC *dc, const POINT *pt, DWORD cbCount);
-extern BOOL PATH_Polygon(DC *dc, const POINT *pt, DWORD cbCount);
-extern BOOL PATH_PolyPolyline(DC *dc, const POINT *pt, const DWORD *counts, DWORD polylines);
-extern BOOL PATH_PolyPolygon(DC *dc, const POINT *pt, const INT *counts, UINT polygons);
-extern BOOL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height);
-extern BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags);
-
-/* text.c */
-extern LPWSTR FONT_mbtowc(HDC, LPCSTR, INT, INT*, UINT*);
#define WINE_GGO_GRAY16_BITMAP 0x7f
diff --git a/include/wine/wingdi16.h b/include/wine/wingdi16.h
index 12bb18c..ac6d65c 100644
--- a/include/wine/wingdi16.h
+++ b/include/wine/wingdi16.h
@@ -372,6 +372,13 @@
DWORD BkColor;
};
+/* DC hook codes */
+#define DCHC_INVALIDVISRGN 0x0001
+#define DCHC_DELETEDC 0x0002
+
+#define DCHF_INVALIDATEVISRGN 0x0001
+#define DCHF_VALIDATEVISRGN 0x0002
+
/* RenderMode */
#define RENDERMODE_NO_DISPLAY 0
#define RENDERMODE_OPEN 1
diff --git a/objects/bitmap.c b/objects/bitmap.c
index 8d36f48..7ced4f7 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -23,10 +23,11 @@
#include <string.h>
#include "wine/winbase16.h"
+#include "wine/winuser16.h"
#include "gdi.h"
#include "bitmap.h"
+#include "gdi_private.h"
#include "wine/debug.h"
-#include "wine/winuser16.h"
WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
diff --git a/objects/brush.c b/objects/brush.c
index cc308de..d9ec0bc 100644
--- a/objects/brush.c
+++ b/objects/brush.c
@@ -29,6 +29,7 @@
#include "wine/wingdi16.h"
#include "bitmap.h"
#include "wownt32.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/objects/clipping.c b/objects/clipping.c
index 11fd7bb..de15845 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -26,6 +26,7 @@
#include "wownt32.h"
#include "wine/winuser16.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(clipping);
@@ -157,7 +158,8 @@
if(dc->funcs->pOffsetClipRgn)
ret = dc->funcs->pOffsetClipRgn( dc->physDev, x, y );
else if (dc->hClipRgn) {
- ret = OffsetRgn( dc->hClipRgn, XLSTODS(dc,x), YLSTODS(dc,y));
+ ret = OffsetRgn( dc->hClipRgn, MulDiv( x, dc->vportExtX, dc->wndExtX ),
+ MulDiv( y, dc->vportExtY, dc->wndExtY ) );
CLIPPING_UpdateGCRegion( dc );
}
GDI_ReleaseObj( hdc );
diff --git a/objects/dc.c b/objects/dc.c
index 99a576e..ebd8e8d 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -32,6 +32,7 @@
#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/objects/dcvalues.c b/objects/dcvalues.c
index 2516398..09bbdad 100644
--- a/objects/dcvalues.c
+++ b/objects/dcvalues.c
@@ -28,6 +28,7 @@
#include "wownt32.h"
#include "gdi.h"
+#include "gdi_private.h"
/***********************************************************************
diff --git a/objects/dib.c b/objects/dib.c
index 43239d8..7b4ba69 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -27,6 +27,7 @@
#include "bitmap.h"
#include "gdi.h"
#include "wownt32.h"
+#include "gdi_private.h"
#include "wine/debug.h"
#include "palette.h"
diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c
index 6c5f76a..920bfbb 100644
--- a/objects/enhmetafile.c
+++ b/objects/enhmetafile.c
@@ -43,6 +43,7 @@
#include "winnls.h"
#include "winerror.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
diff --git a/objects/font.c b/objects/font.c
index fba939b..78ecd43 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -33,12 +33,42 @@
#include "winnls.h"
#include "wownt32.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(font);
WINE_DECLARE_DEBUG_CHANNEL(gdi);
+ /* Device -> World size conversion */
+
+/* Performs a device to world transformation on the specified width (which
+ * is in integer format).
+ */
+static inline INT INTERNAL_XDSTOWS(DC *dc, INT width)
+{
+ FLOAT floatWidth;
+
+ /* Perform operation with floating point */
+ floatWidth = (FLOAT)width * dc->xformVport2World.eM11;
+ /* Round to integers */
+ return GDI_ROUND(floatWidth);
+}
+
+/* Performs a device to world transformation on the specified size (which
+ * is in integer format).
+ */
+static inline INT INTERNAL_YDSTOWS(DC *dc, INT height)
+{
+ FLOAT floatHeight;
+
+ /* Perform operation with floating point */
+ floatHeight = (FLOAT)height * dc->xformVport2World.eM22;
+ /* Round to integers */
+ return GDI_ROUND(floatHeight);
+}
+
+
static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, void *obj, HDC hdc );
static INT FONT_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer );
static INT FONT_GetObjectA( HGDIOBJ handle, void *obj, INT count, LPVOID buffer );
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index 7d3add3..d66afa0 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -35,12 +35,15 @@
#include "local.h"
#include "palette.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(gdi);
#define HGDIOBJ_32(h16) ((HGDIOBJ)(ULONG_PTR)(h16))
+#define GDI_HEAP_SIZE 0xffe0
+
/***********************************************************************
* GDI stock objects
*/
diff --git a/objects/metafile.c b/objects/metafile.c
index 4e233a3..656bcd6 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -54,6 +54,7 @@
#include "wownt32.h"
#include "winreg.h"
#include "winternl.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(metafile);
diff --git a/objects/palette.c b/objects/palette.c
index 02966cf..c21e912 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -33,6 +33,7 @@
#include "wownt32.h"
#include "wine/winuser16.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "palette.h"
#include "wine/debug.h"
#include "winerror.h"
diff --git a/objects/pen.c b/objects/pen.c
index e6933b4..f15cc44 100644
--- a/objects/pen.c
+++ b/objects/pen.c
@@ -28,6 +28,7 @@
#include "wingdi.h"
#include "wine/wingdi16.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/objects/region.c b/objects/region.c
index e82db2a..336f58f 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -101,6 +101,7 @@
#include "winbase.h"
#include "wingdi.h"
#include "gdi.h"
+#include "gdi_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(region);
diff --git a/objects/text.c b/objects/text.c
index 3aa1bdf..e9c9aca 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -27,9 +27,10 @@
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winerror.h"
-#include "gdi.h"
-#include "wine/debug.h"
#include "winnls.h"
+#include "gdi.h"
+#include "gdi_private.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(text);
diff --git a/windows/dce.c b/windows/dce.c
index eda3f79..927c9de 100644
--- a/windows/dce.c
+++ b/windows/dce.c
@@ -34,7 +34,6 @@
#include <assert.h>
#include "dce.h"
#include "win.h"
-#include "gdi.h"
#include "user.h"
#include "wine/debug.h"
#include "windef.h"
diff --git a/windows/nonclient.c b/windows/nonclient.c
index 7d3a79a..185b05e 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -35,7 +35,6 @@
#include "winpos.h"
#include "nonclient.h"
#include "shellapi.h"
-#include "bitmap.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(nonclient);
diff --git a/windows/painting.c b/windows/painting.c
index bb2df1a..fb6a03c 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -31,7 +31,6 @@
#include "wownt32.h"
#include "wine/unicode.h"
#include "wine/server.h"
-#include "gdi.h"
#include "user.h"
#include "win.h"
#include "message.h"
