[WIN32K]
[reactos.git] / subsystems / win32 / win32k / objects / bitblt.c
index b57beb7..5b59a59 100644 (file)
 /*
- *  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.
- */
+*  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.,
+*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 /* $Id: bitmaps.c 28300 2007-08-12 15:20:09Z tkreuzer $ */
 
-#include <w32k.h>
+#include <win32k.h>
 
 #define NDEBUG
 #include <debug.h>
 
 
 
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiAlphaBlend(
-       HDC  hDCDest,
-       LONG  XOriginDest,
-       LONG  YOriginDest,
-       LONG  WidthDest,
-       LONG  HeightDest,
-       HDC  hDCSrc,
-       LONG  XOriginSrc,
-       LONG  YOriginSrc,
-       LONG  WidthSrc,
-       LONG  HeightSrc,
-       BLENDFUNCTION  BlendFunc,
-       HANDLE hcmXform)
+    HDC hDCDest,
+    LONG XOriginDest,
+    LONG YOriginDest,
+    LONG WidthDest,
+    LONG HeightDest,
+    HDC hDCSrc,
+    LONG XOriginSrc,
+    LONG YOriginSrc,
+    LONG WidthSrc,
+    LONG HeightSrc,
+    BLENDFUNCTION BlendFunc,
+    HANDLE hcmXform)
 {
-       PDC DCDest;
-       PDC DCSrc;
-       BITMAPOBJ *BitmapDest, *BitmapSrc;
-       RECTL DestRect, SourceRect;
-       BOOL Status;
-       XLATEOBJ *XlateObj;
-       BLENDOBJ BlendObj;
-       BlendObj.BlendFunction = BlendFunc;
-
-       DCDest = DC_LockDc(hDCDest);
-       if (NULL == DCDest)
-       {
-               DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiAlphaBlend\n", hDCDest);
-               SetLastWin32Error(ERROR_INVALID_HANDLE);
-               return FALSE;
-       }
-       if (DCDest->DC_Type == DC_TYPE_INFO)
-       {
-               DC_UnlockDc(DCDest);
-               /* Yes, Windows really returns TRUE in this case */
-               return TRUE;
-       }
-
-       if (hDCSrc != hDCDest)
-       {
-               DCSrc = DC_LockDc(hDCSrc);
-               if (NULL == DCSrc)
-               {
-                       DC_UnlockDc(DCDest);
-                       DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiAlphaBlend\n", hDCSrc);
-                       SetLastWin32Error(ERROR_INVALID_HANDLE);
-                       return FALSE;
-               }
-               if (DCSrc->DC_Type == DC_TYPE_INFO)
-               {
-                       DC_UnlockDc(DCSrc);
-                       DC_UnlockDc(DCDest);
-                       /* Yes, Windows really returns TRUE in this case */
-                       return TRUE;
-               }
-       }
-       else
-       {
-               DCSrc = DCDest;
-       }
-
-       /* Offset the destination and source by the origin of their DCs. */
-       XOriginDest += DCDest->ptlDCOrig.x;
-       YOriginDest += DCDest->ptlDCOrig.y;
-       XOriginSrc += DCSrc->ptlDCOrig.x;
-       YOriginSrc += DCSrc->ptlDCOrig.y;
-
-       DestRect.left   = XOriginDest;
-       DestRect.top    = YOriginDest;
-       DestRect.right  = XOriginDest + WidthDest;
-       DestRect.bottom = YOriginDest + HeightDest;
-
-       SourceRect.left   = XOriginSrc;
-       SourceRect.top    = YOriginSrc;
-       SourceRect.right  = XOriginSrc + WidthSrc;
-       SourceRect.bottom = YOriginSrc + HeightSrc;
-
-       /* Determine surfaces to be used in the bitblt */
-       BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap);
-       if (!BitmapDest)
-       {
-               if (hDCSrc != hDCDest)
-                       DC_UnlockDc(DCSrc);
-               DC_UnlockDc(DCDest);
-               return FALSE;
-       }
-       if (DCSrc->w.hBitmap == DCDest->w.hBitmap)
-               BitmapSrc = BitmapDest;
-       else
-       {
-               BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap);
-               if (!BitmapSrc)
-               {
-                       BITMAPOBJ_UnlockBitmap(BitmapDest);
-                       if (hDCSrc != hDCDest)
-                               DC_UnlockDc(DCSrc);
-                       DC_UnlockDc(DCDest);
-                       return FALSE;
-               }
-       }
-
-       /* Create the XLATEOBJ. */
-       XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc);
-
-       if (XlateObj == (XLATEOBJ*)-1)
-       {
-               DPRINT1("error!!!\n");
-               SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
-               XlateObj = NULL;
-               Status = FALSE;
-       }
-       else
-       {
-               /* Perform the alpha blend operation */
-               Status = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj,
-                                         DCDest->CombinedClip, XlateObj,
-                                         &DestRect, &SourceRect, &BlendObj);
-       }
-
-       if (XlateObj != NULL)
-               EngDeleteXlate(XlateObj);
-
-       BITMAPOBJ_UnlockBitmap(BitmapDest);
-       if (BitmapSrc != BitmapDest)
-               BITMAPOBJ_UnlockBitmap(BitmapSrc);
-       DC_UnlockDc(DCDest);
-       if (hDCSrc != hDCDest)
-               DC_UnlockDc(DCSrc);
-
-       return Status;
+    PDC DCDest;
+    PDC DCSrc;
+    HDC ahDC[2];
+    PGDIOBJ apObj[2];
+    SURFACE *BitmapDest, *BitmapSrc;
+    RECTL DestRect, SourceRect;
+    BOOL bResult;
+    EXLATEOBJ exlo;
+    BLENDOBJ BlendObj;
+    BlendObj.BlendFunction = BlendFunc;
+
+    if (WidthDest < 0 || HeightDest < 0 || WidthSrc < 0 || HeightSrc < 0)
+    {
+        SetLastWin32Error(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    DPRINT("Locking DCs\n");
+    ahDC[0] = hDCDest;
+    ahDC[1] = hDCSrc ;
+    GDIOBJ_LockMultipleObjs(2, ahDC, apObj);
+    DCDest = apObj[0];
+    DCSrc = apObj[1];
+
+    if ((NULL == DCDest) || (NULL == DCSrc))
+    {
+        DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hDCDest, hDCSrc);
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        if(DCSrc) GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+        if(DCDest) GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+        return FALSE;
+    }
+
+    if (DCDest->dctype == DC_TYPE_INFO || DCDest->dctype == DCTYPE_INFO)
+    {
+        GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+        GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+        /* Yes, Windows really returns TRUE in this case */
+        return TRUE;
+    }
+
+    DestRect.left   = XOriginDest;
+    DestRect.top    = YOriginDest;
+    DestRect.right  = XOriginDest + WidthDest;
+    DestRect.bottom = YOriginDest + HeightDest;
+    IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2);
+
+    DestRect.left   += DCDest->ptlDCOrig.x;
+    DestRect.top    += DCDest->ptlDCOrig.y;
+    DestRect.right  += DCDest->ptlDCOrig.x;
+    DestRect.bottom += DCDest->ptlDCOrig.y;
+
+    SourceRect.left   = XOriginSrc;
+    SourceRect.top    = YOriginSrc;
+    SourceRect.right  = XOriginSrc + WidthSrc;
+    SourceRect.bottom = YOriginSrc + HeightSrc;
+    IntLPtoDP(DCSrc, (LPPOINT)&SourceRect, 2);
+
+    SourceRect.left   += DCSrc->ptlDCOrig.x;
+    SourceRect.top    += DCSrc->ptlDCOrig.y;
+    SourceRect.right  += DCSrc->ptlDCOrig.x;
+    SourceRect.bottom += DCSrc->ptlDCOrig.y;
+
+    if (!DestRect.right ||
+        !DestRect.bottom ||
+        !SourceRect.right ||
+        !SourceRect.bottom)
+    {
+        GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+        GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+        return TRUE;
+    }
+
+    /* Prepare DCs for blit */
+    DPRINT("Preparing DCs for blit\n");
+    DC_vPrepareDCsForBlit(DCDest, DestRect, DCSrc, SourceRect);
+
+    /* Determine surfaces to be used in the bitblt */
+    BitmapDest = DCDest->dclevel.pSurface;
+    if (!BitmapDest)
+    {
+        bResult = FALSE ;
+        goto leave ;
+    }
+
+    BitmapSrc = DCSrc->dclevel.pSurface;
+    if (!BitmapSrc)
+    {
+        bResult = FALSE;
+        goto leave;
+    }
+
+    /* Create the XLATEOBJ. */
+    EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest);
+
+    /* Perform the alpha blend operation */
+    DPRINT("Performing the alpha Blend\n");
+    bResult = IntEngAlphaBlend(&BitmapDest->SurfObj,
+                               &BitmapSrc->SurfObj,
+                               DCDest->rosdc.CombinedClip,
+                               &exlo.xlo,
+                               &DestRect,
+                               &SourceRect,
+                               &BlendObj);
+
+    EXLATEOBJ_vCleanup(&exlo);
+leave :
+    DPRINT("Finishing blit\n");
+    DC_vFinishBlit(DCDest, DCSrc);
+    GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+    GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+
+    return bResult;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiBitBlt(
-       HDC  hDCDest,
-       INT  XDest,
-       INT  YDest,
-       INT  Width,
-       INT  Height,
-       HDC  hDCSrc,
-       INT  XSrc,
-       INT  YSrc,
-       DWORD  ROP,
-       IN DWORD crBackColor,
-       IN FLONG fl)
+    HDC hDCDest,
+    INT XDest,
+    INT YDest,
+    INT Width,
+    INT Height,
+    HDC hDCSrc,
+    INT XSrc,
+    INT YSrc,
+    DWORD ROP,
+    IN DWORD crBackColor,
+    IN FLONG fl)
 {
-       PDC DCDest;
-       PDC DCSrc  = NULL;
-       PDC_ATTR Dc_Attr = NULL;
-       BITMAPOBJ *BitmapDest, *BitmapSrc = NULL;
-       RECTL DestRect;
-       POINTL SourcePoint, BrushOrigin;
-       BOOL Status = FALSE;
-       XLATEOBJ *XlateObj = NULL;
-       PGDIBRUSHOBJ BrushObj = NULL;
-       GDIBRUSHINST BrushInst;
-       BOOL UsesSource = ROP3_USES_SOURCE(ROP);
-       BOOL UsesPattern = ROP3_USES_PATTERN(ROP);
-
-       DCDest = DC_LockDc(hDCDest);
-       if (NULL == DCDest)
-       {
-               DPRINT("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest);
-               return FALSE;
-       }
-       if (DCDest->DC_Type == DC_TYPE_INFO)
-       {
-               DC_UnlockDc(DCDest);
-               /* Yes, Windows really returns TRUE in this case */
-               return TRUE;
-       }
-
-       if (UsesSource)
-       {
-               if (hDCSrc != hDCDest)
-               {
-                       DCSrc = DC_LockDc(hDCSrc);
-                       if (NULL == DCSrc)
-                       {
-                               DC_UnlockDc(DCDest);
-                               DPRINT("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc);
-                               return FALSE;
-                       }
-                       if (DCSrc->DC_Type == DC_TYPE_INFO)
-                       {
-                               DC_UnlockDc(DCSrc);
-                               DC_UnlockDc(DCDest);
-                               /* Yes, Windows really returns TRUE in this case */
-                               return TRUE;
-                       }
-               }
-               else
-               {
-                       DCSrc = DCDest;
-               }
-       }
-
-       Dc_Attr = DCDest->pDc_Attr;
-       if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr;
-
-       /* Offset the destination and source by the origin of their DCs. */
-        XDest += DCDest->ptlDCOrig.x;
-        YDest += DCDest->ptlDCOrig.y;
-       if (UsesSource)
-       {
-               XSrc += DCSrc->ptlDCOrig.x;
-               YSrc += DCSrc->ptlDCOrig.y;
-       }
-
-       DestRect.left   = XDest;
-       DestRect.top    = YDest;
-       DestRect.right  = XDest+Width;
-       DestRect.bottom = YDest+Height;
-
-       IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2);
-
-       SourcePoint.x = XSrc;
-       SourcePoint.y = YSrc;
-
-       BrushOrigin.x = 0;
-       BrushOrigin.y = 0;
-
-       /* Determine surfaces to be used in the bitblt */
-       BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap);
-       if (!BitmapDest)
-               goto cleanup;
-
-       if (UsesSource)
-       {
-               if (DCSrc->w.hBitmap == DCDest->w.hBitmap)
-                       BitmapSrc = BitmapDest;
-               else
-               {
-                       BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap);
-                       if (!BitmapSrc)
-                               goto cleanup;
-               }
-       }
-
-       if (UsesPattern)
-       {
-               BrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush);
-               if (NULL == BrushObj)
-               {
-                       SetLastWin32Error(ERROR_INVALID_HANDLE);
-                       goto cleanup;
-               }
-               BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin);
-               IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush);
-       }
-
-       /* Create the XLATEOBJ. */
-       if (UsesSource)
-       {
-               XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc);
-
-               if (XlateObj == (XLATEOBJ*)-1)
-               {
-                       DPRINT1("error!\n");
-                       SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
-                       XlateObj = NULL;
-                       goto cleanup;
-               }
-       }
-
-       /* Perform the bitblt operation */
-    Status = IntEngBitBlt(&BitmapDest->SurfObj, BitmapSrc ? &BitmapSrc->SurfObj : NULL, NULL,
-                          DCDest->CombinedClip, XlateObj, &DestRect,
-                          &SourcePoint, NULL,
-                          BrushObj ? &BrushInst.BrushObject : NULL,
-                          &BrushOrigin, ROP3_TO_ROP4(ROP));
+    PDC DCDest;
+    PDC DCSrc = NULL;
+    HDC ahDC[2];
+    PGDIOBJ apObj[2];
+    PDC_ATTR pdcattr = NULL;
+    SURFACE *BitmapDest, *BitmapSrc = NULL;
+    RECTL DestRect, SourceRect;
+    POINTL SourcePoint;
+    BOOL Status = FALSE;
+    EXLATEOBJ exlo;
+    XLATEOBJ *XlateObj = NULL;
+    BOOL UsesSource = ROP3_USES_SOURCE(ROP);
+
+    DPRINT("Locking DCs\n");
+    ahDC[0] = hDCDest;
+    ahDC[1] = hDCSrc ;
+    GDIOBJ_LockMultipleObjs(2, ahDC, apObj);
+    DCDest = apObj[0];
+    DCSrc = apObj[1];
+
+    if (NULL == DCDest)
+    {
+        if(DCSrc) GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+        DPRINT("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest);
+        return FALSE;
+    }
 
+    if (DCDest->dctype == DC_TYPE_INFO)
+    {
+        if(DCSrc) GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+        GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+        /* Yes, Windows really returns TRUE in this case */
+        return TRUE;
+    }
+
+    if (UsesSource)
+    {
+        if (NULL == DCSrc)
+        {
+            GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+            DPRINT("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc);
+            return FALSE;
+        }
+        if (DCSrc->dctype == DC_TYPE_INFO)
+        {
+            GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+            GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+            /* Yes, Windows really returns TRUE in this case */
+            return TRUE;
+        }
+    }
+    else if(DCSrc)
+    {
+        DPRINT1("Getting a valid Source handle without using source!!!\n");
+        GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+        DCSrc = NULL ;
+    }
+
+    pdcattr = DCDest->pdcattr;
+
+    DestRect.left   = XDest;
+    DestRect.top    = YDest;
+    DestRect.right  = XDest+Width;
+    DestRect.bottom = YDest+Height;
+    IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2);
+
+    DestRect.left   += DCDest->ptlDCOrig.x;
+    DestRect.top    += DCDest->ptlDCOrig.y;
+    DestRect.right  += DCDest->ptlDCOrig.x;
+    DestRect.bottom += DCDest->ptlDCOrig.y;
+
+    SourcePoint.x = XSrc;
+    SourcePoint.y = YSrc;
+
+    if (UsesSource)
+    {
+        IntLPtoDP(DCSrc, (LPPOINT)&SourcePoint, 1);
+
+        SourcePoint.x += DCSrc->ptlDCOrig.x;
+        SourcePoint.y += DCSrc->ptlDCOrig.y;
+        /* Calculate Source Rect */
+        SourceRect.left = SourcePoint.x;
+        SourceRect.top = SourcePoint.y;
+        SourceRect.right = SourcePoint.x + DestRect.right - DestRect.left;
+        SourceRect.bottom = SourcePoint.y + DestRect.bottom - DestRect.top ;
+    }
+
+    /* Prepare blit */
+    DC_vPrepareDCsForBlit(DCDest, DestRect, DCSrc, SourceRect);
+
+    if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
+        DC_vUpdateFillBrush(DCDest);
+
+    /* Determine surfaces to be used in the bitblt */
+    BitmapDest = DCDest->dclevel.pSurface;
+    if (!BitmapDest)
+        goto cleanup;
+
+    if (UsesSource)
+    {
+        {
+            BitmapSrc = DCSrc->dclevel.pSurface;
+            if (!BitmapSrc)
+                goto cleanup;
+        }
+    }
+
+    /* Create the XLATEOBJ. */
+    if (UsesSource)
+    {
+        EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest);
+        XlateObj = &exlo.xlo;
+    }
+
+    /* Perform the bitblt operation */
+    Status = IntEngBitBlt(&BitmapDest->SurfObj,
+                          BitmapSrc ? &BitmapSrc->SurfObj : NULL,
+                          NULL,
+                          DCDest->rosdc.CombinedClip,
+                          XlateObj,
+                          &DestRect,
+                          &SourcePoint,
+                          NULL,
+                          &DCDest->eboFill.BrushObject,
+                          &DCDest->dclevel.pbrFill->ptOrigin,
+                          ROP3_TO_ROP4(ROP));
+
+    if (UsesSource)
+        EXLATEOBJ_vCleanup(&exlo);
 cleanup:
