[YAROTOWS] Reintegrate the branch. For a brighter future.
[reactos.git] / reactos / subsystems / win32 / win32k / dib / dib4bpp.c
index d3afbd3..e27c226 100644 (file)
@@ -1,24 +1,13 @@
 /*
- *  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.
+ * PROJECT:         Win32 subsystem
+ * LICENSE:         See COPYING in the top level directory
+ * FILE:            subsystems/win32/win32k/dib/dib4bpp.c
+ * PURPOSE:         Device Independant Bitmap functions, 4bpp
+ * PROGRAMMERS:     Jason Filby
  */
-/* $Id$ */
 
-#include <w32k.h>
+
+#include <win32k.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -43,7 +32,8 @@ DIB_4BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
   PBYTE  addr = (PBYTE)SurfObj->pvScan0 + (x1>>1) + y * SurfObj->lDelta;
   LONG  cx = x1;
 
-  while(cx < x2) {
+  while(cx < x2)
+  {
     *addr = (*addr & notmask[x1&1]) | (c << ((1-(x1&1))<<2));
     if((++x1 & 1) == 0)
       ++addr;
@@ -58,7 +48,8 @@ DIB_4BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
   int  lDelta = SurfObj->lDelta;
 
   addr += (x>>1) + y1 * lDelta;
-  while(y1++ < y2) {
+  while(y1++ < y2)
+  {
     *addr = (*addr & notmask[x&1]) | (c << ((1-(x&1))<<2));
     addr += lDelta;
   }
@@ -90,7 +81,9 @@ DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
           if(DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0)
           {
             DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0));
-          } else {
+          }
+          else
+          {
             DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1));
           }
           sx++;
@@ -108,14 +101,14 @@ DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 
         for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-         if (NULL != BltInfo->XlateSourceToDest)
-         {
-           DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy)));
-         }
-         else
-         {
-           DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy));
-         }
+          if (NULL != BltInfo->XlateSourceToDest)
+          {
+            DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy)));
+          }
+          else
+          {
+            DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy));
+          }
           sx++;
         }
         sy++;
