system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-01 22:56:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdi32: Remove no longer used driver entry points.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-08-18 11:59:24 +02:00 committed by Alexandre Julliard
parent b39d4cbe36
commit 817f116e95
12 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/gdi32/dibdrv/dc.c
View file

@ -649,7 +649,6 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_ExtTextOut, /* pExtTextOut */
dibdrv_FillPath, /* pFillPath */
NULL, /* pFillRgn */
NULL, /* pFlattenPath */
NULL, /* pFontIsLinked */
NULL, /* pFrameRgn */
NULL, /* pGetBoundsRect */
@ -697,7 +696,6 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_RoundRect, /* pRoundRect */
dibdrv_SelectBitmap, /* pSelectBitmap */
dibdrv_SelectBrush, /* pSelectBrush */
NULL, /* pSelectClipPath */
dibdrv_SelectFont, /* pSelectFont */
dibdrv_SelectPen, /* pSelectPen */
NULL, /* pSetBkColor */
@ -1218,7 +1216,6 @@ static const struct gdi_dc_funcs window_driver =
windrv_ExtTextOut, /* pExtTextOut */
NULL, /* pFillPath */
NULL, /* pFillRgn */
NULL, /* pFlattenPath */
NULL, /* pFontIsLinked */
NULL, /* pFrameRgn */
NULL, /* pGetBoundsRect */
@ -1266,7 +1263,6 @@ static const struct gdi_dc_funcs window_driver =
windrv_RoundRect, /* pRoundRect */
NULL, /* pSelectBitmap */
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
NULL, /* pSelectFont */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */

2
dlls/gdi32/driver.c
View file

@ -855,7 +855,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_ExtTextOut, /* pExtTextOut */
nulldrv_FillPath, /* pFillPath */
nulldrv_FillRgn, /* pFillRgn */
nulldrv_FlattenPath, /* pFlattenPath */
nulldrv_FontIsLinked, /* pFontIsLinked */
nulldrv_FrameRgn, /* pFrameRgn */
nulldrv_GetBoundsRect, /* pGetBoundsRect */
@ -903,7 +902,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_RoundRect, /* pRoundRect */
nulldrv_SelectBitmap, /* pSelectBitmap */
nulldrv_SelectBrush, /* pSelectBrush */
nulldrv_SelectClipPath, /* pSelectClipPath */
nulldrv_SelectFont, /* pSelectFont */
nulldrv_SelectPen, /* pSelectPen */
nulldrv_SetBkColor, /* pSetBkColor */

2
dlls/gdi32/enhmfdrv/init.c
View file

@ -63,7 +63,6 @@ static const struct gdi_dc_funcs emfdrv_driver =
EMFDRV_ExtTextOut, /* pExtTextOut */
EMFDRV_FillPath, /* pFillPath */
EMFDRV_FillRgn, /* pFillRgn */
NULL, /* pFlattenPath */
NULL, /* pFontIsLinked */
EMFDRV_FrameRgn, /* pFrameRgn */
NULL, /* pGetBoundsRect */
@ -111,7 +110,6 @@ static const struct gdi_dc_funcs emfdrv_driver =
EMFDRV_RoundRect, /* pRoundRect */
EMFDRV_SelectBitmap, /* pSelectBitmap */
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
EMFDRV_SelectFont, /* pSelectFont */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */

2
dlls/gdi32/font.c
View file

@ -3840,7 +3840,6 @@ const struct gdi_dc_funcs font_driver =
NULL, /* pExtTextOut */
NULL, /* pFillPath */
NULL, /* pFillRgn */
NULL, /* pFlattenPath */
font_FontIsLinked, /* pFontIsLinked */
NULL, /* pFrameRgn */
NULL, /* pGetBoundsRect */
@ -3888,7 +3887,6 @@ const struct gdi_dc_funcs font_driver =
NULL, /* pRoundRect */
NULL, /* pSelectBitmap */
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
font_SelectFont, /* pSelectFont */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */

2
dlls/gdi32/ntgdi_private.h
View file

@ -564,7 +564,6 @@ extern BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, con
LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) DECLSPEC_HIDDEN;
extern LONG CDECL nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN;
extern COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
@ -577,7 +576,6 @@ extern BOOL CDECL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD co
extern BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
extern INT CDECL nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height,
INT x_src, INT y_src, UINT start, UINT lines,
const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN;

12
dlls/gdi32/path.c
View file