-       if (UsesSource && XlateObj != NULL)
-               EngDeleteXlate(XlateObj);
-
-       if(BitmapDest != NULL)
-       {
-               BITMAPOBJ_UnlockBitmap(BitmapDest);
-       }
-       if (BitmapSrc != NULL && BitmapSrc != BitmapDest)
-       {
-               BITMAPOBJ_UnlockBitmap(BitmapSrc);
-       }
-       if (BrushObj != NULL)
-       {
-               BRUSHOBJ_UnlockBrush(BrushObj);
-       }
-       if (UsesSource && hDCSrc != hDCDest)
-       {
-               DC_UnlockDc(DCSrc);
-       }
-       DC_UnlockDc(DCDest);
-
-       return Status;
+    DC_vFinishBlit(DCDest, DCSrc);
+    if (UsesSource)
+    {
+        GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+    }
+    GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+
+    return Status;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiTransparentBlt(
-       HDC                     hdcDst,
-       INT                     xDst,
-       INT                     yDst,
-       INT                     cxDst,
-       INT                     cyDst,
-       HDC                     hdcSrc,
-       INT                     xSrc,
-       INT                     ySrc,
-       INT                     cxSrc,
-       INT                     cySrc,
-       COLORREF        TransColor)
+    HDC hdcDst,
+    INT xDst,
+    INT yDst,
+    INT cxDst,
+    INT cyDst,
+    HDC hdcSrc,
+    INT xSrc,
+    INT ySrc,
+    INT cxSrc,
+    INT cySrc,
+    COLORREF TransColor)
 {
-  PDC DCDest, DCSrc;
-  RECTL rcDest, rcSrc;
-  BITMAPOBJ *BitmapDest, *BitmapSrc = NULL;
-  XLATEOBJ *XlateObj = NULL;
-  HPALETTE SourcePalette = 0, DestPalette = 0;
-  PPALGDI PalDestGDI, PalSourceGDI;
-  USHORT PalDestMode, PalSrcMode;
-  ULONG TransparentColor = 0;
-  BOOL Ret = FALSE;
-
-  if(!(DCDest = DC_LockDc(hdcDst)))
-  {
-    DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiTransparentBlt\n", hdcDst);
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    return FALSE;
-  }
-  if (DCDest->DC_Type == DC_TYPE_INFO)
-  {
-    DC_UnlockDc(DCDest);
-    /* Yes, Windows really returns TRUE in this case */
-    return TRUE;
-  }
+    PDC DCDest, DCSrc;
+    HDC ahDC[2];
+    PGDIOBJ apObj[2];
+    RECTL rcDest, rcSrc;
+    SURFACE *BitmapDest, *BitmapSrc = NULL;
+    PPALETTE PalSourceGDI;
+    ULONG TransparentColor = 0;
+    BOOL Ret = FALSE;
+    EXLATEOBJ exlo;
+
+    DPRINT("Locking DCs\n");
+    ahDC[0] = hdcDst;
+    ahDC[1] = hdcSrc ;
+    GDIOBJ_LockMultipleObjs(2, ahDC, apObj);
+    DCDest = apObj[0];
+    DCSrc = apObj[1];
+
+    if ((NULL == DCDest) || (NULL == DCSrc))
+    {
+        DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hdcDst, hdcSrc);
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        if(DCSrc) GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+        if(DCDest) GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+        return FALSE;
+    }
 
