update for HEAD-2003091401

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

diff --git a/subsys/win32k/dib/dib24bpp.c b/subsys/win32k/dib/dib24bpp.c
index e24df91..c0efa85 100644 (file)
--- a/subsys/win32k/dib/dib24bpp.c
+++ b/subsys/win32k/dib/dib24bpp.c
@@ -1,3 +1,22 @@
+/*
+ *  ReactOS W32 Subsystem
+ *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id$ */
 #undef WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdlib.h>
@@ -8,7 +27,8 @@
 #include "../eng/objects.h"
 #include "dib.h"
 
-VOID DIB_24BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c)
+VOID
+DIB_24BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c)
 {
   PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta;
   PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x;
@@ -16,7 +36,8 @@ VOID DIB_24BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c)
   *(PULONG)(addr) = c;
 }
 
-ULONG DIB_24BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y)
+ULONG
+DIB_24BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y)
 {
   PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta;
   PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x;
@@ -24,7 +45,8 @@ ULONG DIB_24BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y)
   return *(PULONG)(addr) & 0x00ffffff;
 }
 
-VOID DIB_24BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
+VOID
+DIB_24BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
 {
   PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta;
   PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x1;
@@ -37,7 +59,8 @@ VOID DIB_24BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
   }
 }
 
-VOID DIB_24BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
+VOID
+DIB_24BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
 {
   PBYTE byteaddr = SurfObj->pvScan0 + y1 * SurfObj->lDelta;
   PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x;
@@ -52,10 +75,11 @@ VOID DIB_24BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
   }
 }
 
-BOOLEAN DIB_24BPP_BitBlt(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-        SURFGDI *DestGDI,  SURFGDI *SourceGDI,
-        PRECTL  DestRect,  POINTL  *SourcePoint,
-        XLATEOBJ *ColorTranslation)
+BOOLEAN
+DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+                         SURFGDI *DestGDI,  SURFGDI *SourceGDI,
+                         PRECTL  DestRect,  POINTL  *SourcePoint,
+                         XLATEOBJ *ColorTranslation)
 {
   LONG     i, j, sx, sy, xColor, f1;
   PBYTE    SourceBits, DestBits, SourceLine, DestLine;
@@ -161,13 +185,27 @@ BOOLEAN DIB_24BPP_BitBlt(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
     case 24:
       if (NULL == ColorTranslation || 0 != (ColorTranslation->flXlate & XO_TRIVIAL))
       {
-       SourceBits = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 3 * SourcePoint->x;
-       for (j = DestRect->top; j < DestRect->bottom; j++)
-       {
-         RtlCopyMemory(DestBits, SourceBits, 3 * (DestRect->right - DestRect->left));
-         SourceBits += SourceSurf->lDelta;
-         DestBits += DestSurf->lDelta;
-       }
+       if (DestRect->top < SourcePoint->y)
+         {
+           SourceBits = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 3 * SourcePoint->x;
+           for (j = DestRect->top; j < DestRect->bottom; j++)
+             {
+               RtlMoveMemory(DestBits, SourceBits, 3 * (DestRect->right - DestRect->left));
+               SourceBits += SourceSurf->lDelta;
+               DestBits += DestSurf->lDelta;
+             }
+         }
+       else
+         {
+           SourceBits = SourceSurf->pvScan0 + ((SourcePoint->y + DestRect->bottom - DestRect->top - 1) * SourceSurf->lDelta) + 3 * SourcePoint->x;
+           DestBits = DestSurf->pvScan0 + ((DestRect->bottom - 1) * DestSurf->lDelta) + 3 * DestRect->left;
+           for (j = DestRect->bottom - 1; DestRect->top <= j; j--)
+             {
+               RtlMoveMemory(DestBits, SourceBits, 3 * (DestRect->right - DestRect->left));
+               SourceBits -= SourceSurf->lDelta;
+               DestBits -= DestSurf->lDelta;
+             }
+         }
       }
       else
       {
@@ -207,3 +245,51 @@ BOOLEAN DIB_24BPP_BitBlt(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
   return TRUE;
 }
+
+BOOLEAN
+DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+                SURFGDI *DestGDI,  SURFGDI *SourceGDI,
+                PRECTL  DestRect,  POINTL  *SourcePoint,
+                PBRUSHOBJ Brush, PPOINTL BrushOrigin,
+                XLATEOBJ *ColorTranslation, ULONG Rop4)
+{
+  LONG     i, j, k, sx, sy;
+  ULONG    Dest, Source, Pattern;
+  PULONG   DestBits;
+  BOOL     UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000);
+  BOOL     UsesPattern = ((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000);  
+
+  if (Rop4 == SRCCOPY)
+    {
+      return(DIB_24BPP_BitBltSrcCopy(DestSurf, SourceSurf, DestGDI, SourceGDI, DestRect, SourcePoint, ColorTranslation));
+    }
+  else
+    {
+      sy = SourcePoint->y;
+
+      for (j = DestRect->top; j < DestRect->bottom; j++)
+      {
+        sx = SourcePoint->x;
+       DestBits = (PULONG)(DestSurf->pvScan0 + 3 * DestRect->left + j * DestSurf->lDelta);
+        for (i=DestRect->left; i<DestRect->right; i++, DestBits++)
+         {
+           Dest = *DestBits & 0x00ffffff;
+           if (UsesSource)
+             {
+               Source = DIB_GetSource(SourceSurf, SourceGDI, sx + i + k, sy, ColorTranslation) & 0x00ffffff;
+             }
+           if (UsesPattern)
+             {
+               /* FIXME: No support for pattern brushes. */
+               Pattern = Brush->iSolidColor;
+             }
+           Dest = DIB_DoRop(Rop4, Dest, Source, Pattern);          
+           *(PBYTE)DestBits = Dest & 0xff;
+            *(PWORD)(DestBits + 1) = Dest >> 8;
+         }
+      }
+    }
+  return TRUE;
+}
+
+/* EOF */