rpcrt4: Add a phase in proxies for clearing output parameters on error.
[wine] / dlls / windowscodecs / bmpdecode.c
index 46b2527..6da6a3c 100644 (file)
@@ -18,6 +18,7 @@
 
 #include "config.h"
 
+#include <assert.h>
 #include <stdarg.h>
 
 #define COBJMACROS
@@ -58,20 +59,41 @@ typedef struct {
     DWORD bc2AppData;
 } BITMAPCOREHEADER2;
 
-typedef struct {
-    const IWICBitmapFrameDecodeVtbl *lpVtbl;
+typedef HRESULT (*ReadDataFunc)(BmpDecoder* This);
+
+struct BmpDecoder {
+    IWICBitmapDecoder IWICBitmapDecoder_iface;
+    IWICBitmapFrameDecode IWICBitmapFrameDecode_iface;
     LONG ref;
+    BOOL initialized;
     IStream *stream;
-    BITMAPFILEHEADER bfh;
+    ULONG palette_offset;
+    ULONG image_offset;
     BITMAPV5HEADER bih;
     const WICPixelFormatGUID *pixelformat;
     int bitsperpixel;
-} BmpFrameDecode;
+    ReadDataFunc read_data_func;
+    INT stride;
+    BYTE *imagedata;
+    BYTE *imagedatastart;
+    CRITICAL_SECTION lock; /* must be held when initialized/imagedata is set or stream is accessed */
+    int packed; /* If TRUE, don't look for a file header and assume a packed DIB. */
+    int icoframe; /* If TRUE, this is a frame of a .ico file. */
+};
+
+static inline BmpDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface)
+{
+    return CONTAINING_RECORD(iface, BmpDecoder, IWICBitmapDecoder_iface);
+}
+
+static inline BmpDecoder *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode *iface)
+{
+    return CONTAINING_RECORD(iface, BmpDecoder, IWICBitmapFrameDecode_iface);
+}
 
 static HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid,
     void **ppv)
 {
-    BmpFrameDecode *This = (BmpFrameDecode*)iface;
     TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv);
 
     if (!ppv) return E_INVALIDARG;
@@ -80,7 +102,7 @@ static HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface
         IsEqualIID(&IID_IWICBitmapSource, iid) ||
         IsEqualIID(&IID_IWICBitmapFrameDecode, iid))
     {
-        *ppv = This;
+        *ppv = iface;
     }
     else
     {
@@ -94,66 +116,42 @@ static HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface
 
 static ULONG WINAPI BmpFrameDecode_AddRef(IWICBitmapFrameDecode *iface)
 {
-    BmpFrameDecode *This = (BmpFrameDecode*)iface;
-    ULONG ref = InterlockedIncrement(&This->ref);
+    BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface);
 
-    TRACE("(%p) refcount=%u\n", iface, ref);
-
-    return ref;
+    return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface);
 }
 
 static ULONG WINAPI BmpFrameDecode_Release(IWICBitmapFrameDecode *iface)
 {
-    BmpFrameDecode *This = (BmpFrameDecode*)iface;
-    ULONG ref = InterlockedDecrement(&This->ref);
-
-    TRACE("(%p) refcount=%u\n", iface, ref);
-
-    if (ref == 0)
-    {
-        IStream_Release(This->stream);
-        HeapFree(GetProcessHeap(), 0, This);
-    }
+    BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface);
 
-    return ref;
+    return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface);
 }
 
-static HRESULT BmpHeader_GetSize(BITMAPV5HEADER *bih, UINT *puiWidth, UINT *puiHeight)
+static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface,
+    UINT *puiWidth, UINT *puiHeight)
 {
-    switch (bih->bV5Size)
-    {
-    case sizeof(BITMAPCOREHEADER):
+    BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface);
+    TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight);
+
+    if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER))
     {
-        BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)bih;
+        BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)&This->bih;
         *puiWidth = bch->bcWidth;
         *puiHeight = bch->bcHeight;
-        return S_OK;
     }
-    case sizeof(BITMAPCOREHEADER2):
-    case sizeof(BITMAPINFOHEADER):
-    case sizeof(BITMAPV4HEADER):
-    case sizeof(BITMAPV5HEADER):
-        *puiWidth = bih->bV5Width;
-        *puiHeight = bih->bV5Height;
-        return S_OK;
-    default:
-        return E_FAIL;
+    else
+    {
+        *puiWidth = This->bih.bV5Width;
+        *puiHeight = abs(This->bih.bV5Height);
     }
-}
-
-static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface,
-    UINT *puiWidth, UINT *puiHeight)
-{
-    BmpFrameDecode *This = (BmpFrameDecode*)iface;
-    TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight);
-
-    return BmpHeader_GetSize(&This->bih, puiWidth, puiHeight);
+    return S_OK;
 }
 
 static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface,
     WICPixelFormatGUID *pPixelFormat)
 {
-    BmpFrameDecode *This = (BmpFrameDecode*)iface;
+    BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface);
     TRACE("(%p,%p)\n", iface, pPixelFormat);
 
     memcpy(pPixelFormat, This->pixelformat, sizeof(GUID));
@@ -184,7 +182,7 @@ static HRESULT BmpHeader_GetResolution(BITMAPV5HEADER *bih, double *pDpiX, doubl
 static HRESULT WINAPI BmpFrameDecode_GetResolution(IWICBitmapFrameDecode *iface,
     double *pDpiX, double *pDpiY)
 {
-    BmpFrameDecode *This = (BmpFrameDecode*)iface;
+    BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface);
     TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY);
 
     return BmpHeader_GetResolution(&This->bih, pDpiX, pDpiY);
@@ -193,39 +191,550 @@ static HRESULT WINAPI BmpFrameDecode_GetResolution(IWICBitmapFrameDecode *iface,
 static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface,
     IWICPalette *pIPalette)
 {
-    FIXME("(%p,%p): stub\n", iface, pIPalette);
-    return E_NOTIMPL;
+    HRESULT hr;
+    BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface);
+    int count;
+    WICColor *wiccolors=NULL;
+    RGBTRIPLE *bgrcolors=NULL;
+
+    TRACE("(%p,%p)\n", iface, pIPalette);
+
+    EnterCriticalSection(&This->lock);
+
+    if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER))
+    {
+        BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)&This->bih;
+        if (bch->bcBitCount <= 8)
+        {
+            /* 2**n colors in BGR format after the header */
+            ULONG tablesize, bytesread;
+            LARGE_INTEGER offset;
+            int i;
+
+            count = 1 << bch->bcBitCount;
+            wiccolors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * count);
+            tablesize = sizeof(RGBTRIPLE) * count;
+            bgrcolors = HeapAlloc(GetProcessHeap(), 0, tablesize);
+            if (!wiccolors || !bgrcolors)
+            {
+                hr = E_OUTOFMEMORY;
+                goto end;
+            }
+
+            offset.QuadPart = This->palette_offset;
+            hr = IStream_Seek(This->stream, offset, STREAM_SEEK_SET, NULL);
+            if (FAILED(hr)) goto end;
+
+            hr = IStream_Read(This->stream, bgrcolors, tablesize, &bytesread);
+            if (FAILED(hr)) goto end;
+            if (bytesread != tablesize) {
+                hr = E_FAIL;
+                goto end;
+            }
+
+            for (i=0; i<count; i++)
+            {
+                wiccolors[i] = 0xff000000|
+                               (bgrcolors[i].rgbtRed<<16)|
+                               (bgrcolors[i].rgbtGreen<<8)|
+                               bgrcolors[i].rgbtBlue;
+            }
+        }
+        else
+        {
+            hr = WINCODEC_ERR_PALETTEUNAVAILABLE;
+            goto end;
+        }
+    }
+    else
+    {
+        if (This->bih.bV5BitCount <= 8)
+        {
+            ULONG tablesize, bytesread;
+            LARGE_INTEGER offset;
+            int i;
+
+            if (This->bih.bV5ClrUsed == 0)
+                count = 1 << This->bih.bV5BitCount;
+            else
+                count = This->bih.bV5ClrUsed;
+
+            tablesize = sizeof(WICColor) * count;
+            wiccolors = HeapAlloc(GetProcessHeap(), 0, tablesize);
+            if (!wiccolors)
+            {
+                hr = E_OUTOFMEMORY;
+                goto end;
+            }
+
+            offset.QuadPart = This->palette_offset;
+            hr = IStream_Seek(This->stream, offset, STREAM_SEEK_SET, NULL);
+            if (FAILED(hr)) goto end;
+
+            hr = IStream_Read(This->stream, wiccolors, tablesize, &bytesread);
+            if (FAILED(hr)) goto end;
+            if (bytesread != tablesize) {
+                hr = E_FAIL;
+                goto end;
+            }
+
+            /* convert from BGR to BGRA by setting alpha to 100% */
+            for (i=0; i<count; i++)
+                wiccolors[i] |= 0xff000000;
+        }
+        else
+        {
+            hr = WINCODEC_ERR_PALETTEUNAVAILABLE;
+            goto end;
+        }
+    }
+
+end:
+
+    LeaveCriticalSection(&This->lock);
+
+    if (SUCCEEDED(hr))
+        hr = IWICPalette_InitializeCustom(pIPalette, wiccolors, count);
+
+    HeapFree(GetProcessHeap(), 0, wiccolors);
+    HeapFree(GetProcessHeap(), 0, bgrcolors);
+    return hr;
 }
 
 static HRESULT WINAPI BmpFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface,
     const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer)
 {
-    FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer);
-    return E_NOTIMPL;
+    BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface);
+    HRESULT hr=S_OK;
+    UINT width, height;
+    TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer);
+
+    EnterCriticalSection(&This->lock);
+    if (!This->imagedata)
+    {
+        hr = This->read_data_func(This);
+    }
+    LeaveCriticalSection(&This->lock);
+    if (FAILED(hr)) return hr;
+
+    hr = BmpFrameDecode_GetSize(iface, &width, &height);
+    if (FAILED(hr)) return hr;
+
+    return copy_pixels(This->bitsperpixel, This->imagedatastart,
+        width, height, This->stride,
+        prc, cbStride, cbBufferSize, pbBuffer);
 }
 
 static HRESULT WINAPI BmpFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecode *iface,
     IWICMetadataQueryReader **ppIMetadataQueryReader)
 {
-    FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader);
-    return E_NOTIMPL;
+    TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader);
+    return WINCODEC_ERR_UNSUPPORTEDOPERATION;
 }
 
 static HRESULT WINAPI BmpFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface,
     UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount)
 {
-    FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount);
-    return E_NOTIMPL;
+    TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount);
+    return WINCODEC_ERR_UNSUPPORTEDOPERATION;
 }
 
 static HRESULT WINAPI BmpFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface,
     IWICBitmapSource **ppIThumbnail)
 {
-    FIXME("(%p,%p): stub\n", iface, ppIThumbnail);
-    return E_NOTIMPL;
+    TRACE("(%p,%p)\n", iface, ppIThumbnail);
+    return WINCODEC_ERR_CODECNOTHUMBNAIL;
+}
+
+static HRESULT BmpFrameDecode_ReadUncompressed(BmpDecoder* This)
+{
+    UINT bytesperrow;
+    UINT width, height;
+    UINT datasize;
+    int bottomup;
+    HRESULT hr;
+    LARGE_INTEGER offbits;
+    ULONG bytesread;
+
+    if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER))
+    {
+        BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)&This->bih;
+        width = bch->bcWidth;
+        height = bch->bcHeight;
+        bottomup = 1;
+    }
+    else
+    {
+        width = This->bih.bV5Width;
+        height = abs(This->bih.bV5Height);
+        bottomup = (This->bih.bV5Height > 0);
+    }
+
+    /* row sizes in BMP files must be divisible by 4 bytes */
+    bytesperrow = (((width * This->bitsperpixel)+31)/32)*4;
+    datasize = bytesperrow * height;
+
+    This->imagedata = HeapAlloc(GetProcessHeap(), 0, datasize);
+    if (!This->imagedata) return E_OUTOFMEMORY;
+
+    offbits.QuadPart = This->image_offset;
+    hr = IStream_Seek(This->stream, offbits, STREAM_SEEK_SET, NULL);
+    if (FAILED(hr)) goto fail;
+
+    hr = IStream_Read(This->stream, This->imagedata, datasize, &bytesread);
+    if (FAILED(hr) || bytesread != datasize) goto fail;
+
+    if (bottomup)
+    {
+        This->imagedatastart = This->imagedata + (height-1) * bytesperrow;
+        This->stride = -bytesperrow;
+    }
+    else
+    {
+        This->imagedatastart = This->imagedata;
+        This->stride = bytesperrow;
+    }
+    return S_OK;
+
+fail:
+    HeapFree(GetProcessHeap(), 0, This->imagedata);
+    This->imagedata = NULL;
+    if (SUCCEEDED(hr)) hr = E_FAIL;
+    return hr;
+}
+
+static HRESULT BmpFrameDecode_ReadRGB8(BmpDecoder* This)
+{
+    HRESULT hr;
+    UINT width, height;
+
+    hr = IWICBitmapFrameDecode_GetSize(&This->IWICBitmapFrameDecode_iface, &width, &height);
+
+    if (SUCCEEDED(hr))
+    {
+        hr = BmpFrameDecode_ReadUncompressed(This);
+    }
+
+    if (SUCCEEDED(hr))
+    {
+        reverse_bgr8(This->bitsperpixel/8, This->imagedatastart,
+            width, height, This->stride);
+    }
+
+    return hr;
+}
+
+static HRESULT ReadByte(IStream *stream, BYTE *buffer, ULONG buffer_size,
+    ULONG *cursor, ULONG *bytesread, BYTE *result)
+{
+    HRESULT hr=S_OK;
+
+    if (*bytesread == 0 || *cursor == *bytesread)
+    {
+        hr = IStream_Read(stream, buffer, buffer_size, bytesread);
+        *cursor = 0;
+    }
+
+    if (SUCCEEDED(hr))
+    {
+        if (*cursor < *bytesread)
+            *result = buffer[(*cursor)++];
+        else
+            hr = E_FAIL;
+    }
+
+    return hr;
+}
+
+static HRESULT BmpFrameDecode_ReadRLE8(BmpDecoder* This)
+{
+    UINT bytesperrow;
+    UINT width, height;
+    BYTE rledata[4096];
+    UINT datasize, palettesize;
+    DWORD palette[256];
+    UINT x, y;
+    DWORD *bgrdata;
+    HRESULT hr;
+    LARGE_INTEGER offbits;
+    ULONG cursor=0, bytesread=0;
+
+    width = This->bih.bV5Width;
+    height = abs(This->bih.bV5Height);
+    bytesperrow = width * 4;
+    datasize = bytesperrow * height;
+    if (This->bih.bV5ClrUsed && This->bih.bV5ClrUsed < 256)
+        palettesize = 4 * This->bih.bV5ClrUsed;
+    else
+        palettesize = 4 * 256;
+
+    This->imagedata = HeapAlloc(GetProcessHeap(), 0, datasize);
+    if (!This->imagedata)
+    {
+        hr = E_OUTOFMEMORY;
+        goto fail;
+    }
+
+    /* read palette */
+    offbits.QuadPart = This->palette_offset;
+    hr = IStream_Seek(This->stream, offbits, STREAM_SEEK_SET, NULL);
+    if (FAILED(hr)) goto fail;
+
+    hr = IStream_Read(This->stream, palette, palettesize, &bytesread);
+    if (FAILED(hr) || bytesread != palettesize) goto fail;
+
+    /* read RLE data */
+    offbits.QuadPart = This->image_offset;
+    hr = IStream_Seek(This->stream, offbits, STREAM_SEEK_SET, NULL);
+    if (FAILED(hr)) goto fail;
+
+    /* decode RLE */
+    bgrdata = (DWORD*)This->imagedata;
+    x = 0;
+    y = 0;
+    cursor = 0;
+    bytesread = 0;
+    while (y < height)
+    {
+        BYTE length;
+        hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &length);
+
+        if (FAILED(hr))
+            goto fail;
+        else if (length == 0)
+        {
+            /* escape code */
+            BYTE escape;
+            hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &escape);
+            if (FAILED(hr))
+                goto fail;
+            switch(escape)
+            {
+            case 0: /* end of line */
+                x = 0;
+                y++;
+                break;
+            case 1: /* end of bitmap */
+                goto end;
+            case 2: /* delta */
+            {
+                BYTE dx, dy;
+                hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &dx);
+                if (SUCCEEDED(hr))
+                    hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &dy);
+                if (FAILED(hr))
+                    goto fail;
+                x += dx;
+                y += dy;
+                break;
+            }
+            default: /* absolute mode */
+                length = escape;
+                while (length-- && x < width)
+                {
+                    BYTE index;
+                    hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &index);
+                    if (FAILED(hr))
+                        goto fail;
+                    bgrdata[y*width + x++] = palette[index];
+                }
+                if (escape & 1)
+                    hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &length); /* skip pad byte */
+                if (FAILED(hr))
+                    goto fail;
+            }
+        }
+        else
+        {
+            BYTE index;
+            DWORD color;
+            hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &index);
+            if (FAILED(hr))
+                goto fail;
+            color = palette[index];
+            while (length-- && x < width)
+                bgrdata[y*width + x++] = color;
+        }
+    }
+
+end:
+    This->imagedatastart = This->imagedata + (height-1) * bytesperrow;
+    This->stride = -bytesperrow;
+
+    return S_OK;
+
+fail:
+    HeapFree(GetProcessHeap(), 0, This->imagedata);
+    This->imagedata = NULL;
+    if (SUCCEEDED(hr)) hr = E_FAIL;
+    return hr;
+}
+
+static HRESULT BmpFrameDecode_ReadRLE4(BmpDecoder* This)
+{
+    UINT bytesperrow;
+    UINT width, height;
+    BYTE rledata[4096];
+    UINT datasize, palettesize;
+    DWORD palette[16];
+    UINT x, y;
+    DWORD *bgrdata;
+    HRESULT hr;
+    LARGE_INTEGER offbits;
+    ULONG cursor=0, bytesread=0;
+
+    width = This->bih.bV5Width;
+    height = abs(This->bih.bV5Height);
+    bytesperrow = width * 4;
+    datasize = bytesperrow * height;
+    if (This->bih.bV5ClrUsed && This->bih.bV5ClrUsed < 16)
+        palettesize = 4 * This->bih.bV5ClrUsed;
+    else
+        palettesize = 4 * 16;
+
+    This->imagedata = HeapAlloc(GetProcessHeap(), 0, datasize);
+    if (!This->imagedata)
+    {
+        hr = E_OUTOFMEMORY;
+        goto fail;
+    }
+
+    /* read palette */
+    offbits.QuadPart = This->palette_offset;
+    hr = IStream_Seek(This->stream, offbits, STREAM_SEEK_SET, NULL);
+    if (FAILED(hr)) goto fail;
+
+    hr = IStream_Read(This->stream, palette, palettesize, &bytesread);
+    if (FAILED(hr) || bytesread != palettesize) goto fail;
+
+    /* read RLE data */
+    offbits.QuadPart = This->image_offset;
+    hr = IStream_Seek(This->stream, offbits, STREAM_SEEK_SET, NULL);
+    if (FAILED(hr)) goto fail;
+
+    /* decode RLE */
+    bgrdata = (DWORD*)This->imagedata;
+    x = 0;
+    y = 0;
+    cursor = 0;
+    bytesread = 0;
+    while (y < height)
+    {
+        BYTE length;
+        hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &length);
+
+        if (FAILED(hr))
+            goto fail;
+        else if (length == 0)
+        {
+            /* escape code */
+            BYTE escape;
+            hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &escape);
+            if (FAILED(hr))
+                goto fail;
+            switch(escape)
+            {
+            case 0: /* end of line */
+                x = 0;
+                y++;
+                break;
+            case 1: /* end of bitmap */
+                goto end;
+            case 2: /* delta */
+            {
+                BYTE dx, dy;
+                hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &dx);
+                if (SUCCEEDED(hr))
+                    hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &dy);
+                if (FAILED(hr))
+                    goto fail;
+                x += dx;
+                y += dy;
+                break;
+            }
+            default: /* absolute mode */
+            {
+                BYTE realsize=0;
+                length = escape;
+                while (length-- && x < width)
+                {
+                    BYTE colors;
+                    hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &colors);
+                    realsize++;
+                    if (FAILED(hr))
+                        goto fail;
+                    bgrdata[y*width + x++] = palette[colors>>4];
+                    if (length-- && x < width)
+                        bgrdata[y*width + x++] = palette[colors&0xf];
+                    else
+                        break;
+                }
+                if (realsize & 1)
+                    hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &length); /* skip pad byte */
+                if (FAILED(hr))
+                    goto fail;
+            }
+            }
+        }
+        else
+        {
+            BYTE colors;
+            DWORD color1;
+            DWORD color2;
+            hr = ReadByte(This->stream, rledata, 4096, &cursor, &bytesread, &colors);
+            if (FAILED(hr))
+                goto fail;
+            color1 = palette[colors>>4];
+            color2 = palette[colors&0xf];
+            while (length-- && x < width)
+            {
+                bgrdata[y*width + x++] = color1;
+                if (length-- && x < width)
+                    bgrdata[y*width + x++] = color2;
+                else
+                    break;
+            }
+        }
+    }
+
+end:
+    This->imagedatastart = This->imagedata + (height-1) * bytesperrow;
+    This->stride = -bytesperrow;
+
+    return S_OK;
+
+fail:
+    HeapFree(GetProcessHeap(), 0, This->imagedata);
+    This->imagedata = NULL;
+    if (SUCCEEDED(hr)) hr = E_FAIL;
+    return hr;
+}
+
+static HRESULT BmpFrameDecode_ReadUnsupported(BmpDecoder* This)
+{
+    return E_FAIL;
 }
 