-  if((hdcDst != hdcSrc) && !(DCSrc = DC_LockDc(hdcSrc)))
-  {
-    DC_UnlockDc(DCDest);
-    DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiTransparentBlt\n", hdcSrc);
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    return FALSE;
-  }
-  if(hdcDst == hdcSrc)
-  {
-    DCSrc = DCDest;
-  }
-  if (DCSrc->DC_Type == DC_TYPE_INFO)
-  {
-    DC_UnlockDc(DCSrc);
-    if(hdcDst != hdcSrc)
+    if (DCDest->dctype == DC_TYPE_INFO || DCDest->dctype == DCTYPE_INFO)
     {
-      DC_UnlockDc(DCDest);
+        GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+        GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+        /* Yes, Windows really returns TRUE in this case */
+        return TRUE;
     }
-    /* Yes, Windows really returns TRUE in this case */
-    return TRUE;
-  }
-
-  /* Offset positions */
-  xDst += DCDest->ptlDCOrig.x;
-  yDst += DCDest->ptlDCOrig.y;
-  xSrc += DCSrc->ptlDCOrig.x;
-  ySrc += DCSrc->ptlDCOrig.y;
-
-  BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap);
-  if (!BitmapDest)
-  {
-    goto done;
-  }
-
-  BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap);
-  if (!BitmapSrc)
-  {
-    goto done;
-  }
-
-  DestPalette = BitmapDest->hDIBPalette;
-  if (!DestPalette) DestPalette = pPrimarySurface->DevInfo.hpalDefault;
-
-  SourcePalette = BitmapSrc->hDIBPalette;
-  if (!SourcePalette) SourcePalette = pPrimarySurface->DevInfo.hpalDefault;
-
-  if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette)))
-  {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    goto done;
-  }
-  PalSrcMode = PalSourceGDI->Mode;
-  PALETTE_UnlockPalette(PalSourceGDI);
-
-  if(DestPalette != SourcePalette)
-  {
-    if (!(PalDestGDI = PALETTE_LockPalette(DestPalette)))
+
+    rcDest.left   = xDst;
+    rcDest.top    = yDst;
+    rcDest.right  = rcDest.left + cxDst;
+    rcDest.bottom = rcDest.top + cyDst;
+    IntLPtoDP(DCDest, (LPPOINT)&rcDest, 2);
+
+    rcDest.left   += DCDest->ptlDCOrig.x;
+    rcDest.top    += DCDest->ptlDCOrig.y;
+    rcDest.right  += DCDest->ptlDCOrig.x;
+    rcDest.bottom += DCDest->ptlDCOrig.y;
+
+    rcSrc.left   = xSrc;
+    rcSrc.top    = ySrc;
+    rcSrc.right  = rcSrc.left + cxSrc;
+    rcSrc.bottom = rcSrc.top + cySrc;
+    IntLPtoDP(DCSrc, (LPPOINT)&rcSrc, 2);
+
+    rcSrc.left   += DCSrc->ptlDCOrig.x;
+    rcSrc.top    += DCSrc->ptlDCOrig.y;
+    rcSrc.right  += DCSrc->ptlDCOrig.x;
+    rcSrc.bottom += DCSrc->ptlDCOrig.y;
+
+    /* Prepare for blit */
+    DC_vPrepareDCsForBlit(DCDest, rcDest, DCSrc, rcSrc);
+
+    BitmapDest = DCDest->dclevel.pSurface;
+    if (!BitmapDest)
     {
-      SetLastWin32Error(ERROR_INVALID_HANDLE);
-      goto done;
+        goto done;
     }
-    PalDestMode = PalDestGDI->Mode;
-    PALETTE_UnlockPalette(PalDestGDI);
-  }
-  else
-  {
-    PalDestMode = PalSrcMode;
-  }
-
-  /* Translate Transparent (RGB) Color to the source palette */
-  if((XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalSrcMode, PAL_RGB, SourcePalette, NULL)))
-  {
-    TransparentColor = XLATEOBJ_iXlate(XlateObj, (ULONG)TransColor);
-    EngDeleteXlate(XlateObj);
-  }
-
-  /* Create the XLATE object to convert colors between source and destination */
-  XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalDestMode, PalSrcMode, DestPalette, SourcePalette);
-
-  rcDest.left = xDst;
-  rcDest.top = yDst;
-  rcDest.right = rcDest.left + cxDst;
-  rcDest.bottom = rcDest.top + cyDst;
-  rcSrc.left = xSrc;
-  rcSrc.top = ySrc;
-  rcSrc.right = rcSrc.left + cxSrc;
-  rcSrc.bottom = rcSrc.top + cySrc;
-
-  if((cxDst != cxSrc) || (cyDst != cySrc))
-  {
-    DPRINT1("TransparentBlt() does not support stretching at the moment!\n");
-    goto done;
-  }
-
-  Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj,
-                             DCDest->CombinedClip, XlateObj, &rcDest, &rcSrc,
-                             TransparentColor, 0);
+
+    BitmapSrc = DCSrc->dclevel.pSurface;
+    if (!BitmapSrc)
+    {
+        goto done;
+    }
+
+    if (BitmapSrc->ppal)
+    {
+        GDIOBJ_IncrementShareCount(&BitmapSrc->ppal->BaseObject);
+        PalSourceGDI = BitmapSrc->ppal ;
+    }
+    else
+        PalSourceGDI = PALETTE_ShareLockPalette(pPrimarySurface->devinfo.hpalDefault) ;
+
+    if(!PalSourceGDI)
+    {
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        goto done;
+    }
+
+    /* Translate Transparent (RGB) Color to the source palette */
+    EXLATEOBJ_vInitialize(&exlo, &gpalRGB, PalSourceGDI, 0, 0, 0);
+    TransparentColor = XLATEOBJ_iXlate(&exlo.xlo, (ULONG)TransColor);
+    EXLATEOBJ_vCleanup(&exlo);
+    PALETTE_ShareUnlockPalette(PalSourceGDI);
+
+    EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest);
+
+    Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj,
+        DCDest->rosdc.CombinedClip, &exlo.xlo, &rcDest, &rcSrc,
+        TransparentColor, 0);
+
+    EXLATEOBJ_vCleanup(&exlo);
 
 done:
-  DC_UnlockDc(DCSrc);
-  if (BitmapDest)
-  {
-    BITMAPOBJ_UnlockBitmap(BitmapDest);
-  }
-  if (BitmapSrc)
-  {
-    BITMAPOBJ_UnlockBitmap(BitmapSrc);
-  }
-  if(hdcDst != hdcSrc)
-  {
-    DC_UnlockDc(DCDest);
-  }
-  if(XlateObj)
-  {
-    EngDeleteXlate(XlateObj);
-  }
-  return Ret;
+    DC_vFinishBlit(DCDest, DCSrc);
+    GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+    GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+
+    return Ret;
 }
 
 /***********************************************************************
- * MaskBlt
- * Ported from WINE by sedwards 11-4-03
- *
- * Someone thought it would be faster to do it here and then switch back
- * to GDI32. I dunno. Write a test and let me know.
- */
+* MaskBlt
+* Ported from WINE by sedwards 11-4-03
+*
+* Someone thought it would be faster to do it here and then switch back
+* to GDI32. I dunno. Write a test and let me know.
+* A. It should be in here!
+*/
 
 static __inline BYTE
 SwapROP3_SrcDst(BYTE bRop3)
 {
-       return (bRop3 & 0x99) | ((bRop3 & 0x22) << 1) | ((bRop3 & 0x44) >> 1);
+    return (bRop3 & 0x99) | ((bRop3 & 0x22) << 1) | ((bRop3 & 0x44) >> 1);
 }
 
