Alexandre Julliard : win32u: Fix some prototype mismatches.

Alexandre Julliard julliard at winehq.org
Wed Jan 26 15:57:30 CST 2022


Module: wine
Branch: master
Commit: 7e792b3bcad87bfa9a45b9754ca4f63aa961f965
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7e792b3bcad87bfa9a45b9754ca4f63aa961f965

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jan 26 11:20:52 2022 +0100

win32u: Fix some prototype mismatches.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/win32u/dibdrv/dibdrv.h   | 2 +-
 dlls/win32u/dibdrv/graphics.c | 2 +-
 dlls/win32u/emfdrv.c          | 2 +-
 dlls/win32u/painting.c        | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/win32u/dibdrv/dibdrv.h b/dlls/win32u/dibdrv/dibdrv.h
index b6f6bb41098..fe96c9d17f4 100644
--- a/dlls/win32u/dibdrv/dibdrv.h
+++ b/dlls/win32u/dibdrv/dibdrv.h
@@ -138,7 +138,7 @@ extern BOOL     CDECL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWO
 extern BOOL     CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN;
 extern BOOL     CDECL dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
                                   INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN;
-extern BOOL     CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD polygons ) DECLSPEC_HIDDEN;
+extern BOOL     CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, UINT polygons ) DECLSPEC_HIDDEN;
 extern BOOL     CDECL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts,
                                            DWORD polylines ) DECLSPEC_HIDDEN;
 extern DWORD    CDECL dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c
index 410f29e8f19..32d98572801 100644
--- a/dlls/win32u/dibdrv/graphics.c
+++ b/dlls/win32u/dibdrv/graphics.c
@@ -1244,7 +1244,7 @@ BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn )
 /***********************************************************************
  *           dibdrv_PolyPolygon
  */
-BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD polygons )
+BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, UINT polygons )
 {
     dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
     DC *dc = get_physdev_dc( dev );
diff --git a/dlls/win32u/emfdrv.c b/dlls/win32u/emfdrv.c
index 8df666d81ba..f261a86e392 100644
--- a/dlls/win32u/emfdrv.c
+++ b/dlls/win32u/emfdrv.c
@@ -318,7 +318,7 @@ static BOOL CDECL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD coun
 }
 
 static BOOL CDECL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT *pt,
-                                       const DWORD *counts, UINT polys )
+                                       const DWORD *counts, DWORD polys )
 {
     /* FIXME: update bounding rect */
     return TRUE;
diff --git a/dlls/win32u/painting.c b/dlls/win32u/painting.c
index 648630cf2c0..5a080bb5a0b 100644
--- a/dlls/win32u/painting.c
+++ b/dlls/win32u/painting.c
@@ -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, &count, 1, NtGdiPolyBezier );
+        ret = NtGdiPolyPolyDraw( dev->hdc, pts, (UINT *)&count, 1, NtGdiPolyBezier );
         free( pts );
     }
     return ret;
@@ -550,7 +550,7 @@ BOOL WINAPI NtGdiInvertRgn( HDC hdc, HRGN hrgn )
  *          NtGdiPolyPolyDraw  (win32u.@)
  */
 ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts,
-                                UINT count, UINT function )
+                                DWORD count, UINT function )
 {
     PHYSDEV physdev;
     ULONG ret;
@@ -572,7 +572,7 @@ ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts
 
     case NtGdiPolyPolyline:
         physdev = GET_DC_PHYSDEV( dc, pPolyPolyline );
-        ret = physdev->funcs->pPolyPolyline( physdev, points, counts, count );
+        ret = physdev->funcs->pPolyPolyline( physdev, points, (const DWORD *)counts, count );
         break;
 
     case NtGdiPolyBezier:




More information about the wine-cvs mailing list