[ros-diffs] [tkreuzer] 58077: Fix build

Author: tkreuzer
Date: Tue Jan  1 09:50:33 2013
New Revision: 58077

URL: http://svn.reactos.org/svn/reactos?rev=58077&view=rev
Log:
Fix build

Modified:
    trunk/reactos/win32ss/gdi/eng/bitblt.c
    trunk/reactos/win32ss/gdi/eng/clip.c

Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Tue Jan  1 09:50:33 2013
@@ -469,16 +469,23 @@
     switch (clippingType)
     {
         case DC_TRIVIAL:
-            Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation,
-                                 &OutputRect, &InputPoint, MaskOrigin, pbo,
-                                 &AdjustedBrushOrigin, Rop4);
+            Ret = (*BltRectFunc)(OutputObj,
+                                 InputObj,
+                                 psoSrc,
+                                 pxlo,
+                                 &OutputRect,
+                                 &InputPoint,
+                                 pptlMask,
+                                 pbo,
+                                 &AdjustedBrushOrigin,
+                                 rop4);
             break;
         case DC_RECT:
             /* Clip the blt to the clip rectangle */
-            ClipRect.left = ClipRegion->rclBounds.left;
-            ClipRect.right = ClipRegion->rclBounds.right;
-            ClipRect.top = ClipRegion->rclBounds.top;
-            ClipRect.bottom = ClipRegion->rclBounds.bottom;
+            ClipRect.left = pco->rclBounds.left;
+            ClipRect.right = pco->rclBounds.right;
+            ClipRect.top = pco->rclBounds.top;
+            ClipRect.bottom = pco->rclBounds.bottom;
             if (RECTL_bIntersectRect(&CombinedRect, &OutputRect, &ClipRect))
             {
 #ifdef _USE_DIBLIB_
@@ -490,9 +497,16 @@
 #endif
                 Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
                 Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
-                Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation,
-                                     &CombinedRect, &Pt, MaskOrigin, pbo,
-                                     &AdjustedBrushOrigin, Rop4);
+                Ret = (*BltRectFunc)(OutputObj,
+                                     InputObj,
+                                     psoSrc,
+                                     pxlo,
+                                     &CombinedRect,
+                                     &Pt,
+                                     pptlMask,
+                                     pbo,
+                                     &AdjustedBrushOrigin,
+                                     rop4);
             }
             break;
         case DC_COMPLEX:

Modified: trunk/reactos/win32ss/gdi/eng/clip.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/clip.c?rev…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] Tue Jan  1 09:50:33 2013
@@ -315,8 +315,8 @@
                 break;
 
             default:
-                DPRINT1("Invalid BuildOrder %lu\n", BuildOrder);
-                BuildOrder = ClipGDI->EnumOrder;
+                DPRINT1("Invalid iDirection %lu\n", iDirection);
+                iDirection = ClipGDI->EnumOrder;
                 CompareFunc = NULL;
                 break;
         }