-#define FRGND_ROP3(ROP4)       ((ROP4) & 0x00FFFFFF)
-#define BKGND_ROP3(ROP4)       (ROP3Table[(SwapROP3_SrcDst((ROP4)>>24)) & 0xFF])
-#define DSTCOPY                0x00AA0029
-#define DSTERASE               0x00220326 /* dest = dest & (~src) : DSna */
-
-BOOL STDCALL
-NtGdiMaskBlt (
-       HDC hdcDest, INT nXDest, INT nYDest,
-       INT nWidth, INT nHeight, HDC hdcSrc,
-       INT nXSrc, INT nYSrc, HBITMAP hbmMask,
-       INT xMask, INT yMask, DWORD dwRop,
-       IN DWORD crBackColor)
+#define FRGND_ROP3(ROP4)    ((ROP4) & 0x00FFFFFF)
+#define BKGND_ROP3(ROP4)    (ROP3Table[(SwapROP3_SrcDst((ROP4)>>24)) & 0xFF])
+#define DSTCOPY    0x00AA0029
+#define DSTERASE    0x00220326 /* dest = dest & (~src) : DSna */
+
+BOOL APIENTRY
+NtGdiMaskBlt(
+    HDC hdcDest,
+    INT nXDest,
+    INT nYDest,
+    INT nWidth,
+    INT nHeight,
+    HDC hdcSrc,
+    INT nXSrc,
+    INT nYSrc,
+    HBITMAP hbmMask,
+    INT xMask,
+    INT yMask,
+    DWORD dwRop,
+    IN DWORD crBackColor)
 {
-       HBITMAP hOldMaskBitmap, hBitmap2, hOldBitmap2, hBitmap3, hOldBitmap3;
-       HDC hDCMask, hDC1, hDC2;
-       static const DWORD ROP3Table[256] =
-       {
-               0x00000042, 0x00010289,
-               0x00020C89, 0x000300AA,
-               0x00040C88, 0x000500A9,
-               0x00060865, 0x000702C5,
-               0x00080F08, 0x00090245,
-               0x000A0329, 0x000B0B2A,
-               0x000C0324, 0x000D0B25,
-               0x000E08A5, 0x000F0001,
-               0x00100C85, 0x001100A6,
-               0x00120868, 0x001302C8,
-               0x00140869, 0x001502C9,
-               0x00165CCA, 0x00171D54,
-               0x00180D59, 0x00191CC8,
-               0x001A06C5, 0x001B0768,
-               0x001C06CA, 0x001D0766,
-               0x001E01A5, 0x001F0385,
-               0x00200F09, 0x00210248,
-               0x00220326, 0x00230B24,
-               0x00240D55, 0x00251CC5,
-               0x002606C8, 0x00271868,
-               0x00280369, 0x002916CA,
-               0x002A0CC9, 0x002B1D58,
-               0x002C0784, 0x002D060A,
-               0x002E064A, 0x002F0E2A,
-               0x0030032A, 0x00310B28,
-               0x00320688, 0x00330008,
-               0x003406C4, 0x00351864,
-               0x003601A8, 0x00370388,
-               0x0038078A, 0x00390604,
-               0x003A0644, 0x003B0E24,
-               0x003C004A, 0x003D18A4,
-               0x003E1B24, 0x003F00EA,
-               0x00400F0A, 0x00410249,
-               0x00420D5D, 0x00431CC4,
-               0x00440328, 0x00450B29,
-               0x004606C6, 0x0047076A,
-               0x00480368, 0x004916C5,
-               0x004A0789, 0x004B0605,
-               0x004C0CC8, 0x004D1954,
-               0x004E0645, 0x004F0E25,
-               0x00500325, 0x00510B26,
-               0x005206C9, 0x00530764,
-               0x005408A9, 0x00550009,
-               0x005601A9, 0x00570389,
-               0x00580785, 0x00590609,
-               0x005A0049, 0x005B18A9,
-               0x005C0649, 0x005D0E29,
-               0x005E1B29, 0x005F00E9,
-               0x00600365, 0x006116C6,
-               0x00620786, 0x00630608,
-               0x00640788, 0x00650606,
-               0x00660046, 0x006718A8,
-               0x006858A6, 0x00690145,
-               0x006A01E9, 0x006B178A,
-               0x006C01E8, 0x006D1785,
-               0x006E1E28, 0x006F0C65,
-               0x00700CC5, 0x00711D5C,
-               0x00720648, 0x00730E28,
-               0x00740646, 0x00750E26,
-               0x00761B28, 0x007700E6,
-               0x007801E5, 0x00791786,
-               0x007A1E29, 0x007B0C68,
-               0x007C1E24, 0x007D0C69,
-               0x007E0955, 0x007F03C9,
-               0x008003E9, 0x00810975,
-               0x00820C49, 0x00831E04,
-               0x00840C48, 0x00851E05,
-               0x008617A6, 0x008701C5,
-               0x008800C6, 0x00891B08,
-               0x008A0E06, 0x008B0666,
-               0x008C0E08, 0x008D0668,
-               0x008E1D7C, 0x008F0CE5,
-               0x00900C45, 0x00911E08,
-               0x009217A9, 0x009301C4,
-               0x009417AA, 0x009501C9,
-               0x00960169, 0x0097588A,
-               0x00981888, 0x00990066,
-               0x009A0709, 0x009B07A8,
-               0x009C0704, 0x009D07A6,
-               0x009E16E6, 0x009F0345,
-               0x00A000C9, 0x00A11B05,
-               0x00A20E09, 0x00A30669,
-               0x00A41885, 0x00A50065,
-               0x00A60706, 0x00A707A5,
-               0x00A803A9, 0x00A90189,
-               0x00AA0029, 0x00AB0889,
-               0x00AC0744, 0x00AD06E9,
-               0x00AE0B06, 0x00AF0229,
-               0x00B00E05, 0x00B10665,
-               0x00B21974, 0x00B30CE8,
-               0x00B4070A, 0x00B507A9,
-               0x00B616E9, 0x00B70348,
-               0x00B8074A, 0x00B906E6,
-               0x00BA0B09, 0x00BB0226,
-               0x00BC1CE4, 0x00BD0D7D,
-               0x00BE0269, 0x00BF08C9,
-               0x00C000CA, 0x00C11B04,
-               0x00C21884, 0x00C3006A,
-               0x00C40E04, 0x00C50664,
-               0x00C60708, 0x00C707AA,
-               0x00C803A8, 0x00C90184,
-               0x00CA0749, 0x00CB06E4,
-               0x00CC0020, 0x00CD0888,
-               0x00CE0B08, 0x00CF0224,
-               0x00D00E0A, 0x00D1066A,
-               0x00D20705, 0x00D307A4,
-               0x00D41D78, 0x00D50CE9,
-               0x00D616EA, 0x00D70349,
-               0x00D80745, 0x00D906E8,
-               0x00DA1CE9, 0x00DB0D75,
-               0x00DC0B04, 0x00DD0228,
-               0x00DE0268, 0x00DF08C8,
-               0x00E003A5, 0x00E10185,
-               0x00E20746, 0x00E306EA,
-               0x00E40748, 0x00E506E5,
-               0x00E61CE8, 0x00E70D79,
-               0x00E81D74, 0x00E95CE6,
-               0x00EA02E9, 0x00EB0849,
-               0x00EC02E8, 0x00ED0848,
-               0x00EE0086, 0x00EF0A08,
-               0x00F00021, 0x00F10885,
-               0x00F20B05, 0x00F3022A,
-               0x00F40B0A, 0x00F50225,
-               0x00F60265, 0x00F708C5,
-               0x00F802E5, 0x00F90845,
-               0x00FA0089, 0x00FB0A09,
-               0x00FC008A, 0x00FD0A0A,
-               0x00FE02A9, 0x00FF0062,
-       };
-
-       if (!hbmMask)
-               return NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0, 0);
-
-       /* 1. make mask bitmap's dc */
-       hDCMask = NtGdiCreateCompatibleDC(hdcDest);
-       hOldMaskBitmap = (HBITMAP)NtGdiSelectBitmap(hDCMask, hbmMask);
-
-       /* 2. make masked Background bitmap */
-
-       /* 2.1 make bitmap */
-       hDC1 = NtGdiCreateCompatibleDC(hdcDest);
-       hBitmap2 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight);
-       hOldBitmap2 = (HBITMAP)NtGdiSelectBitmap(hDC1, hBitmap2);
-
-       /* 2.2 draw dest bitmap and mask */
-       NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY, 0, 0);
-       NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, BKGND_ROP3(dwRop), 0, 0);
-       NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, DSTERASE, 0, 0);
-
-       /* 3. make masked Foreground bitmap */
-
-       /* 3.1 make bitmap */
-       hDC2 = NtGdiCreateCompatibleDC(hdcDest);
-       hBitmap3 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight);
-       hOldBitmap3 = (HBITMAP)NtGdiSelectBitmap(hDC2, hBitmap3);
-
-       /* 3.2 draw src bitmap and mask */
-       NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, SRCCOPY, 0, 0);
-       NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0,0);
-       NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, SRCAND, 0, 0);
-
-       /* 4. combine two bitmap and copy it to hdcDest */
-       NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDC2, 0, 0, SRCPAINT, 0, 0);
-       NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hDC1, 0, 0, SRCCOPY, 0, 0);
-
-       /* 5. restore all object */
-       NtGdiSelectBitmap(hDCMask, hOldMaskBitmap);
-       NtGdiSelectBitmap(hDC1, hOldBitmap2);
-       NtGdiSelectBitmap(hDC2, hOldBitmap3);
-
-       /* 6. delete all temp object */
-       NtGdiDeleteObject(hBitmap2);
-       NtGdiDeleteObject(hBitmap3);
-
-       NtGdiDeleteObjectApp(hDC1);
-       NtGdiDeleteObjectApp(hDC2);
-       NtGdiDeleteObjectApp(hDCMask);
-
-       return TRUE;
+    HBITMAP hOldMaskBitmap, hBitmap2, hOldBitmap2, hBitmap3, hOldBitmap3;
+    HDC hDCMask, hDC1, hDC2;
+    static const DWORD ROP3Table[256] =
+    {
+        0x00000042, 0x00010289,
+        0x00020C89, 0x000300AA,
+        0x00040C88, 0x000500A9,
+        0x00060865, 0x000702C5,
+        0x00080F08, 0x00090245,
+        0x000A0329, 0x000B0B2A,
+        0x000C0324, 0x000D0B25,
+        0x000E08A5, 0x000F0001,
+        0x00100C85, 0x001100A6,
+        0x00120868, 0x001302C8,
+        0x00140869, 0x001502C9,
+        0x00165CCA, 0x00171D54,
+        0x00180D59, 0x00191CC8,
+        0x001A06C5, 0x001B0768,
+        0x001C06CA, 0x001D0766,
+        0x001E01A5, 0x001F0385,
+        0x00200F09, 0x00210248,
+        0x00220326, 0x00230B24,
+        0x00240D55, 0x00251CC5,
+        0x002606C8, 0x00271868,
+        0x00280369, 0x002916CA,
+        0x002A0CC9, 0x002B1D58,
+        0x002C0784, 0x002D060A,
+        0x002E064A, 0x002F0E2A,
+        0x0030032A, 0x00310B28,
+        0x00320688, 0x00330008,
+        0x003406C4, 0x00351864,
+        0x003601A8, 0x00370388,
+        0x0038078A, 0x00390604,
+        0x003A0644, 0x003B0E24,
+        0x003C004A, 0x003D18A4,
+        0x003E1B24, 0x003F00EA,
+        0x00400F0A, 0x00410249,
+        0x00420D5D, 0x00431CC4,
+        0x00440328, 0x00450B29,
+        0x004606C6, 0x0047076A,
+        0x00480368, 0x004916C5,
+        0x004A0789, 0x004B0605,
+        0x004C0CC8, 0x004D1954,
+        0x004E0645, 0x004F0E25,
+        0x00500325, 0x00510B26,
+        0x005206C9, 0x00530764,
+        0x005408A9, 0x00550009,
+        0x005601A9, 0x00570389,
+        0x00580785, 0x00590609,
+        0x005A0049, 0x005B18A9,
+        0x005C0649, 0x005D0E29,
+        0x005E1B29, 0x005F00E9,
+        0x00600365, 0x006116C6,
+        0x00620786, 0x00630608,
+        0x00640788, 0x00650606,
+        0x00660046, 0x006718A8,
+        0x006858A6, 0x00690145,
+        0x006A01E9, 0x006B178A,
+        0x006C01E8, 0x006D1785,
+        0x006E1E28, 0x006F0C65,
+        0x00700CC5, 0x00711D5C,
+        0x00720648, 0x00730E28,
+        0x00740646, 0x00750E26,
+        0x00761B28, 0x007700E6,
+        0x007801E5, 0x00791786,
+        0x007A1E29, 0x007B0C68,
+        0x007C1E24, 0x007D0C69,
+        0x007E0955, 0x007F03C9,
+        0x008003E9, 0x00810975,
+        0x00820C49, 0x00831E04,
+        0x00840C48, 0x00851E05,
+        0x008617A6, 0x008701C5,
+        0x008800C6, 0x00891B08,
+        0x008A0E06, 0x008B0666,
+        0x008C0E08, 0x008D0668,
+        0x008E1D7C, 0x008F0CE5,
+        0x00900C45, 0x00911E08,
+        0x009217A9, 0x009301C4,
+        0x009417AA, 0x009501C9,
+        0x00960169, 0x0097588A,
+        0x00981888, 0x00990066,
+        0x009A0709, 0x009B07A8,
+        0x009C0704, 0x009D07A6,
+        0x009E16E6, 0x009F0345,
+        0x00A000C9, 0x00A11B05,
+        0x00A20E09, 0x00A30669,
+        0x00A41885, 0x00A50065,
+        0x00A60706, 0x00A707A5,
+        0x00A803A9, 0x00A90189,
+        0x00AA0029, 0x00AB0889,
+        0x00AC0744, 0x00AD06E9,
+        0x00AE0B06, 0x00AF0229,
+        0x00B00E05, 0x00B10665,
+        0x00B21974, 0x00B30CE8,
+        0x00B4070A, 0x00B507A9,
+        0x00B616E9, 0x00B70348,
+        0x00B8074A, 0x00B906E6,
+        0x00BA0B09, 0x00BB0226,
+        0x00BC1CE4, 0x00BD0D7D,
+        0x00BE0269, 0x00BF08C9,
+        0x00C000CA, 0x00C11B04,
+        0x00C21884, 0x00C3006A,
+        0x00C40E04, 0x00C50664,
+        0x00C60708, 0x00C707AA,
+        0x00C803A8, 0x00C90184,
+        0x00CA0749, 0x00CB06E4,
+        0x00CC0020, 0x00CD0888,
+        0x00CE0B08, 0x00CF0224,
+        0x00D00E0A, 0x00D1066A,
+        0x00D20705, 0x00D307A4,
+        0x00D41D78, 0x00D50CE9,
+        0x00D616EA, 0x00D70349,
+        0x00D80745, 0x00D906E8,
+        0x00DA1CE9, 0x00DB0D75,
+        0x00DC0B04, 0x00DD0228,
+        0x00DE0268, 0x00DF08C8,
+        0x00E003A5, 0x00E10185,
+        0x00E20746, 0x00E306EA,
+        0x00E40748, 0x00E506E5,
+        0x00E61CE8, 0x00E70D79,
+        0x00E81D74, 0x00E95CE6,
+        0x00EA02E9, 0x00EB0849,
+        0x00EC02E8, 0x00ED0848,
+        0x00EE0086, 0x00EF0A08,
+        0x00F00021, 0x00F10885,
+        0x00F20B05, 0x00F3022A,
+        0x00F40B0A, 0x00F50225,
+        0x00F60265, 0x00F708C5,
+        0x00F802E5, 0x00F90845,
+        0x00FA0089, 0x00FB0A09,
+        0x00FC008A, 0x00FD0A0A,
+        0x00FE02A9, 0x00FF0062,
+    };
+
+    if (!hbmMask)
+        return NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0, 0);
+
+    /* 1. make mask bitmap's dc */
+    hDCMask = NtGdiCreateCompatibleDC(hdcDest);
+    hOldMaskBitmap = (HBITMAP)NtGdiSelectBitmap(hDCMask, hbmMask);
+
+    /* 2. make masked Background bitmap */
+
+    /* 2.1 make bitmap */
+    hDC1 = NtGdiCreateCompatibleDC(hdcDest);
+    hBitmap2 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight);
+    hOldBitmap2 = (HBITMAP)NtGdiSelectBitmap(hDC1, hBitmap2);
+
+    /* 2.2 draw dest bitmap and mask */
+    NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY, 0, 0);
+    NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, BKGND_ROP3(dwRop), 0, 0);
+    NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, DSTERASE, 0, 0);
+
+    /* 3. make masked Foreground bitmap */
+
+    /* 3.1 make bitmap */
+    hDC2 = NtGdiCreateCompatibleDC(hdcDest);
+    hBitmap3 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight);
+    hOldBitmap3 = (HBITMAP)NtGdiSelectBitmap(hDC2, hBitmap3);
+
+    /* 3.2 draw src bitmap and mask */
+    NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, SRCCOPY, 0, 0);
+    NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0,0);
+    NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, SRCAND, 0, 0);
+
+    /* 4. combine both and copy the result to hdcDest */
+    NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDC2, 0, 0, SRCPAINT, 0, 0);
+    NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hDC1, 0, 0, SRCCOPY, 0, 0);
+
+    /* 5. restore all objects */
+    NtGdiSelectBitmap(hDCMask, hOldMaskBitmap);
+    NtGdiSelectBitmap(hDC1, hOldBitmap2);
+    NtGdiSelectBitmap(hDC2, hOldBitmap3);
+
+    /* 6. delete all temp objects */
+    GreDeleteObject(hBitmap2);
+    GreDeleteObject(hBitmap3);
+
+    NtGdiDeleteObjectApp(hDC1);
+    NtGdiDeleteObjectApp(hDC2);
+    NtGdiDeleteObjectApp(hDCMask);
+
+    return TRUE;
 }
 
 BOOL
