diff --git a/reactos/subsys/win32k/objects/fillshap.c b/reactos/subsys/win32k/objects/fillshap.c
index 01317225b43..f168eb76667 100644
--- a/reactos/subsys/win32k/objects/fillshap.c
+++ b/reactos/subsys/win32k/objects/fillshap.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fillshap.c,v 1.29 2003/08/26 12:28:53 weiden Exp $ */
+/* $Id: fillshap.c,v 1.30 2003/08/28 19:41:37 gvg Exp $ */
 
 #undef WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -271,9 +271,10 @@ NtGdiPolyPolygon(HDC            hDC,
 	    ret = IntPolygon ( dc, pt, *pc );
 		if (ret == FALSE)
 		{
+		    DC_UnlockDc ( hDC );
 			return ret;
 		}
-		(DWORD)pt+=(DWORD)pc++;
+		pt+=*pc++;
 	}
     DC_UnlockDc ( hDC );
   }
diff --git a/reactos/subsys/win32k/objects/line.c b/reactos/subsys/win32k/objects/line.c
index 454bc8a1c4a..1866ac83656 100644
--- a/reactos/subsys/win32k/objects/line.c
+++ b/reactos/subsys/win32k/objects/line.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: line.c,v 1.22 2003/08/26 12:28:53 weiden Exp $ */
+/* $Id: line.c,v 1.23 2003/08/28 19:41:37 gvg Exp $ */
 
 // Some code from the WINE project source (www.winehq.com)
 
@@ -466,9 +466,10 @@ NtGdiPolyPolyline(HDC            hDC,
 		ret = IntPolyline ( dc, pts, *pc );
 		if (ret == FALSE)
 		{
+		    DC_UnlockDc( hDC );
 			return ret;
 		}
-		(DWORD)pts+=(DWORD)pc++;
+		pts+=*pc++;
 	}
     DC_UnlockDc( hDC );
   }