Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-01 23:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32K]

Browse source 
- Get rid of IntEngBitBltEx, it's Exness isn't needed anymore

svn path=/branches/reactos-yarotows/; revision=46940
This commit is contained in:
Jérôme Gardou 2010-04-19 15:08:03 +00:00
parent 75108218f7
commit 82ad88f1ab
3 changed files with 20 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
subsystems/win32/win32k/eng/bitblt.c
View file

@ -521,7 +521,7 @@ EngBitBlt(SURFOBJ *DestObj,
}
BOOL APIENTRY
IntEngBitBltEx(
IntEngBitBlt(
SURFOBJ *psoTrg,
SURFOBJ *psoSrc,
SURFOBJ *psoMask,
@ -532,8 +532,7 @@ IntEngBitBltEx(
POINTL *pptlMask,
BRUSHOBJ *pbo,
POINTL *pptlBrush,
ROP4 rop4,
BOOL bRemoveMouse)
ROP4 rop4)
{
SURFACE *psurfTrg;
SURFACE *psurfSrc = NULL;
@ -950,17 +949,17 @@ IntEngMaskBlt(SURFOBJ *psoDest,
/* 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;
}

30
subsystems/win32/win32k/eng/mouse.c
View file

@ -162,7 +162,7 @@ IntHideMousePointer(
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 @@ IntHideMousePointer(
&ptlSave,
NULL,
NULL,
ROP3_TO_ROP4(SRCCOPY),
FALSE);
ROP3_TO_ROP4(SRCCOPY));
}
VOID
@ -213,7 +212,7 @@ IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest)
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 @@ IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest)
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 @@ IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest)
NULL,
NULL,
NULL,
ROP3_TO_ROP4(SRCAND),
FALSE);
ROP3_TO_ROP4(SRCAND));
IntEngBitBltEx(psoDest,
IntEngBitBlt(psoDest,
&pgp->psurfColor->SurfObj,
NULL,
NULL,
@ -252,12 +249,11 @@ IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest)
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 @@ IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest)
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 @@ IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest)
NULL,
NULL,
NULL,
ROP3_TO_ROP4(SRCINVERT),
FALSE);
ROP3_TO_ROP4(SRCINVERT));
}
}

11
subsystems/win32/win32k/include/inteng.h
View file

@ -45,7 +45,7 @@ IntEngLineTo(SURFOBJ *Surface,
MIX mix);
BOOL APIENTRY
IntEngBitBltEx(SURFOBJ *DestObj,
IntEngBitBlt(SURFOBJ *DestObj,
SURFOBJ *SourceObj,
SURFOBJ *Mask,
CLIPOBJ *ClipRegion,
@ -55,14 +55,7 @@ IntEngBitBltEx(SURFOBJ *DestObj,
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,