BUGFIX: bad params to MouseSafetyOnDrawStart() in IntEngTransparentBlt(), also ASSERT...
authorRoyce Mitchell III <royce3@ev1.net>
Tue, 14 Dec 2004 04:40:16 +0000 (04:40 +0000)
committerRoyce Mitchell III <royce3@ev1.net>
Tue, 14 Dec 2004 04:40:16 +0000 (04:40 +0000)
svn path=/trunk/; revision=12112

reactos/subsys/win32k/eng/transblt.c

index cd934a1..34a97b7 100644 (file)
@@ -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);