Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 14:25:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

ASSERT parameter assumptions in IntEngStretchBlt() and IntEngMaskBlt()

Browse source 
svn path=/trunk/; revision=12107
This commit is contained in:
Royce Mitchell III 2004-12-14 03:36:46 +00:00
parent adf92baa5e
commit 6484c7e5b5
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
reactos/subsys/win32k/eng/bitblt.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: bitblt.c,v 1.63 2004/12/14 03:28:34 royce Exp $ /* $Id: bitblt.c,v 1.64 2004/12/14 03:36:46 royce Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -746,23 +746,29 @@ IntEngStretchBlt(BITMAPOBJ *DestObj,
BOOLEAN ret; BOOLEAN ret;
COLORADJUSTMENT ca; COLORADJUSTMENT ca;
POINT MaskOrigin; POINT MaskOrigin;
SURFOBJ *DestSurf = &DestObj->SurfObj; SURFOBJ *DestSurf;
SURFOBJ *SourceSurf = SourceObj ? &SourceObj->SurfObj : NULL; SURFOBJ *SourceSurf = SourceObj ? &SourceObj->SurfObj : NULL;
SURFOBJ *MaskSurf = MaskObj ? &MaskObj->SurfObj : NULL; SURFOBJ *MaskSurf = MaskObj ? &MaskObj->SurfObj : NULL;
ASSERT(DestObj);
DestSurf = &DestObj->SurfObj;
ASSERT(DestSurf);
if (pMaskOrigin != NULL) if (pMaskOrigin != NULL)
{ {
MaskOrigin.x = pMaskOrigin->x; MaskOrigin.y = pMaskOrigin->y; MaskOrigin.x = pMaskOrigin->x; MaskOrigin.y = pMaskOrigin->y;
} }
if (NULL != SourceObj) if (NULL != SourceSurf)
{ {
ASSERT(SourceRect);
MouseSafetyOnDrawStart(SourceSurf, SourceRect->left, SourceRect->top, MouseSafetyOnDrawStart(SourceSurf, SourceRect->left, SourceRect->top,
SourceRect->right, SourceRect->bottom); SourceRect->right, SourceRect->bottom);
} }
/* No success yet */ /* No success yet */
ret = FALSE; ret = FALSE;
ASSERT(DestRect);
MouseSafetyOnDrawStart(DestSurf, DestRect->left, DestRect->top, MouseSafetyOnDrawStart(DestSurf, DestRect->left, DestRect->top,
DestRect->right, DestRect->bottom); DestRect->right, DestRect->bottom);
@ -1109,6 +1115,7 @@ IntEngMaskBlt(SURFOBJ *DestObj,
/* No success yet */ /* No success yet */
ret = FALSE; ret = FALSE;
ASSERT(DestObj);
MouseSafetyOnDrawStart(DestObj, OutputRect.left, OutputRect.top, MouseSafetyOnDrawStart(DestObj, OutputRect.left, OutputRect.top,
OutputRect.right, OutputRect.bottom); OutputRect.right, OutputRect.bottom);