@@ -227,311 +220,159 @@ DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 BOOLEAN
 DIB_4BPP_BitBlt(PBLTINFO BltInfo)
 {
-   ULONG DestX, DestY;
-   ULONG SourceX, SourceY;
-   ULONG PatternY = 0;
-   ULONG Dest, Source = 0, Pattern = 0;
-   BOOLEAN UsesSource;
-   BOOLEAN UsesPattern;
-   PULONG DestBits;
-   LONG RoundedRight;
-   static const ULONG ExpandSolidColor[16] =
-   {
-      0x00000000 /* 0 */,
-      0x11111111 /* 1 */,
-      0x22222222 /* 2 */,
-      0x33333333 /* 3 */,
-      0x44444444 /* 4 */,
-      0x55555555 /* 5 */,
-      0x66666666 /* 6 */,
-      0x77777777 /* 7 */,
-      0x88888888 /* 8 */,
-      0x99999999 /* 9 */,
-      0xAAAAAAAA /* 10 */,
-      0xBBBBBBBB /* 11 */,
-      0xCCCCCCCC /* 12 */,
-      0xDDDDDDDD /* 13 */,
-      0xEEEEEEEE /* 14 */,
-      0xFFFFFFFF /* 15 */,
-   };
-
-   UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4);
-   UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);
-
-   SourceY = BltInfo->SourcePoint.y;
-   RoundedRight = BltInfo->DestRect.right -
-                  ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 0x7);
-
-   if (UsesPattern)
-   {
-      if (BltInfo->PatternSurface)
+  ULONG DestX, DestY;
+  ULONG SourceX, SourceY;
+  ULONG PatternY = 0;
+  ULONG Dest, Source = 0, Pattern = 0;
+  BOOLEAN UsesSource;
+  BOOLEAN UsesPattern;
+  PULONG DestBits;
+  LONG RoundedRight;
+  static const ULONG ExpandSolidColor[16] =
+  {
+    0x00000000 /* 0 */,
+    0x11111111 /* 1 */,
+    0x22222222 /* 2 */,
+    0x33333333 /* 3 */,
+    0x44444444 /* 4 */,
+    0x55555555 /* 5 */,
+    0x66666666 /* 6 */,
+    0x77777777 /* 7 */,
+    0x88888888 /* 8 */,
+    0x99999999 /* 9 */,
+    0xAAAAAAAA /* 10 */,
+    0xBBBBBBBB /* 11 */,
+    0xCCCCCCCC /* 12 */,
+    0xDDDDDDDD /* 13 */,
+    0xEEEEEEEE /* 14 */,
+    0xFFFFFFFF /* 15 */,
+  };
+
+  UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4);
+  UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);
+
+  SourceY = BltInfo->SourcePoint.y;
+  RoundedRight = BltInfo->DestRect.right -
+    ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 0x7);
+
+  if (UsesPattern)
+  {
+    if (BltInfo->PatternSurface)
+    {
+      PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
+        BltInfo->PatternSurface->sizlBitmap.cy;
+    }
+    else
+    {
+      if (BltInfo->Brush)
+        Pattern = ExpandSolidColor[BltInfo->Brush->iSolidColor];
+    }
+  }
+
+  for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++)
+  {
+    DestBits = (PULONG)(
+      (PBYTE)BltInfo->DestSurface->pvScan0 +
+      (BltInfo->DestRect.left >> 1) +
+      DestY * BltInfo->DestSurface->lDelta);
+    SourceX = BltInfo->SourcePoint.x;
+    DestX = BltInfo->DestRect.left;
+
+    if (DestX & 0x1)
+    {
+      Dest = DIB_4BPP_GetPixel(BltInfo->DestSurface, DestX, DestY);
+
+      if (UsesSource)
       {
-         PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
-                    BltInfo->PatternSurface->sizlBitmap.cy;
+        Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest);
       }
-      else
+
+      if (BltInfo->PatternSurface)
       {
-         Pattern = ExpandSolidColor[BltInfo->Brush->iSolidColor];
+        Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY);
       }
-   }
-
-   for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++)
-   {
-      DestBits = (PULONG)(
-         (PBYTE)BltInfo->DestSurface->pvScan0 +
-         (BltInfo->DestRect.left >> 1) +
-         DestY * BltInfo->DestSurface->lDelta);
-      SourceX = BltInfo->SourcePoint.x;
-      DestX = BltInfo->DestRect.left;
-
-      if (DestX & 0x1)
-      {
-         Dest = DIB_4BPP_GetPixel(BltInfo->DestSurface, DestX, DestY);
-
-         if (UsesSource)
-         {
-            Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest);
-         }
 
-         if (BltInfo->PatternSurface)
-         {
-            Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
-         }
+      DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF);
 
-         DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF);
+      DestX++;
+      SourceX++;
+      DestBits = (PULONG)((ULONG_PTR)DestBits + 1);
+    }
 
