From 7d34208e7f3ea9e605fe033111e938533bc33a53 Mon Sep 17 00:00:00 2001 From: Gregor Schneider Date: Sat, 15 Nov 2008 22:35:44 +0000 Subject: [PATCH] - DIB_1BPP_BitBlt: Increment source coordinates properly, see bug #2372 - Remove old code - Enable dprint for DIB_1BPP_StretchBlt svn path=/trunk/; revision=37382 --- reactos/subsystems/win32/win32k/dib/dib1bpp.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/reactos/subsystems/win32/win32k/dib/dib1bpp.c b/reactos/subsystems/win32/win32k/dib/dib1bpp.c index 6529b7be53e..33a8901087f 100644 --- a/reactos/subsystems/win32/win32k/dib/dib1bpp.c +++ b/reactos/subsystems/win32/win32k/dib/dib1bpp.c @@ -351,7 +351,6 @@ DIB_1BPP_BitBlt(PBLTINFO BltInfo) BOOLEAN UsesPattern; PULONG DestBits; ULONG RoundedRight; -/* BYTE NoBits;*/ UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); @@ -417,7 +416,7 @@ DIB_1BPP_BitBlt(PBLTINFO BltInfo) #endif } - for (; DestX < RoundedRight; DestX += 32, DestBits++, SourceX++) + for (; DestX < RoundedRight; DestX += 32, DestBits++, SourceX += 32) { Dest = *DestBits; @@ -450,10 +449,8 @@ DIB_1BPP_BitBlt(PBLTINFO BltInfo) if (DestX < BltInfo->DestRect.right) { -// Dest = *DestBits; for (; DestX < BltInfo->DestRect.right; DestX++, SourceX++) { -// Dest = *DestBits; Dest = DIB_1BPP_GetPixel(BltInfo->DestSurface, DestX, DestY); if (UsesSource) @@ -467,7 +464,6 @@ DIB_1BPP_BitBlt(PBLTINFO BltInfo) } DIB_1BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF); -// Dest >>= 1; } } @@ -627,7 +623,7 @@ BOOLEAN DIB_1BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, break; default: - //DPRINT1("DIB_1BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); + DPRINT1("DIB_1BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; }