Skip to content

W
wine-cw
Commit 1f5cc0e5 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

gdi32: Remove no longer used Polygon and Polyline driver entry points.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarHuw Davies <huw@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 77a6beb4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 125 deletions
dlls/gdi32/dibdrv/dc.c
View file @ 1f5cc0e5
......@@ -696,8 +696,6 @@ const struct gdi_dc_funcs dib_driver =
NULL, /* pPolyDraw */
dibdrv_PolyPolygon, /* pPolyPolygon */
dibdrv_PolyPolyline, /* pPolyPolyline */
dibdrv_Polygon, /* pPolygon */
dibdrv_Polyline, /* pPolyline */
NULL, /* pPolylineTo */
dibdrv_PutImage, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
......@@ -1102,30 +1100,6 @@ static BOOL CDECL windrv_PolyPolyline( PHYSDEV dev, const POINT *points, const D
return ret;
}
static BOOL CDECL windrv_Polygon( PHYSDEV dev, const POINT *points, INT count )
{
struct windrv_physdev *physdev = get_windrv_physdev( dev );
BOOL ret;
lock_surface( physdev );
dev = GET_NEXT_PHYSDEV( dev, pPolygon );
ret = dev->funcs->pPolygon( dev, points, count );
unlock_surface( physdev );
return ret;
}
static BOOL CDECL windrv_Polyline( PHYSDEV dev, const POINT *points, INT count )
{
struct windrv_physdev *physdev = get_windrv_physdev( dev );
BOOL ret;
lock_surface( physdev );
dev = GET_NEXT_PHYSDEV( dev, pPolyline );
ret = dev->funcs->pPolyline( dev, points, count );
unlock_surface( physdev );
return ret;
}
static DWORD CDECL windrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
const struct gdi_image_bits *bits, struct bitblt_coords *src,
struct bitblt_coords *dst, DWORD rop )
......@@ -1321,8 +1295,6 @@ static const struct gdi_dc_funcs window_driver =
NULL, /* pPolyDraw */
windrv_PolyPolygon, /* pPolyPolygon */
windrv_PolyPolyline, /* pPolyPolyline */
windrv_Polygon, /* pPolygon */
windrv_Polyline, /* pPolyline */
NULL, /* pPolylineTo */
windrv_PutImage, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
......
dlls/gdi32/dibdrv/dibdrv.h
View file @ 1f5cc0e5
......@@ -141,8 +141,6 @@ extern BOOL CDECL dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT
extern BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD polygons ) DECLSPEC_HIDDEN;
extern BOOL CDECL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts,
DWORD polylines ) DECLSPEC_HIDDEN;
extern BOOL CDECL dibdrv_Polygon( PHYSDEV dev, const POINT *pt, INT count ) DECLSPEC_HIDDEN;
extern BOOL CDECL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN;
extern DWORD CDECL dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
const struct gdi_image_bits *bits, struct bitblt_coords *src,
struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN;
......
dlls/gdi32/dibdrv/graphics.c
View file @ 1f5cc0e5
......@@ -1365,27 +1365,6 @@ done:
}
/***********************************************************************
* dibdrv_Polygon
*/
BOOL CDECL dibdrv_Polygon( PHYSDEV dev, const POINT *pt, INT count )
{
INT counts[1] = { count };
return dibdrv_PolyPolygon( dev, pt, counts, 1 );
}
/***********************************************************************
* dibdrv_Polyline
*/
BOOL CDECL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count )
{
DWORD counts[1] = { count };
if (count < 0) return FALSE;
return dibdrv_PolyPolyline( dev, pt, counts, 1 );
}
/***********************************************************************
* dibdrv_Rectangle
*/
BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
......@@ -1401,11 +1380,12 @@ BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott
if (dc->attr->graphics_mode == GM_ADVANCED)
{
const INT count = 4;
pts[0].x = pts[3].x = left;
pts[0].y = pts[1].y = top;
pts[1].x = pts[2].x = right;
pts[2].y = pts[3].y = bottom;
return dibdrv_Polygon( dev, pts, 4 );
return dibdrv_PolyPolygon( dev, pts, &count, 1 );
}
if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE;
......
dlls/gdi32/driver.c
View file @ 1f5cc0e5
......@@ -703,21 +703,6 @@ static BOOL CDECL nulldrv_PolyPolyline( PHYSDEV dev, const POINT *points, const
return TRUE;
}
static BOOL CDECL nulldrv_Polygon( PHYSDEV dev, const POINT *points, INT count )
{
INT counts[1] = { count };
return PolyPolygon( dev->hdc, points, counts, 1 );
}
static BOOL CDECL nulldrv_Polyline( PHYSDEV dev, const POINT *points, INT count )
{
DWORD counts[1] = { count };
if (count < 0) return FALSE;
return PolyPolyline( dev->hdc, points, counts, 1 );
}
static DWORD CDECL nulldrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
const struct gdi_image_bits *bits, struct bitblt_coords *src,
struct bitblt_coords *dst, DWORD rop )
......@@ -993,8 +978,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_PolyDraw, /* pPolyDraw */
nulldrv_PolyPolygon, /* pPolyPolygon */
nulldrv_PolyPolyline, /* pPolyPolyline */
nulldrv_Polygon, /* pPolygon */
nulldrv_Polyline, /* pPolyline */
nulldrv_PolylineTo, /* pPolylineTo */
nulldrv_PutImage, /* pPutImage */
nulldrv_RealizeDefaultPalette, /* pRealizeDefaultPalette */
......
dlls/gdi32/enhmfdrv/dc.c
View file @ 1f5cc0e5
......@@ -796,8 +796,6 @@ static const struct gdi_dc_funcs emfpath_driver =
emfpathdrv_PolyDraw, /* pPolyDraw */
NULL, /* pPolyPolygon */
NULL, /* pPolyPolyline */
NULL, /* pPolygon */
NULL, /* pPolyline */
emfpathdrv_PolylineTo, /* pPolylineTo */
NULL, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
......
dlls/gdi32/enhmfdrv/init.c
View file @ 1f5cc0e5
......@@ -110,8 +110,6 @@ static const struct gdi_dc_funcs emfdrv_driver =
EMFDRV_PolyDraw, /* pPolyDraw */
EMFDRV_PolyPolygon, /* pPolyPolygon */
EMFDRV_PolyPolyline, /* pPolyPolyline */
NULL, /* pPolygon */
NULL, /* pPolyline */
EMFDRV_PolylineTo, /* pPolylineTo */
NULL, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
......
dlls/gdi32/font.c
View file @ 1f5cc0e5
......@@ -3887,8 +3887,6 @@ const struct gdi_dc_funcs font_driver =
NULL, /* pPolyDraw */
NULL, /* pPolyPolygon */
NULL, /* pPolyPolyline */
NULL, /* pPolygon */
NULL, /* pPolyline */
NULL, /* pPolylineTo */
NULL, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
......
dlls/gdi32/mfdrv/init.c
View file @ 1f5cc0e5
......@@ -173,8 +173,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pPolyDraw */
NULL, /* pPolyPolygon */
NULL, /* pPolyPolyline */
NULL, /* pPolygon */
NULL, /* pPolyline */
NULL, /* pPolylineTo */
NULL, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
......
dlls/gdi32/path.c
View file @ 1f5cc0e5
......@@ -1340,22 +1340,6 @@ static BOOL CDECL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *t
/*************************************************************
* pathdrv_Polyline
*/
static BOOL CDECL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT count )
{
struct path_physdev *physdev = get_path_physdev( dev );
DC *dc = get_physdev_dc( dev );
BYTE *type;
if (count < 2) return FALSE;
if (!(type = add_log_points( dc, physdev->path, pts, count, PT_LINETO ))) return FALSE;
type[0] = PT_MOVETO;
return TRUE;
}
/*************************************************************
* pathdrv_PolylineTo
*/
static BOOL CDECL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT count )
......@@ -1369,23 +1353,6 @@ static BOOL CDECL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT count )
/*************************************************************
* pathdrv_Polygon
*/
static BOOL CDECL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT count )
{
struct path_physdev *physdev = get_path_physdev( dev );
DC *dc = get_physdev_dc( dev );
BYTE *type;
if (count < 2) return FALSE;
if (!(type = add_log_points( dc, physdev->path, pts, count, PT_LINETO ))) return FALSE;
type[0] = PT_MOVETO;
type[count - 1] = PT_LINETO | PT_CLOSEFIGURE;
return TRUE;
}
/*************************************************************
* pathdrv_PolyPolygon
*/
static BOOL CDECL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons )
......@@ -2194,8 +2161,6 @@ const struct gdi_dc_funcs path_driver =
pathdrv_PolyDraw, /* pPolyDraw */
pathdrv_PolyPolygon, /* pPolyPolygon */
pathdrv_PolyPolyline, /* pPolyPolyline */
pathdrv_Polygon, /* pPolygon */
pathdrv_Polyline, /* pPolyline */
pathdrv_PolylineTo, /* pPolylineTo */
NULL, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
......
dlls/wineandroid.drv/init.c
View file @ 1f5cc0e5
......@@ -357,8 +357,6 @@ static const struct gdi_dc_funcs android_drv_funcs =
NULL, /* pPolyDraw */
NULL, /* pPolyPolygon */
NULL, /* pPolyPolyline */
NULL, /* pPolygon */
NULL, /* pPolyline */
NULL, /* pPolylineTo */
NULL, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
......
dlls/winemac.drv/gdi.c
View file @ 1f5cc0e5
......@@ -337,8 +337,6 @@ static const struct gdi_dc_funcs macdrv_funcs =
NULL, /* pPolyDraw */
NULL, /* pPolyPolygon */
NULL, /* pPolyPolyline */
NULL, /* pPolygon */
NULL, /* pPolyline */
NULL, /* pPolylineTo */
NULL, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
......
dlls/wineps.drv/init.c
View file @ 1f5cc0e5
......@@ -851,8 +851,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pPolyDraw */
PSDRV_PolyPolygon, /* pPolyPolygon */
PSDRV_PolyPolyline, /* pPolyPolyline */
NULL, /* pPolygon */
NULL, /* pPolyline */
NULL, /* pPolylineTo */
PSDRV_PutImage, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
......
dlls/winex11.drv/init.c
View file @ 1f5cc0e5
......@@ -416,8 +416,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
NULL, /* pPolyDraw */
X11DRV_PolyPolygon, /* pPolyPolygon */
X11DRV_PolyPolyline, /* pPolyPolyline */
NULL, /* pPolygon */
NULL, /* pPolyline */
NULL, /* pPolylineTo */
X11DRV_PutImage, /* pPutImage */
X11DRV_RealizeDefaultPalette, /* pRealizeDefaultPalette */
......
dlls/winex11.drv/xrender.c
View file @ 1f5cc0e5
......@@ -2228,8 +2228,6 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pPolyDraw */
NULL, /* pPolyPolygon */
NULL, /* pPolyPolyline */
NULL, /* pPolygon */
NULL, /* pPolyline */
NULL, /* pPolylineTo */
xrenderdrv_PutImage, /* pPutImage */
NULL, /* pRealizeDefaultPalette */
......
include/wine/gdi_driver.h
View file @ 1f5cc0e5
......@@ -141,8 +141,6 @@ struct gdi_dc_funcs
BOOL (CDECL *pPolyDraw)(PHYSDEV,const POINT*,const BYTE *,DWORD);
BOOL (CDECL *pPolyPolygon)(PHYSDEV,const POINT*,const INT*,UINT);
BOOL (CDECL *pPolyPolyline)(PHYSDEV,const POINT*,const DWORD*,DWORD);
BOOL (CDECL *pPolygon)(PHYSDEV,const POINT*,INT);
BOOL (CDECL *pPolyline)(PHYSDEV,const POINT*,INT);
BOOL (CDECL *pPolylineTo)(PHYSDEV,const POINT*,INT);
DWORD (CDECL *pPutImage)(PHYSDEV,HRGN,BITMAPINFO*,const struct gdi_image_bits*,struct bitblt_coords*,struct bitblt_coords*,DWORD);
UINT (CDECL *pRealizeDefaultPalette)(PHYSDEV);
......@@ -204,7 +202,7 @@ struct gdi_dc_funcs
};
/* increment this when you change the DC function table */
#define WINE_GDI_DRIVER_VERSION 51
#define WINE_GDI_DRIVER_VERSION 52
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */
#define GDI_PRIORITY_FONT_DRV 100 /* any font driver */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment