From 3057388ff877dcf6ea18fc2355f496927bbe17e3 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 17 Aug 2021 11:39:56 +0200 Subject: [PATCH] gdi32: Remove no longer used driver entry points. Signed-off-by: Jacek Caban Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- dlls/gdi32/dc.c | 9 --------- dlls/gdi32/dibdrv/dc.c | 4 ---- dlls/gdi32/driver.c | 7 ------- dlls/gdi32/enhmfdrv/init.c | 2 -- dlls/gdi32/font.c | 2 -- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 2 -- dlls/wineandroid.drv/init.c | 2 -- dlls/winemac.drv/gdi.c | 2 -- dlls/wineps.drv/init.c | 2 -- dlls/winex11.drv/init.c | 2 -- dlls/winex11.drv/xrender.c | 2 -- include/wine/gdi_driver.h | 4 +--- 13 files changed, 1 insertion(+), 40 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 7ed7a256420..4fc1204d70c 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -393,15 +393,6 @@ void DC_UpdateXforms( DC *dc ) } -/*********************************************************************** - * nulldrv_RestoreDC - */ -BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) -{ - return TRUE; -} - - /*********************************************************************** * reset_dc_state */ diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 4237ee0e716..defb2585cc4 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -652,7 +652,6 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ NULL, /* pFrameRgn */ - NULL, /* pGdiComment */ NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ @@ -695,7 +694,6 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pRealizePalette */ dibdrv_Rectangle, /* pRectangle */ NULL, /* pResetDC */ - NULL, /* pRestoreDC */ dibdrv_RoundRect, /* pRoundRect */ dibdrv_SelectBitmap, /* pSelectBitmap */ dibdrv_SelectBrush, /* pSelectBrush */ @@ -1223,7 +1221,6 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ NULL, /* pFrameRgn */ - NULL, /* pGdiComment */ NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ @@ -1266,7 +1263,6 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pRealizePalette */ windrv_Rectangle, /* pRectangle */ NULL, /* pResetDC */ - NULL, /* pRestoreDC */ windrv_RoundRect, /* pRoundRect */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 1fe288eae2f..6d755ff03ac 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -386,11 +386,6 @@ static BOOL CDECL nulldrv_FontIsLinked( PHYSDEV dev ) return FALSE; } -static BOOL CDECL nulldrv_GdiComment( PHYSDEV dev, UINT size, const BYTE *data ) -{ - return FALSE; -} - static UINT CDECL nulldrv_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) { return DCB_RESET; @@ -863,7 +858,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_FlattenPath, /* pFlattenPath */ nulldrv_FontIsLinked, /* pFontIsLinked */ nulldrv_FrameRgn, /* pFrameRgn */ - nulldrv_GdiComment, /* pGdiComment */ nulldrv_GetBoundsRect, /* pGetBoundsRect */ nulldrv_GetCharABCWidths, /* pGetCharABCWidths */ nulldrv_GetCharABCWidthsI, /* pGetCharABCWidthsI */ @@ -906,7 +900,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_RealizePalette, /* pRealizePalette */ nulldrv_Rectangle, /* pRectangle */ nulldrv_ResetDC, /* pResetDC */ - nulldrv_RestoreDC, /* pRestoreDC */ nulldrv_RoundRect, /* pRoundRect */ nulldrv_SelectBitmap, /* pSelectBitmap */ nulldrv_SelectBrush, /* pSelectBrush */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 4bd9d831a53..5421f6009ce 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -66,7 +66,6 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_FlattenPath, /* pFlattenPath */ NULL, /* pFontIsLinked */ EMFDRV_FrameRgn, /* pFrameRgn */ - NULL, /* pGdiComment */ NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ @@ -109,7 +108,6 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pRealizePalette */ EMFDRV_Rectangle, /* pRectangle */ NULL, /* pResetDC */ - NULL, /* pRestoreDC */ EMFDRV_RoundRect, /* pRoundRect */ EMFDRV_SelectBitmap, /* pSelectBitmap */ NULL, /* pSelectBrush */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3aafc6ef241..c8d05f1a8b6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3843,7 +3843,6 @@ const struct gdi_dc_funcs font_driver = NULL, /* pFlattenPath */ font_FontIsLinked, /* pFontIsLinked */ NULL, /* pFrameRgn */ - NULL, /* pGdiComment */ NULL, /* pGetBoundsRect */ font_GetCharABCWidths, /* pGetCharABCWidths */ font_GetCharABCWidthsI, /* pGetCharABCWidthsI */ @@ -3886,7 +3885,6 @@ const struct gdi_dc_funcs font_driver = NULL, /* pRealizePalette */ NULL, /* pRectangle */ NULL, /* pResetDC */ - NULL, /* pRestoreDC */ NULL, /* pRoundRect */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 978a9a42cd3..fa9980ba8c4 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -577,7 +577,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_RestoreDC( PHYSDEV dev, INT level ) 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, diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 44833ca2cbc..fd8970f2929 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2104,7 +2104,6 @@ const struct gdi_dc_funcs path_driver = NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ NULL, /* pFrameRgn */ - NULL, /* pGdiComment */ NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ @@ -2147,7 +2146,6 @@ const struct gdi_dc_funcs path_driver = NULL, /* pRealizePalette */ pathdrv_Rectangle, /* pRectangle */ NULL, /* pResetDC */ - NULL, /* pRestoreDC */ pathdrv_RoundRect, /* pRoundRect */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 6f7c7c21504..e13745a39e4 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -313,7 +313,6 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ NULL, /* pFrameRgn */ - NULL, /* pGdiComment */ NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ @@ -356,7 +355,6 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pRealizePalette */ NULL, /* pRectangle */ NULL, /* pResetDC */ - NULL, /* pRestoreDC */ NULL, /* pRoundRect */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 7fafd36a642..49d17eba206 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -293,7 +293,6 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ NULL, /* pFrameRgn */ - NULL, /* pGdiComment */ NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ @@ -336,7 +335,6 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pRealizePalette */ NULL, /* pRectangle */ NULL, /* pResetDC */ - NULL, /* pRestoreDC */ NULL, /* pRoundRect */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 3b129c3a475..f0198c0334c 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -807,7 +807,6 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ NULL, /* pFrameRgn */ - NULL, /* pGdiComment */ NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ @@ -850,7 +849,6 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pRealizePalette */ PSDRV_Rectangle, /* pRectangle */ PSDRV_ResetDC, /* pResetDC */ - NULL, /* pRestoreDC */ PSDRV_RoundRect, /* pRoundRect */ NULL, /* pSelectBitmap */ PSDRV_SelectBrush, /* pSelectBrush */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index aa62f44e3fb..2bd2b1d9b90 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -372,7 +372,6 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ NULL, /* pFrameRgn */ - NULL, /* pGdiComment */ NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ @@ -415,7 +414,6 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_RealizePalette, /* pRealizePalette */ X11DRV_Rectangle, /* pRectangle */ NULL, /* pResetDC */ - NULL, /* pRestoreDC */ X11DRV_RoundRect, /* pRoundRect */ NULL, /* pSelectBitmap */ X11DRV_SelectBrush, /* pSelectBrush */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e7b21015139..462b3dabcd0 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2184,7 +2184,6 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ NULL, /* pFrameRgn */ - NULL, /* pGdiComment */ NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ @@ -2227,7 +2226,6 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pRealizePalette */ NULL, /* pRectangle */ NULL, /* pResetDC */ - NULL, /* pRestoreDC */ NULL, /* pRoundRect */ NULL, /* pSelectBitmap */ xrenderdrv_SelectBrush, /* pSelectBrush */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 08f294844be..1c19e320ee2 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -97,7 +97,6 @@ struct gdi_dc_funcs BOOL (CDECL *pFlattenPath)(PHYSDEV); BOOL (CDECL *pFontIsLinked)(PHYSDEV); BOOL (CDECL *pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT); - BOOL (CDECL *pGdiComment)(PHYSDEV,UINT,const BYTE*); UINT (CDECL *pGetBoundsRect)(PHYSDEV,RECT*,UINT); BOOL (CDECL *pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC); BOOL (CDECL *pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); @@ -140,7 +139,6 @@ struct gdi_dc_funcs UINT (CDECL *pRealizePalette)(PHYSDEV,HPALETTE,BOOL); BOOL (CDECL *pRectangle)(PHYSDEV,INT,INT,INT,INT); HDC (CDECL *pResetDC)(PHYSDEV,const DEVMODEW*); - BOOL (CDECL *pRestoreDC)(PHYSDEV,INT); BOOL (CDECL *pRoundRect)(PHYSDEV,INT,INT,INT,INT,INT,INT); HBITMAP (CDECL *pSelectBitmap)(PHYSDEV,HBITMAP); HBRUSH (CDECL *pSelectBrush)(PHYSDEV,HBRUSH,const struct brush_pattern*); @@ -174,7 +172,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 60 +#define WINE_GDI_DRIVER_VERSION 61 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */