[WIN32K]
[reactos.git] / reactos / subsystems / win32 / win32k / objects / bitmaps.c
index 658b53d..f974625 100644 (file)
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <w32k.h>
+#include <win32k.h>
 
 #define NDEBUG
 #include <debug.h>
 
-HBITMAP APIENTRY
-IntGdiCreateBitmap(
-    INT Width,
-    INT Height,
-    UINT Planes,
-    UINT BitsPixel,
-    IN OPTIONAL LPBYTE pBits)
+LONG APIENTRY
+IntSetBitmapBits(
+    PSURFACE psurf,
+    DWORD Bytes,
+    IN PBYTE Bits)
 {
-    HBITMAP hBitmap;
-    SIZEL Size;
-    LONG WidthBytes;
-    PSURFACE psurfBmp;
+    /* Don't copy more bytes than the buffer has */
+    Bytes = min(Bytes, psurf->SurfObj.cjBits);
 
-    /* NOTE: Windows also doesn't store nr. of planes separately! */
-    BitsPixel = BITMAP_GetRealBitsPixel(BitsPixel * Planes);
+    RtlCopyMemory(psurf->SurfObj.pvBits, Bits, Bytes);
 
-    /* Check parameters */
-    if (BitsPixel == 0 || Width <= 0 || Width >= 0x8000000 || Height == 0)
-    {
-        DPRINT1("Width = %d, Height = %d BitsPixel = %d\n",
-                Width, Height, BitsPixel);
-        SetLastWin32Error(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
+    return Bytes;
+}
 
-    WidthBytes = BITMAP_GetWidthBytes(Width, BitsPixel);
+void
+NTAPI
+UnsafeSetBitmapBits(
+    PSURFACE psurf,
+    IN ULONG cjBits,
+    IN PVOID pvBits)
+{
+    PUCHAR pjDst, pjSrc;
+    LONG lDeltaDst, lDeltaSrc;
+    ULONG nWidth, nHeight, cBitsPixel;
 
-    Size.cx = Width;
-    Size.cy = abs(Height);
+    nWidth = psurf->SurfObj.sizlBitmap.cx;
+    nHeight = psurf->SurfObj.sizlBitmap.cy;
+    cBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat);
 
-    /* Make sure that cjBits will not overflow */
-    if ((ULONGLONG)WidthBytes * Size.cy >= 0x100000000ULL)
-    {
-        DPRINT1("Width = %d, Height = %d BitsPixel = %d\n",
-                Width, Height, BitsPixel);
-        SetLastWin32Error(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
+    /* Get pointers */
+    pjDst = psurf->SurfObj.pvScan0;
+    pjSrc = pvBits;
+    lDeltaDst = psurf->SurfObj.lDelta;
+    lDeltaSrc = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel);
 
-    /* Create the bitmap object. */
-    hBitmap = IntCreateBitmap(Size, WidthBytes,
-                              BitmapFormat(BitsPixel, BI_RGB),
-                              (Height < 0 ? BMF_TOPDOWN : 0) |
-                              (NULL == pBits ? 0 : BMF_NOZEROINIT), NULL);
-    if (!hBitmap)
+    while (nHeight--)
     {
-        DPRINT("IntGdiCreateBitmap: returned 0\n");
-        return 0;
+        /* Copy one line */
+        memcpy(pjDst, pjSrc, lDeltaSrc);
+        pjSrc += lDeltaSrc;
+        pjDst += lDeltaDst;
     }
 
-    psurfBmp = SURFACE_LockSurface(hBitmap);
-    if (psurfBmp == NULL)
+}
+
+HBITMAP
+APIENTRY
+GreCreateBitmapEx(
+    IN INT nWidth,
+    IN INT nHeight,
+    IN ULONG cjWidthBytes,
+    IN ULONG iFormat,
+    IN USHORT fjBitmap,
+    IN ULONG cjSizeImage,
+    IN OPTIONAL PVOID pvBits,
+       IN FLONG flags)
+{
+    PSURFACE psurf;
+    SURFOBJ *pso;
+    HBITMAP hbmp;
+
+    /* Verify format */
+    if (iFormat < BMF_1BPP || iFormat > BMF_PNG) return NULL;
+
+    /* Allocate a surface */
+    psurf = SURFACE_AllocSurface(STYPE_BITMAP, nWidth, nHeight, iFormat);
+    if (!psurf)
     {
-        GreDeleteObject(hBitmap);
+        DPRINT1("SURFACE_AllocSurface failed.\n");
         return NULL;
     }
 
-    psurfBmp->flFlags = BITMAPOBJ_IS_APIBITMAP;
-    psurfBmp->hDC = NULL; // Fixme
+    /* Get the handle for the bitmap and the surfobj */
+    hbmp = (HBITMAP)psurf->SurfObj.hsurf;
+    pso = &psurf->SurfObj;
 
-    if (NULL != pBits)
+    /* The infamous RLE hack */
+    if (iFormat == BMF_4RLE || iFormat == BMF_8RLE)
     {
-        IntSetBitmapBits(psurfBmp, psurfBmp->SurfObj.cjBits, pBits);
+        PVOID pvCompressedBits;
+        SIZEL sizl;
+        LONG lDelta;
+
+        sizl.cx = nWidth;
+        sizl.cy = nHeight;
+        lDelta = WIDTH_BYTES_ALIGN32(nWidth, gajBitsPerFormat[iFormat]);
+
+        pvCompressedBits = pvBits;
+        pvBits = EngAllocMem(FL_ZERO_MEMORY, lDelta * nHeight, TAG_DIB);
+        if (!pvBits)
+        {
+            EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
+            SURFACE_FreeSurfaceByHandle(hbmp);
+            return NULL;
+        }
+        DecompressBitmap(sizl, pvCompressedBits, pvBits, lDelta, iFormat);
+        fjBitmap |= BMF_RLE_HACK;
+        
+        iFormat = iFormat == BMF_4RLE ? BMF_4BPP : BMF_8BPP;
+        psurf->SurfObj.iBitmapFormat = iFormat;
     }
 
-    SURFACE_UnlockSurface(psurfBmp);
+    /* Mark as API bitmap */
+    psurf->flags |= (flags | API_BITMAP);
 
-    DPRINT("IntGdiCreateBitmap : %dx%d, %d BPP colors, topdown %d, returning %08x\n",
-           Size.cx, Size.cy, BitsPixel, (Height < 0 ? 1 : 0), hBitmap);
+    /* Set the bitmap bits */
+    if (!SURFACE_bSetBitmapBits(psurf, fjBitmap, cjWidthBytes, pvBits))
+    {
+        /* Bail out if that failed */
+        DPRINT1("SURFACE_bSetBitmapBits failed.\n");
+        EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        SURFACE_FreeSurfaceByHandle(hbmp);
+        return NULL;
+    }
 
-    return hBitmap;
+    /* Unlock the surface and return */
+    SURFACE_UnlockSurface(psurf);
+    return hbmp;
 }
 
+/* Creates a DDB surface,
+ * as in CreateCompatibleBitmap or CreateBitmap.
+ */
+HBITMAP
+APIENTRY
+GreCreateBitmap(
+    IN INT nWidth,
+    IN INT nHeight,
+    IN UINT cPlanes,
+    IN UINT cBitsPixel,
+    IN OPTIONAL PVOID pvBits)
+{
+    /* Call the extended function */
+    return GreCreateBitmapEx(nWidth,
+                             nHeight,
+                             0, /* auto width */
+                             BitmapFormat(cBitsPixel * cPlanes, BI_RGB),
+                             0, /* no bitmap flags */
+                             0, /* auto size */
+                             pvBits,
+                                                        DDB_SURFACE /* DDB */);
+}
 
-HBITMAP APIENTRY
+HBITMAP
+APIENTRY
 NtGdiCreateBitmap(
-    INWidth,
-    INHeight,
-    UINT Planes,
-    UINT BitsPixel,
+    IN INT nWidth,
+    IN INT nHeight,
+    IN UINT cPlanes,
+    IN UINT cBitsPixel,
     IN OPTIONAL LPBYTE pUnsafeBits)
 {
-    if (pUnsafeBits)
+    HBITMAP hbmp;
+    ULONG cRealBpp, cjWidthBytes, iFormat;
+    ULONGLONG cjSize;
+
+    /* Calculate bitmap format and real bits per pixel. */
+    iFormat = BitmapFormat(cBitsPixel * cPlanes, BI_RGB);
+    cRealBpp = gajBitsPerFormat[iFormat];
+
+    /* Calculate width and image size in bytes */
+    cjWidthBytes = WIDTH_BYTES_ALIGN16(nWidth, cRealBpp);
+    cjSize = cjWidthBytes * nHeight;
+
+    /* Check parameters (possible overflow of cjWidthBytes!) */
+    if (iFormat == 0 || nWidth <= 0 || nWidth >= 0x8000000 || nHeight <= 0 ||
+        cBitsPixel > 32 || cPlanes > 32 || cjSize >= 0x100000000ULL)
     {
-        BOOL Hit = FALSE;
-        UINT cjBits = BITMAP_GetWidthBytes(Width, BitsPixel) * abs(Height);
+        DPRINT1("Invalid bitmap format! Width=%d, Height=%d, Bpp=%d, Planes=%d\n",
+                nWidth, nHeight, cBitsPixel, cPlanes);
+        EngSetLastError(ERROR_INVALID_PARAMETER);
+        return NULL;
+    }
 
-        // FIXME: Use MmSecureVirtualMemory
+    /* Call internal function. */
+    hbmp = GreCreateBitmapEx(nWidth, nHeight, 0, iFormat, 0, 0, NULL, DDB_SURFACE);
+
+    if (pUnsafeBits && hbmp)
+    {
+        PSURFACE psurf = SURFACE_LockSurface(hbmp);
         _SEH2_TRY
         {
-            ProbeForRead(pUnsafeBits, cjBits, 1);
+            ProbeForRead(pUnsafeBits, cjSize, 1);
+            UnsafeSetBitmapBits(psurf, 0, pUnsafeBits);
         }
         _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
         {
-            Hit = TRUE;
+            SURFACE_UnlockSurface(psurf);
+            SURFACE_FreeSurfaceByHandle(hbmp);
+            _SEH2_YIELD(return NULL;)
         }
         _SEH2_END
 
-        if (Hit) return 0;
+        SURFACE_UnlockSurface(psurf);
     }
 
-    return IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits);
+    return hbmp;
 }
 
+
 HBITMAP FASTCALL
 IntCreateCompatibleBitmap(
     PDC Dc,
@@ -137,120 +233,111 @@ IntCreateCompatibleBitmap(
     /* MS doc says if width or height is 0, return 1-by-1 pixel, monochrome bitmap */
     if (0 == Width || 0 == Height)
     {
-        Bmp = NtGdiGetStockObject(DEFAULT_BITMAP);
+        return NtGdiGetStockObject(DEFAULT_BITMAP);
+    }
+
+    if (Dc->dctype != DC_TYPE_MEMORY)
+    {
+        PSURFACE psurf;
+
+        Bmp = GreCreateBitmap(abs(Width),
+                              abs(Height),
+                              1,
+                              Dc->ppdev->gdiinfo.cBitsPixel,
+                              NULL);
+        psurf = SURFACE_ShareLockSurface(Bmp);
+        ASSERT(psurf);
+        /* Set palette */
+        psurf->ppal = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault);
+        /* Set flags */
+        psurf->flags = API_BITMAP;
+        psurf->hdc = NULL; // Fixme
+        SURFACE_ShareUnlockSurface(psurf);
     }
     else
     {
-        if (Dc->dctype != DC_TYPE_MEMORY)
+        DIBSECTION dibs;
+        INT Count;
+        PSURFACE psurf = Dc->dclevel.pSurface;
+        Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs);
+
+        if (Count == sizeof(BITMAP))
         {
-            Bmp = IntGdiCreateBitmap(abs(Width),
-                                     abs(Height),
-                                     IntGdiGetDeviceCaps(Dc,PLANES),
-                                     IntGdiGetDeviceCaps(Dc,BITSPIXEL),
-                                     NULL);
+            PSURFACE psurfBmp;
+
+            Bmp = GreCreateBitmap(abs(Width),
+                          abs(Height),
+                          1,
+                          dibs.dsBm.bmBitsPixel,
+                          NULL);
+            psurfBmp = SURFACE_LockSurface(Bmp);
+            ASSERT(psurfBmp);
+            /* Assign palette */
+            psurfBmp->ppal = psurf->ppal;
+            GDIOBJ_IncrementShareCount((POBJ)psurf->ppal);
+            /* Set flags */
+            psurfBmp->flags = API_BITMAP;
+            psurfBmp->hdc = NULL; // Fixme
+            SURFACE_UnlockSurface(psurfBmp);
         }
-        else
+        else if (Count == sizeof(DIBSECTION))
         {
-            DIBSECTION dibs;
-            INT Count;
-            PSURFACE psurf = Dc->dclevel.pSurface;
-            Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs);
-
-            if (Count)
+            /* A DIB section is selected in the DC */
+            BYTE buf[sizeof(BITMAPINFOHEADER) + 256*sizeof(RGBQUAD)] = {0};
+            PVOID Bits;
+            BITMAPINFO* bi = (BITMAPINFO*)buf;
+
+            bi->bmiHeader.biSize          = sizeof(bi->bmiHeader);
+            bi->bmiHeader.biWidth         = Width;
+            bi->bmiHeader.biHeight        = Height;
+            bi->bmiHeader.biPlanes        = dibs.dsBmih.biPlanes;
+            bi->bmiHeader.biBitCount      = dibs.dsBmih.biBitCount;
+            bi->bmiHeader.biCompression   = dibs.dsBmih.biCompression;
+            bi->bmiHeader.biSizeImage     = 0;
+            bi->bmiHeader.biXPelsPerMeter = dibs.dsBmih.biXPelsPerMeter;
+            bi->bmiHeader.biYPelsPerMeter = dibs.dsBmih.biYPelsPerMeter;
+            bi->bmiHeader.biClrUsed       = dibs.dsBmih.biClrUsed;
+            bi->bmiHeader.biClrImportant  = dibs.dsBmih.biClrImportant;
+
+            if (bi->bmiHeader.biCompression == BI_BITFIELDS)
+            {
+                /* Copy the color masks */
+                RtlCopyMemory(bi->bmiColors, dibs.dsBitfields, 3*sizeof(RGBQUAD));
+            }
+            else if (bi->bmiHeader.biBitCount <= 8)
             {
-                if (Count == sizeof(BITMAP))
+                /* Copy the color table */
+                UINT Index;
+                PPALETTE PalGDI;
+
+                if (!psurf->ppal)
                 {
-                    /* We have a bitmap bug!!! W/O the HACK, we have white icons.
-
-                       MSDN Note: When a memory device context is created, it initially
-                       has a 1-by-1 monochrome bitmap selected into it. If this memory
-                       device context is used in CreateCompatibleBitmap, the bitmap that
-                       is created is a monochrome bitmap. To create a color bitmap, use
-                       the hDC that was used to create the memory device context, as
-                       shown in the following code:
-
-                           HDC memDC = CreateCompatibleDC(hDC);
-                           HBITMAP memBM = CreateCompatibleBitmap(hDC, nWidth, nHeight);
-                           SelectObject(memDC, memBM);
-                     */
-                    Bmp = IntGdiCreateBitmap(abs(Width),
-                                             abs(Height),
-                                             dibs.dsBm.bmPlanes,
-                                             IntGdiGetDeviceCaps(Dc,BITSPIXEL),//<-- HACK! dibs.dsBm.bmBitsPixel, // <-- Correct!
-                                             NULL);
+                    EngSetLastError(ERROR_INVALID_HANDLE);
+                    return 0;
                 }
-                else
+
+                PalGDI = PALETTE_LockPalette(psurf->ppal->BaseObject.hHmgr);
+
+                for (Index = 0;
+                        Index < 256 && Index < PalGDI->NumColors;
+                        Index++)
                 {
-                    /* A DIB section is selected in the DC */
-                    BITMAPINFO *bi;
-                    PVOID Bits;
-
-                    /* Allocate memory for a BITMAPINFOHEADER structure and a
-                       color table. The maximum number of colors in a color table
-                       is 256 which corresponds to a bitmap with depth 8.
-                       Bitmaps with higher depths don't have color tables. */
-                    bi = ExAllocatePoolWithTag(PagedPool,
-                                               sizeof(BITMAPINFOHEADER) +
-                                                   256 * sizeof(RGBQUAD),
-                                               TAG_TEMP);
-
-                    if (bi)
-                    {
-                        bi->bmiHeader.biSize          = sizeof(bi->bmiHeader);
-                        bi->bmiHeader.biWidth         = Width;
-                        bi->bmiHeader.biHeight        = Height;
-                        bi->bmiHeader.biPlanes        = dibs.dsBmih.biPlanes;
-                        bi->bmiHeader.biBitCount      = dibs.dsBmih.biBitCount;
-                        bi->bmiHeader.biCompression   = dibs.dsBmih.biCompression;
-                        bi->bmiHeader.biSizeImage     = 0;
-                        bi->bmiHeader.biXPelsPerMeter = dibs.dsBmih.biXPelsPerMeter;
-                        bi->bmiHeader.biYPelsPerMeter = dibs.dsBmih.biYPelsPerMeter;
-                        bi->bmiHeader.biClrUsed       = dibs.dsBmih.biClrUsed;
-                        bi->bmiHeader.biClrImportant  = dibs.dsBmih.biClrImportant;
-
-                        if (bi->bmiHeader.biCompression == BI_BITFIELDS)
-                        {
-                            /* Copy the color masks */
-                            RtlCopyMemory(bi->bmiColors, dibs.dsBitfields, 3 * sizeof(DWORD));
-                        }
-                        else if (bi->bmiHeader.biBitCount <= 8)
-                        {
-                            /* Copy the color table */
-                            UINT Index;
-                            PPALETTE PalGDI = PALETTE_LockPalette(psurf->hDIBPalette);
-
-                            if (!PalGDI)
-                            {
-                                ExFreePoolWithTag(bi, TAG_TEMP);
-                                SetLastWin32Error(ERROR_INVALID_HANDLE);
-                                return 0;
-                            }
-
-                            for (Index = 0;
-                                    Index < 256 && Index < PalGDI->NumColors;
-                                    Index++)
-                            {
-                                bi->bmiColors[Index].rgbRed   = PalGDI->IndexedColors[Index].peRed;
-                                bi->bmiColors[Index].rgbGreen = PalGDI->IndexedColors[Index].peGreen;
-                                bi->bmiColors[Index].rgbBlue  = PalGDI->IndexedColors[Index].peBlue;
-                                bi->bmiColors[Index].rgbReserved = 0;
-                            }
-                            PALETTE_UnlockPalette(PalGDI);
-                        }
-
-                        Bmp = DIB_CreateDIBSection(Dc,
-                                                   bi,
-                                                   DIB_RGB_COLORS,
-                                                   &Bits,
-                                                   NULL,
-                                                   0,
-                                                   0);
-
-                        ExFreePoolWithTag(bi, TAG_TEMP);
-                        return Bmp;
-                    }
+                    bi->bmiColors[Index].rgbRed   = PalGDI->IndexedColors[Index].peRed;
+                    bi->bmiColors[Index].rgbGreen = PalGDI->IndexedColors[Index].peGreen;
+                    bi->bmiColors[Index].rgbBlue  = PalGDI->IndexedColors[Index].peBlue;
+                    bi->bmiColors[Index].rgbReserved = 0;
                 }
+                PALETTE_UnlockPalette(PalGDI);
             }
+
+            Bmp = DIB_CreateDIBSection(Dc,
+                                       bi,
+                                       DIB_RGB_COLORS,
+                                       &Bits,
+                                       NULL,
+                                       0,
+                                       0);
+            return Bmp;
         }
     }
     return Bmp;