-static const IWICBitmapFrameDecodeVtbl BmpFrameDecode_Vtbl = {
+struct bitfields_format {
+    WORD bitcount; /* 0 for end of list */
+    DWORD redmask;
+    DWORD greenmask;
+    DWORD bluemask;
+    DWORD alphamask;
+    const WICPixelFormatGUID *pixelformat;
+    ReadDataFunc read_data_func;
+};
+
+static const struct bitfields_format bitfields_formats[] = {
+    {16,0x7c00,0x3e0,0x1f,0,&GUID_WICPixelFormat16bppBGR555,BmpFrameDecode_ReadUncompressed},
+    {16,0xf800,0x7e0,0x1f,0,&GUID_WICPixelFormat16bppBGR565,BmpFrameDecode_ReadUncompressed},
+    {32,0xff0000,0xff00,0xff,0,&GUID_WICPixelFormat32bppBGR,BmpFrameDecode_ReadUncompressed},
+    {32,0xff0000,0xff00,0xff,0xff000000,&GUID_WICPixelFormat32bppBGRA,BmpFrameDecode_ReadUncompressed},
+    {32,0xff,0xff00,0xff0000,0,&GUID_WICPixelFormat32bppBGR,BmpFrameDecode_ReadRGB8},
+    {0}
+};
+
+static const IWICBitmapFrameDecodeVtbl BmpDecoder_FrameVtbl = {
     BmpFrameDecode_QueryInterface,
     BmpFrameDecode_AddRef,
     BmpFrameDecode_Release,
@@ -239,29 +748,27 @@ static const IWICBitmapFrameDecodeVtbl BmpFrameDecode_Vtbl = {
     BmpFrameDecode_GetThumbnail
 };
 
-typedef struct {
-    const IWICBitmapDecoderVtbl *lpVtbl;
-    LONG ref;
-    BOOL initialized;
-    IStream *stream;
-    BITMAPFILEHEADER bfh;
-    BITMAPV5HEADER bih;
-    BmpFrameDecode *framedecode;
-    const WICPixelFormatGUID *pixelformat;
-    int bitsperpixel;
-} BmpDecoder;
-
 static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream)
 {
     HRESULT hr;
     ULONG bytestoread, bytesread;
+    LARGE_INTEGER seek;
 
     if (This->initialized) return WINCODEC_ERR_WRONGSTATE;
 
-    hr = IStream_Read(stream, &This->bfh, sizeof(BITMAPFILEHEADER), &bytesread);
+    seek.QuadPart = 0;
+    hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL);
     if (FAILED(hr)) return hr;
-    if (bytesread != sizeof(BITMAPFILEHEADER) ||
-        This->bfh.bfType != 0x4d42 /* "BM" */) return E_FAIL;
+
+    if (!This->packed)
+    {
+        BITMAPFILEHEADER bfh;
+        hr = IStream_Read(stream, &bfh, sizeof(BITMAPFILEHEADER), &bytesread);
+        if (FAILED(hr)) return hr;
+        if (bytesread != sizeof(BITMAPFILEHEADER) ||
+            bfh.bfType != 0x4d42 /* "BM" */) return E_FAIL;
+        This->image_offset = bfh.bfOffBits;
+    }
 
     hr = IStream_Read(stream, &This->bih.bV5Size, sizeof(DWORD), &bytesread);
     if (FAILED(hr)) return hr;
@@ -277,12 +784,43 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream)
     if (FAILED(hr)) return hr;
     if (bytestoread != bytesread) return E_FAIL;
 
