From 05df86a38f90441cca1e07c7d1101bd5088c8466 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 4 Mar 2004 20:41:12 +0000 Subject: [PATCH] Moved more GDI definitions to gdi_private.h. Get rid of bitmap.h and palette.h. --- dlls/ddraw/dsurface/dib.c | 5 +- dlls/gdi/enhmfdrv/bitblt.c | 1 - dlls/gdi/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi/enhmfdrv/objects.c | 2 +- dlls/gdi/gdi_private.h | 107 +++++++++++++++++++++++++ dlls/gdi/mfdrv/bitblt.c | 1 - dlls/gdi/mfdrv/metafiledrv.h | 1 + dlls/gdi/mfdrv/objects.c | 6 +- dlls/gdi/painting.c | 1 - dlls/gdi/wing.c | 6 +- dlls/ttydrv/palette.c | 2 +- dlls/x11drv/bitmap.c | 1 - dlls/x11drv/brush.c | 2 +- dlls/x11drv/dib.c | 2 +- dlls/x11drv/palette.c | 1 - dlls/x11drv/x11ddraw.c | 2 +- include/bitmap.h | 52 ------------ include/gdi.h | 123 +++++++---------------------- include/palette.h | 42 ---------- objects/bitmap.c | 1 - objects/brush.c | 2 +- objects/dib.c | 2 - objects/gdiobj.c | 2 - objects/metafile.c | 2 +- objects/palette.c | 1 - 25 files changed, 155 insertions(+), 213 deletions(-) delete mode 100644 include/bitmap.h delete mode 100644 include/palette.h diff --git a/dlls/ddraw/dsurface/dib.c b/dlls/ddraw/dsurface/dib.c index 27b21d7ce92..bf333a9f2ce 100644 --- a/dlls/ddraw/dsurface/dib.c +++ b/dlls/ddraw/dsurface/dib.c @@ -28,7 +28,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "winerror.h" -#include "bitmap.h" #include "wine/debug.h" #include "ddraw_private.h" #include "dsurface/main.h" @@ -36,6 +35,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +/* FIXME */ +extern HBITMAP DIB_CreateDIBSection( HDC hdc, BITMAPINFO *bmi, UINT usage, LPVOID *bits, + HANDLE section, DWORD offset, DWORD ovr_pitch ); + static ICOM_VTABLE(IDirectDrawSurface7) DIB_IDirectDrawSurface7_VTable; /* Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. */ diff --git a/dlls/gdi/enhmfdrv/bitblt.c b/dlls/gdi/enhmfdrv/bitblt.c index 7759c621c89..45641fcdd01 100644 --- a/dlls/gdi/enhmfdrv/bitblt.c +++ b/dlls/gdi/enhmfdrv/bitblt.c @@ -26,7 +26,6 @@ #include "wingdi.h" #include "gdi.h" #include "enhmetafiledrv.h" -#include "bitmap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); diff --git a/dlls/gdi/enhmfdrv/enhmetafiledrv.h b/dlls/gdi/enhmfdrv/enhmetafiledrv.h index d9c8bfc9942..9d8383ab9ca 100644 --- a/dlls/gdi/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi/enhmfdrv/enhmetafiledrv.h @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "gdi.h" +#include "gdi_private.h" /* Enhanced Metafile driver physical DC */ diff --git a/dlls/gdi/enhmfdrv/objects.c b/dlls/gdi/enhmfdrv/objects.c index 85603769de3..f143abe3f8f 100644 --- a/dlls/gdi/enhmfdrv/objects.c +++ b/dlls/gdi/enhmfdrv/objects.c @@ -22,7 +22,7 @@ #include #include -#include "bitmap.h" +#include "gdi.h" #include "enhmfdrv/enhmetafiledrv.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi/gdi_private.h b/dlls/gdi/gdi_private.h index 7957db5dff7..5049f7cb2f7 100644 --- a/dlls/gdi/gdi_private.h +++ b/dlls/gdi/gdi_private.h @@ -46,6 +46,8 @@ struct hdc_list /* Device functions for the Wine driver interface */ +typedef struct { int opaque; } *PHYSDEV; /* PHYSDEV is an opaque pointer */ + typedef struct tagDC_FUNCS { INT (*pAbortDoc)(PHYSDEV); @@ -170,6 +172,92 @@ typedef struct tagDC_FUNCS BOOL (*pWidenPath)(PHYSDEV); } DC_FUNCTIONS; +/* It should not be necessary to access the contents of the GdiPath + * structure directly; if you find that the exported functions don't + * allow you to do what you want, then please place a new exported + * function that does this job in path.c. + */ +typedef enum tagGdiPathState +{ + PATH_Null, + PATH_Open, + PATH_Closed +} GdiPathState; + +typedef struct tagGdiPath +{ + GdiPathState state; + POINT *pPoints; + BYTE *pFlags; + int numEntriesUsed, numEntriesAllocated; + BOOL newStroke; +} GdiPath; + +typedef struct tagGdiFont *GdiFont; + +typedef struct tagDC +{ + GDIOBJHDR header; + HDC hSelf; /* Handle to this DC */ + const struct tagDC_FUNCS *funcs; /* DC function table */ + PHYSDEV physDev; /* Physical device (driver-specific) */ + INT saveLevel; + DWORD dwHookData; + FARPROC16 hookProc; /* the original SEGPTR ... */ + DCHOOKPROC hookThunk; /* ... and the thunk to call it */ + + INT wndOrgX; /* Window origin */ + INT wndOrgY; + INT wndExtX; /* Window extent */ + INT wndExtY; + INT vportOrgX; /* Viewport origin */ + INT vportOrgY; + INT vportExtX; /* Viewport extent */ + INT vportExtY; + + int flags; + HRGN hClipRgn; /* Clip region (may be 0) */ + HRGN hVisRgn; /* Visible region (must never be 0) */ + HPEN hPen; + HBRUSH hBrush; + HFONT hFont; + HBITMAP hBitmap; + HANDLE hDevice; + HPALETTE hPalette; + + GdiFont gdiFont; + GdiPath path; + + WORD ROPmode; + WORD polyFillMode; + WORD stretchBltMode; + WORD relAbsMode; + WORD backgroundMode; + COLORREF backgroundColor; + COLORREF textColor; + COLORREF dcBrushColor; + COLORREF dcPenColor; + short brushOrgX; + short brushOrgY; + + WORD textAlign; /* Text alignment from SetTextAlign() */ + INT charExtra; /* Spacing from SetTextCharacterExtra() */ + INT breakExtra; /* breakTotalExtra / breakCount */ + INT breakRem; /* breakTotalExtra % breakCount */ + INT MapMode; + INT GraphicsMode; /* Graphics mode */ + ABORTPROC pAbortProc; /* AbortProc for Printing */ + ABORTPROC16 pAbortProc16; + INT CursPosX; /* Current position */ + INT CursPosY; + INT ArcDirection; + XFORM xformWorld2Wnd; /* World-to-window transformation */ + XFORM xformWorld2Vport; /* World-to-viewport transformation */ + XFORM xformVport2World; /* Inverse of the above transformation */ + BOOL vport2WorldValid; /* Is xformVport2World valid? */ + RECT BoundsRect; /* Current bounding rect */ +} DC; + /* DC flags */ #define DC_SAVED 0x0002 /* It is a saved DC */ #define DC_DIRTY 0x0004 /* hVisRgn has to be updated */ @@ -180,6 +268,15 @@ typedef struct tagDC_FUNCS Used by mfdrv for example. */ #define GDI_NO_MORE_WORK 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. + */ +static inline INT WINE_UNUSED GDI_ROUND(FLOAT val) +{ + return (int)floor(val + 0.5); +} + /* bidi.c */ /* Wine_GCPW Flags */ @@ -196,6 +293,10 @@ extern BOOL BIDI_Reorder( LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwW LPWSTR lpOutString, INT uCountOut, UINT *lpOrder ); extern BOOL BidiAvail; +/* bitmap.c */ +extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ); +extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, DC *dc ); + /* clipping.c */ extern void CLIPPING_UpdateGCRegion( DC * dc ); @@ -206,6 +307,11 @@ extern DC * DC_GetDCPtr( HDC hdc ); extern void DC_InitDC( DC * dc ); extern void DC_UpdateXforms( DC * dc ); +/* dib.c */ +extern int DIB_GetDIBWidthBytes( int width, int depth ); +extern int DIB_GetDIBImageBytes( int width, int height, int depth ); +extern int DIB_BitmapInfoSize( const BITMAPINFO * info, WORD coloruse ); + /* driver.c */ extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ); extern const DC_FUNCTIONS *DRIVER_get_driver( const DC_FUNCTIONS *funcs ); @@ -286,6 +392,7 @@ 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 ); +extern HPALETTE PALETTE_Init(void); /* region.c */ extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y ); diff --git a/dlls/gdi/mfdrv/bitblt.c b/dlls/gdi/mfdrv/bitblt.c index 6dee436215d..bd36a636610 100644 --- a/dlls/gdi/mfdrv/bitblt.c +++ b/dlls/gdi/mfdrv/bitblt.c @@ -23,7 +23,6 @@ #include "gdi.h" #include "mfdrv/metafiledrv.h" #include "wine/debug.h" -#include "bitmap.h" WINE_DEFAULT_DEBUG_CHANNEL(metafile); diff --git a/dlls/gdi/mfdrv/metafiledrv.h b/dlls/gdi/mfdrv/metafiledrv.h index 76b8591b844..4262ef25e89 100644 --- a/dlls/gdi/mfdrv/metafiledrv.h +++ b/dlls/gdi/mfdrv/metafiledrv.h @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "gdi.h" +#include "gdi_private.h" /* Metafile driver physical DC */ diff --git a/dlls/gdi/mfdrv/objects.c b/dlls/gdi/mfdrv/objects.c index e7aaadd388b..f5c0db11d81 100644 --- a/dlls/gdi/mfdrv/objects.c +++ b/dlls/gdi/mfdrv/objects.c @@ -21,10 +21,14 @@ #include #include #include +#include -#include "bitmap.h" +#include "windef.h" +#include "winbase.h" +#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/gdi/painting.c b/dlls/gdi/painting.c index cd37f90eeab..c574b939a22 100644 --- a/dlls/gdi/painting.c +++ b/dlls/gdi/painting.c @@ -32,7 +32,6 @@ #include "wingdi.h" #include "winerror.h" #include "gdi.h" -#include "bitmap.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi/wing.c b/dlls/gdi/wing.c index ab4611e7638..a6c24fae5b1 100644 --- a/dlls/gdi/wing.c +++ b/dlls/gdi/wing.c @@ -20,11 +20,11 @@ #include "config.h" -#include "wine/winuser16.h" -#include "bitmap.h" -#include "wine/debug.h" #include "windef.h" #include "wownt32.h" +#include "gdi.h" +#include "wine/winuser16.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wing); diff --git a/dlls/ttydrv/palette.c b/dlls/ttydrv/palette.c index 1b282cc2ab3..d0999fc8e4e 100644 --- a/dlls/ttydrv/palette.c +++ b/dlls/ttydrv/palette.c @@ -22,7 +22,7 @@ #include -#include "palette.h" +#include "gdi.h" #include "winbase.h" #include "ttydrv.h" #include "wine/debug.h" diff --git a/dlls/x11drv/bitmap.c b/dlls/x11drv/bitmap.c index 0f4e25c08ef..84eb0090a57 100644 --- a/dlls/x11drv/bitmap.c +++ b/dlls/x11drv/bitmap.c @@ -24,7 +24,6 @@ #include #include #include "gdi.h" -#include "bitmap.h" #include "wine/debug.h" #include "x11drv.h" #include "wingdi.h" diff --git a/dlls/x11drv/brush.c b/dlls/x11drv/brush.c index 65b114b892c..ef0e48b9175 100644 --- a/dlls/x11drv/brush.c +++ b/dlls/x11drv/brush.c @@ -22,7 +22,7 @@ #include -#include "bitmap.h" +#include "gdi.h" #include "x11drv.h" #include "wine/debug.h" diff --git a/dlls/x11drv/dib.c b/dlls/x11drv/dib.c index e33f91e642c..04a0a38fc1d 100644 --- a/dlls/x11drv/dib.c +++ b/dlls/x11drv/dib.c @@ -36,7 +36,7 @@ #include #include "windef.h" #include "winbase.h" -#include "bitmap.h" +#include "gdi.h" #include "x11drv.h" #include "wine/debug.h" diff --git a/dlls/x11drv/palette.c b/dlls/x11drv/palette.c index cda12762cd4..98180c26fd7 100644 --- a/dlls/x11drv/palette.c +++ b/dlls/x11drv/palette.c @@ -24,7 +24,6 @@ #include #include "gdi.h" -#include "palette.h" #include "windef.h" #include "winreg.h" #include "x11drv.h" diff --git a/dlls/x11drv/x11ddraw.c b/dlls/x11drv/x11ddraw.c index 914973fc32a..3d7e4570f98 100644 --- a/dlls/x11drv/x11ddraw.c +++ b/dlls/x11drv/x11ddraw.c @@ -34,7 +34,7 @@ #include "windef.h" #include "wingdi.h" #include "ddrawi.h" -#include "bitmap.h" +#include "gdi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/include/bitmap.h b/include/bitmap.h deleted file mode 100644 index bc5722a0820..00000000000 --- a/include/bitmap.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * GDI bitmap definitions - * - * Copyright 1993, 1994 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_BITMAP_H -#define __WINE_BITMAP_H - -#include - - /* GDI logical bitmap object */ -typedef struct tagBITMAPOBJ -{ - GDIOBJHDR header; - BITMAP bitmap; - SIZE size; /* For SetBitmapDimension() */ - const struct tagDC_FUNCS *funcs; /* DC function table */ - void *physBitmap; /* ptr to device specific data */ - /* For device-independent bitmaps: */ - DIBSECTION *dib; - SEGPTR segptr_bits; /* segptr to DIB bits */ -} BITMAPOBJ; - - /* objects/bitmap.c */ -extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ); -extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, DC *dc ); - - /* objects/dib.c */ -extern int DIB_GetDIBWidthBytes( int width, int depth ); -extern int DIB_GetDIBImageBytes( int width, int height, int depth ); -extern int DIB_BitmapInfoSize( const BITMAPINFO * info, WORD coloruse ); -extern HBITMAP DIB_CreateDIBSection( HDC hdc, BITMAPINFO *bmi, UINT usage, LPVOID *bits, - HANDLE section, DWORD offset, DWORD ovr_pitch ); -extern void DIB_UpdateDIBSection( DC *dc, BOOL toDIB ); -extern void DIB_SelectDIBSection( DC *dc, BITMAPOBJ *bmp ); - -#endif /* __WINE_BITMAP_H */ diff --git a/include/gdi.h b/include/gdi.h index d1ff92f14a3..6bc0c4bcda2 100644 --- a/include/gdi.h +++ b/include/gdi.h @@ -66,106 +66,37 @@ typedef struct tagGDIOBJHDR struct hdc_list *hdcs; } GDIOBJHDR; - -/* It should not be necessary to access the contents of the GdiPath - * structure directly; if you find that the exported functions don't - * allow you to do what you want, then please place a new exported - * function that does this job in path.c. - */ -typedef enum tagGdiPathState -{ - PATH_Null, - PATH_Open, - PATH_Closed -} GdiPathState; - -typedef struct tagGdiPath -{ - GdiPathState state; - POINT *pPoints; - BYTE *pFlags; - int numEntriesUsed, numEntriesAllocated; - BOOL newStroke; -} GdiPath; - -typedef struct tagGdiFont *GdiFont; - -typedef struct { int opaque; } *PHYSDEV; /* PHYSDEV is an opaque pointer */ - -typedef struct tagDC -{ - GDIOBJHDR header; - HDC hSelf; /* Handle to this DC */ - const struct tagDC_FUNCS *funcs; /* DC function table */ - PHYSDEV physDev; /* Physical device (driver-specific) */ - INT saveLevel; - DWORD dwHookData; - FARPROC16 hookProc; /* the original SEGPTR ... */ - DCHOOKPROC hookThunk; /* ... and the thunk to call it */ - - INT wndOrgX; /* Window origin */ - INT wndOrgY; - INT wndExtX; /* Window extent */ - INT wndExtY; - INT vportOrgX; /* Viewport origin */ - INT vportOrgY; - INT vportExtX; /* Viewport extent */ - INT vportExtY; - - int flags; - HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hVisRgn; /* Visible region (must never be 0) */ - HPEN hPen; - HBRUSH hBrush; - HFONT hFont; - HBITMAP hBitmap; - HANDLE hDevice; - HPALETTE hPalette; - - GdiFont gdiFont; - GdiPath path; - - WORD ROPmode; - WORD polyFillMode; - WORD stretchBltMode; - WORD relAbsMode; - WORD backgroundMode; - COLORREF backgroundColor; - COLORREF textColor; - COLORREF dcBrushColor; - COLORREF dcPenColor; - short brushOrgX; - short brushOrgY; - - WORD textAlign; /* Text alignment from SetTextAlign() */ - INT charExtra; /* Spacing from SetTextCharacterExtra() */ - INT breakExtra; /* breakTotalExtra / breakCount */ - INT breakRem; /* breakTotalExtra % breakCount */ - INT MapMode; - INT GraphicsMode; /* Graphics mode */ - ABORTPROC pAbortProc; /* AbortProc for Printing */ - ABORTPROC16 pAbortProc16; - INT CursPosX; /* Current position */ - INT CursPosY; - INT ArcDirection; - XFORM xformWorld2Wnd; /* World-to-window transformation */ - XFORM xformWorld2Vport; /* World-to-viewport transformation */ - XFORM xformVport2World; /* Inverse of the above transformation */ - BOOL vport2WorldValid; /* Is xformVport2World valid? */ - RECT BoundsRect; /* Current bounding rect */ -} DC; - /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) -/* 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. - */ -static inline INT WINE_UNUSED GDI_ROUND(FLOAT val) +/* bitmap object */ + +typedef struct tagBITMAPOBJ { - return (int)floor(val + 0.5); -} + GDIOBJHDR header; + BITMAP bitmap; + SIZE size; /* For SetBitmapDimension() */ + const struct tagDC_FUNCS *funcs; /* DC function table */ + void *physBitmap; /* ptr to device specific data */ + /* For device-independent bitmaps: */ + DIBSECTION *dib; + SEGPTR segptr_bits; /* segptr to DIB bits */ +} BITMAPOBJ; + +/* palette object */ + +#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ + +#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ +#define PC_SYS_RESERVED 0x40 /* system palentry is not to be mapped to */ +#define PC_SYS_MAPPED 0x10 /* logical palentry is a direct alias for system palentry */ + +typedef struct tagPALETTEOBJ +{ + GDIOBJHDR header; + int *mapping; + LOGPALETTE logpalette; /* _MUST_ be the last field */ +} PALETTEOBJ; /* GDI local heap */ diff --git a/include/palette.h b/include/palette.h deleted file mode 100644 index 04f59080aa3..00000000000 --- a/include/palette.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * GDI palette definitions - * - * Copyright 1994 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_PALETTE_H -#define __WINE_PALETTE_H - -#include - -#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ - -#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ -#define PC_SYS_RESERVED 0x40 /* system palentry is not to be mapped to */ -#define PC_SYS_MAPPED 0x10 /* logical palentry is a direct alias for system palentry */ - - /* GDI logical palette object */ -typedef struct tagPALETTEOBJ -{ - GDIOBJHDR header; - int *mapping; - LOGPALETTE logpalette; /* _MUST_ be the last field */ -} PALETTEOBJ; - -extern HPALETTE PALETTE_Init(void); - -#endif /* __WINE_PALETTE_H */ diff --git a/objects/bitmap.c b/objects/bitmap.c index 8858c16a529..ed6c82d4f78 100644 --- a/objects/bitmap.c +++ b/objects/bitmap.c @@ -25,7 +25,6 @@ #include "wine/winbase16.h" #include "wine/winuser16.h" #include "gdi.h" -#include "bitmap.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/objects/brush.c b/objects/brush.c index d9ec0bc5be2..4fe7c82fae9 100644 --- a/objects/brush.c +++ b/objects/brush.c @@ -27,7 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "wine/wingdi16.h" -#include "bitmap.h" +#include "gdi.h" #include "wownt32.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/objects/dib.c b/objects/dib.c index eb68bedc0af..74fd3d1b695 100644 --- a/objects/dib.c +++ b/objects/dib.c @@ -24,12 +24,10 @@ #include "windef.h" #include "winbase.h" -#include "bitmap.h" #include "gdi.h" #include "wownt32.h" #include "gdi_private.h" #include "wine/debug.h" -#include "palette.h" WINE_DEFAULT_DEBUG_CHANNEL(bitmap); diff --git a/objects/gdiobj.c b/objects/gdiobj.c index 88b8d9fc28e..285d912e9aa 100644 --- a/objects/gdiobj.c +++ b/objects/gdiobj.c @@ -31,9 +31,7 @@ #include "winreg.h" #include "winerror.h" -#include "bitmap.h" #include "local.h" -#include "palette.h" #include "gdi.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/objects/metafile.c b/objects/metafile.c index a3a9594e921..1c8e70c4b0c 100644 --- a/objects/metafile.c +++ b/objects/metafile.c @@ -50,7 +50,7 @@ #include "wine/winbase16.h" #include "wine/wingdi16.h" -#include "bitmap.h" +#include "gdi.h" #include "wownt32.h" #include "winreg.h" #include "winternl.h" diff --git a/objects/palette.c b/objects/palette.c index dfca7611ea8..a406a67b960 100644 --- a/objects/palette.c +++ b/objects/palette.c @@ -34,7 +34,6 @@ #include "wine/winuser16.h" #include "gdi.h" #include "gdi_private.h" -#include "palette.h" #include "wine/debug.h" #include "winerror.h"