[PATCH v2 10/10] gdi32: Remove no longer used driver entry points.
Huw Davies
huw at codeweavers.com
Thu Jul 29 07:22:05 CDT 2021
From: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
---
dlls/gdi32/dibdrv/dc.c | 8 --------
dlls/gdi32/driver.c | 24 ------------------------
dlls/gdi32/enhmfdrv/init.c | 4 ----
dlls/gdi32/font.c | 4 ----
dlls/gdi32/mfdrv/init.c | 4 ----
dlls/gdi32/path.c | 4 ----
dlls/wineandroid.drv/init.c | 4 ----
dlls/winemac.drv/gdi.c | 4 ----
dlls/wineps.drv/init.c | 4 ----
dlls/winex11.drv/init.c | 4 ----
dlls/winex11.drv/xrender.c | 4 ----
include/wine/gdi_driver.h | 6 +-----
12 files changed, 1 insertion(+), 73 deletions(-)
diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c
index b9332b32d58..d05c50aab7b 100644
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/dlls/gdi32/dibdrv/dc.c
@@ -713,7 +713,6 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_SelectFont, /* pSelectFont */
NULL, /* pSelectPalette */
dibdrv_SelectPen, /* pSelectPen */
- NULL, /* pSetArcDirection */
NULL, /* pSetBkColor */
dibdrv_SetBoundsRect, /* pSetBoundsRect */
dibdrv_SetDCBrushColor, /* pSetDCBrushColor */
@@ -725,9 +724,6 @@ const struct gdi_dc_funcs dib_driver =
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
dibdrv_SetPixel, /* pSetPixel */
- NULL, /* pSetPolyFillMode */
- NULL, /* pSetRelAbs */
- NULL, /* pSetStretchBltMode */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
@@ -1309,7 +1305,6 @@ static const struct gdi_dc_funcs window_driver =
NULL, /* pSelectFont */
NULL, /* pSelectPalette */
NULL, /* pSelectPen */
- NULL, /* pSetArcDirection */
NULL, /* pSetBkColor */
windrv_SetBoundsRect, /* pSetBoundsRect */
NULL, /* pSetDCBrushColor */
@@ -1321,9 +1316,6 @@ static const struct gdi_dc_funcs window_driver =
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
windrv_SetPixel, /* pSetPixel */
- NULL, /* pSetPolyFillMode */
- NULL, /* pSetRelAbs */
- NULL, /* pSetStretchBltMode */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index b5cb80dce65..ddc39bd1825 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -761,11 +761,6 @@ static HPEN CDECL nulldrv_SelectPen( PHYSDEV dev, HPEN pen, const struct brush_p
return pen;
}
-static INT CDECL nulldrv_SetArcDirection( PHYSDEV dev, INT dir )
-{
- return dir;
-}
-
static COLORREF CDECL nulldrv_SetBkColor( PHYSDEV dev, COLORREF color )
{
return color;
@@ -822,21 +817,6 @@ static COLORREF CDECL nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF colo
return color;
}
-static INT CDECL nulldrv_SetPolyFillMode( PHYSDEV dev, INT mode )
-{
- return mode;
-}
-
-static INT CDECL nulldrv_SetRelAbs( PHYSDEV dev, INT mode )
-{
- return mode;
-}
-
-static INT CDECL nulldrv_SetStretchBltMode( PHYSDEV dev, INT mode )
-{
- return mode;
-}
-
static INT CDECL nulldrv_SetTextCharacterExtra( PHYSDEV dev, INT extra )
{
return extra;
@@ -980,7 +960,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_SelectFont, /* pSelectFont */
nulldrv_SelectPalette, /* pSelectPalette */
nulldrv_SelectPen, /* pSelectPen */
- nulldrv_SetArcDirection, /* pSetArcDirection */
nulldrv_SetBkColor, /* pSetBkColor */
nulldrv_SetBoundsRect, /* pSetBoundsRect */
nulldrv_SetDCBrushColor, /* pSetDCBrushColor */
@@ -992,9 +971,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_SetMapMode, /* pSetMapMode */
nulldrv_SetMapperFlags, /* pSetMapperFlags */
nulldrv_SetPixel, /* pSetPixel */
- nulldrv_SetPolyFillMode, /* pSetPolyFillMode */
- nulldrv_SetRelAbs, /* pSetRelAbs */
- nulldrv_SetStretchBltMode, /* pSetStretchBltMode */
nulldrv_SetTextCharacterExtra, /* pSetTextCharacterExtra */
nulldrv_SetTextColor, /* pSetTextColor */
nulldrv_SetTextJustification, /* pSetTextJustification */
diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c
index 3eb01025e50..516c6c4e884 100644
--- a/dlls/gdi32/enhmfdrv/init.c
+++ b/dlls/gdi32/enhmfdrv/init.c
@@ -127,7 +127,6 @@ static const struct gdi_dc_funcs emfdrv_driver =
EMFDRV_SelectFont, /* pSelectFont */
EMFDRV_SelectPalette, /* pSelectPalette */
EMFDRV_SelectPen, /* pSelectPen */
- NULL, /* pSetArcDirection */
EMFDRV_SetBkColor, /* pSetBkColor */
NULL, /* pSetBoundsRect */
EMFDRV_SetDCBrushColor, /* pSetDCBrushColor*/
@@ -139,9 +138,6 @@ static const struct gdi_dc_funcs emfdrv_driver =
EMFDRV_SetMapMode, /* pSetMapMode */
EMFDRV_SetMapperFlags, /* pSetMapperFlags */
EMFDRV_SetPixel, /* pSetPixel */
- NULL, /* pSetPolyFillMode */
- NULL, /* pSetRelAbs */
- NULL, /* pSetStretchBltMode */
NULL, /* pSetTextCharacterExtra */
EMFDRV_SetTextColor, /* pSetTextColor */
EMFDRV_SetTextJustification, /* pSetTextJustification */
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index fd1f25025b6..bbf55724013 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -3904,7 +3904,6 @@ const struct gdi_dc_funcs font_driver =
font_SelectFont, /* pSelectFont */
NULL, /* pSelectPalette */
NULL, /* pSelectPen */
- NULL, /* pSetArcDirection */
NULL, /* pSetBkColor */
NULL, /* pSetBoundsRect */
NULL, /* pSetDCBrushColor */
@@ -3916,9 +3915,6 @@ const struct gdi_dc_funcs font_driver =
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */
- NULL, /* pSetPolyFillMode */
- NULL, /* pSetRelAbs */
- NULL, /* pSetStretchBltMode */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c
index 12ea0f55948..31a0297c9e3 100644
--- a/dlls/gdi32/mfdrv/init.c
+++ b/dlls/gdi32/mfdrv/init.c
@@ -190,7 +190,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
MFDRV_SelectFont, /* pSelectFont */
MFDRV_SelectPalette, /* pSelectPalette */
MFDRV_SelectPen, /* pSelectPen */
- NULL, /* pSetArcDirection */
MFDRV_SetBkColor, /* pSetBkColor */
MFDRV_SetBoundsRect, /* pSetBoundsRect */
MFDRV_SetDCBrushColor, /* pSetDCBrushColor*/
@@ -202,9 +201,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
MFDRV_SetMapMode, /* pSetMapMode */
MFDRV_SetMapperFlags, /* pSetMapperFlags */
NULL, /* pSetPixel */
- NULL, /* pSetPolyFillMode */
- NULL, /* pSetRelAbs */
- NULL, /* pSetStretchBltMode */
MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */
MFDRV_SetTextColor, /* pSetTextColor */
MFDRV_SetTextJustification, /* pSetTextJustification */
diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c
index b9414967982..8a0369a82d0 100644
--- a/dlls/gdi32/path.c
+++ b/dlls/gdi32/path.c
@@ -2165,7 +2165,6 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pSelectFont */
NULL, /* pSelectPalette */
NULL, /* pSelectPen */
- NULL, /* pSetArcDirection */
NULL, /* pSetBkColor */
NULL, /* pSetBoundsRect */
NULL, /* pSetDCBrushColor */
@@ -2177,9 +2176,6 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */
- NULL, /* pSetPolyFillMode */
- NULL, /* pSetRelAbs */
- NULL, /* pSetStretchBltMode */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c
index dd79e187670..94301a016c6 100644
--- a/dlls/wineandroid.drv/init.c
+++ b/dlls/wineandroid.drv/init.c
@@ -374,7 +374,6 @@ static const struct gdi_dc_funcs android_drv_funcs =
NULL, /* pSelectFont */
NULL, /* pSelectPalette */
NULL, /* pSelectPen */
- NULL, /* pSetArcDirection */
NULL, /* pSetBkColor */
NULL, /* pSetBoundsRect */
NULL, /* pSetDCBrushColor */
@@ -386,9 +385,6 @@ static const struct gdi_dc_funcs android_drv_funcs =
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */
- NULL, /* pSetPolyFillMode */
- NULL, /* pSetRelAbs */
- NULL, /* pSetStretchBltMode */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c
index 00f358f0985..7e03c96a256 100644
--- a/dlls/winemac.drv/gdi.c
+++ b/dlls/winemac.drv/gdi.c
@@ -354,7 +354,6 @@ static const struct gdi_dc_funcs macdrv_funcs =
NULL, /* pSelectFont */
NULL, /* pSelectPalette */
NULL, /* pSelectPen */
- NULL, /* pSetArcDirection */
NULL, /* pSetBkColor */
NULL, /* pSetBoundsRect */
NULL, /* pSetDCBrushColor */
@@ -366,9 +365,6 @@ static const struct gdi_dc_funcs macdrv_funcs =
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */
- NULL, /* pSetPolyFillMode */
- NULL, /* pSetRelAbs */
- NULL, /* pSetStretchBltMode */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 3bfb085db6b..f18a56671cc 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -868,7 +868,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
PSDRV_SelectFont, /* pSelectFont */
NULL, /* pSelectPalette */
PSDRV_SelectPen, /* pSelectPen */
- NULL, /* pSetArcDirection */
PSDRV_SetBkColor, /* pSetBkColor */
NULL, /* pSetBoundsRect */
PSDRV_SetDCBrushColor, /* pSetDCBrushColor */
@@ -880,9 +879,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
PSDRV_SetPixel, /* pSetPixel */
- NULL, /* pSetPolyFillMode */
- NULL, /* pSetRelAbs */
- NULL, /* pSetStretchBltMode */
NULL, /* pSetTextCharacterExtra */
PSDRV_SetTextColor, /* pSetTextColor */
NULL, /* pSetTextJustification */
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 51924afb9af..0f0e1849e17 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -433,7 +433,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
X11DRV_SelectFont, /* pSelectFont */
NULL, /* pSelectPalette */
X11DRV_SelectPen, /* pSelectPen */
- NULL, /* pSetArcDirection */
NULL, /* pSetBkColor */
X11DRV_SetBoundsRect, /* pSetBoundsRect */
X11DRV_SetDCBrushColor, /* pSetDCBrushColor */
@@ -445,9 +444,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
X11DRV_SetPixel, /* pSetPixel */
- NULL, /* pSetPolyFillMode */
- NULL, /* pSetRelAbs */
- NULL, /* pSetStretchBltMode */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index c09c2403631..5949588cd24 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -2245,7 +2245,6 @@ static const struct gdi_dc_funcs xrender_funcs =
xrenderdrv_SelectFont, /* pSelectFont */
NULL, /* pSelectPalette */
NULL, /* pSelectPen */
- NULL, /* pSetArcDirection */
NULL, /* pSetBkColor */
NULL, /* pSetBoundsRect */
NULL, /* pSetDCBrushColor */
@@ -2257,9 +2256,6 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */
- NULL, /* pSetPolyFillMode */
- NULL, /* pSetRelAbs */
- NULL, /* pSetStretchBltMode */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 5492fa9d1e5..2d342903cf9 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -158,7 +158,6 @@ struct gdi_dc_funcs
HFONT (CDECL *pSelectFont)(PHYSDEV,HFONT,UINT*);
HPALETTE (CDECL *pSelectPalette)(PHYSDEV,HPALETTE,BOOL);
HPEN (CDECL *pSelectPen)(PHYSDEV,HPEN,const struct brush_pattern*);
- INT (CDECL *pSetArcDirection)(PHYSDEV,INT);
COLORREF (CDECL *pSetBkColor)(PHYSDEV,COLORREF);
UINT (CDECL *pSetBoundsRect)(PHYSDEV,RECT*,UINT);
COLORREF (CDECL *pSetDCBrushColor)(PHYSDEV, COLORREF);
@@ -170,9 +169,6 @@ struct gdi_dc_funcs
INT (CDECL *pSetMapMode)(PHYSDEV,INT);
DWORD (CDECL *pSetMapperFlags)(PHYSDEV,DWORD);
COLORREF (CDECL *pSetPixel)(PHYSDEV,INT,INT,COLORREF);
- INT (CDECL *pSetPolyFillMode)(PHYSDEV,INT);
- INT (CDECL *pSetRelAbs)(PHYSDEV,INT);
- INT (CDECL *pSetStretchBltMode)(PHYSDEV,INT);
INT (CDECL *pSetTextCharacterExtra)(PHYSDEV,INT);
COLORREF (CDECL *pSetTextColor)(PHYSDEV,COLORREF);
BOOL (CDECL *pSetTextJustification)(PHYSDEV,INT,INT);
@@ -199,7 +195,7 @@ struct gdi_dc_funcs
};
/* increment this when you change the DC function table */
-#define WINE_GDI_DRIVER_VERSION 53
+#define WINE_GDI_DRIVER_VERSION 54
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */
#define GDI_PRIORITY_FONT_DRV 100 /* any font driver */
--
2.25.1
More information about the wine-devel
mailing list