@@ -705,454 +666,483 @@ NtGdiPlgBlt(
     IN INT yMask,
     IN DWORD crBackColor)
 {
-       UNIMPLEMENTED;
-       return FALSE;
+    UNIMPLEMENTED;
+    return FALSE;
 }
 
-BOOL STDCALL
-NtGdiStretchBlt(
-       HDC  hDCDest,
-       INT  XOriginDest,
-       INT  YOriginDest,
-       INT  WidthDest,
-       INT  HeightDest,
-       HDC  hDCSrc,
-       INT  XOriginSrc,
-       INT  YOriginSrc,
-       INT  WidthSrc,
-       INT  HeightSrc,
-       DWORD  ROP,
-       IN DWORD dwBackColor)
+BOOL APIENTRY
+GreStretchBltMask(
+    HDC hDCDest,
+    INT XOriginDest,
+    INT YOriginDest,
+    INT WidthDest,
+    INT HeightDest,
+    HDC hDCSrc,
+    INT XOriginSrc,
+    INT YOriginSrc,
+    INT WidthSrc,
+    INT HeightSrc,
+    DWORD ROP,
+    IN DWORD dwBackColor,
+    HDC hDCMask,
+    INT XOriginMask,
+    INT YOriginMask)
 {
-       PDC DCDest;
-       PDC DCSrc  = NULL;
-       PDC_ATTR Dc_Attr;
-       BITMAPOBJ *BitmapDest, *BitmapSrc = NULL;
-       RECTL DestRect;
-       RECTL SourceRect;
-       BOOL Status = FALSE;
-       XLATEOBJ *XlateObj = NULL;
-       PGDIBRUSHOBJ BrushObj = NULL;
-       BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000);
-       BOOL UsesPattern = ((ROP & 0xF00000) >> 4) != (ROP & 0x0F0000);
-
-       if (0 == WidthDest || 0 == HeightDest || 0 == WidthSrc || 0 == HeightSrc)
-       {
-               SetLastWin32Error(ERROR_INVALID_PARAMETER);
-               return FALSE;
-       }
-       DCDest = DC_LockDc(hDCDest);
-       if (NULL == DCDest)
-       {
-               DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiStretchBlt\n", hDCDest);
-               SetLastWin32Error(ERROR_INVALID_HANDLE);
-               return FALSE;
-       }
-       if (DCDest->DC_Type == DC_TYPE_INFO)
-       {
-               DC_UnlockDc(DCDest);
-               /* Yes, Windows really returns TRUE in this case */
-               return TRUE;
-       }
-
-       if (UsesSource)
-       {
-               if (hDCSrc != hDCDest)
-               {
-                       DCSrc = DC_LockDc(hDCSrc);
-                       if (NULL == DCSrc)
-                       {
-                               DC_UnlockDc(DCDest);
-                               DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiStretchBlt\n", hDCSrc);
-                               SetLastWin32Error(ERROR_INVALID_HANDLE);
-                               return FALSE;
-                       }
-                       if (DCSrc->DC_Type == DC_TYPE_INFO)
-                       {
-                               DC_UnlockDc(DCSrc);
-                               DC_UnlockDc(DCDest);
-                               /* Yes, Windows really returns TRUE in this case */
-                               return TRUE;
-                       }
-               }
-               else
-               {
-                       DCSrc = DCDest;
-               }
-       }
-
-       /* Offset the destination and source by the origin of their DCs. */
-       // FIXME: ptlDCOrig is in device coordinates!
-       XOriginDest += DCDest->ptlDCOrig.x;
-       YOriginDest += DCDest->ptlDCOrig.y;
-       if (UsesSource)
-       {
-               XOriginSrc += DCSrc->ptlDCOrig.x;
-               YOriginSrc += DCSrc->ptlDCOrig.y;
-       }
-
-       DestRect.left   = XOriginDest;
-       DestRect.top    = YOriginDest;
-       DestRect.right  = XOriginDest+WidthDest;
-       DestRect.bottom = YOriginDest+HeightDest;
-
-       SourceRect.left   = XOriginSrc;
-       SourceRect.top    = YOriginSrc;
-       SourceRect.right  = XOriginSrc+WidthSrc;
-       SourceRect.bottom = YOriginSrc+HeightSrc;
-
-       /* Determine surfaces to be used in the bitblt */
-       BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap);
-       if (BitmapDest == NULL)
-               goto failed;
-       if (UsesSource)
-       {
-               if (DCSrc->w.hBitmap == DCDest->w.hBitmap)
-               {
-                       BitmapSrc = BitmapDest;
-               }
-               else
-               {
-                       BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap);
-                       if (BitmapSrc == NULL)
-                               goto failed;
-               }
-
-               int sw = BitmapSrc->SurfObj.sizlBitmap.cx;
-               int sh = BitmapSrc->SurfObj.sizlBitmap.cy;
-               if ( SourceRect.left < 0 )
-               {
-                       DestRect.left = DestRect.right - (DestRect.right-DestRect.left) * (SourceRect.right)/abs(SourceRect.right-SourceRect.left);
-                       SourceRect.left = 0;
-               }
-               if ( SourceRect.top < 0 )
-               {
-                       DestRect.top = DestRect.bottom - (DestRect.bottom-DestRect.top) * (SourceRect.bottom)/abs(SourceRect.bottom-SourceRect.top);
-                       SourceRect.top = 0;
-               }
-               if ( SourceRect.right < -1 )
-               {
-                       DestRect.right = DestRect.left + (DestRect.right-DestRect.left) * (-1-SourceRect.left)/abs(SourceRect.right-SourceRect.left);
-                       SourceRect.right = -1;
-               }
-               if ( SourceRect.bottom < -1 )
-               {
-                       DestRect.bottom = DestRect.top + (DestRect.bottom-DestRect.top) * (-1-SourceRect.top)/abs(SourceRect.bottom-SourceRect.top);
-                       SourceRect.bottom = -1;
-               }
-               if ( SourceRect.right > sw )
-               {
-                       DestRect.right = DestRect.left + (DestRect.right-DestRect.left) * abs(sw-SourceRect.left) / abs(SourceRect.right-SourceRect.left);
-                       SourceRect.right = sw;
-               }
-               if ( SourceRect.bottom > sh )
-               {
-                       DestRect.bottom = DestRect.top + (DestRect.bottom-DestRect.top) * abs(sh-SourceRect.top) / abs(SourceRect.bottom-SourceRect.top);
-                       SourceRect.bottom = sh;
-               }
-               sw--;
-               sh--;
-               if ( SourceRect.left > sw )
-               {
-                       DestRect.left = DestRect.right - (DestRect.right-DestRect.left) * (SourceRect.right-sw) / abs(SourceRect.right-SourceRect.left);
-                       SourceRect.left = 0;
-               }
-               if ( SourceRect.top > sh )
-               {
-                       DestRect.top = DestRect.bottom - (DestRect.bottom-DestRect.top) * (SourceRect.bottom-sh) / abs(SourceRect.bottom-SourceRect.top);
-                       SourceRect.top = 0;
-               }
-               if (0 == (DestRect.right-DestRect.left) || 0 == (DestRect.bottom-DestRect.top) || 0 == (SourceRect.right-SourceRect.left) || 0 == (SourceRect.bottom-SourceRect.top))
-               {
-                       SetLastWin32Error(ERROR_INVALID_PARAMETER);
-                       goto failed;
-               }
-
-               /* Create the XLATEOBJ. */
-               XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc);
-               if (XlateObj == (XLATEOBJ*)-1)
-               {
-                       SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
-                       XlateObj = NULL;
-                       goto failed;
-               }
-       }
-
-       if (UsesPattern)
-       {
-               Dc_Attr = DCDest->pDc_Attr;
-               if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr;
-               BrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush);
-               if (NULL == BrushObj)
-               {
-                       SetLastWin32Error(ERROR_INVALID_HANDLE);
-                       goto failed;
-               }
-       }
-
-       /* Perform the bitblt operation */
-       Status = IntEngStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj,
-                                  NULL, DCDest->CombinedClip, XlateObj,
-                                  &DestRect, &SourceRect, NULL, NULL, NULL,
-                                  COLORONCOLOR);
+    PDC DCDest;
+    PDC DCSrc  = NULL;
+    PDC DCMask = NULL;
+    HDC ahDC[3];
+    PGDIOBJ apObj[3];
+    PDC_ATTR pdcattr;
+    SURFACE *BitmapDest, *BitmapSrc = NULL;
+    SURFACE *BitmapMask = NULL;
+    RECTL DestRect;
+    RECTL SourceRect;
+    POINTL MaskPoint;
+    BOOL Status = FALSE;
+    EXLATEOBJ exlo;
+    XLATEOBJ *XlateObj = NULL;
+    POINTL BrushOrigin;
+    BOOL UsesSource = ROP3_USES_SOURCE(ROP);
+
+    if (0 == WidthDest || 0 == HeightDest || 0 == WidthSrc || 0 == HeightSrc)
+    {
+        SetLastWin32Error(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    DPRINT("Locking DCs\n");
+    ahDC[0] = hDCDest;
+    ahDC[1] = hDCSrc ;
+    ahDC[2] = hDCMask ;
+    GDIOBJ_LockMultipleObjs(3, ahDC, apObj);
+    DCDest = apObj[0];
+    DCSrc = apObj[1];
+    DCMask = apObj[2];
+
+    if (NULL == DCDest)
+    {
+        if(DCSrc) GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+        if(DCMask) GDIOBJ_UnlockObjByPtr(&DCMask->BaseObject);
+        DPRINT("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest);
+        return FALSE;
+    }
+
+    if (DCDest->dctype == DC_TYPE_INFO)
+    {
+        if(DCSrc) GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+        if(DCMask) GDIOBJ_UnlockObjByPtr(&DCMask->BaseObject);
+        GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+        /* Yes, Windows really returns TRUE in this case */
+        return TRUE;
+    }
+
+    if (UsesSource)
+    {
+        if (NULL == DCSrc)
+        {
+            GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+            if(DCMask) GDIOBJ_UnlockObjByPtr(&DCMask->BaseObject);
+            DPRINT("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc);
+            return FALSE;
+        }
+        if (DCSrc->dctype == DC_TYPE_INFO)
+        {
+            GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject);
+            GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+            if(DCMask) GDIOBJ_UnlockObjByPtr(&DCMask->BaseObject);
+            /* Yes, Windows really returns TRUE in this case */
+            return TRUE;
+        }
+    }
+    else if(DCSrc)
+    {
+        DPRINT1("Getting a valid Source handle without using source!!!\n");
+        GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject);
+        DCSrc = NULL ;
+    }
+
+    pdcattr = DCDest->pdcattr;
+
+    DestRect.left   = XOriginDest;
+    DestRect.top    = YOriginDest;
+    DestRect.right  = XOriginDest+WidthDest;
+    DestRect.bottom = YOriginDest+HeightDest;
+    IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2);
+
+    DestRect.left   += DCDest->ptlDCOrig.x;
+    DestRect.top    += DCDest->ptlDCOrig.y;
+    DestRect.right  += DCDest->ptlDCOrig.x;
+    DestRect.bottom += DCDest->ptlDCOrig.y;
+
+    SourceRect.left   = XOriginSrc;
+    SourceRect.top    = YOriginSrc;
+    SourceRect.right  = XOriginSrc+WidthSrc;
+    SourceRect.bottom = YOriginSrc+HeightSrc;
+
+    if (UsesSource)
+    {
+        IntLPtoDP(DCSrc, (LPPOINT)&SourceRect, 2);
+
+        SourceRect.left   += DCSrc->ptlDCOrig.x;
+        SourceRect.top    += DCSrc->ptlDCOrig.y;
+        SourceRect.right  += DCSrc->ptlDCOrig.x;
+        SourceRect.bottom += DCSrc->ptlDCOrig.y;
+    }
+
+    BrushOrigin.x = 0;
+    BrushOrigin.y = 0;
+
+    /* Only prepare Source and Dest, hdcMask represents a DIB */
+    DC_vPrepareDCsForBlit(DCDest, DestRect, DCSrc, SourceRect);
+
+    if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
+        DC_vUpdateFillBrush(DCDest);
+
+    /* Determine surfaces to be used in the bitblt */
+    BitmapDest = DCDest->dclevel.pSurface;
+    if (BitmapDest == NULL)
+        goto failed;
+    if (UsesSource)
+    {
+        BitmapSrc = DCSrc->dclevel.pSurface;
+        if (BitmapSrc == NULL)
+            goto failed;
+
+        /* Create the XLATEOBJ. */
+        EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest);
+        XlateObj = &exlo.xlo;
+    }
+
+    /* Offset the brush */
+    BrushOrigin.x += DCDest->ptlDCOrig.x;
+    BrushOrigin.y += DCDest->ptlDCOrig.y;
+
+    /* Make mask surface for source surface */
+    if (BitmapSrc && DCMask)
+    {
+        BitmapMask = DCMask->dclevel.pSurface;
+        if (BitmapMask &&
+            (BitmapMask->SurfObj.sizlBitmap.cx < WidthSrc ||
+             BitmapMask->SurfObj.sizlBitmap.cy < HeightSrc))
+        {
+            DPRINT1("%dx%d mask is smaller than %dx%d bitmap\n",
+                    BitmapMask->SurfObj.sizlBitmap.cx, BitmapMask->SurfObj.sizlBitmap.cy,
+                    WidthSrc, HeightSrc);
+            EXLATEOBJ_vCleanup(&exlo);
+            goto failed;
+        }
+        /* Create mask offset point */
+        MaskPoint.x = XOriginMask;
+        MaskPoint.y = YOriginMask;
+        IntLPtoDP(DCMask, &MaskPoint, 1);
+        MaskPoint.x += DCMask->ptlDCOrig.x;
+        MaskPoint.y += DCMask->ptlDCOrig.x;
+    }
+
+    /* Perform the bitblt operation */
+    Status = IntEngStretchBlt(&BitmapDest->SurfObj,
+                              &BitmapSrc->SurfObj,
+                              BitmapMask ? &BitmapMask->SurfObj : NULL,
+                              DCDest->rosdc.CombinedClip,
+                              XlateObj,
+                              &DestRect,
+                              &SourceRect,
+                              BitmapMask ? &MaskPoint : NULL,
+                              &DCDest->eboFill.BrushObject,
+                              &BrushOrigin,
+                              ROP3_TO_ROP4(ROP));
+    if (UsesSource)
+    {
+        EXLATEOBJ_vCleanup(&exlo);
+    }
 
 failed:
