[PATCH v2 8/9] gdi32: Remove no longer used driver entry points.
Huw Davies
huw at codeweavers.com
Tue Aug 10 01:37:46 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 | 14 --------------
dlls/gdi32/driver.c | 12 ------------
dlls/gdi32/enhmfdrv/init.c | 7 -------
dlls/gdi32/font.c | 7 -------
dlls/gdi32/mapping.c | 34 ----------------------------------
dlls/gdi32/mfdrv/init.c | 7 -------
dlls/gdi32/ntgdi_private.h | 6 ------
dlls/gdi32/path.c | 7 -------
dlls/wineandroid.drv/init.c | 7 -------
dlls/winemac.drv/gdi.c | 7 -------
dlls/wineps.drv/init.c | 7 -------
dlls/winex11.drv/init.c | 7 -------
dlls/winex11.drv/xrender.c | 7 -------
include/wine/gdi_driver.h | 9 +--------
14 files changed, 1 insertion(+), 137 deletions(-)
diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c
index 467cdb144e6..e12c5ec0751 100644
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/dlls/gdi32/dibdrv/dc.c
@@ -682,8 +682,6 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_LineTo, /* pLineTo */
NULL, /* pModifyWorldTransform */
NULL, /* pMoveTo */
- NULL, /* pOffsetViewportOrg */
- NULL, /* pOffsetWindowOrg */
dibdrv_PaintRgn, /* pPaintRgn */
dibdrv_PatBlt, /* pPatBlt */
dibdrv_Pie, /* pPie */
@@ -704,7 +702,6 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_SelectBrush, /* pSelectBrush */
NULL, /* pSelectClipPath */
dibdrv_SelectFont, /* pSelectFont */
- NULL, /* pSelectPalette */
dibdrv_SelectPen, /* pSelectPen */
NULL, /* pSetBkColor */
dibdrv_SetBoundsRect, /* pSetBoundsRect */
@@ -715,10 +712,6 @@ const struct gdi_dc_funcs dib_driver =
NULL, /* pSetDeviceGammaRamp */
dibdrv_SetPixel, /* pSetPixel */
NULL, /* pSetTextColor */
- NULL, /* pSetViewportExt */
- NULL, /* pSetViewportOrg */
- NULL, /* pSetWindowExt */
- NULL, /* pSetWindowOrg */
NULL, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
@@ -1262,8 +1255,6 @@ static const struct gdi_dc_funcs window_driver =
windrv_LineTo, /* pLineTo */
NULL, /* pModifyWorldTransform */
NULL, /* pMoveTo */
- NULL, /* pOffsetViewportOrg */
- NULL, /* pOffsetWindowOrg */
windrv_PaintRgn, /* pPaintRgn */
windrv_PatBlt, /* pPatBlt */
windrv_Pie, /* pPie */
@@ -1284,7 +1275,6 @@ static const struct gdi_dc_funcs window_driver =
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
NULL, /* pSelectFont */
- NULL, /* pSelectPalette */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */
windrv_SetBoundsRect, /* pSetBoundsRect */
@@ -1295,10 +1285,6 @@ static const struct gdi_dc_funcs window_driver =
NULL, /* pSetDeviceGammaRamp */
windrv_SetPixel, /* pSetPixel */
NULL, /* pSetTextColor */
- NULL, /* pSetViewportExt */
- NULL, /* pSetViewportOrg */
- NULL, /* pSetWindowExt */
- NULL, /* pSetWindowOrg */
NULL, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 21e066630fc..eb4fd2ae99c 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -751,11 +751,6 @@ static HFONT CDECL nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags )
return font;
}
-static HPALETTE CDECL nulldrv_SelectPalette( PHYSDEV dev, HPALETTE palette, BOOL bkgnd )
-{
- return palette;
-}
-
static HPEN CDECL nulldrv_SelectPen( PHYSDEV dev, HPEN pen, const struct brush_pattern *pattern )
{
return pen;
@@ -898,8 +893,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_LineTo, /* pLineTo */
nulldrv_ModifyWorldTransform, /* pModifyWorldTransform */
nulldrv_MoveTo, /* pMoveTo */
- nulldrv_OffsetViewportOrgEx, /* pOffsetViewportOrg */
- nulldrv_OffsetWindowOrgEx, /* pOffsetWindowOrg */
nulldrv_PaintRgn, /* pPaintRgn */
nulldrv_PatBlt, /* pPatBlt */
nulldrv_Pie, /* pPie */
@@ -920,7 +913,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_SelectBrush, /* pSelectBrush */
nulldrv_SelectClipPath, /* pSelectClipPath */
nulldrv_SelectFont, /* pSelectFont */
- nulldrv_SelectPalette, /* pSelectPalette */
nulldrv_SelectPen, /* pSelectPen */
nulldrv_SetBkColor, /* pSetBkColor */
nulldrv_SetBoundsRect, /* pSetBoundsRect */
@@ -931,10 +923,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */
nulldrv_SetPixel, /* pSetPixel */
nulldrv_SetTextColor, /* pSetTextColor */
- nulldrv_SetViewportExtEx, /* pSetViewportExt */
- nulldrv_SetViewportOrgEx, /* pSetViewportOrg */
- nulldrv_SetWindowExtEx, /* pSetWindowExt */
- nulldrv_SetWindowOrgEx, /* pSetWindowOrg */
nulldrv_SetWorldTransform, /* pSetWorldTransform */
nulldrv_StartDoc, /* pStartDoc */
nulldrv_StartPage, /* pStartPage */
diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c
index 424f69cd9b4..df34ae57756 100644
--- a/dlls/gdi32/enhmfdrv/init.c
+++ b/dlls/gdi32/enhmfdrv/init.c
@@ -96,8 +96,6 @@ static const struct gdi_dc_funcs emfdrv_driver =
EMFDRV_LineTo, /* pLineTo */
EMFDRV_ModifyWorldTransform, /* pModifyWorldTransform */
NULL, /* pMoveTo */
- NULL, /* pOffsetViewportOrgEx */
- NULL, /* pOffsetWindowOrgEx */
NULL, /* pPaintRgn */
EMFDRV_PatBlt, /* pPatBlt */
EMFDRV_Pie, /* pPie */
@@ -118,7 +116,6 @@ static const struct gdi_dc_funcs emfdrv_driver =
NULL, /* pSelectBrush */
EMFDRV_SelectClipPath, /* pSelectClipPath */
EMFDRV_SelectFont, /* pSelectFont */
- NULL, /* pSelectPalette */
NULL, /* pSelectPen */
EMFDRV_SetBkColor, /* pSetBkColor */
NULL, /* pSetBoundsRect */
@@ -129,10 +126,6 @@ static const struct gdi_dc_funcs emfdrv_driver =
NULL, /* pSetDeviceGammaRamp */
EMFDRV_SetPixel, /* pSetPixel */
EMFDRV_SetTextColor, /* pSetTextColor */
- NULL, /* pSetViewportExtEx */
- NULL, /* pSetViewportOrgEx */
- NULL, /* pSetWindowExtEx */
- NULL, /* pSetWindowOrgEx */
EMFDRV_SetWorldTransform, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index b8dc2cc4b1f..2e49f19b461 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -3873,8 +3873,6 @@ const struct gdi_dc_funcs font_driver =
NULL, /* pLineTo */
NULL, /* pModifyWorldTransform */
NULL, /* pMoveTo */
- NULL, /* pOffsetViewportOrg */
- NULL, /* pOffsetWindowOrg */
NULL, /* pPaintRgn */
NULL, /* pPatBlt */
NULL, /* pPie */
@@ -3895,7 +3893,6 @@ const struct gdi_dc_funcs font_driver =
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
font_SelectFont, /* pSelectFont */
- NULL, /* pSelectPalette */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */
NULL, /* pSetBoundsRect */
@@ -3906,10 +3903,6 @@ const struct gdi_dc_funcs font_driver =
NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetPixel */
NULL, /* pSetTextColor */
- NULL, /* pSetViewportExt */
- NULL, /* pSetViewportOrg */
- NULL, /* pSetWindowExt */
- NULL, /* pSetWindowOrg */
NULL, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c
index 3dcaf3f430f..f21b965bc4b 100644
--- a/dlls/gdi32/mapping.c
+++ b/dlls/gdi32/mapping.c
@@ -82,20 +82,6 @@ static void MAPPING_FixIsotropic( DC * dc )
}
-/***********************************************************************
- * null driver fallback implementations
- */
-
-BOOL CDECL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt )
-{
- return TRUE;
-}
-
-BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt )
-{
- return TRUE;
-}
-
BOOL set_map_mode( DC *dc, int mode )
{
SIZE virtual_size, virtual_res;
@@ -155,26 +141,6 @@ BOOL set_map_mode( DC *dc, int mode )
return TRUE;
}
-BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size )
-{
- return TRUE;
-}
-
-BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt )
-{
- return TRUE;
-}
-
-BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size )
-{
- return TRUE;
-}
-
-BOOL CDECL nulldrv_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt )
-{
- return TRUE;
-}
-
BOOL CDECL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode )
{
DC *dc = get_nulldrv_dc( dev );
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c
index e6c2a905df8..17bef62018c 100644
--- a/dlls/gdi32/mfdrv/init.c
+++ b/dlls/gdi32/mfdrv/init.c
@@ -161,8 +161,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pLineTo */
NULL, /* pModifyWorldTransform */
NULL, /* pMoveTo */
- NULL, /* pOffsetViewportOrgEx */
- NULL, /* pOffsetWindowOrgEx */
NULL, /* pPaintRgn */
NULL, /* pPatBlt */
NULL, /* pPie */
@@ -183,7 +181,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pSelectBrush */
MFDRV_SelectClipPath, /* pSelectClipPath */
NULL, /* pSelectFont */
- NULL, /* pSelectPalette */
NULL, /* pSelectPen */
MFDRV_SetBkColor, /* pSetBkColor */
MFDRV_SetBoundsRect, /* pSetBoundsRect */
@@ -194,10 +191,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetPixel */
MFDRV_SetTextColor, /* pSetTextColor */
- NULL, /* pSetViewportExtEx */
- NULL, /* pSetViewportOrgEx */
- NULL, /* pSetWindowExtEx */
- NULL, /* pSetWindowOrgEx */
NULL, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h
index 62e6e5101ee..560414b93c9 100644
--- a/dlls/gdi32/ntgdi_private.h
+++ b/dlls/gdi32/ntgdi_private.h
@@ -569,8 +569,6 @@ extern BOOL CDECL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULON
void * grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN;
-extern BOOL CDECL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN;
-extern BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN;
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;
@@ -580,10 +578,6 @@ extern BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDE
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;
-extern BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN;
-extern BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN;
-extern BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN;
-extern BOOL CDECL nulldrv_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN;
diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c
index 57a93658abd..720b877e65c 100644
--- a/dlls/gdi32/path.c
+++ b/dlls/gdi32/path.c
@@ -2134,8 +2134,6 @@ const struct gdi_dc_funcs path_driver =
pathdrv_LineTo, /* pLineTo */
NULL, /* pModifyWorldTransform */
pathdrv_MoveTo, /* pMoveTo */
- NULL, /* pOffsetViewportOrg */
- NULL, /* pOffsetWindowOrg */
NULL, /* pPaintRgn */
NULL, /* pPatBlt */
pathdrv_Pie, /* pPie */
@@ -2156,7 +2154,6 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
NULL, /* pSelectFont */
- NULL, /* pSelectPalette */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */
NULL, /* pSetBoundsRect */
@@ -2167,10 +2164,6 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetPixel */
NULL, /* pSetTextColor */
- NULL, /* pSetViewportExt */
- NULL, /* pSetViewportOrg */
- NULL, /* pSetWindowExt */
- NULL, /* pSetWindowOrg */
NULL, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c
index b3d4f945993..474c3089677 100644
--- a/dlls/wineandroid.drv/init.c
+++ b/dlls/wineandroid.drv/init.c
@@ -343,8 +343,6 @@ static const struct gdi_dc_funcs android_drv_funcs =
NULL, /* pLineTo */
NULL, /* pModifyWorldTransform */
NULL, /* pMoveTo */
- NULL, /* pOffsetViewportOrg */
- NULL, /* pOffsetWindowOrg */
NULL, /* pPaintRgn */
NULL, /* pPatBlt */
NULL, /* pPie */
@@ -365,7 +363,6 @@ static const struct gdi_dc_funcs android_drv_funcs =
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
NULL, /* pSelectFont */
- NULL, /* pSelectPalette */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */
NULL, /* pSetBoundsRect */
@@ -376,10 +373,6 @@ static const struct gdi_dc_funcs android_drv_funcs =
NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetPixel */
NULL, /* pSetTextColor */
- NULL, /* pSetViewportExt */
- NULL, /* pSetViewportOrg */
- NULL, /* pSetWindowExt */
- NULL, /* pSetWindowOrg */
NULL, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c
index b657afd5943..7c635c200d9 100644
--- a/dlls/winemac.drv/gdi.c
+++ b/dlls/winemac.drv/gdi.c
@@ -323,8 +323,6 @@ static const struct gdi_dc_funcs macdrv_funcs =
NULL, /* pLineTo */
NULL, /* pModifyWorldTransform */
NULL, /* pMoveTo */
- NULL, /* pOffsetViewportOrg */
- NULL, /* pOffsetWindowOrg */
NULL, /* pPaintRgn */
NULL, /* pPatBlt */
NULL, /* pPie */
@@ -345,7 +343,6 @@ static const struct gdi_dc_funcs macdrv_funcs =
NULL, /* pSelectBrush */
NULL, /* pSelectClipPath */
NULL, /* pSelectFont */
- NULL, /* pSelectPalette */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */
NULL, /* pSetBoundsRect */
@@ -356,10 +353,6 @@ static const struct gdi_dc_funcs macdrv_funcs =
macdrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */
NULL, /* pSetPixel */
NULL, /* pSetTextColor */
- NULL, /* pSetViewportExt */
- NULL, /* pSetViewportOrg */
- NULL, /* pSetWindowExt */
- NULL, /* pSetWindowOrg */
NULL, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index e71e82e092f..673f36749ae 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -837,8 +837,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
PSDRV_LineTo, /* pLineTo */
NULL, /* pModifyWorldTransform */
NULL, /* pMoveTo */
- NULL, /* pOffsetViewportOrg */
- NULL, /* pOffsetWindowOrg */
PSDRV_PaintRgn, /* pPaintRgn */
PSDRV_PatBlt, /* pPatBlt */
PSDRV_Pie, /* pPie */
@@ -859,7 +857,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
PSDRV_SelectBrush, /* pSelectBrush */
NULL, /* pSelectClipPath */
PSDRV_SelectFont, /* pSelectFont */
- NULL, /* pSelectPalette */
PSDRV_SelectPen, /* pSelectPen */
PSDRV_SetBkColor, /* pSetBkColor */
NULL, /* pSetBoundsRect */
@@ -870,10 +867,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pSetDeviceGammaRamp */
PSDRV_SetPixel, /* pSetPixel */
PSDRV_SetTextColor, /* pSetTextColor */
- NULL, /* pSetViewportExt */
- NULL, /* pSetViewportOrg */
- NULL, /* pSetWindowExt */
- NULL, /* pSetWindowOrg */
NULL, /* pSetWorldTransform */
PSDRV_StartDoc, /* pStartDoc */
PSDRV_StartPage, /* pStartPage */
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 937286b8601..1c14d62ce3c 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -402,8 +402,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
X11DRV_LineTo, /* pLineTo */
NULL, /* pModifyWorldTransform */
NULL, /* pMoveTo */
- NULL, /* pOffsetViewportOrg */
- NULL, /* pOffsetWindowOrg */
X11DRV_PaintRgn, /* pPaintRgn */
X11DRV_PatBlt, /* pPatBlt */
X11DRV_Pie, /* pPie */
@@ -424,7 +422,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
X11DRV_SelectBrush, /* pSelectBrush */
NULL, /* pSelectClipPath */
X11DRV_SelectFont, /* pSelectFont */
- NULL, /* pSelectPalette */
X11DRV_SelectPen, /* pSelectPen */
NULL, /* pSetBkColor */
X11DRV_SetBoundsRect, /* pSetBoundsRect */
@@ -435,10 +432,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
X11DRV_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */
X11DRV_SetPixel, /* pSetPixel */
NULL, /* pSetTextColor */
- NULL, /* pSetViewportExt */
- NULL, /* pSetViewportOrg */
- NULL, /* pSetWindowExt */
- NULL, /* pSetWindowOrg */
NULL, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 3ab576ea8d5..804982d1a3c 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -2214,8 +2214,6 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pLineTo */
NULL, /* pModifyWorldTransform */
NULL, /* pMoveTo */
- NULL, /* pOffsetViewportOrg */
- NULL, /* pOffsetWindowOrg */
NULL, /* pPaintRgn */
NULL, /* pPatBlt */
NULL, /* pPie */
@@ -2236,7 +2234,6 @@ static const struct gdi_dc_funcs xrender_funcs =
xrenderdrv_SelectBrush, /* pSelectBrush */
NULL, /* pSelectClipPath */
xrenderdrv_SelectFont, /* pSelectFont */
- NULL, /* pSelectPalette */
NULL, /* pSelectPen */
NULL, /* pSetBkColor */
NULL, /* pSetBoundsRect */
@@ -2247,10 +2244,6 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetPixel */
NULL, /* pSetTextColor */
- NULL, /* pSetViewportExt */
- NULL, /* pSetViewportOrg */
- NULL, /* pSetWindowExt */
- NULL, /* pSetWindowOrg */
NULL, /* pSetWorldTransform */
NULL, /* pStartDoc */
NULL, /* pStartPage */
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index ffa730f9105..13aac87887f 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -127,8 +127,6 @@ struct gdi_dc_funcs
BOOL (CDECL *pLineTo)(PHYSDEV,INT,INT);
BOOL (CDECL *pModifyWorldTransform)(PHYSDEV,const XFORM*,DWORD);
BOOL (CDECL *pMoveTo)(PHYSDEV,INT,INT);
- BOOL (CDECL *pOffsetViewportOrgEx)(PHYSDEV,INT,INT,POINT*);
- BOOL (CDECL *pOffsetWindowOrgEx)(PHYSDEV,INT,INT,POINT*);
BOOL (CDECL *pPaintRgn)(PHYSDEV,HRGN);
BOOL (CDECL *pPatBlt)(PHYSDEV,struct bitblt_coords*,DWORD);
BOOL (CDECL *pPie)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
@@ -149,7 +147,6 @@ struct gdi_dc_funcs
HBRUSH (CDECL *pSelectBrush)(PHYSDEV,HBRUSH,const struct brush_pattern*);
BOOL (CDECL *pSelectClipPath)(PHYSDEV,INT);
HFONT (CDECL *pSelectFont)(PHYSDEV,HFONT,UINT*);
- HPALETTE (CDECL *pSelectPalette)(PHYSDEV,HPALETTE,BOOL);
HPEN (CDECL *pSelectPen)(PHYSDEV,HPEN,const struct brush_pattern*);
COLORREF (CDECL *pSetBkColor)(PHYSDEV,COLORREF);
UINT (CDECL *pSetBoundsRect)(PHYSDEV,RECT*,UINT);
@@ -160,10 +157,6 @@ struct gdi_dc_funcs
BOOL (CDECL *pSetDeviceGammaRamp)(PHYSDEV,LPVOID);
COLORREF (CDECL *pSetPixel)(PHYSDEV,INT,INT,COLORREF);
COLORREF (CDECL *pSetTextColor)(PHYSDEV,COLORREF);
- BOOL (CDECL *pSetViewportExtEx)(PHYSDEV,INT,INT,SIZE*);
- BOOL (CDECL *pSetViewportOrgEx)(PHYSDEV,INT,INT,POINT*);
- BOOL (CDECL *pSetWindowExtEx)(PHYSDEV,INT,INT,SIZE*);
- BOOL (CDECL *pSetWindowOrgEx)(PHYSDEV,INT,INT,POINT*);
BOOL (CDECL *pSetWorldTransform)(PHYSDEV,const XFORM*);
INT (CDECL *pStartDoc)(PHYSDEV,const DOCINFOW*);
INT (CDECL *pStartPage)(PHYSDEV);
@@ -183,7 +176,7 @@ struct gdi_dc_funcs
};
/* increment this when you change the DC function table */
-#define WINE_GDI_DRIVER_VERSION 58
+#define WINE_GDI_DRIVER_VERSION 59
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */
#define GDI_PRIORITY_FONT_DRV 100 /* any font driver */
--
2.23.0
More information about the wine-devel
mailing list