Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 13:59:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed some dumb bugs in 1bpp code causing memory corruption.

Browse source 
svn path=/trunk/; revision=8992
This commit is contained in:
Filip Navara 2004-04-06 21:19:44 +00:00
parent 4466dbbf17
commit 409aaad5d5
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reactos/subsys/win32k/dib/dib1bpp.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: dib1bpp.c,v 1.18 2004/04/06 17:54:32 weiden Exp $ */ /* $Id: dib1bpp.c,v 1.19 2004/04/06 21:19:44 navaraf Exp $ */
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
@ -405,7 +405,7 @@ DIB_1BPP_BitBlt(
UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000); UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000);
UsesPattern = ((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000); UsesPattern = ((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000);
RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x7); RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x31);
SourceY = SourcePoint->y; SourceY = SourcePoint->y;
for (Y = DestRect->top; Y < DestRect->bottom; Y++) for (Y = DestRect->top; Y < DestRect->bottom; Y++)
@ -417,16 +417,18 @@ DIB_1BPP_BitBlt(
Y * DestSurf->lDelta); Y * DestSurf->lDelta);
X = DestRect->left; X = DestRect->left;
if (X & 7) if (X & 31)
{ {
/* FIXME: This case is completely untested!!! */
Dest = *((PBYTE)DestBits); Dest = *((PBYTE)DestBits);
NoBits = 7 - (X & 7); NoBits = 31 - (X & 31);
if (UsesSource) if (UsesSource)
{ {
Source = 0; Source = 0;
for (k = 7 - NoBits; k < NoBits; k++) for (k = 31 - NoBits; k < NoBits; k++)
Source |= (DIB_GetSource(SourceSurf, SourceGDI, SourceX + k, SourceY, ColorTranslation) << (7 - k)); Source |= (DIB_GetSource(SourceSurf, SourceGDI, SourceX + k, SourceY, ColorTranslation) << (31 - k));
} }
if (UsesPattern) if (UsesPattern)
@ -434,8 +436,8 @@ DIB_1BPP_BitBlt(
if (Brush->iSolidColor == 0xFFFFFFFF) if (Brush->iSolidColor == 0xFFFFFFFF)
{ {
Pattern = 0; Pattern = 0;
for (k = 7 - NoBits; k < NoBits; k++) for (k = 31 - NoBits; k < NoBits; k++)
Pattern |= (DIB_1BPP_GetPixel(PatternObj, (X + k) % PatternWidth, Y % PatternHeight) << (7 - k)); Pattern |= (DIB_1BPP_GetPixel(PatternObj, (X + k) % PatternWidth, Y % PatternHeight) << (31 - k));
} }
else else
{ {
@ -444,8 +446,10 @@ DIB_1BPP_BitBlt(
} }
Dest = DIB_DoRop(Rop4, Dest, Source, Pattern); Dest = DIB_DoRop(Rop4, Dest, Source, Pattern);
Dest &= ~((1 << (7 - NoBits)) - 1); Dest &= ~((1 << (31 - NoBits)) - 1);
Dest |= *((PBYTE)DestBits) & ((1 << (7 - NoBits)) - 1); Dest |= *((PBYTE)DestBits) & ((1 << (31 - NoBits)) - 1);
*DestBits = Dest;
X += NoBits; X += NoBits;
SourceX += NoBits; SourceX += NoBits;