- Fixed BitBlts from 4bpp surfaces.

reactos/subsys/win32k/dib

diff -u -r1.20 -r1.21
--- dib16bpp.c	26 Mar 2004 23:48:47 -0000	1.20
+++ dib16bpp.c	28 Mar 2004 23:25:48 -0000	1.21
@@ -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: dib16bpp.c,v 1.20 2004/03/26 23:48:47 weiden Exp $ */

+/* $Id: dib16bpp.c,v 1.21 2004/03/28 23:25:48 navaraf Exp $ */

 #undef WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdlib.h>

@@ -122,7 +122,7 @@

         for (i=DestRect->left; i<DestRect->right; i++)
         {
           xColor = XLATEOBJ_iXlate(ColorTranslation,

-              (*SourceLine_4BPP & altnotmask[sx&1]) >> (4 * (1-(sx & 1))));

+              (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1)));

           DIB_16BPP_PutPixel(DestSurf, i, j, xColor);
           if(f1 == 1) { SourceLine_4BPP++; f1 = 0; } else { f1 = 1; }
           sx++;

reactos/subsys/win32k/dib

diff -u -r1.16 -r1.17
--- dib24bpp.c	8 Jan 2004 20:59:42 -0000	1.16
+++ dib24bpp.c	28 Mar 2004 23:25:48 -0000	1.17
@@ -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: dib24bpp.c,v 1.16 2004/01/08 20:59:42 navaraf Exp $ */

+/* $Id: dib24bpp.c,v 1.17 2004/03/28 23:25:48 navaraf Exp $ */

 #undef WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdlib.h>

@@ -122,7 +122,7 @@

         for (i=DestRect->left; i<DestRect->right; i++)
         {
           xColor = XLATEOBJ_iXlate(ColorTranslation,

-              (*SourceLine_4BPP & altnotmask[sx&1]) >> (4 * (1-(sx & 1))));

+              (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1)));

           *DestLine++ = xColor & 0xff;
           *(PWORD)DestLine = xColor >> 8;
           DestLine += 2;

reactos/subsys/win32k/dib

diff -u -r1.13 -r1.14
--- dib32bpp.c	26 Mar 2004 23:48:47 -0000	1.13
+++ dib32bpp.c	28 Mar 2004 23:25:48 -0000	1.14
@@ -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: dib32bpp.c,v 1.13 2004/03/26 23:48:47 weiden Exp $ */

+/* $Id: dib32bpp.c,v 1.14 2004/03/28 23:25:48 navaraf Exp $ */

 #undef WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdlib.h>

@@ -121,7 +121,7 @@

         for (i=DestRect->left; i<DestRect->right; i++)
         {
           xColor = XLATEOBJ_iXlate(ColorTranslation,

-              (*SourceLine_4BPP & altnotmask[sx&1]) >> (4 * (1-(sx & 1))));

+              (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1)));

           DIB_32BPP_PutPixel(DestSurf, i, j, xColor);
           if(f1 == 1) { SourceLine_4BPP++; f1 = 0; } else { f1 = 1; }
           sx++;

reactos/subsys/win32k/dib

diff -u -r1.15 -r1.16
--- dib8bpp.c	26 Mar 2004 23:48:47 -0000	1.15
+++ dib8bpp.c	28 Mar 2004 23:25:48 -0000	1.16
@@ -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: dib8bpp.c,v 1.15 2004/03/26 23:48:47 weiden Exp $ */

+/* $Id: dib8bpp.c,v 1.16 2004/03/28 23:25:48 navaraf Exp $ */

 #undef WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdlib.h>

@@ -119,7 +119,7 @@

         for (i=DestRect->left; i<DestRect->right; i++)
         {
           xColor = XLATEOBJ_iXlate(ColorTranslation,

-              (*SourceLine_4BPP & altnotmask[sx&1]) >> (4 * (1-(sx & 1))));

+              (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1)));

           DIB_8BPP_PutPixel(DestSurf, i, j, xColor);
           if(f1 == 1) { SourceLine_4BPP++; f1 = 0; } else { f1 = 1; }
           sx++;