+    if (This->packed)
+        This->palette_offset = This->bih.bV5Size;
+    else
+        This->palette_offset = sizeof(BITMAPFILEHEADER) + This->bih.bV5Size;
+
+    if (This->icoframe)
+    {
+        if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER))
+        {
+            BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)&This->bih;
+            bch->bcHeight /= 2;
+        }
+        else
+        {
+            This->bih.bV5Height /= 2;
+        }
+    }
+
+    /* if this is a BITMAPINFOHEADER with BI_BITFIELDS compression, we need to
+        read the extra fields */
+    if (This->bih.bV5Size == sizeof(BITMAPINFOHEADER) &&
+        This->bih.bV5Compression == BI_BITFIELDS)
+    {
+        hr = IStream_Read(stream, &This->bih.bV5RedMask, 12, &bytesread);
+        if (FAILED(hr)) return hr;
+        if (bytesread != 12) return E_FAIL;
+        This->bih.bV5AlphaMask = 0;
+        This->palette_offset += 12;
+    }
+
     /* decide what kind of bitmap this is and how/if we can read it */
     if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER))
     {
         BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)&This->bih;
         TRACE("BITMAPCOREHEADER with depth=%i\n", bch->bcBitCount);
         This->bitsperpixel = bch->bcBitCount;
