[ros-diffs] [jimtabor] 34188: Sorry fixed Ellipse, see bug 3337.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Sun Jun 29 08:23:08 2008
New Revision: 34188

URL: http://svn.reactos.org/svn/reactos?rev=34188&view=rev
Log:
Sorry fixed Ellipse, see bug 3337.

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

Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/fillshap.c?rev=34188&r1=34187&r2=34188&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sun Jun 29 08:23:08 2008
@@ -222,10 +222,16 @@
      * Check the parameters.
      */
     DPRINT("nLeftRect: %d, nTopRect: %d, nRightRect: %d, nBottomRect: %d\n",nLeftRect,nTopRect,nRightRect,nBottomRect);
-    if (nRightRect <= nLeftRect || nTopRect <= nBottomRect)
-    {
-        SetLastWin32Error(ERROR_INVALID_PARAMETER);
-        return FALSE;
+
+    if ((nLeftRect == nRightRect) || (nTopRect == nBottomRect)) return TRUE;
+
+    if (nRightRect < nLeftRect)
+    {
+       INT tmp = nRightRect; nRightRect = nLeftRect; nLeftRect = tmp;
+    }
+    if (nBottomRect < nTopRect)
+    {
+       INT tmp = nBottomRect; nBottomRect = nTopRect; nTopRect = tmp;
     }
 
     /*
@@ -294,15 +300,23 @@
     DPRINT("2: Left: %d, Top: %d, Right: %d, Bottom: %d\n",
                RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom);
 
-    RadiusX = (RectBounds.right - RectBounds.left)/2;
-    RadiusY = (RectBounds.bottom - RectBounds.top)/2;
+    RadiusX = max((RectBounds.right - RectBounds.left) >> 1, 1);
+    RadiusY = max((RectBounds.bottom - RectBounds.top) >> 1, 1);
     CenterX = RectBounds.left + RadiusX;
     CenterY = RectBounds.top + RadiusY;
     DPRINT("3: RadiusX: %d, RadiusY: %d, CenterX: %d, CenterY: %d\n",
            RadiusX,RadiusY,CenterX,CenterY);
 
-    nx = RadiusX;
-    ny = -RadiusY;
+    if (RadiusX > RadiusY) 	 
+    { 	 
+       nx = RadiusX;
+       ny = RadiusY;
+    } 	 
+    else 	 
+    { 	 
+       nx = RadiusY; 	 
+       ny = RadiusX; 	 
+    }
     da = -1;
     db = 0xFFFF;
     ix = 0;