@ -2006,11 +2006,6 @@ BOOL CDECL nulldrv_CloseFigure( PHYSDEV dev )
return FALSE;
}
BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode )
{
return TRUE;
}
BOOL CDECL nulldrv_FillPath( PHYSDEV dev )
{
if (GetPath( dev->hdc, NULL, NULL, 0 ) == -1) return FALSE;
@ -2032,11 +2027,6 @@ BOOL CDECL nulldrv_StrokePath( PHYSDEV dev )
return TRUE;
}
BOOL CDECL nulldrv_FlattenPath( PHYSDEV dev )
{
return TRUE;
}
BOOL CDECL nulldrv_WidenPath( PHYSDEV dev )
{
DC *dc = get_nulldrv_dc( dev );
@ -2082,7 +2072,6 @@ const struct gdi_dc_funcs path_driver =
pathdrv_ExtTextOut, /* pExtTextOut */
NULL, /* pFillPath */
NULL, /* pFillRgn */
NULL, /* pFlattenPath */
NULL, /* pFontIsLinked */
NULL, /* pFrameRgn */
NULL, /* pGetBoundsRect */
@ -2130,7 +2119,6 @@ const struct gdi_dc_funcs path_driver =
pathdrv_RoundRect, /* pRoundRect */
NULL, /* pSelectBitmap */
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
NULL, /* pSelectFont */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */

2
dlls/wineandroid.drv/init.c
View file

@ -310,7 +310,6 @@ static const struct gdi_dc_funcs android_drv_funcs =
NULL, /* pExtTextOut */
NULL, /* pFillPath */
NULL, /* pFillRgn */
NULL, /* pFlattenPath */
NULL, /* pFontIsLinked */
NULL, /* pFrameRgn */
NULL, /* pGetBoundsRect */
@ -358,7 +357,6 @@ static const struct gdi_dc_funcs android_drv_funcs =
NULL, /* pRoundRect */
NULL, /* pSelectBitmap */
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
NULL, /* pSelectFont */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */

2
dlls/winemac.drv/gdi.c
View file

@ -290,7 +290,6 @@ static const struct gdi_dc_funcs macdrv_funcs =
NULL, /* pExtTextOut */
NULL, /* pFillPath */
NULL, /* pFillRgn */
NULL, /* pFlattenPath */
NULL, /* pFontIsLinked */
NULL, /* pFrameRgn */
NULL, /* pGetBoundsRect */
@ -338,7 +337,6 @@ static const struct gdi_dc_funcs macdrv_funcs =
NULL, /* pRoundRect */
NULL, /* pSelectBitmap */
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
NULL, /* pSelectFont */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */

2
dlls/wineps.drv/init.c
View file

@ -804,7 +804,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
PSDRV_ExtTextOut, /* pExtTextOut */
PSDRV_FillPath, /* pFillPath */
NULL, /* pFillRgn */
NULL, /* pFlattenPath */
NULL, /* pFontIsLinked */
NULL, /* pFrameRgn */
NULL, /* pGetBoundsRect */
@ -852,7 +851,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
PSDRV_RoundRect, /* pRoundRect */
NULL, /* pSelectBitmap */
PSDRV_SelectBrush, /* pSelectBrush */
NULL, /* pSelectClipPath */
PSDRV_SelectFont, /* pSelectFont */
PSDRV_SelectPen, /* pSelectPen */
PSDRV_SetBkColor, /* pSetBkColor */

2
dlls/winex11.drv/init.c
View file

@ -369,7 +369,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
NULL, /* pExtTextOut */
X11DRV_FillPath, /* pFillPath */
NULL, /* pFillRgn */
NULL, /* pFlattenPath */
NULL, /* pFontIsLinked */
NULL, /* pFrameRgn */
NULL, /* pGetBoundsRect */
@ -417,7 +416,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
X11DRV_RoundRect, /* pRoundRect */
NULL, /* pSelectBitmap */
X11DRV_SelectBrush, /* pSelectBrush */
NULL, /* pSelectClipPath */
X11DRV_SelectFont, /* pSelectFont */
X11DRV_SelectPen, /* pSelectPen */
NULL, /* pSetBkColor */

2
dlls/winex11.drv/xrender.c
View file

@ -2181,7 +2181,6 @@ static const struct gdi_dc_funcs xrender_funcs =
xrenderdrv_ExtTextOut, /* pExtTextOut */
NULL, /* pFillPath */
NULL, /* pFillRgn */
NULL, /* pFlattenPath */
NULL, /* pFontIsLinked */
NULL, /* pFrameRgn */
NULL, /* pGetBoundsRect */
@ -2229,7 +2228,6 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pRoundRect */
NULL, /* pSelectBitmap */
xrenderdrv_SelectBrush, /* pSelectBrush */
NULL, /* pSelectClipPath */
xrenderdrv_SelectFont, /* pSelectFont */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */

4
include/wine/gdi_driver.h
View file

@ -94,7 +94,6 @@ struct gdi_dc_funcs
BOOL (CDECL *pExtTextOut)(PHYSDEV,INT,INT,UINT,const RECT*,LPCWSTR,UINT,const INT*);
BOOL (CDECL *pFillPath)(PHYSDEV);
BOOL (CDECL *pFillRgn)(PHYSDEV,HRGN,HBRUSH);
BOOL (CDECL *pFlattenPath)(PHYSDEV);
BOOL (CDECL *pFontIsLinked)(PHYSDEV);
BOOL (CDECL *pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT);
UINT (CDECL *pGetBoundsRect)(PHYSDEV,RECT*,UINT);
@ -142,7 +141,6 @@ struct gdi_dc_funcs
BOOL (CDECL *pRoundRect)(PHYSDEV,INT,INT,INT,INT,INT,INT);
HBITMAP (CDECL *pSelectBitmap)(PHYSDEV,HBITMAP);
HBRUSH (CDECL *pSelectBrush)(PHYSDEV,HBRUSH,const struct brush_pattern*);
BOOL (CDECL *pSelectClipPath)(PHYSDEV,INT);
HFONT (CDECL *pSelectFont)(PHYSDEV,HFONT,UINT*);
HPEN (CDECL *pSelectPen)(PHYSDEV,HPEN,const struct brush_pattern*);
COLORREF (CDECL *pSetBkColor)(PHYSDEV,COLORREF);
@ -172,7 +170,7 @@ struct gdi_dc_funcs
};
/* increment this when you change the DC function table */
#define WINE_GDI_DRIVER_VERSION 61
#define WINE_GDI_DRIVER_VERSION 62
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */
#define GDI_PRIORITY_FONT_DRV 100 /* any font driver */