[ros-diffs] [rharabien] 56072: [WIN32K] - When using output rect clipping results in input rect, scale them to input rect size. Fixes gdiplus:graphics winetest crash.

[rharabien at svn.reactos.org]

Author: rharabien
Date: Wed Mar  7 00:24:14 2012
New Revision: 56072

URL: http://svn.reactos.org/svn/reactos?rev=56072&view=rev
Log:
[WIN32K]
- When using output rect clipping results in input rect, scale them to input rect size. Fixes gdiplus:graphics winetest crash.

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

Modified: trunk/reactos/subsystems/win32/win32k/eng/alphablend.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng/alphablend.c?rev=56072&r1=56071&r2=56072&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Wed Mar  7 00:24:14 2012
@@ -51,19 +51,11 @@
 
     /* Validate output */
     OutputRect = *DestRect;
-    if (OutputRect.right < OutputRect.left)
-    {
-        OutputRect.left = DestRect->right;
-        OutputRect.right = DestRect->left;
-    }
-    if (OutputRect.bottom < OutputRect.top)
-    {
-        OutputRect.left = DestRect->right;
-        OutputRect.right = DestRect->left;
-    }
+    RECTL_vMakeWellOrdered(&OutputRect);
 
     /* Validate input */
     InputRect = *SourceRect;
+    RECTL_vMakeWellOrdered(&InputRect);
     if ( (InputRect.top < 0) || (InputRect.bottom < 0) ||
          (InputRect.left < 0) || (InputRect.right < 0) ||
          InputRect.right > psoSource->sizlBitmap.cx ||
@@ -124,6 +116,8 @@
     OutputRect.right += Translate.x;
     OutputRect.top += Translate.y;
     OutputRect.bottom += Translate.y;
+
+    ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom);
 
     Ret = FALSE;
     ClippingType = (ClipRegion == NULL) ? DC_TRIVIAL : ClipRegion->iDComplexity;
@@ -141,10 +135,14 @@
             ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y;
             if (RECTL_bIntersectRect(&CombinedRect, &OutputRect, &ClipRect))
             {
-                Rect.left = InputRect.left + CombinedRect.left - OutputRect.left;
-                Rect.right = InputRect.right + CombinedRect.right - OutputRect.right;
-                Rect.top = InputRect.top + CombinedRect.top - OutputRect.top;
-                Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom;
+                /* take into acount clipping results when calculating new input rect (scaled to input rect size) */
+                Rect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left);
+                Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left);
+                Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top);
+                Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top);
+                ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom);
+                
+                /* Aplha blend one rect */
                 Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend(
                           OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj);
             }
@@ -166,10 +164,14 @@
                     ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y;
                     if (RECTL_bIntersectRect(&CombinedRect, &OutputRect, &ClipRect))
                     {
-                        Rect.left = InputRect.left + CombinedRect.left - OutputRect.left;
-                        Rect.right = InputRect.right + CombinedRect.right - OutputRect.right;
-                        Rect.top = InputRect.top + CombinedRect.top - OutputRect.top;
-                        Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom;
+                        /* take into acount clipping results when calculating new input rect (scaled to input rect size) */
+                        Rect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left);
+                        Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left);
+                        Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top);
+                        Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top);
+                        ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom);
+                        
+                        /* Alpha blend one rect */
                         Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend(
                                   OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj) && Ret;
                     }