Alexandre Julliard : gdi32: Fix PathToRegion and SelectClipPath behavior with an empty path.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7373a7c71da2684f1497acdb2cb2051a4448ac56
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7373a7c71da2684f1497acdb2c...

Author: Alexandre Julliard 
Date:   Thu Jun 16 00:37:01 2016 +0900

gdi32: Fix PathToRegion and SelectClipPath behavior with an empty path.

Signed-off-by: Alexandre Julliard

---

dlls/gdi32/path.c       | 43 +++++++++++--------------------------------
 dlls/gdi32/tests/path.c |  4 ++--
 2 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c
index e09cd0b..0d89cfb 100644
--- a/dlls/gdi32/path.c
+++ b/dlls/gdi32/path.c
@@ -374,9 +374,9 @@ static HRGN PATH_PathToRegion(const struct gdi_path *pPath, INT nPolyFillMode)
     INT  *pNumPointsInStroke;
     HRGN hrgn;

-    if (!(rgn_path = PATH_FlattenPath( pPath ))) return 0;
+    if (!pPath->count) return 0;

-    /* FIXME: What happens when number of points is zero? */
+    if (!(rgn_path = PATH_FlattenPath( pPath ))) return 0;

/* First pass: Find out how many strokes there are in the path */
     /* FIXME: We could eliminate this with some bookkeeping in GdiPath */
@@ -636,30 +636,20 @@ INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes, INT nSize)

/***********************************************************************
  *           PathToRegion    (GDI32.@)
- *
- * FIXME
- *   Check that SetLastError is being called correctly
- *
- * The documentation does not state this explicitly, but a test under Windows
- * shows that the region which is returned should be in device coordinates.
  */
 HRGN WINAPI PathToRegion(HDC hdc)
 {
    HRGN  hrgnRval = 0;
    DC *dc = get_dc_ptr( hdc );

-   /* Get pointer to path */
    if(!dc) return 0;

if (!dc->path) SetLastError(ERROR_CAN_NOT_COMPLETE);
    else
    {
-       if ((hrgnRval = PATH_PathToRegion(dc->path, GetPolyFillMode(hdc))))
-       {
-           /* FIXME: Should we empty the path even if conversion failed? */
-           free_gdi_path( dc->path );
-           dc->path = NULL;
-       }
+       hrgnRval = PATH_PathToRegion(dc->path, GetPolyFillMode(hdc));
+       free_gdi_path( dc->path );
+       dc->path = NULL;
    }
    release_dc_ptr( dc );
    return hrgnRval;
@@ -674,6 +664,7 @@ static BOOL PATH_FillPath( HDC hdc, const struct gdi_path *pPath )
    HRGN  hrgn;

/* Construct a region from the path and fill it */
+   if (!pPath->count) return TRUE;
    if ((hrgn = PATH_PathToRegion(pPath, GetPolyFillMode(hdc))))
    {
       /* Since PaintRgn interprets the region as being in logical coordinates
@@ -752,8 +743,6 @@ BOOL WINAPI FillPath(HDC hdc)

/***********************************************************************
  *           SelectClipPath    (GDI32.@)
- * FIXME
- *  Check that SetLastError is being called correctly
  */
 BOOL WINAPI SelectClipPath(HDC hdc, INT iMode)
 {
@@ -2116,24 +2105,14 @@ BOOL nulldrv_CloseFigure( PHYSDEV dev )

BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode )
 {
-    BOOL ret;
-    HRGN hrgn;
-    DC *dc = get_nulldrv_dc( dev );
+    BOOL ret = FALSE;
+    HRGN hrgn = PathToRegion( dev->hdc );

-    if (!dc->path)
-    {
-        SetLastError( ERROR_CAN_NOT_COMPLETE );
-        return FALSE;
-    }
-    if (!(hrgn = PATH_PathToRegion( dc->path, GetPolyFillMode(dev->hdc)))) return FALSE;
-    ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR;
-    if (ret)
+    if (hrgn)
     {
-        free_gdi_path( dc->path );
-        dc->path = NULL;
+        ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR;
+        DeleteObject( hrgn );
     }
-    /* FIXME: Should this function delete the path even if it failed? */
-    DeleteObject( hrgn );
     return ret;
 }

diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c
index f7ed012..6e7f65a 100644
--- a/dlls/gdi32/tests/path.c
+++ b/dlls/gdi32/tests/path.c
@@ -266,7 +266,7 @@ static void test_path_state(void)
     EndPath( hdc );
     SetLastError( 0xdeadbeef );
     ret = SelectClipPath( hdc, RGN_OR );
-    todo_wine ok( !ret, "SelectClipPath succeeded on empty path\n" );
+    ok( !ret, "SelectClipPath succeeded on empty path\n" );
     ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() );
     ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" );

@@ -282,7 +282,7 @@ static void test_path_state(void)
     EndPath( hdc );
     SetLastError( 0xdeadbeef );
     rgn = PathToRegion( hdc );
-    todo_wine ok( !rgn, "PathToRegion succeeded on empty path\n" );
+    ok( !rgn, "PathToRegion succeeded on empty path\n" );
     ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() );
     DeleteObject( rgn );
     ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" );