From: Jacek Caban jacek@codeweavers.com
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com --- dlls/gdi32/dibdrv/dc.c | 4 ---- dlls/gdi32/driver.c | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 -- dlls/gdi32/font.c | 2 -- dlls/gdi32/mapping.c | 10 ---------- dlls/gdi32/mfdrv/init.c | 2 -- dlls/gdi32/ntgdi_private.h | 2 -- 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 +--- 14 files changed, 1 insertion(+), 39 deletions(-)
diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 7a9296d58c0..467cdb144e6 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -700,8 +700,6 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pResetDC */ NULL, /* pRestoreDC */ dibdrv_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ dibdrv_SelectBitmap, /* pSelectBitmap */ dibdrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ @@ -1282,8 +1280,6 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pResetDC */ NULL, /* pRestoreDC */ windrv_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 1cefbfc3a44..21e066630fc 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -916,8 +916,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_ResetDC, /* pResetDC */ nulldrv_RestoreDC, /* pRestoreDC */ nulldrv_RoundRect, /* pRoundRect */ - nulldrv_ScaleViewportExtEx, /* pScaleViewportExt */ - nulldrv_ScaleWindowExtEx, /* pScaleWindowExt */ nulldrv_SelectBitmap, /* pSelectBitmap */ nulldrv_SelectBrush, /* pSelectBrush */ nulldrv_SelectClipPath, /* pSelectClipPath */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index b104d58b6be..433c0be6c0c 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -114,8 +114,6 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pResetDC */ EMFDRV_RestoreDC, /* pRestoreDC */ EMFDRV_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExtEx */ - NULL, /* pScaleWindowExtEx */ EMFDRV_SelectBitmap, /* pSelectBitmap */ EMFDRV_SelectBrush, /* pSelectBrush */ EMFDRV_SelectClipPath, /* pSelectClipPath */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ea49815b579..b8dc2cc4b1f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3891,8 +3891,6 @@ const struct gdi_dc_funcs font_driver = NULL, /* pResetDC */ NULL, /* pRestoreDC */ NULL, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 189481c2e3e..0c440908beb 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -111,16 +111,6 @@ BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return TRUE; }
-BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) -{ - return TRUE; -} - -BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) -{ - return TRUE; -} - BOOL set_map_mode( DC *dc, int mode ) { SIZE virtual_size, virtual_res; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index a860932d012..d606fccc84e 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -179,8 +179,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pResetDC */ MFDRV_RestoreDC, /* pRestoreDC */ NULL, /* pRoundRect */ - NULL, /* pScaleViewportExtEx */ - NULL, /* pScaleWindowExtEx */ MFDRV_SelectBitmap, /* pSelectBitmap */ MFDRV_SelectBrush, /* pSelectBrush */ MFDRV_SelectClipPath, /* pSelectClipPath */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 07b761f272f..9af4aa3d61f 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -588,8 +588,6 @@ extern BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD 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_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) 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 51ab7a3dab9..57a93658abd 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2152,8 +2152,6 @@ const struct gdi_dc_funcs path_driver = NULL, /* pResetDC */ NULL, /* pRestoreDC */ pathdrv_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index e055828af1c..b3d4f945993 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -361,8 +361,6 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pResetDC */ NULL, /* pRestoreDC */ NULL, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 4259ecc8b0b..b657afd5943 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -341,8 +341,6 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pResetDC */ NULL, /* pRestoreDC */ NULL, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 4d6e70a126f..e71e82e092f 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -855,8 +855,6 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_ResetDC, /* pResetDC */ NULL, /* pRestoreDC */ PSDRV_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ PSDRV_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 1b51da43423..937286b8601 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -420,8 +420,6 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pResetDC */ NULL, /* pRestoreDC */ X11DRV_RoundRect, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ X11DRV_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 045f0c5f64b..3ab576ea8d5 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2232,8 +2232,6 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pResetDC */ NULL, /* pRestoreDC */ NULL, /* pRoundRect */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ NULL, /* pSelectBitmap */ xrenderdrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 2f6fd4ff734..ffa730f9105 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -145,8 +145,6 @@ struct gdi_dc_funcs HDC (CDECL *pResetDC)(PHYSDEV,const DEVMODEW*); BOOL (CDECL *pRestoreDC)(PHYSDEV,INT); BOOL (CDECL *pRoundRect)(PHYSDEV,INT,INT,INT,INT,INT,INT); - BOOL (CDECL *pScaleViewportExtEx)(PHYSDEV,INT,INT,INT,INT,SIZE*); - BOOL (CDECL *pScaleWindowExtEx)(PHYSDEV,INT,INT,INT,INT,SIZE*); HBITMAP (CDECL *pSelectBitmap)(PHYSDEV,HBITMAP); HBRUSH (CDECL *pSelectBrush)(PHYSDEV,HBRUSH,const struct brush_pattern*); BOOL (CDECL *pSelectClipPath)(PHYSDEV,INT); @@ -185,7 +183,7 @@ struct gdi_dc_funcs };
/* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 57 +#define WINE_GDI_DRIVER_VERSION 58
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */