Author: jgardou Date: Mon Apr 19 17:08:03 2010 New Revision: 46940
URL: http://svn.reactos.org/svn/reactos?rev=46940&view=rev Log: [WIN32K] - Get rid of IntEngBitBltEx, it's Exness isn't needed anymore
Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c branches/reactos-yarotows/subsystems/win32/win32k/include/inteng.h
Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win3... ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Mon Apr 19 17:08:03 2010 @@ -521,7 +521,7 @@ }
BOOL APIENTRY -IntEngBitBltEx( +IntEngBitBlt( SURFOBJ *psoTrg, SURFOBJ *psoSrc, SURFOBJ *psoMask, @@ -532,8 +532,7 @@ POINTL *pptlMask, BRUSHOBJ *pbo, POINTL *pptlBrush, - ROP4 rop4, - BOOL bRemoveMouse) + ROP4 rop4) { SURFACE *psurfTrg; SURFACE *psurfSrc = NULL; @@ -950,17 +949,17 @@ /* Dummy BitBlt to let driver know that it should flush its changes. This should really be done using a call to DrvSynchronizeSurface, but the VMware driver doesn't hook that call. */ - IntEngBitBltEx(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, + IntEngBitBlt(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, DestRect, pptlMask, pptlMask, pbo, BrushOrigin, - R4_NOOP, FALSE); + R4_NOOP);
ret = EngMaskBitBlt(psoDest, psoMask, ClipRegion, DestColorTranslation, SourceColorTranslation, &OutputRect, &InputPoint, pbo, BrushOrigin);
/* Dummy BitBlt to let driver know that something has changed. */ - IntEngBitBltEx(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, + IntEngBitBlt(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, DestRect, pptlMask, pptlMask, pbo, BrushOrigin, - R4_NOOP, FALSE); + R4_NOOP);
return ret; }
Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win3... ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Mon Apr 19 17:08:03 2010 @@ -162,7 +162,7 @@ ptlSave.x = rclDest.left - pt.x; ptlSave.y = rclDest.top - pt.y;
- IntEngBitBltEx(psoDest, + IntEngBitBlt(psoDest, &pgp->psurfSave->SurfObj, NULL, NULL, @@ -172,8 +172,7 @@ &ptlSave, NULL, NULL, - ROP3_TO_ROP4(SRCCOPY), - FALSE); + ROP3_TO_ROP4(SRCCOPY)); }
VOID @@ -213,7 +212,7 @@ rclPointer.bottom = min(pgp->Size.cy, psoDest->sizlBitmap.cy - pt.y);
/* Copy the pixels under the cursor to temporary surface. */ - IntEngBitBltEx(&pgp->psurfSave->SurfObj, + IntEngBitBlt(&pgp->psurfSave->SurfObj, psoDest, NULL, NULL, @@ -223,13 +222,12 @@ NULL, NULL, NULL, - ROP3_TO_ROP4(SRCCOPY), - FALSE); + ROP3_TO_ROP4(SRCCOPY));
/* Blt the pointer on the screen. */ if (pgp->psurfColor) { - IntEngBitBltEx(psoDest, + IntEngBitBlt(psoDest, &pgp->psurfMask->SurfObj, NULL, NULL, @@ -239,10 +237,9 @@ NULL, NULL, NULL, - ROP3_TO_ROP4(SRCAND), - FALSE); - - IntEngBitBltEx(psoDest, + ROP3_TO_ROP4(SRCAND)); + + IntEngBitBlt(psoDest, &pgp->psurfColor->SurfObj, NULL, NULL, @@ -252,12 +249,11 @@ NULL, NULL, NULL, - ROP3_TO_ROP4(SRCINVERT), - FALSE); + ROP3_TO_ROP4(SRCINVERT)); } else { - IntEngBitBltEx(psoDest, + IntEngBitBlt(psoDest, &pgp->psurfMask->SurfObj, NULL, NULL, @@ -267,12 +263,11 @@ NULL, NULL, NULL, - ROP3_TO_ROP4(SRCAND), - FALSE); + ROP3_TO_ROP4(SRCAND));
rclPointer.top += pgp->Size.cy;
- IntEngBitBltEx(psoDest, + IntEngBitBlt(psoDest, &pgp->psurfMask->SurfObj, NULL, NULL, @@ -282,8 +277,7 @@ NULL, NULL, NULL, - ROP3_TO_ROP4(SRCINVERT), - FALSE); + ROP3_TO_ROP4(SRCINVERT)); } }
Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/inteng.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win3... ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/inteng.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/inteng.h [iso-8859-1] Mon Apr 19 17:08:03 2010 @@ -45,7 +45,7 @@ MIX mix);
BOOL APIENTRY -IntEngBitBltEx(SURFOBJ *DestObj, +IntEngBitBlt(SURFOBJ *DestObj, SURFOBJ *SourceObj, SURFOBJ *Mask, CLIPOBJ *ClipRegion, @@ -55,14 +55,7 @@ POINTL *MaskOrigin, BRUSHOBJ *Brush, POINTL *BrushOrigin, - ROP4 Rop4, - BOOL RemoveMouse); -#define IntEngBitBlt(DestObj, SourceObj, Mask, ClipRegion, ColorTranslation, \ - DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, \ - Rop4) \ - IntEngBitBltEx((DestObj), (SourceObj), (Mask), (ClipRegion), \ - (ColorTranslation), (DestRect), (SourcePoint), \ - (MaskOrigin), (Brush), (BrushOrigin), (Rop4), TRUE) + ROP4 Rop4);
BOOL APIENTRY IntEngStretchBlt(SURFOBJ *DestObj,
-
jgardou＠svn.reactos.org