-         DestX++;
-         SourceX++;
-         DestBits = (PULONG)((ULONG_PTR)DestBits + 1);
+    for (; DestX < RoundedRight; DestX += 8, SourceX += 8, DestBits++)
+    {
+      Dest = *DestBits;
+      if (UsesSource)
+      {
+        Source =
+          (DIB_GetSource(BltInfo->SourceSurface, SourceX + 1, SourceY, BltInfo->XlateSourceToDest)) |
+          (DIB_GetSource(BltInfo->SourceSurface, SourceX + 0, SourceY, BltInfo->XlateSourceToDest) << 4) |
+          (DIB_GetSource(BltInfo->SourceSurface, SourceX + 3, SourceY, BltInfo->XlateSourceToDest) << 8) |
+          (DIB_GetSource(BltInfo->SourceSurface, SourceX + 2, SourceY, BltInfo->XlateSourceToDest) << 12) |
+          (DIB_GetSource(BltInfo->SourceSurface, SourceX + 5, SourceY, BltInfo->XlateSourceToDest) << 16) |
+          (DIB_GetSource(BltInfo->SourceSurface, SourceX + 4, SourceY, BltInfo->XlateSourceToDest) << 20) |
+          (DIB_GetSource(BltInfo->SourceSurface, SourceX + 7, SourceY, BltInfo->XlateSourceToDest) << 24) |
+          (DIB_GetSource(BltInfo->SourceSurface, SourceX + 6, SourceY, BltInfo->XlateSourceToDest) << 28);
       }
-
-      for (; DestX < RoundedRight; DestX += 8, SourceX += 8, DestBits++)
+      if (BltInfo->PatternSurface)
       {
-         Dest = *DestBits;
-         if (UsesSource)
-         {
-            Source =
-               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 1, SourceY, BltInfo->XlateSourceToDest)) |
-               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 0, SourceY, BltInfo->XlateSourceToDest) << 4) |
-               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 3, SourceY, BltInfo->XlateSourceToDest) << 8) |
-               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 2, SourceY, BltInfo->XlateSourceToDest) << 12) |
-               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 5, SourceY, BltInfo->XlateSourceToDest) << 16) |
-               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 4, SourceY, BltInfo->XlateSourceToDest) << 20) |
-               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 7, SourceY, BltInfo->XlateSourceToDest) << 24) |
-               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 6, SourceY, BltInfo->XlateSourceToDest) << 28);
-         }
-         if (BltInfo->PatternSurface)
-         {
-            Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 1) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
-            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 0) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 4;
-            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 3) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 8;
-            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 2) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 12;
-            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 5) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 16;
-            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 4) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 20;
-            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 7) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 24;
-            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 6) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 28;
-         }
-         *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);
+        Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 1) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY);
+        Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 0) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 4;
+        Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 3) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 8;
+        Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 2) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 12;
+        Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 5) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 16;
+        Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 4) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 20;
+        Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 7) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 24;
+        Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 6) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 28;
       }
-
-      /* Process the rest of pixel on the line */
-      for (; DestX < BltInfo->DestRect.right; DestX++, SourceX++)
+      *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);
+    }
+
+    /* Process the rest of pixel on the line */
+    for (; DestX < BltInfo->DestRect.right; DestX++, SourceX++)
+    {
+      Dest = DIB_4BPP_GetPixel(BltInfo->DestSurface, DestX, DestY);
+      if (UsesSource)
       {
-         Dest = DIB_4BPP_GetPixel(BltInfo->DestSurface, DestX, DestY);
-         if (UsesSource)
-         {
-            Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest);
-         }
-         if (BltInfo->PatternSurface)
-         {
-            Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
-         }
-         DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF);
+        Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest);
       }
-
-      SourceY++;
       if (BltInfo->PatternSurface)
       {
-         PatternY++;
-         PatternY %= BltInfo->PatternSurface->sizlBitmap.cy;
+        Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY);
       }
-   }
+      DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF);
+    }
+
+    SourceY++;
+    if (BltInfo->PatternSurface)
+    {
+      PatternY++;
+      PatternY %= BltInfo->PatternSurface->sizlBitmap.cy;
+    }
+  }
 
-   return TRUE;
+  return TRUE;
 }
 
 /* BitBlt Optimize */
