Skip to content

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

winex11: Don't use pPolygon graphics driver entry point.

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 1b7a15e4
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/winex11.drv/graphics.c
View file @ 3a7c1630
...@@ -1074,7 +1074,7 @@ BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) ...@@ -1074,7 +1074,7 @@ BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn )
/********************************************************************** /**********************************************************************
* X11DRV_Polygon * X11DRV_Polygon
*/ */
BOOL CDECL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) static BOOL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count )
{ {
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
int i; int i;
...@@ -1123,6 +1123,8 @@ BOOL CDECL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, ...@@ -1123,6 +1123,8 @@ BOOL CDECL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts,
POINT *points; POINT *points;
BOOL ret = FALSE; BOOL ret = FALSE;
if (polygons == 1) return X11DRV_Polygon( dev, pt, *counts );
for (i = 0; i < polygons; i++) for (i = 0; i < polygons; i++)
{ {
if (counts[i] < 2) return FALSE; if (counts[i] < 2) return FALSE;
......
dlls/winex11.drv/init.c
View file @ 3a7c1630
...@@ -416,7 +416,7 @@ static const struct gdi_dc_funcs x11drv_funcs = ...@@ -416,7 +416,7 @@ static const struct gdi_dc_funcs x11drv_funcs =
NULL, /* pPolyDraw */ NULL, /* pPolyDraw */
X11DRV_PolyPolygon, /* pPolyPolygon */ X11DRV_PolyPolygon, /* pPolyPolygon */
X11DRV_PolyPolyline, /* pPolyPolyline */ X11DRV_PolyPolyline, /* pPolyPolyline */
X11DRV_Polygon, /* pPolygon */ NULL, /* pPolygon */
NULL, /* pPolyline */ NULL, /* pPolyline */
NULL, /* pPolylineTo */ NULL, /* pPolylineTo */
X11DRV_PutImage, /* pPutImage */ X11DRV_PutImage, /* pPutImage */
......
dlls/winex11.drv/x11drv.h
View file @ 3a7c1630
...@@ -168,7 +168,6 @@ extern BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; ...@@ -168,7 +168,6 @@ extern BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right, extern BOOL CDECL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right,
INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines) DECLSPEC_HIDDEN;
extern DWORD CDECL X11DRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, extern DWORD CDECL X11DRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
......
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