mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 01:55:19 +00:00
BUGFIX: bad params to MouseSafetyOnDrawStart() in IntEngTransparentBlt(), also ASSERT parameter assumptions
svn path=/trunk/; revision=12112
This commit is contained in:
parent
3bbc2dd8e3
commit
9df9a16c4d
1 changed files with 14 additions and 5 deletions
|
@ -16,7 +16,7 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
/* $Id: transblt.c,v 1.21 2004/07/03 17:40:25 navaraf Exp $
|
||||
/* $Id: transblt.c,v 1.22 2004/12/14 04:40:16 royce Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -204,9 +204,19 @@ IntEngTransparentBlt(BITMAPOBJ *DestObj,
|
|||
{
|
||||
BOOL Ret;
|
||||
RECTL OutputRect, InputClippedRect;
|
||||
SURFOBJ *DestSurf = &DestObj->SurfObj;
|
||||
SURFOBJ *SourceSurf = &SourceObj->SurfObj;
|
||||
SURFOBJ *DestSurf;
|
||||
SURFOBJ *SourceSurf;
|
||||
|
||||
ASSERT(DestObj);
|
||||
ASSERT(SourceObj);
|
||||
ASSERT(DestRect);
|
||||
|
||||
DestSurf = &DestObj->SurfObj;
|
||||
SourceSurf = &SourceObj->SurfObj;
|
||||
|
||||
ASSERT(DestSurf);
|
||||
ASSERT(SourceSurf);
|
||||
|
||||
InputClippedRect = *DestRect;
|
||||
if(InputClippedRect.right < InputClippedRect.left)
|
||||
{
|
||||
|
@ -240,8 +250,7 @@ IntEngTransparentBlt(BITMAPOBJ *DestObj,
|
|||
if(SourceSurf != DestSurf)
|
||||
{
|
||||
MouseSafetyOnDrawStart(SourceSurf, SourceRect->left, SourceRect->top,
|
||||
(SourceRect->left + abs(SourceRect->right - SourceRect->left)),
|
||||
(SourceRect->top + abs(SourceRect->bottom - SourceRect->top)));
|
||||
SourceRect->right, SourceRect->bottom);
|
||||
}
|
||||
MouseSafetyOnDrawStart(DestSurf, OutputRect.left, OutputRect.top,
|
||||
OutputRect.right, OutputRect.bottom);
|
||||
|
|
Loading…
Reference in a new issue