-BOOLEAN 
+BOOLEAN
 DIB_4BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
 {
-  ULONG DestY; 
-
-        for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++)
-       {                                                       
-               DIB_4BPP_HLine(DestSurface, DestRect->left, DestRect->right, DestY, color);                                                     
-       }
-
-return TRUE;
-}
-
-//NOTE: If you change something here, please do the same in other dibXXbpp.c files!
-BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            RECTL* DestRect, RECTL *SourceRect,
-                            POINTL* MaskOrigin, POINTL BrushOrigin,
-                            CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
-                            ULONG Mode)
-{
-   LONG SrcSizeY;
-   LONG SrcSizeX;
-   LONG DesSizeY;
-   LONG DesSizeX;      
-   LONG sx;
-   LONG sy;
-   LONG DesX;
-   LONG DesY;
-   LONG color;
-  
-   SrcSizeY = SourceRect->bottom - SourceRect->top;
-   SrcSizeX = SourceRect->right - SourceRect->left;
-  
-   DesSizeY = DestRect->bottom - DestRect->top;
-   DesSizeX = DestRect->right - DestRect->left;
-
-   switch(SourceSurf->iBitmapFormat)
-   {
-      case BMF_1BPP:
-         /* FIXME :  MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
-      /* This is a reference implementation, it hasn't been optimized for speed */
-                      
-       for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
-       {                        
-           sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top;
-                     
-            for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
-            {                  
-                  sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left;
-                               
-                  if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0)
-                                 {
-                                       DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0));
-                  } 
-                                 else 
-                                 {
-                    DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1));
-                  }
-            }
-       }               
-
-         break;
-
-      case BMF_4BPP:           
-      /* FIXME :  MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
-      /* This is a reference implementation, it hasn't been optimized for speed */
-                      
-       for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
-       {                        
-           sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top;
-                     
-            for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
-            {                  
-                 sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left;            
-                 color = DIB_4BPP_GetPixel(SourceSurf, sx, sy);
-                 DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color));
-            }
-       }                  
-      break;
-
-      case BMF_8BPP:           
-      /* FIXME :  MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
-      /* This is a reference implementation, it hasn't been optimized for speed */
-                      
-       for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
-       {                        
-           sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top;
-                     
-            for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
-            {                  
-                 sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left;            
-                 color = DIB_8BPP_GetPixel(SourceSurf, sx, sy);
-                 DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color));
-            }
-       }                  
-      break;
-
-      case BMF_16BPP:          
-      /* FIXME :  MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
-      /* This is a reference implementation, it hasn't been optimized for speed */
-                      
-       for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
-       {                        
-           sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top;
-                     
-            for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
-            {                  
-                 sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left;            
-                 color = DIB_16BPP_GetPixel(SourceSurf, sx, sy);
-                 DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color));
-            }
-       }                  
-      break;
+  ULONG DestY;
 
-      case BMF_24BPP:          
-      /* FIXME :  MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
-      /* This is a reference implementation, it hasn't been optimized for speed */
-                      
-       for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
-       {                        
-           sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top;
-                     
-            for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
-            {                  
-                 sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left;            
-                 color = DIB_24BPP_GetPixel(SourceSurf, sx, sy);
-                 DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color));
-            }
-       }                  
-      break;
-
-      case BMF_32BPP:          
-      /* FIXME :  MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
-      /* This is a reference implementation, it hasn't been optimized for speed */
-                      
-       for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
-       {                        
-           sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top;
-                     
-            for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
-            {                  
-                 sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left;            
-                 color = DIB_32BPP_GetPixel(SourceSurf, sx, sy);
-                 DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color));
-            }
-       }                  
-      break;
-
-      default:
-      //DPRINT1("DIB_4BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
-      return FALSE;
-   }
-  
+  for (DestY = DestRect->top; DestY < DestRect->bottom; DestY++)
+  {
+    DIB_4BPP_HLine(DestSurface, DestRect->left, DestRect->right, DestY, color);
+  }
   return TRUE;
 }
 
 BOOLEAN
 DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                        RECTL*  DestRect,  POINTL  *SourcePoint,
+                        RECTL*  DestRect,  RECTL *SourceRect,
                         XLATEOBJ *ColorTranslation, ULONG iTransColor)
 {
   return FALSE;
 }
 
-BOOLEAN
-DIB_4BPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect,
-                    RECTL* SourceRect, CLIPOBJ* ClipRegion,
-                    XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 /* EOF */