+        This->read_data_func = BmpFrameDecode_ReadUncompressed;
         switch(bch->bcBitCount)
         {
         case 1:
@@ -313,6 +851,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream)
         {
         case BI_RGB:
             This->bitsperpixel = This->bih.bV5BitCount;
+            This->read_data_func = BmpFrameDecode_ReadUncompressed;
             switch(This->bih.bV5BitCount)
             {
             case 1:
@@ -341,14 +880,77 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream)
                 FIXME("unsupported bit depth %i for uncompressed RGB\n", This->bih.bV5BitCount);
             }
             break;
+        case BI_RLE8:
+            This->bitsperpixel = 32;
+            This->read_data_func = BmpFrameDecode_ReadRLE8;
+            This->pixelformat = &GUID_WICPixelFormat32bppBGR;
+            break;
+        case BI_RLE4:
+            This->bitsperpixel = 32;
+            This->read_data_func = BmpFrameDecode_ReadRLE4;
+            This->pixelformat = &GUID_WICPixelFormat32bppBGR;
+            break;
+        case BI_BITFIELDS:
+        {
+            const struct bitfields_format *format;
+            if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER2))
+            {
+                /* BCH2 doesn't support bitfields; this is Huffman 1D compression */
+                This->bitsperpixel = 0;
+                This->read_data_func = BmpFrameDecode_ReadUnsupported;
+                This->pixelformat = &GUID_WICPixelFormatUndefined;
+                FIXME("Huffman 1D compression is unsupported\n");
+                break;
+            }
+            This->bitsperpixel = This->bih.bV5BitCount;
+            for (format = bitfields_formats; format->bitcount; format++)
+            {
+                if ((format->bitcount == This->bih.bV5BitCount) &&
+                    (format->redmask == This->bih.bV5RedMask) &&
+                    (format->greenmask == This->bih.bV5GreenMask) &&
+                    (format->bluemask == This->bih.bV5BlueMask) &&
+                    (format->alphamask == This->bih.bV5AlphaMask))
+                {
+                    This->read_data_func = format->read_data_func;
+                    This->pixelformat = format->pixelformat;
+                    break;
+                }
+            }
+            if (!format->bitcount)
+            {
+                This->read_data_func = BmpFrameDecode_ReadUncompressed;
+                This->pixelformat = &GUID_WICPixelFormatUndefined;
+                FIXME("unsupported bitfields type depth=%i red=%x green=%x blue=%x alpha=%x\n",
+                    This->bih.bV5BitCount, This->bih.bV5RedMask, This->bih.bV5GreenMask, This->bih.bV5BlueMask, This->bih.bV5AlphaMask);
+            }
+            break;
+        }
         default:
             This->bitsperpixel = 0;
