[ros-diffs] [cwittich] 26402: disable IntEngGradientFillTriangle because of an endless loop and add a FIXME

Author: cwittich
Date: Wed Apr 18 23:07:11 2007
New Revision: 26402

URL: http://svn.reactos.org/svn/reactos?rev=26402&view=rev
Log:
disable IntEngGradientFillTriangle because of an endless loop and add a FIXME

Modified:
    trunk/reactos/subsystems/win32/win32k/eng/gradient.c

Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/gradient.c (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/gradient.c Wed Apr 18 23:07:11 2007
@@ -318,19 +318,19 @@
 {
   SURFOBJ *OutputObj;
   PTRIVERTEX v1, v2, v3;
-  RECT_ENUM RectEnum;
-  BOOL EnumMore;
-  ULONG i;
+  //RECT_ENUM RectEnum;
+  //BOOL EnumMore;
+  //ULONG i;
   POINTL Translate;
   INTENG_ENTER_LEAVE EnterLeave;
   RECTL FillRect;
-  ULONG Color;
-
-  BOOL sx[NLINES];
-  LONG x[NLINES], dx[NLINES], dy[NLINES], incx[NLINES], ex[NLINES], destx[NLINES];
-  LONG c[NLINES][3], dc[NLINES][3], ec[NLINES][3], ic[NLINES][3]; /* colors on lines */
-  LONG g, gx, gxi, gc[3], gd[3], ge[3], gi[3]; /* colors in triangle */
-  LONG sy, y, bt;
+  //ULONG Color;
+
+  //BOOL sx[NLINES];
+  //LONG x[NLINES], dx[NLINES], dy[NLINES], incx[NLINES], ex[NLINES], destx[NLINES];
+  //LONG c[NLINES][3], dc[NLINES][3], ec[NLINES][3], ic[NLINES][3]; /* colors on lines
*/
+  //LONG g, gx, gxi, gc[3], gd[3], ge[3], gi[3]; /* colors in triangle */
+  //LONG sy, y, bt;
 
   v1 = (pVertex + gTriangle->Vertex1);
   v2 = (pVertex + gTriangle->Vertex2);
@@ -353,100 +353,102 @@
   }
 
   DbgPrint("Triangle: (%i,%i) (%i,%i) (%i,%i)\n", v1->x, v1->y, v2->x,
v2->y, v3->x, v3->y);
+  /* FIXME: commented out because of an endless loop - fix triangles first */
+  DbgPrint("FIXME: IntEngGradientFillTriangle is broken");
 
   if(!IntEngEnter(&EnterLeave, psoDest, &FillRect, FALSE, &Translate,
&OutputObj))
   {
     return FALSE;
   }
 
-  if(VCMPCLRS(v1, v2, v3))
-  {
-    CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0);
-    do
-    {
-      EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum);
-      for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <=
prclExtents->bottom; i++)
-      {
-        if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i],
(PRECT)prclExtents))
-        {
-          BOOL InY;
-
-          DOINIT(v1, v3, 0);
-          DOINIT(v1, v2, 1);
-          DOINIT(v2, v3, 2);
-
-          y = v1->y;
-          sy = v1->y + pptlDitherOrg->y;
-          bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom);
-
-          while(sy < bt)
-          {
-            InY = !(sy < FillRect.top || sy >= FillRect.bottom);
-            GOLINE(v1, v3, 0);
-            DOLINE(v1, v3, 0);
-            ENDLINE(v1, v3, 0);
-
-            GOLINE(v1, v2, 1);
-            DOLINE(v1, v2, 1);
-            FILLLINE(0, 1);
-            ENDLINE(v1, v2, 1);
-
-            GOLINE(v2, v3, 2);
-            DOLINE(v2, v3, 2);
-            FILLLINE(0, 2);
-            ENDLINE(23, v3, 2);
-
-            y++;
-            sy++;
-          }
-        }
-      }
-    } while(EnumMore);
-
-    return IntEngLeave(&EnterLeave);
-  }
-
-  /* fill triangle with one solid color */
-
-  Color = XLATEOBJ_iXlate(pxlo, RGB(v1->Red >> 8, v1->Green >> 8,
v1->Blue >> 8));
-  CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0);
-  do
-  {
-    EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum);
-    for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <=
prclExtents->bottom; i++)
-    {
-      if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i],
(PRECT)prclExtents))
-      {
-        S_INITLINE(v1, v3, 0);
-        S_INITLINE(v1, v2, 1);
-        S_INITLINE(v2, v3, 2);
-
-        y = v1->y;
-        sy = v1->y + pptlDitherOrg->y;
-        bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom);
-
-        while(sy < bt)
-        {
-          S_GOLINE(v1, v3, 0);
-          S_DOLINE(v1, v3, 0);
-          S_ENDLINE(v1, v3, 0);
-
-          S_GOLINE(v1, v2, 1);
-          S_DOLINE(v1, v2, 1);
-          S_FILLLINE(0, 1);
-          S_ENDLINE(v1, v2, 1);
-
-          S_GOLINE(v2, v3, 2);
-          S_DOLINE(v2, v3, 2);
-          S_FILLLINE(0, 2);
-          S_ENDLINE(23, v3, 2);
-
-          y++;
-          sy++;
-        }
-      }
-    }
-  } while(EnumMore);
+  //if(VCMPCLRS(v1, v2, v3))
+  //{
+  //  CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0);
+  //  do
+  //  {
+  //    EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum);
+  //    for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <=
prclExtents->bottom; i++)
+  //    {
+  //      if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i],
(PRECT)prclExtents))
+  //      {
+  //        BOOL InY;
+
+  //        DOINIT(v1, v3, 0);
+  //        DOINIT(v1, v2, 1);
+  //        DOINIT(v2, v3, 2);
+
+  //        y = v1->y;
+  //        sy = v1->y + pptlDitherOrg->y;
+  //        bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom);
+
+  //        while(sy < bt)
+  //        {
+  //          InY = !(sy < FillRect.top || sy >= FillRect.bottom);
+  //          GOLINE(v1, v3, 0);
+  //          DOLINE(v1, v3, 0);
+  //          ENDLINE(v1, v3, 0);
+
+  //          GOLINE(v1, v2, 1);
+  //          DOLINE(v1, v2, 1);
+  //          FILLLINE(0, 1);
+  //          ENDLINE(v1, v2, 1);
+
+  //          GOLINE(v2, v3, 2);
+  //          DOLINE(v2, v3, 2);
+  //          FILLLINE(0, 2);
+  //          ENDLINE(23, v3, 2);
+
+  //          y++;
+  //          sy++;
+  //        }
+  //      }
+  //    }
+  //  } while(EnumMore);
+
+  //  return IntEngLeave(&EnterLeave);
+  //}
+
+  ///* fill triangle with one solid color */
+
+  //Color = XLATEOBJ_iXlate(pxlo, RGB(v1->Red >> 8, v1->Green >> 8,
v1->Blue >> 8));
+  //CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0);
+  //do
+  //{
+  //  EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum);
+  //  for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <=
prclExtents->bottom; i++)
+  //  {
+  //    if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i],
(PRECT)prclExtents))
+  //    {
+  //      S_INITLINE(v1, v3, 0);
+  //      S_INITLINE(v1, v2, 1);
+  //      S_INITLINE(v2, v3, 2);
+
+  //      y = v1->y;
+  //      sy = v1->y + pptlDitherOrg->y;
+  //      bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom);
+
+  //      while(sy < bt)
+  //      {
+  //        S_GOLINE(v1, v3, 0);
+  //        S_DOLINE(v1, v3, 0);
+  //        S_ENDLINE(v1, v3, 0);
+
+  //        S_GOLINE(v1, v2, 1);
+  //        S_DOLINE(v1, v2, 1);
+  //        S_FILLLINE(0, 1);
+  //        S_ENDLINE(v1, v2, 1);
+
+  //        S_GOLINE(v2, v3, 2);
+  //        S_DOLINE(v2, v3, 2);
+  //        S_FILLLINE(0, 2);
+  //        S_ENDLINE(23, v3, 2);
+
+  //        y++;
+  //        sy++;
+  //      }
+  //    }
+  //  }
+  //} while(EnumMore);
 
   return IntEngLeave(&EnterLeave);
 }