- Magnus: Reformat clip.c source code to better match overall coding style. No code logic change.

svn path=/trunk/; revision=33895

reactos/subsystems/win32/win32k/eng/clip.c

@@ -33,7 +33,9 @@
 #include <debug.h>
 
 static __inline int
-CompareRightDown(const PRECT r1, const PRECT r2)
+CompareRightDown(
+    const PRECT r1,
+    const PRECT r2)
 {
     int Cmp;
 
@@ -67,7 +69,9 @@ CompareRightDown(const PRECT r1, const PRECT r2)
 }
 
 static __inline int
-CompareRightUp(const PRECT r1, const PRECT r2)
+CompareRightUp(
+    const PRECT r1,
+    const PRECT r2)
 {
     int Cmp;
 
@@ -101,7 +105,9 @@ CompareRightUp(const PRECT r1, const PRECT r2)
 }
 
 static __inline int
-CompareLeftDown(const PRECT r1, const PRECT r2)
+CompareLeftDown(
+    const PRECT r1,
+    const PRECT r2)
 {
     int Cmp;
 
@@ -135,7 +141,9 @@ CompareLeftDown(const PRECT r1, const PRECT r2)
 }
 
 static __inline int
-CompareLeftUp(const PRECT r1, const PRECT r2)
+CompareLeftUp(
+    const PRECT r1,
+    const PRECT r2)
 {
     int Cmp;
 
@@ -164,12 +172,13 @@ CompareLeftUp(const PRECT r1, const PRECT r2)
             Cmp = 0;
         }
     }
-
     return Cmp;
 }
 
 static __inline int
-CompareSpans(const PSPAN Span1, const PSPAN Span2)
+CompareSpans(
+    const PSPAN Span1,
+    const PSPAN Span2)
 {
     int Cmp;
 
@@ -221,9 +230,7 @@ IntEngCreateClipRegion(ULONG count, PRECTL pRect, PRECTL rcBounds)
         {
             Clip->EnumRects.c = count;
             Clip->EnumOrder = CD_ANY;
-      for(dest = Clip->EnumRects.arcl;
+            for(dest = Clip->EnumRects.arcl;count > 0; count--, dest++, pRect++)
-          count > 0;
-          count--, dest++, pRect++)
             {
                 *dest = *pRect;
             }
@@ -249,6 +256,7 @@ IntEngCreateClipRegion(ULONG count, PRECTL pRect, PRECTL rcBounds)
             Clip->ClipObj.iDComplexity = (((rcBounds->top == rcBounds->bottom) &&
                                          (rcBounds->left == rcBounds->right))
                                          ? DC_TRIVIAL : DC_RECT);
+
             Clip->ClipObj.iFComplexity = FC_RECT;
             Clip->ClipObj.iMode = TC_RECTANGLES;
             Clip->ClipObj.rclBounds = *rcBounds;
@@ -288,7 +296,8 @@ EngDeleteClip(CLIPOBJ *ClipRegion)
  * @implemented
  */
 ULONG STDCALL
-CLIPOBJ_cEnumStart(IN CLIPOBJ* ClipObj,
+CLIPOBJ_cEnumStart(
+    IN CLIPOBJ* ClipObj,
     IN BOOL ShouldDoAll,
     IN ULONG ClipType,
     IN ULONG BuildOrder,
@@ -307,15 +316,19 @@ CLIPOBJ_cEnumStart(IN CLIPOBJ* ClipObj,
             case CD_RIGHTDOWN:
                 CompareFunc = (SORTCOMP) CompareRightDown;
                 break;
+
             case CD_RIGHTUP:
                 CompareFunc = (SORTCOMP) CompareRightUp;
                 break;
+
             case CD_LEFTDOWN:
                 CompareFunc = (SORTCOMP) CompareLeftDown;
                 break;
+
             case CD_LEFTUP:
                 CompareFunc = (SORTCOMP) CompareLeftUp;
                 break;
+
             default:
                 DPRINT1("Invalid BuildOrder %d\n", BuildOrder);
                 BuildOrder = ClipGDI->EnumOrder;
@@ -325,8 +338,7 @@ CLIPOBJ_cEnumStart(IN CLIPOBJ* ClipObj,
 
         if (NULL != CompareFunc)
         {
-	  EngSort((PBYTE) ClipGDI->EnumRects.arcl, sizeof(RECTL), ClipGDI->EnumRects.c,
+            EngSort((PBYTE) ClipGDI->EnumRects.arcl, sizeof(RECTL), ClipGDI->EnumRects.c, CompareFunc);
-	          CompareFunc);
         }
 
         ClipGDI->EnumOrder = BuildOrder;
@@ -345,7 +357,8 @@ CLIPOBJ_cEnumStart(IN CLIPOBJ* ClipObj,
  * @implemented
  */
 BOOL STDCALL
-CLIPOBJ_bEnum(IN CLIPOBJ* ClipObj,
+CLIPOBJ_bEnum(
+    IN CLIPOBJ* ClipObj,
     IN ULONG ObjSize,
     OUT ULONG *EnumRects)
 {
@@ -358,6 +371,7 @@ CLIPOBJ_bEnum(IN CLIPOBJ* ClipObj,
     nCopy = min( ClipGDI->EnumMax - ClipGDI->EnumPos,
             min( ClipGDI->EnumRects.c - ClipGDI->EnumPos,
             (ObjSize - sizeof(ULONG)) / sizeof(RECTL)));
+
     if(nCopy == 0)
     {
         return FALSE;
@@ -365,9 +379,7 @@ CLIPOBJ_bEnum(IN CLIPOBJ* ClipObj,
 
     /* copy rectangles */
     src = ClipGDI->EnumRects.arcl + ClipGDI->EnumPos;
-  for(i = 0, dest = pERects->arcl;
+    for(i = 0, dest = pERects->arcl; i < nCopy; i++, dest++, src++)
-      i < nCopy;
-      i++, dest++, src++)
     {
         *dest = *src;
     }
@@ -380,7 +392,11 @@ CLIPOBJ_bEnum(IN CLIPOBJ* ClipObj,
 }
 
 BOOLEAN FASTCALL
-ClipobjToSpans(PSPAN *Spans, UINT *Count, CLIPOBJ *ClipRegion, PRECTL Boundary)
+ClipobjToSpans(
+    PSPAN *Spans,
+    UINT *Count,
+    CLIPOBJ *ClipRegion,
+    PRECTL Boundary)
 {
     BOOL EnumMore;
     UINT i, NewCount;
@@ -441,9 +457,7 @@ ClipobjToSpans(PSPAN *Spans, UINT *Count, CLIPOBJ *ClipRegion, PRECTL Boundary)
             {
                 PSPAN dest, src;
                 UINT i = *Count;
-              for(dest = NewSpans, src = *Spans;
+                for(dest = NewSpans, src = *Spans;i > 0; i--)
-                  i > 0;
-                  i--)
                 {
                     *dest++ = *src++;
                 }