+            This->read_data_func = BmpFrameDecode_ReadUnsupported;
             This->pixelformat = &GUID_WICPixelFormatUndefined;
             FIXME("unsupported bitmap type header=%i compression=%i depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount);
             break;
         }
     }
 
+    if (This->packed)
+    {
+        /* In a packed DIB, the image follows the palette. */
+        ULONG palette_count, palette_size;
+        if (This->bih.bV5ClrUsed)
+            palette_count = This->bih.bV5ClrUsed;
+        else if (This->bih.bV5BitCount <= 8)
+            palette_count = 1 << This->bih.bV5BitCount;
+        else
+            palette_count = 0;
+        if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER))
+            palette_size = sizeof(RGBTRIPLE) * palette_count;
+        else
+            palette_size = sizeof(RGBQUAD) * palette_count;
+        This->image_offset = This->palette_offset + palette_size;
+    }
+
     This->initialized = TRUE;
 
     return S_OK;
@@ -357,7 +959,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream)
 static HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid,
     void **ppv)
 {
-    BmpDecoder *This = (BmpDecoder*)iface;
+    BmpDecoder *This = impl_from_IWICBitmapDecoder(iface);
     TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv);
 
     if (!ppv) return E_INVALIDARG;
@@ -378,7 +980,7 @@ static HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID
 
 static ULONG WINAPI BmpDecoder_AddRef(IWICBitmapDecoder *iface)
 {
-    BmpDecoder *This = (BmpDecoder*)iface;
+    BmpDecoder *This = impl_from_IWICBitmapDecoder(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
     TRACE("(%p) refcount=%u\n", iface, ref);
@@ -388,7 +990,7 @@ static ULONG WINAPI BmpDecoder_AddRef(IWICBitmapDecoder *iface)
 
 static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface)
 {
-    BmpDecoder *This = (BmpDecoder*)iface;
+    BmpDecoder *This = impl_from_IWICBitmapDecoder(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
     TRACE("(%p) refcount=%u\n", iface, ref);
@@ -396,7 +998,9 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface)
     if (ref == 0)
     {
         if (This->stream) IStream_Release(This->stream);
-        if (This->framedecode) IUnknown_Release((IUnknown*)This->framedecode);
+        HeapFree(GetProcessHeap(), 0, This->imagedata);
+        This->lock.DebugInfo->Spare[0] = 0;
+        DeleteCriticalSection(&This->lock);
         HeapFree(GetProcessHeap(), 0, This);
     }
 
@@ -406,16 +1010,29 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface)
 static HRESULT WINAPI BmpDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream,
     DWORD *pdwCapability)
 {
-    FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability);
-    return E_NOTIMPL;
+    HRESULT hr;
+    BmpDecoder *This = impl_from_IWICBitmapDecoder(iface);
+
+    EnterCriticalSection(&This->lock);
+    hr = BmpDecoder_ReadHeaders(This, pIStream);
+    LeaveCriticalSection(&This->lock);
+    if (FAILED(hr)) return hr;
+
+    if (This->read_data_func == BmpFrameDecode_ReadUnsupported)
+        *pdwCapability = 0;
+    else
+        *pdwCapability = WICBitmapDecoderCapabilityCanDecodeAllImages;
+
+    return S_OK;
 }
 
 static HRESULT WINAPI BmpDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream,
     WICDecodeOptions cacheOptions)
 {
     HRESULT hr;
-    BmpDecoder *This = (BmpDecoder*)iface;
+    BmpDecoder *This = impl_from_IWICBitmapDecoder(iface);
 
+    EnterCriticalSection(&This->lock);
     hr = BmpDecoder_ReadHeaders(This, pIStream);
 
     if (SUCCEEDED(hr))
@@ -423,6 +1040,7 @@ static HRESULT WINAPI BmpDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p
         This->stream = pIStream;
         IStream_AddRef(pIStream);
     }