-       if (XlateObj)
-       {
-               EngDeleteXlate(XlateObj);
-       }
-       if (BrushObj)
-       {
-               BRUSHOBJ_UnlockBrush(BrushObj);
-       }
-       if (BitmapSrc && DCSrc->w.hBitmap != DCDest->w.hBitmap)
-       {
-               BITMAPOBJ_UnlockBitmap(BitmapSrc);
-       }
-       if (BitmapDest)
-       {
-               BITMAPOBJ_UnlockBitmap(BitmapDest);
-       }
-       if (UsesSource && hDCSrc != hDCDest)
-       {
-               DC_UnlockDc(DCSrc);
-       }
-       DC_UnlockDc(DCDest);
-
-       return Status;
+    DC_vFinishBlit(DCDest, DCSrc);
+    if (UsesSource)
+    {
+        DC_UnlockDc(DCSrc);
+    }
+    if (DCMask)
+    {
+        DC_UnlockDc(DCMask);
+    }
+    DC_UnlockDc(DCDest);
+
+    return Status;
+}
+
+
+BOOL APIENTRY
+NtGdiStretchBlt(
+    HDC hDCDest,
+    INT XOriginDest,
+    INT YOriginDest,
+    INT WidthDest,
+    INT HeightDest,
+    HDC hDCSrc,
+    INT XOriginSrc,
+    INT YOriginSrc,
+    INT WidthSrc,
+    INT HeightSrc,
+    DWORD ROP,
+    IN DWORD dwBackColor)
+{
+    return GreStretchBltMask(
+                hDCDest,
+                XOriginDest,
+                YOriginDest,
+                WidthDest,
+                HeightDest,
+                hDCSrc,
+                XOriginSrc,
+                YOriginSrc,
+                WidthSrc,
+                HeightSrc,
+                ROP,
+                dwBackColor,
+                NULL,
+                0,
+                0);
 }
 
