Vincent Povirk : windowscodecs: Implement CopyPixels for 32-bit ICO icons.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 84dff04e3a7e1d3632346551c447ea7c26d5f492
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=84dff04e3a7e1d3632346551c4...

Author: Vincent Povirk 
Date:   Thu Aug 20 15:10:10 2009 -0500

windowscodecs: Implement CopyPixels for 32-bit ICO icons.

---

dlls/windowscodecs/icoformat.c |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c
index d499146..ab30ab0 100644
--- a/dlls/windowscodecs/icoformat.c
+++ b/dlls/windowscodecs/icoformat.c
@@ -406,6 +406,38 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This)
         HeapFree(GetProcessHeap(), 0, tempdata);
         break;
     }
+    case 32:
+    {
+        UINT xorBytesPerRow = width*4;
+        UINT xorBytes = xorBytesPerRow * height;
+
+        bits = HeapAlloc(GetProcessHeap(), 0, xorBytes);
+        if (!bits)
+        {
+            hr = E_OUTOFMEMORY;
+            goto fail;
+        }
+
+        if (bih.biHeight > 0) /* bottom-up DIB */
+        {
+            /* read the rows backwards so we get a top-down DIB */
+            UINT i;
+            BYTE *xorRow = bits + xorBytesPerRow * (height-1);
+
+            for (i=0; i<height; i++)
+            {
+                hr = IStream_Read(This->parent->stream, xorRow, xorBytesPerRow, &bytesread);
+                if (FAILED(hr) || bytesread != xorBytesPerRow) goto fail;
+                xorRow -= xorBytesPerRow;
+            }
+        }
+        else /* top-down DIB */
+        {
+            hr = IStream_Read(This->parent->stream, bits, xorBytes, &bytesread);
+            if (FAILED(hr) || bytesread != xorBytes) goto fail;
+        }
+        break;
+    }
     default:
         FIXME("unsupported bitcount: %u\n", This->entry.wBitCount);
         goto fail;