+    LeaveCriticalSection(&This->lock);
 
     return hr;
 }
@@ -437,43 +1055,56 @@ static HRESULT WINAPI BmpDecoder_GetContainerFormat(IWICBitmapDecoder *iface,
 static HRESULT WINAPI BmpDecoder_GetDecoderInfo(IWICBitmapDecoder *iface,
     IWICBitmapDecoderInfo **ppIDecoderInfo)
 {
-    FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo);
-    return E_NOTIMPL;
+    HRESULT hr;
+    IWICComponentInfo *compinfo;
+
+    TRACE("(%p,%p)\n", iface, ppIDecoderInfo);
+
+    hr = CreateComponentInfo(&CLSID_WICBmpDecoder, &compinfo);
+    if (FAILED(hr)) return hr;
+
+    hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo,
+        (void**)ppIDecoderInfo);
+
+    IWICComponentInfo_Release(compinfo);
+
+    return hr;
 }
 
 static HRESULT WINAPI BmpDecoder_CopyPalette(IWICBitmapDecoder *iface,
     IWICPalette *pIPalette)
 {
-    FIXME("(%p,%p): stub\n", iface, pIPalette);
-    return E_NOTIMPL;
+    TRACE("(%p,%p)\n", iface, pIPalette);
+
+    return WINCODEC_ERR_PALETTEUNAVAILABLE;
 }
 
 static HRESULT WINAPI BmpDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface,
     IWICMetadataQueryReader **ppIMetadataQueryReader)
 {
-    FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader);
-    return E_NOTIMPL;
+    TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader);
+    return WINCODEC_ERR_UNSUPPORTEDOPERATION;
 }
 
 static HRESULT WINAPI BmpDecoder_GetPreview(IWICBitmapDecoder *iface,
     IWICBitmapSource **ppIBitmapSource)
 {
-    FIXME("(%p,%p): stub\n", iface, ppIBitmapSource);
-    return E_NOTIMPL;
+    TRACE("(%p,%p)\n", iface, ppIBitmapSource);
+    return WINCODEC_ERR_UNSUPPORTEDOPERATION;
 }
 
 static HRESULT WINAPI BmpDecoder_GetColorContexts(IWICBitmapDecoder *iface,
     UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount)
 {
-    FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount);
-    return E_NOTIMPL;
+    TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount);
+    return WINCODEC_ERR_UNSUPPORTEDOPERATION;
 }
 
 static HRESULT WINAPI BmpDecoder_GetThumbnail(IWICBitmapDecoder *iface,
     IWICBitmapSource **ppIThumbnail)
 {
-    FIXME("(%p,%p): stub\n", iface, ppIThumbnail);
-    return E_NOTIMPL;
+    TRACE("(%p,%p)\n", iface, ppIThumbnail);
+    return WINCODEC_ERR_CODECNOTHUMBNAIL;
 }
 
 static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface,
