ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-01 12:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source 
svn path=/trunk/; revision=58077
This commit is contained in:
Timo Kreuzer
2013-01-01 09:50:33 +00:00
parent 737708cfb0
commit d2a161fbb5
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/win32ss/gdi/eng/bitblt.c
+24 -10
View File
@@ -469,16 +469,23 @@ EngBitBlt(
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 @@ EngBitBlt(
#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:
reactos/win32ss/gdi/eng/clip.c
+2 -2
View File
@@ -315,8 +315,8 @@ CLIPOBJ_cEnumStart(
break;
default:
DPRINT1("Invalid BuildOrder %lu\n", BuildOrder);
BuildOrder = ClipGDI->EnumOrder;
DPRINT1("Invalid iDirection %lu\n", iDirection);
iDirection = ClipGDI->EnumOrder;
CompareFunc = NULL;
break;
}