[ros-diffs] [jimtabor] 22262: Cleanup coding of IntGdiPolyPolygon and IntGdiPolygon.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Wed Jun  7 05:28:44 2006
New Revision: 22262

URL: http://svn.reactos.ru/svn/reactos?rev=22262&view=rev
Log:
Cleanup coding of  IntGdiPolyPolygon and IntGdiPolygon.

Modified:
    trunk/reactos/subsystems/win32/win32k/objects/fillshap.c

Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/fillshap.c?rev=22262&r1=22261&r2=22262&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Wed Jun  7 05:28:44 2006
@@ -94,7 +94,7 @@
 	if (FillBrushObj && !(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL))
 	{
           IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush);
-	  ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(dc->w.ROPmode), UnsafePoints, Count, DestRect );
+          ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(dc->w.ROPmode), UnsafePoints, Count, DestRect );  
 	}
 	BRUSHOBJ_UnlockBrush(FillBrushObj);
 
@@ -104,35 +104,29 @@
 	if (PenBrushObj && !(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
 	{
 	  IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen);
-	  for ( CurrentPoint = 0; CurrentPoint < Count; ++CurrentPoint )
-	  {
-	    POINT To, From; //, Next;
-
-	    /* Let CurrentPoint be i
-	     * if i+1 > Count, Draw a line from Points[i] to Points[0]
-	     * Draw a line from Points[i] to Points[i+1]
-	     */
-	    From = UnsafePoints[CurrentPoint];
-	    if (Count <= CurrentPoint + 1)
-	      To = UnsafePoints[0];
-	    else
-	      To = UnsafePoints[CurrentPoint + 1];
-
-	    //DPRINT("Polygon Making line from (%d,%d) to (%d,%d)\n", From.x, From.y, To.x, To.y );
-	    ret = IntEngLineTo(&BitmapObj->SurfObj,
+
+        while(Count-- >1)
+          {
+
+// DPRINT1("Polygon Making line from (%d,%d) to (%d,%d)\n",
+//                                 UnsafePoints[0].x, UnsafePoints[0].y,
+//                                 UnsafePoints[1].x, UnsafePoints[1].y );
+                                 
+  	    ret = IntEngLineTo(&BitmapObj->SurfObj,
 			       dc->CombinedClip,
 			       &PenBrushInst.BrushObject,
-			       From.x,
-			       From.y,
-			       To.x,
-			       To.y,
+			       UnsafePoints[0].x,          /* From */
+			       UnsafePoints[0].y,
+			       UnsafePoints[1].x,          /* To */
+			       UnsafePoints[1].y,
 			       &DestRect,
 			       ROP2_TO_MIX(dc->w.ROPmode)); /* MIX */
+             if(!ret) break;
+             UnsafePoints++;
 	  }
 	}
 	PENOBJ_UnlockPen(PenBrushObj);
       }
-
       BITMAPOBJ_UnlockBitmap(BitmapObj);
 
   return ret;
@@ -144,25 +138,12 @@
                   LPINT   PolyCounts,
                   int     Count)
 {
-  int i;
-  LPPOINT pt;
-  LPINT pc;
-  BOOL ret = FALSE; // default to failure
-
-  pt = Points;
-  pc = PolyCounts;
-
-  for (i=0;i<Count;i++)
-  {
-    ret = IntGdiPolygon ( dc, pt, *pc );
-    if (ret == FALSE)
-    {
-      return ret;
-    }
-    pt+=*pc++;
-  }
-
-  return ret;
+  while(--Count >=0)
+  {
+    if(!IntGdiPolygon ( dc, Points, *PolyCounts )) return FALSE;
+    Points+=*PolyCounts++;
+  }
+  return TRUE;
 }
 
 /******************************************************************************/