@@ -486,29 +1117,14 @@ static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface,
 static HRESULT WINAPI BmpDecoder_GetFrame(IWICBitmapDecoder *iface,
     UINT index, IWICBitmapFrameDecode **ppIBitmapFrame)
 {
-    BmpDecoder *This = (BmpDecoder*)iface;
+    BmpDecoder *This = impl_from_IWICBitmapDecoder(iface);
 
     if (index != 0) return E_INVALIDARG;
 
     if (!This->stream) return WINCODEC_ERR_WRONGSTATE;
 
-    if (!This->framedecode)
-    {
-        This->framedecode = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpFrameDecode));
-        if (!This->framedecode) return E_OUTOFMEMORY;
-
-        This->framedecode->lpVtbl = &BmpFrameDecode_Vtbl;
-        This->framedecode->ref = 1;
-        This->framedecode->stream = This->stream;
-        IStream_AddRef(This->stream);
-        This->framedecode->bfh = This->bfh;
-        This->framedecode->bih = This->bih;
-        This->framedecode->pixelformat = This->pixelformat;
-        This->framedecode->bitsperpixel = This->bitsperpixel;
-    }
-
-    *ppIBitmapFrame = (IWICBitmapFrameDecode*)This->framedecode;
-    IWICBitmapFrameDecode_AddRef((IWICBitmapFrameDecode*)This->framedecode);
+    *ppIBitmapFrame = &This->IWICBitmapFrameDecode_iface;
+    IWICBitmapDecoder_AddRef(iface);
 
     return S_OK;
 }
@@ -530,7 +1146,30 @@ static const IWICBitmapDecoderVtbl BmpDecoder_Vtbl = {
     BmpDecoder_GetFrame
 };
 
-HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
+static HRESULT BmpDecoder_Create(int packed, int icoframe, BmpDecoder **ppDecoder)
+{
+    BmpDecoder *This;
+
+    This = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpDecoder));
+    if (!This) return E_OUTOFMEMORY;
+
+    This->IWICBitmapDecoder_iface.lpVtbl = &BmpDecoder_Vtbl;
+    This->IWICBitmapFrameDecode_iface.lpVtbl = &BmpDecoder_FrameVtbl;
+    This->ref = 1;
+    This->initialized = FALSE;
+    This->stream = NULL;
+    This->imagedata = NULL;
+    InitializeCriticalSection(&This->lock);
+    This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BmpDecoder.lock");
+    This->packed = packed;
+    This->icoframe = icoframe;
+
+    *ppDecoder = This;
+
+    return S_OK;
+}
+
+static HRESULT BmpDecoder_Construct(int packed, int icoframe, IUnknown *pUnkOuter, REFIID iid, void** ppv)
 {
     BmpDecoder *This;
     HRESULT ret;
@@ -541,17 +1180,51 @@ HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
 
     if (pUnkOuter) return CLASS_E_NOAGGREGATION;
 
-    This = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpDecoder));
-    if (!This) return E_OUTOFMEMORY;
-
-    This->lpVtbl = &BmpDecoder_Vtbl;
-    This->ref = 1;
-    This->initialized = FALSE;
-    This->stream = NULL;
-    This->framedecode = NULL;
+    ret = BmpDecoder_Create(packed, icoframe, &This);
+    if (FAILED(ret)) return ret;
 
-    ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv);
-    IUnknown_Release((IUnknown*)This);
+    ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv);
+    IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface);
 
     return ret;
 }
+
+HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
+{
+    return BmpDecoder_Construct(FALSE, FALSE, pUnkOuter, iid, ppv);
+}
+
+HRESULT DibDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
+{
+    return BmpDecoder_Construct(TRUE, FALSE, pUnkOuter, iid, ppv);
+}
+
+HRESULT IcoDibDecoder_CreateInstance(BmpDecoder **ppDecoder)
+{
+    return BmpDecoder_Create(TRUE, TRUE, ppDecoder);
+}
+
+void BmpDecoder_GetWICDecoder(BmpDecoder *This, IWICBitmapDecoder **ppDecoder)
+{
+    *ppDecoder = &This->IWICBitmapDecoder_iface;
+}
+
+/* Return the offset where the mask of an icon might be, or 0 for failure. */
+void BmpDecoder_FindIconMask(BmpDecoder *This, ULONG *mask_offset, int *topdown)
+{
+    assert(This->stream != NULL);
+
+    if (This->read_data_func == BmpFrameDecode_ReadUncompressed)
+    {
+        /* RGB or BITFIELDS data */
+        ULONG width, height, bytesperrow, datasize;
+        IWICBitmapFrameDecode_GetSize(&This->IWICBitmapFrameDecode_iface, &width, &height);
+        bytesperrow = (((width * This->bitsperpixel)+31)/32)*4;
+        datasize = bytesperrow * height;
+        *mask_offset = This->image_offset + datasize;
+    }
+    else
+        *mask_offset = 0;
+
+    *topdown = This->stride > 0;
+}