+
 BOOL FASTCALL
 IntPatBlt(
-   PDC dc,
-   INT XLeft,
-   INT YLeft,
-   INT Width,
-   INT Height,
-   DWORD ROP,
-   PGDIBRUSHOBJ BrushObj)
+    PDC pdc,
+    INT XLeft,
+    INT YLeft,
+    INT Width,
+    INT Height,
+    DWORD dwRop,
+    PBRUSH pbrush)
 {
-   RECTL DestRect;
-   BITMAPOBJ *BitmapObj;
-   GDIBRUSHINST BrushInst;
-   POINTL BrushOrigin;
-   BOOL ret = TRUE;
-
-   ASSERT(BrushObj);
-
-   BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
-   if (BitmapObj == NULL)
-   {
-      SetLastWin32Error(ERROR_INVALID_HANDLE);
-      return FALSE;
-   }
-
-   if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL))
-   {
-      if (Width > 0)
-      {
-         DestRect.left = XLeft + dc->ptlDCOrig.x;
-         DestRect.right = XLeft + Width + dc->ptlDCOrig.x;
-      }
-      else
-      {
-         DestRect.left = XLeft + Width + 1 + dc->ptlDCOrig.x;
-         DestRect.right = XLeft + dc->ptlDCOrig.x + 1;
-      }
-
-      if (Height > 0)
-      {
-         DestRect.top = YLeft + dc->ptlDCOrig.y;
-         DestRect.bottom = YLeft + Height + dc->ptlDCOrig.y;
-      }
-      else
-      {
-         DestRect.top = YLeft + Height + dc->ptlDCOrig.y + 1;
-         DestRect.bottom = YLeft + dc->ptlDCOrig.y + 1;
-      }
-
-      IntLPtoDP(dc, (LPPOINT)&DestRect, 2);
-
-      BrushOrigin.x = BrushObj->ptOrigin.x + dc->ptlDCOrig.x;
-      BrushOrigin.y = BrushObj->ptOrigin.y + dc->ptlDCOrig.y;
-
-      IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlateBrush);
-
-      ret = IntEngBitBlt(
-         &BitmapObj->SurfObj,
-         NULL,
-         NULL,
-         dc->CombinedClip,
-         NULL,
-         &DestRect,
-         NULL,
-         NULL,
-         &BrushInst.BrushObject, // use pDC->eboFill
-         &BrushOrigin,
-         ROP3_TO_ROP4(ROP));
-   }
-
-   BITMAPOBJ_UnlockBitmap(BitmapObj);
-
-   return ret;
+    RECTL DestRect;
+    SURFACE *psurf;
+    EBRUSHOBJ eboFill ;
+    POINTL BrushOrigin;
+    BOOL ret;
+
+    ASSERT(pbrush);
+
+    if (pbrush->flAttrs & GDIBRUSH_IS_NULL)
+    {
+        return TRUE;
+    }
+
+    if (Width > 0)
+    {
+        DestRect.left = XLeft;
+        DestRect.right = XLeft + Width;
+    }
+    else
+    {
+        DestRect.left = XLeft + Width + 1;
+        DestRect.right = XLeft + 1;
+    }
+
+    if (Height > 0)
+    {
+        DestRect.top = YLeft;
+        DestRect.bottom = YLeft + Height;
+    }
+    else
+    {
+        DestRect.top = YLeft + Height + 1;
+        DestRect.bottom = YLeft + 1;
+    }
+
+    IntLPtoDP(pdc, (LPPOINT)&DestRect, 2);
+
+    DestRect.left   += pdc->ptlDCOrig.x;
+    DestRect.top    += pdc->ptlDCOrig.y;
+    DestRect.right  += pdc->ptlDCOrig.x;
+    DestRect.bottom += pdc->ptlDCOrig.y;
+
+    BrushOrigin.x = pbrush->ptOrigin.x + pdc->ptlDCOrig.x;
+    BrushOrigin.y = pbrush->ptOrigin.y + pdc->ptlDCOrig.y;
+
+    DC_vPrepareDCsForBlit(pdc, DestRect, NULL, DestRect);
+
+    psurf = pdc->dclevel.pSurface;
+
+    if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
+        DC_vUpdateFillBrush(pdc);
+
+    EBRUSHOBJ_vInit(&eboFill, pbrush, pdc);
+
+    ret = IntEngBitBlt(
+        &psurf->SurfObj,
+        NULL,
+        NULL,
+        pdc->rosdc.CombinedClip,
+        NULL,
+        &DestRect,
+        NULL,
+        NULL,
+        &eboFill.BrushObject,
+        &BrushOrigin,
+        ROP3_TO_ROP4(dwRop));
+
+    DC_vFinishBlit(pdc, NULL);
+
+    EBRUSHOBJ_vCleanup(&eboFill);
+
+    return ret;
 }
 
 BOOL FASTCALL
 IntGdiPolyPatBlt(
-   HDC hDC,
-   DWORD dwRop,
-   PPATRECT pRects,
-   int cRects,
-   ULONG Reserved)
+    HDC hDC,
+    DWORD dwRop,
+    PPATRECT pRects,
+    INT cRects,
+    ULONG Reserved)
 {
-   int i;
-   PPATRECT r;
-   PGDIBRUSHOBJ BrushObj;
-   DC *dc;
-
-   dc = DC_LockDc(hDC);
-   if (dc == NULL)
-   {
-      SetLastWin32Error(ERROR_INVALID_HANDLE);
-      return FALSE;
-   }
-   if (dc->DC_Type == DC_TYPE_INFO)
-   {
-      DC_UnlockDc(dc);
-      /* Yes, Windows really returns TRUE in this case */
-      return TRUE;
-   }
-
-   for (r = pRects, i = 0; i < cRects; i++)
-   {
-      BrushObj = BRUSHOBJ_LockBrush(r->hBrush);
-      if(BrushObj != NULL)
-      {
-        IntPatBlt(
-           dc,
-           r->r.left,
-           r->r.top,
-           r->r.right,
-           r->r.bottom,
-           dwRop,
-           BrushObj);
-        BRUSHOBJ_UnlockBrush(BrushObj);
-      }
-      r++;
-   }
-
-   DC_UnlockDc(dc);
-
-   return TRUE;
+    INT i;
+    PBRUSH pbrush;
+    PDC pdc;
+
+    pdc = DC_LockDc(hDC);
+    if (!pdc)
+    {
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        return FALSE;
+    }
+
+    if (pdc->dctype == DC_TYPE_INFO)
+    {
+        DC_UnlockDc(pdc);
+        /* Yes, Windows really returns TRUE in this case */
+        return TRUE;
+    }
+
+    for (i = 0; i < cRects; i++)
+    {
+        pbrush = BRUSH_LockBrush(pRects->hBrush);
+        if(pbrush != NULL)
+        {
+            IntPatBlt(
+                pdc,
+                pRects->r.left,
+                pRects->r.top,
+                pRects->r.right,
+                pRects->r.bottom,
+                dwRop,
+                pbrush);
+            BRUSH_UnlockBrush(pbrush);
+        }
+        pRects++;
+    }
+
+    DC_UnlockDc(pdc);
+
+    return TRUE;
 }
 
 
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiPatBlt(
-   HDC hDC,
-   INT XLeft,
-   INT YLeft,
-   INT Width,
-   INT Height,
-   DWORD ROP)
+    HDC hDC,
+    INT XLeft,
+    INT YLeft,
+    INT Width,
+    INT Height,
+    DWORD ROP)
 {
-   PGDIBRUSHOBJ BrushObj;
-   DC *dc;
-   PDC_ATTR Dc_Attr;
-   BOOL ret;
-
-   BOOL UsesSource = ROP3_USES_SOURCE(ROP);
-   if (UsesSource)
-   {
-       /* in this case we call on GdiMaskBlt */
-       return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0);
-   }
-
-   dc = DC_LockDc(hDC);
-   if (dc == NULL)
-   {
-      SetLastWin32Error(ERROR_INVALID_HANDLE);
-      return FALSE;
-   }
-   Dc_Attr = dc->pDc_Attr;
-   if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
-   if (dc->DC_Type == DC_TYPE_INFO)
-   {
-      DC_UnlockDc(dc);
-      /* Yes, Windows really returns TRUE in this case */
-      return TRUE;
-   }
-
-   BrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush);
-   if (BrushObj == NULL)
-   {
-      SetLastWin32Error(ERROR_INVALID_HANDLE);
-      DC_UnlockDc(dc);
-      return FALSE;
-   }
-
-   ret = IntPatBlt(
-      dc,
-      XLeft,
-      YLeft,
-      Width,
-      Height,
-      ROP,
-      BrushObj);
-
-   BRUSHOBJ_UnlockBrush(BrushObj);
-   DC_UnlockDc(dc);
-
-   return ret;
+    PBRUSH pbrush;
+    DC *dc;
+    PDC_ATTR pdcattr;
+    BOOL ret;
+
+    BOOL UsesSource = ROP3_USES_SOURCE(ROP);
+    if (UsesSource)
+    {
+        /* in this case we call on GdiMaskBlt */
+        return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0);
+    }
+
+    dc = DC_LockDc(hDC);
+    if (dc == NULL)
+    {
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        return FALSE;
+    }
+    if (dc->dctype == DC_TYPE_INFO)
+    {
+        DC_UnlockDc(dc);
+        /* Yes, Windows really returns TRUE in this case */
+        return TRUE;
+    }
+
+    pdcattr = dc->pdcattr;
+
+    if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
+        DC_vUpdateFillBrush(dc);
+
+    pbrush = BRUSH_LockBrush(pdcattr->hbrush);
+    if (pbrush == NULL)
+    {
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        DC_UnlockDc(dc);
+        return FALSE;
+    }
+
+    ret = IntPatBlt(dc, XLeft, YLeft, Width, Height, ROP, pbrush);
+
+    BRUSH_UnlockBrush(pbrush);
+    DC_UnlockDc(dc);
+
+    return ret;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiPolyPatBlt(
-   HDC hDC,
-   DWORD dwRop,
-   IN PPOLYPATBLT pRects,
-   IN DWORD cRects,
-   IN DWORD Mode)
+    HDC hDC,
+    DWORD dwRop,
+    IN PPOLYPATBLT pRects,
+    IN DWORD cRects,
+    IN DWORD Mode)
 {
-   PPATRECT rb = NULL;
-   NTSTATUS Status = STATUS_SUCCESS;
-   BOOL Ret;
-
-   if (cRects > 0)
-   {
-      rb = ExAllocatePoolWithTag(PagedPool, sizeof(PATRECT) * cRects, TAG_PATBLT);
-      if (!rb)
-      {
-         SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
-         return FALSE;
-      }
-      _SEH_TRY
-      {
-         ProbeForRead(pRects,
-                      cRects * sizeof(PATRECT),
-                      1);
-         RtlCopyMemory(rb,
-                       pRects,
-                       cRects * sizeof(PATRECT));
-      }
-      _SEH_HANDLE
-      {
-         Status = _SEH_GetExceptionCode();
-      }
-      _SEH_END;
-
-      if (!NT_SUCCESS(Status))
-      {
-         ExFreePool(rb);
-         SetLastNtError(Status);
-         return FALSE;
-      }
-   }
-
-   Ret = IntGdiPolyPatBlt(hDC, dwRop, rb, cRects, Mode);
-
-   if (cRects > 0)
-      ExFreePool(rb);
-
-   return Ret;
+    PPATRECT rb = NULL;
+    NTSTATUS Status = STATUS_SUCCESS;
+    BOOL Ret;
+
+    if (cRects > 0)
+    {
+        rb = ExAllocatePoolWithTag(PagedPool, sizeof(PATRECT) * cRects, TAG_PATBLT);
+        if (!rb)
+        {
+            SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+            return FALSE;
+        }
+        _SEH2_TRY
+        {
+            ProbeForRead(pRects,
+                cRects * sizeof(PATRECT),
+                1);
+            RtlCopyMemory(rb,
+                pRects,
+                cRects * sizeof(PATRECT));
+        }
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+        {
+            Status = _SEH2_GetExceptionCode();
+        }
+        _SEH2_END;
+
+        if (!NT_SUCCESS(Status))
+        {
+            ExFreePoolWithTag(rb, TAG_PATBLT);
+            SetLastNtError(Status);
+            return FALSE;
+        }
+    }
+
+    Ret = IntGdiPolyPatBlt(hDC, dwRop, rb, cRects, Mode);
+
+    if (cRects > 0)
+        ExFreePoolWithTag(rb, TAG_PATBLT);
+
+    return Ret;
 }