branch update for HEAD-2003050101

[reactos.git] / subsys / win32k / dib / dib1bpp.c

diff --git a/subsys/win32k/dib/dib1bpp.c b/subsys/win32k/dib/dib1bpp.c
index a3af45a..d56140f 100644 (file)
--- a/subsys/win32k/dib/dib1bpp.c
+++ b/subsys/win32k/dib/dib1bpp.c
@@ -8,52 +8,49 @@
 #include "../eng/objects.h"
 #include "dib.h"
 
-PFN_DIB_PutPixel DIB_1BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c)
+VOID DIB_1BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c)
 {
-  unsigned char *vp;
-  unsigned char mask;
-  PBYTE addr = SurfObj->pvBits;
+  PBYTE addr = SurfObj->pvScan0;
 
   addr += y * SurfObj->lDelta + (x >> 3);
 
   if(c == 0)
   {
-    *addr = (*addr ^ mask1Bpp[mod(x, 8)]);
+    *addr = (*addr ^ mask1Bpp[x % 8]);
   }
     else
   {
-    *addr = (*addr | mask1Bpp[mod(x, 8)]);
+    *addr = (*addr | mask1Bpp[x % 8]);
   }
 }
 
-PFN_DIB_GetPixel DIB_1BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y)
+ULONG DIB_1BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y)
 {
-  PBYTE addr = SurfObj->pvBits + y * SurfObj->lDelta + (x >> 3);
+  PBYTE addr = SurfObj->pvScan0 + y * SurfObj->lDelta + (x >> 3);
 
-  if(*addr & mask1Bpp[mod(x, 8)]) return (PFN_DIB_GetPixel)(1);
-  return (PFN_DIB_GetPixel)(0);
+  return (*addr & mask1Bpp[x % 8] ? 1 : 0);
 }
 
-PFN_DIB_HLine DIB_1BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
+VOID DIB_1BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
 {
-  while(x1 <= x2) {
+  while(x1 < x2) {
     DIB_1BPP_PutPixel(SurfObj, x1, y, c);
     x1++;
   }
 }
 
-PFN_DIB_VLine DIB_1BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
+VOID DIB_1BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
 {
-  while(y1 <= y2) {
+  while(y1 < y2) {
     DIB_1BPP_PutPixel(SurfObj, x, y1, c);
     y1++;
   }
 }
 
-BOOLEAN DIB_To_1BPP_Bitblt(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-        SURFGDI *DestGDI,  SURFGDI *SourceGDI,
-        PRECTL  DestRect,  POINTL  *SourcePoint,
-        LONG    Delta,     XLATEOBJ *ColorTranslation)
+BOOLEAN DIB_1BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+                        SURFGDI *DestGDI,  SURFGDI *SourceGDI,
+                        PRECTL  DestRect,  POINTL  *SourcePoint,
+                        XLATEOBJ *ColorTranslation)
 {
   LONG    i, j, sx, sy = SourcePoint->y;
 
@@ -95,6 +92,42 @@ BOOLEAN DIB_To_1BPP_Bitblt(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
+    case 8:
+      for (j=DestRect->top; j<DestRect->bottom; j++)
+      {
+        sx = SourcePoint->x;
+        for (i=DestRect->left; i<DestRect->right; i++)
+        {
+          if(XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)) == 0)
+          {
+            DIB_1BPP_PutPixel(DestSurf, i, j, 0);
+          } else {
+            DIB_1BPP_PutPixel(DestSurf, i, j, 1);
+          }
+          sx++;
+        }
+        sy++;
+      }
+      break;
+
+    case 16:
+      for (j=DestRect->top; j<DestRect->bottom; j++)
+      {
+        sx = SourcePoint->x;
+        for (i=DestRect->left; i<DestRect->right; i++)
+        {
+          if(XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)) == 0)
+          {
+            DIB_1BPP_PutPixel(DestSurf, i, j, 0);
+          } else {
+            DIB_1BPP_PutPixel(DestSurf, i, j, 1);
+          }
+          sx++;
+        }
+        sy++;
+      }
+      break;
+
     case 24:
       for (j=DestRect->top; j<DestRect->bottom; j++)
       {
@@ -113,6 +146,24 @@ BOOLEAN DIB_To_1BPP_Bitblt(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
+    case 32:
+      for (j=DestRect->top; j<DestRect->bottom; j++)
+      {
+        sx = SourcePoint->x;
+        for (i=DestRect->left; i<DestRect->right; i++)
+        {
+          if(XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)) == 0)
+          {
+            DIB_1BPP_PutPixel(DestSurf, i, j, 0);
+          } else {
+            DIB_1BPP_PutPixel(DestSurf, i, j, 1);
+          }
+          sx++;
+        }
+        sy++;
+      }
+      break;
+
     default:
       DbgPrint("DIB_1BPP_Bitblt: Unhandled Source BPP: %u\n", SourceGDI->BitsPerPixel);
       return FALSE;