Module: wine Branch: master Commit: b072f01e13fe3a6c1c3aaf0acffec3d3298eb069 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b072f01e13fe3a6c1c3aaf0ac...
Author: Eric Pouech eric.pouech@gmail.com Date: Tue Feb 1 14:04:57 2022 +0100
win32u: Change NtGdiPolyPolyDraw parameter to ULONG.
As suggested by Nikolay Sivov.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/objects.c | 2 +- dlls/win32u/font.c | 6 +++--- dlls/win32u/painting.c | 6 +++--- dlls/win32u/wrappers.c | 2 +- include/ntgdi.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ea8047a4285..d609185be76 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1438,7 +1438,7 @@ BOOL WINAPI Polygon( HDC hdc, const POINT *points, INT count ) if (is_meta_dc( hdc )) return METADC_Polygon( hdc, points, count ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_Polygon( dc_attr, points, count )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolyPolygon ); + return NtGdiPolyPolyDraw( hdc, points, (const ULONG *)&count, 1, NtGdiPolyPolygon ); }
/********************************************************************** @@ -1453,7 +1453,7 @@ BOOL WINAPI PolyPolygon( HDC hdc, const POINT *points, const INT *counts, UINT p if (is_meta_dc( hdc )) return METADC_PolyPolygon( hdc, points, counts, polygons ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolyPolygon( dc_attr, points, counts, polygons )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, (const UINT *)counts, polygons, NtGdiPolyPolygon ); + return NtGdiPolyPolyDraw( hdc, points, (const ULONG *)counts, polygons, NtGdiPolyPolygon ); }
/********************************************************************** @@ -1468,7 +1468,7 @@ BOOL WINAPI Polyline( HDC hdc, const POINT *points, INT count ) if (is_meta_dc( hdc )) return METADC_Polyline( hdc, points, count ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_Polyline( dc_attr, points, count )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolyPolyline ); + return NtGdiPolyPolyDraw( hdc, points, (const ULONG *)&count, 1, NtGdiPolyPolyline ); }
/********************************************************************** diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 42d2c202e98..50240b7b29a 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -674,7 +674,7 @@ HRGN WINAPI ExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA *dat */ HRGN WINAPI CreatePolyPolygonRgn( const POINT *points, const INT *counts, INT count, INT mode ) { - ULONG ret = NtGdiPolyPolyDraw( ULongToHandle(mode), points, (const UINT *)counts, + ULONG ret = NtGdiPolyPolyDraw( ULongToHandle(mode), points, (const ULONG *)counts, count, NtGdiPolyPolygonRgn ); return ULongToHandle( ret ); } diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index e7d2c3a13e3..b8213ac9e6a 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -5248,7 +5248,7 @@ static void draw_glyph( DC *dc, INT origin_x, INT origin_y, const GLYPHMETRICS * dp_to_lp( dc, pts, count ); for (i = 0; i < count; i += 2) { - const UINT pts_count = 2; + const ULONG pts_count = 2; NtGdiPolyPolyDraw( dc->hSelf, pts + i, &pts_count, 1, NtGdiPolyPolyline ); } free( pts ); @@ -5745,7 +5745,7 @@ done:
if (lf.lfUnderline) { - const UINT cnt = 5; + const ULONG cnt = 5; pts[0].x = x - (underlinePos + underlineWidth / 2) * sinEsc; pts[0].y = y - (underlinePos + underlineWidth / 2) * cosEsc; pts[1].x = x + width.x - (underlinePos + underlineWidth / 2) * sinEsc; @@ -5762,7 +5762,7 @@ done:
if (lf.lfStrikeOut) { - const UINT cnt = 5; + const ULONG cnt = 5; pts[0].x = x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; pts[0].y = y - (strikeoutPos + strikeoutWidth / 2) * cosEsc; pts[1].x = x + width.x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; diff --git a/dlls/win32u/painting.c b/dlls/win32u/painting.c index 5a080bb5a0b..87871e23ff0 100644 --- a/dlls/win32u/painting.c +++ b/dlls/win32u/painting.c @@ -117,7 +117,7 @@ BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) return ret; }
-static BOOL polyline( HDC hdc, const POINT *points, UINT count ) +static BOOL polyline( HDC hdc, const POINT *points, ULONG count ) { return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolyPolyline ); } @@ -147,7 +147,7 @@ BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) pts[0] = dc->attr->cur_pos; memcpy( pts + 1, points, sizeof(POINT) * count ); count++; - ret = NtGdiPolyPolyDraw( dev->hdc, pts, (UINT *)&count, 1, NtGdiPolyBezier ); + ret = NtGdiPolyPolyDraw( dev->hdc, pts, &count, 1, NtGdiPolyBezier ); free( pts ); } return ret; @@ -549,7 +549,7 @@ BOOL WINAPI NtGdiInvertRgn( HDC hdc, HRGN hrgn ) /********************************************************************** * NtGdiPolyPolyDraw (win32u.@) */ -ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts, +ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const ULONG *counts, DWORD count, UINT function ) { PHYSDEV physdev; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index fe56f5e0e3c..aaabf51a2f8 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -450,7 +450,7 @@ BOOL WINAPI NtGdiPolyDraw( HDC hdc, const POINT *points, const BYTE *types, DWOR return unix_funcs->pNtGdiPolyDraw( hdc, points, types, count ); }
-ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts, +ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const ULONG *counts, DWORD count, UINT function ) { if (!unix_funcs) return 0; diff --git a/include/ntgdi.h b/include/ntgdi.h index 4ea5549c223..d8103e3f995 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -364,7 +364,7 @@ BOOL WINAPI NtGdiPlgBlt( HDC hdc, const POINT *point, HDC hdc_src, INT x_src INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask, DWORD bk_color ); BOOL WINAPI NtGdiPolyDraw(HDC hdc, const POINT *points, const BYTE *types, DWORD count ); -ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts, +ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const ULONG *counts, DWORD count, UINT function ); BOOL WINAPI NtGdiPtInRegion( HRGN hrgn, INT x, INT y ); BOOL WINAPI NtGdiPtVisible( HDC hdc, INT x, INT y );