Author: fireball
Date: Sat Apr 4 22:24:24 2009
New Revision: 40362
URL:
http://svn.reactos.org/svn/reactos?rev=40362&view=rev
Log:
Evgeniy Boltik <bstsoft(a)narod.ru>
- Fix copypaste mistake in EngStretchBltROP.
- Fix check in EngStretchBltROP, it should check original InputRect, not the clipped one.
- Fix improper variable type in DIB_XXBPP_StretchBlt: PatternX and PatternY could be
negative.
See issue #4336 for more details.
Modified:
trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c
trunk/reactos/subsystems/win32/win32k/eng/bitblt.c
Modified: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] Sat Apr 4 22:24:24
2009
@@ -50,7 +50,7 @@
PFN_DIB_GetPixel fnPattern_GetPixel = NULL;
PFN_DIB_GetPixel fnMask_GetPixel = NULL;
- ULONG PatternX = 0, PatternY = 0;
+ LONG PatternX = 0, PatternY = 0;
BOOL UsesSource = ROP4_USES_SOURCE(ROP);
BOOL UsesPattern = ROP4_USES_PATTERN(ROP);
Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sat Apr 4 22:24:24
2009
@@ -938,8 +938,8 @@
}
if (OutputRect.bottom < OutputRect.top)
{
- OutputRect.left = prclDest->right;
- OutputRect.right = prclDest->left;
+ OutputRect.top = prclDest->bottom;
+ OutputRect.bottom = prclDest->top;
}
InputRect = *prclSrc;
@@ -1198,8 +1198,8 @@
}
InputRect = *SourceRect;
- if (InputClippedRect.right < InputClippedRect.left ||
- InputClippedRect.bottom < InputClippedRect.top)
+ if (InputRect.right < InputRect.left ||
+ InputRect.bottom < InputRect.top)
{
/* Everything clipped away, nothing to do */
return TRUE;