@@ -267,12 +354,12 @@ NtGdiCreateCompatibleBitmap(
 
     if (Width <= 0 || Height <= 0 || (Width * Height) > 0x3FFFFFFF)
     {
-        SetLastWin32Error(ERROR_INVALID_PARAMETER);
+        EngSetLastError(ERROR_INVALID_PARAMETER);
         return NULL;
     }
 
     if (!hDC)
-        return IntGdiCreateBitmap(Width, Height, 1, 1, 0);
+        return GreCreateBitmap(Width, Height, 1, 1, 0);
 
     Dc = DC_LockDc(hDC);
 
@@ -281,7 +368,7 @@ NtGdiCreateCompatibleBitmap(
 
     if (NULL == Dc)
     {
-        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        EngSetLastError(ERROR_INVALID_HANDLE);
         return NULL;
     }
 
@@ -306,14 +393,14 @@ NtGdiGetBitmapDimension(
     psurfBmp = SURFACE_LockSurface(hBitmap);
     if (psurfBmp == NULL)
     {
-        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        EngSetLastError(ERROR_INVALID_HANDLE);
         return FALSE;
     }
 
     _SEH2_TRY
     {
         ProbeForWrite(Dimension, sizeof(SIZE), 1);
-        *Dimension = psurfBmp->dimension;
+        *Dimension = psurfBmp->sizlDim;
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -334,8 +421,6 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
     BOOL bInRect = FALSE;
     SURFACE *psurf;
     SURFOBJ *pso;
-    HPALETTE hpal = 0;
-    PPALETTE ppal;
     EXLATEOBJ exlo;
     HBITMAP hBmpTmp;
 
@@ -343,7 +428,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 
     if (!dc)
     {
-        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        EngSetLastError(ERROR_INVALID_HANDLE);
         return Result;
     }
 
@@ -355,27 +440,15 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 
     XPos += dc->ptlDCOrig.x;
     YPos += dc->ptlDCOrig.y;
-    if (RECTL_bPointInRect(&dc->rosdc.CombinedClip->rclBounds, XPos, YPos))
+    if ((dc->rosdc.CombinedClip == NULL) ||
+        (RECTL_bPointInRect(&dc->rosdc.CombinedClip->rclBounds, XPos, YPos)))
     {
         bInRect = TRUE;
         psurf = dc->dclevel.pSurface;
         if (psurf)
         {
-            pso = &psurf->SurfObj;
-            hpal = psurf->hDIBPalette;
-            if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault;
-            ppal = PALETTE_ShareLockPalette(hpal);
-
-            if (psurf->SurfObj.iBitmapFormat == BMF_1BPP && !psurf->hSecure)
-            {
-                /* FIXME: palette should be gpalMono already ! */
-                EXLATEOBJ_vInitialize(&exlo, &gpalMono, &gpalRGB, 0, 0xffffff, 0);
-            }
-            else
-            {
-                EXLATEOBJ_vInitialize(&exlo, ppal, &gpalRGB, 0, 0xffffff, 0);
-            }
-
+                       pso = &psurf->SurfObj;
+            EXLATEOBJ_vInitialize(&exlo, psurf->ppal, &gpalRGB, 0, 0xffffff, 0);
             // check if this DC has a DIB behind it...
             if (pso->pvScan0) // STYPE_BITMAP == pso->iType
             {
@@ -385,7 +458,6 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
             }
 
             EXLATEOBJ_vCleanup(&exlo);
-            PALETTE_ShareUnlockPalette(ppal);
         }
     }
     DC_UnlockDc(dc);
@@ -412,7 +484,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
                                                   0,
                                                   0);
 
-            //HBITMAP hBmpTmp = IntGdiCreateBitmap(1, 1, 1, 32, NULL);
+            //HBITMAP hBmpTmp = GreCreateBitmap(1, 1, 1, 32, NULL);
             if (hBmpTmp)
             {
                 HBITMAP hBmpOld = (HBITMAP)NtGdiSelectBitmap(hDCTmp, hBmpTmp);
@@ -482,6 +554,36 @@ IntGetBitmapBits(
     return ret;
 }
 
+VOID
+FASTCALL
+UnsafeGetBitmapBits(
+    PSURFACE psurf,
+       DWORD Bytes,
+       OUT PBYTE pvBits)
+{
+       PUCHAR pjDst, pjSrc;
+    LONG lDeltaDst, lDeltaSrc;
+    ULONG nWidth, nHeight, cBitsPixel;
+
+    nWidth = psurf->SurfObj.sizlBitmap.cx;
+    nHeight = psurf->SurfObj.sizlBitmap.cy;
+    cBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat);
+
+    /* Get pointers */
+    pjSrc = psurf->SurfObj.pvScan0;
+    pjDst = pvBits;
+    lDeltaSrc = psurf->SurfObj.lDelta;
+    lDeltaDst = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel);
+
+    while (nHeight--)
+    {
+        /* Copy one line */
+        RtlCopyMemory(pjDst, pjSrc, lDeltaDst);
+        pjSrc += lDeltaSrc;
+        pjDst += lDeltaDst;
+    }
+}
+
 LONG APIENTRY
 NtGdiGetBitmapBits(
     HBITMAP hBitmap,
@@ -499,11 +601,11 @@ NtGdiGetBitmapBits(
     psurf = SURFACE_LockSurface(hBitmap);
     if (!psurf)
     {
-        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        EngSetLastError(ERROR_INVALID_HANDLE);
         return 0;
     }
 
-    bmSize = BITMAP_GetWidthBytes(psurf->SurfObj.sizlBitmap.cx,
+    bmSize = WIDTH_BYTES_ALIGN16(psurf->SurfObj.sizlBitmap.cx,
              BitsPerFormat(psurf->SurfObj.iBitmapFormat)) *
              abs(psurf->SurfObj.sizlBitmap.cy);
 
@@ -521,7 +623,8 @@ NtGdiGetBitmapBits(
     _SEH2_TRY
     {
         ProbeForWrite(pUnsafeBits, Bytes, 1);
-        ret = IntGetBitmapBits(psurf, Bytes, pUnsafeBits);
+        UnsafeGetBitmapBits(psurf, Bytes, pUnsafeBits);
+               ret = Bytes;
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -535,46 +638,6 @@ NtGdiGetBitmapBits(
 }
 
 
-LONG APIENTRY
-IntSetBitmapBits(
-    PSURFACE psurf,
-    DWORD Bytes,
-    IN PBYTE Bits)
-{
-    LONG ret;
-
-    /* Don't copy more bytes than the buffer has */
-    Bytes = min(Bytes, psurf->SurfObj.cjBits);
-
-#if 0
-    /* FIXME: call DDI specific function here if available  */
-    if (psurf->DDBitmap)
-    {
-        DPRINT("Calling device specific BitmapBits\n");
-        if (psurf->DDBitmap->funcs->pBitmapBits)
-        {
-            ret = psurf->DDBitmap->funcs->pBitmapBits(hBitmap,
-                                                      (void *)Bits,
-                                                      Bytes,
-                                                      DDB_SET);
-        }
-        else
-        {
-            DPRINT("BitmapBits == NULL??\n");
-            ret = 0;
-        }
-    }
-    else
-#endif
-    {
-        RtlCopyMemory(psurf->SurfObj.pvBits, Bits, Bytes);
-        ret = Bytes;
-    }
-
-    return ret;
-}
-
-
 LONG APIENTRY
 NtGdiSetBitmapBits(
     HBITMAP hBitmap,
@@ -592,14 +655,15 @@ NtGdiSetBitmapBits(
     psurf = SURFACE_LockSurface(hBitmap);
     if (psurf == NULL)
     {
-        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        EngSetLastError(ERROR_INVALID_HANDLE);
         return 0;
     }
 
     _SEH2_TRY
     {
         ProbeForRead(pUnsafeBits, Bytes, 1);
-        ret = IntSetBitmapBits(psurf, Bytes, pUnsafeBits);
+        UnsafeSetBitmapBits(psurf, Bytes, pUnsafeBits);
+        ret = 1;
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -628,7 +692,7 @@ NtGdiSetBitmapDimension(
     psurf = SURFACE_LockSurface(hBitmap);
     if (psurf == NULL)
     {
-        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        EngSetLastError(ERROR_INVALID_HANDLE);
         return FALSE;
     }
 
@@ -637,7 +701,7 @@ NtGdiSetBitmapDimension(
         _SEH2_TRY
         {
             ProbeForWrite(Size, sizeof(SIZE), 1);
-            *Size = psurf->dimension;
+            *Size = psurf->sizlDim;
         }
         _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
         {
@@ -647,8 +711,8 @@ NtGdiSetBitmapDimension(
     }
 
     /* The dimension is changed even if writing the old value failed */
-    psurf->dimension.cx = Width;
-    psurf->dimension.cy = Height;
+    psurf->sizlDim.cx = Width;
+    psurf->sizlDim.cy = Height;
 
     SURFACE_UnlockSurface(psurf);
 
@@ -665,7 +729,7 @@ VOID IntHandleSpecialColorType(HDC hDC, COLORREF* Color)
     switch (*Color >> 24)
     {
         case 0x10: /* DIBINDEX */
-            if (IntGetDIBColorTable(hDC, LOWORD(*Color), 1, &quad) == 1) 
+            if (IntGetDIBColorTable(hDC, LOWORD(*Color), 1, &quad) == 1)
             {
                 *Color = RGB(quad.rgbRed, quad.rgbGreen, quad.rgbBlue);
             }
@@ -707,7 +771,7 @@ VOID IntHandleSpecialColorType(HDC hDC, COLORREF* Color)
         default:
             DPRINT("Unsupported color type %d passed\n", *Color >> 24);
             break;
-    }   
+    }
 }
 
 BOOL APIENTRY
@@ -767,59 +831,6 @@ NtGdiSetPixel(
 
 /*  Internal Functions  */
 
-UINT FASTCALL
-BITMAP_GetRealBitsPixel(UINT nBitsPixel)
-{
-    if (nBitsPixel <= 1)
-        return 1;
-    if (nBitsPixel <= 4)
-        return 4;
-    if (nBitsPixel <= 8)
-        return 8;
-    if (nBitsPixel <= 16)
-        return 16;
-    if (nBitsPixel <= 24)
-        return 24;
-    if (nBitsPixel <= 32)
-        return 32;
-
-    return 0;
-}
-
-INT FASTCALL
-BITMAP_GetWidthBytes(INT bmWidth, INT bpp)
-{
-#if 0
-    switch (bpp)
-    {
-    case 1:
-        return 2 * ((bmWidth+15) >> 4);
-
-    case 24:
-        bmWidth *= 3; /* fall through */
-    case 8:
-        return bmWidth + (bmWidth & 1);
-
-    case 32:
-        return bmWidth * 4;
-
-    case 16:
-    case 15:
-        return bmWidth * 2;
-
-    case 4:
-        return 2 * ((bmWidth+3) >> 2);
-
-    default:
-        DPRINT ("stub");
-    }
-
-    return -1;
-#endif
-
-    return ((bmWidth * bpp + 15) & ~15) >> 3;
-}
-
 HBITMAP FASTCALL
 BITMAP_CopyBitmap(HBITMAP hBitmap)
 {
@@ -833,7 +844,7 @@ BITMAP_CopyBitmap(HBITMAP hBitmap)
         return 0;
     }
 
-    Bitmap = GDIOBJ_LockObj(hBitmap, GDI_OBJECT_TYPE_BITMAP);
+    Bitmap = SURFACE_ShareLockSurface(hBitmap);
     if (Bitmap == NULL)
     {
         return 0;
@@ -846,34 +857,26 @@ BITMAP_CopyBitmap(HBITMAP hBitmap)
 
     Size.cx = abs(bm.bmWidth);
     Size.cy = abs(bm.bmHeight);
-    res = IntCreateBitmap(Size,
-                          bm.bmWidthBytes,
-                          BitmapFormat(bm.bmBitsPixel * bm.bmPlanes, BI_RGB),
-                          (bm.bmHeight < 0 ? BMF_TOPDOWN : 0) | BMF_NOZEROINIT,
-                          NULL);
+    res = GreCreateBitmapEx(Size.cx,
+                                                       Size.cy,
+                                                       bm.bmWidthBytes,
+                                                       Bitmap->SurfObj.iBitmapFormat,
+                                                       Bitmap->SurfObj.fjBitmap,
+                                                       Bitmap->SurfObj.cjBits,
+                                                       NULL,
+                                                       Bitmap->flags);
+
 
     if (res)
     {
-        PBYTE buf;
-
-        resBitmap = GDIOBJ_LockObj(res, GDI_OBJECT_TYPE_BITMAP);
+        resBitmap = SURFACE_ShareLockSurface(res);
         if (resBitmap)
         {
-            buf = ExAllocatePoolWithTag(PagedPool,
-                                        bm.bmWidthBytes * abs(bm.bmHeight),
-                                        TAG_BITMAP);
-            if (buf == NULL)
-            {
-                GDIOBJ_UnlockObjByPtr((POBJ)resBitmap);
-                GDIOBJ_UnlockObjByPtr((POBJ)Bitmap);
-                GreDeleteObject(res);
-                return 0;
-            }
-            IntGetBitmapBits(Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf);
-            IntSetBitmapBits(resBitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf);
-            ExFreePoolWithTag(buf,TAG_BITMAP);
-            resBitmap->flFlags = Bitmap->flFlags;
-            GDIOBJ_UnlockObjByPtr((POBJ)resBitmap);
+            IntSetBitmapBits(resBitmap, Bitmap->SurfObj.cjBits, Bitmap->SurfObj.pvBits);
+            GDIOBJ_IncrementShareCount(&Bitmap->ppal->BaseObject);
+            GDIOBJ_ShareUnlockObjByPtr(&resBitmap->ppal->BaseObject);
+            resBitmap->ppal = Bitmap->ppal;
+            SURFACE_ShareUnlockSurface(resBitmap);
         }
         else
         {
@@ -882,7 +885,7 @@ BITMAP_CopyBitmap(HBITMAP hBitmap)
         }
     }
 
-    GDIOBJ_UnlockObjByPtr((POBJ)Bitmap);
+    SURFACE_ShareUnlockSurface(Bitmap);
 
     return  res;
 }
@@ -900,15 +903,17 @@ BITMAP_GetObject(SURFACE *psurf, INT Count, LPVOID buffer)
     pBitmap->bmType = 0;
     pBitmap->bmWidth = psurf->SurfObj.sizlBitmap.cx;
     pBitmap->bmHeight = psurf->SurfObj.sizlBitmap.cy;
-    pBitmap->bmWidthBytes = abs(psurf->SurfObj.lDelta);
     pBitmap->bmPlanes = 1;
     pBitmap->bmBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat);
+       pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN16(pBitmap->bmWidth, pBitmap->bmBitsPixel);
 
     /* Check for DIB section */
     if (psurf->hSecure)
     {
         /* Set bmBits in this case */
         pBitmap->bmBits = psurf->SurfObj.pvBits;
+               /* DIBs data are 32 bits aligned */
+               pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN32(pBitmap->bmWidth, pBitmap->bmBitsPixel);
 
         if (Count >= sizeof(DIBSECTION))
         {
@@ -920,17 +925,31 @@ BITMAP_GetObject(SURFACE *psurf, INT Count, LPVOID buffer)
             pds->dsBmih.biHeight = pds->dsBm.bmHeight;
             pds->dsBmih.biPlanes = pds->dsBm.bmPlanes;
             pds->dsBmih.biBitCount = pds->dsBm.bmBitsPixel;
+
             switch (psurf->SurfObj.iBitmapFormat)
             {
-                /* FIXME: What about BI_BITFIELDS? */
                 case BMF_1BPP:
                 case BMF_4BPP:
                 case BMF_8BPP:
+                   pds->dsBmih.biCompression = BI_RGB;
+                   break;
+
                 case BMF_16BPP:
+                    if (psurf->ppal->flFlags & PAL_RGB16_555)
+                        pds->dsBmih.biCompression = BI_RGB;
+                    else
+                        pds->dsBmih.biCompression = BI_BITFIELDS;
+                    break;
+
                 case BMF_24BPP:
                 case BMF_32BPP:
-                   pds->dsBmih.biCompression = BI_RGB;
-                   break;
+                    /* 24/32bpp BI_RGB is actually BGR format */
+                    if (psurf->ppal->flFlags & PAL_BGR)
+                        pds->dsBmih.biCompression = BI_RGB;
+                    else
+                        pds->dsBmih.biCompression = BI_BITFIELDS;
+                    break;
+
                 case BMF_4RLE:
                    pds->dsBmih.biCompression = BI_RLE4;
                    break;
@@ -943,15 +962,18 @@ BITMAP_GetObject(SURFACE *psurf, INT Count, LPVOID buffer)
                 case BMF_PNG:
                    pds->dsBmih.biCompression = BI_PNG;
                    break;
+                default:
+                    ASSERT(FALSE); /* this shouldn't happen */
             }
+
             pds->dsBmih.biSizeImage = psurf->SurfObj.cjBits;
             pds->dsBmih.biXPelsPerMeter = 0;
             pds->dsBmih.biYPelsPerMeter = 0;
-            pds->dsBmih.biClrUsed = psurf->biClrUsed;
+            pds->dsBmih.biClrUsed = psurf->ppal->NumColors;
             pds->dsBmih.biClrImportant = psurf->biClrImportant;
-            pds->dsBitfields[0] = psurf->dsBitfields[0];
-            pds->dsBitfields[1] = psurf->dsBitfields[1];
-            pds->dsBitfields[2] = psurf->dsBitfields[2];
+            pds->dsBitfields[0] = psurf->ppal->RedMask;
+            pds->dsBitfields[1] = psurf->ppal->GreenMask;
+            pds->dsBitfields[2] = psurf->ppal->BlueMask;
             pds->dshSection = psurf->hDIBSection;
             pds->dsOffset = psurf->dwOffset;
 
@@ -975,14 +997,15 @@ APIENTRY
 NtGdiGetDCforBitmap(
     IN HBITMAP hsurf)
 {
-    HDC hDC = NULL;
+    HDC hdc = NULL;
     PSURFACE psurf = SURFACE_LockSurface(hsurf);
     if (psurf)
     {
-        hDC = psurf->hDC;
+        hdc = psurf->hdc;
         SURFACE_UnlockSurface(psurf);
     }
-    return hDC;
+    return hdc;
 }
 
+
 /* EOF */