Changeset 21951 for trunk/src/user32/winicon.cpp

Timestamp:

Jan 24, 2012, 11:47:23 PM (14 years ago)

Author:

dmik

Message:

Align scanlines passed to GetDIBits on a LONG boundary.

This fixes crashes in CreateIconIndirect()/CreateIconFromResource()/LoadImage()
etc. See #58 for more info.

File:

• trunk/src/user32/winicon.cpp (modified) (3 diffs)

trunk/src/user32/winicon.cpp

@@ -163 +163 @@
     colortablesize = 0;
 
+    // CreateDIBits expectes DWORD-aligned scan lines
+    bmpXor.bmWidthBytes = (bmpXor.bmWidthBytes + 3) / 4 * 4;
+    bmpAnd.bmWidthBytes = (bmpAnd.bmWidthBytes + 3) / 4 * 4;
+
     if(bmpXor.bmBitsPixel <= 8) {
          colortablesize = sizeof(RGBQUAD)*(1<<bmpXor.bmBitsPixel);
@@ -221 +225 @@
             //recalculate the mask bitmap size
             GetObjectA( hbmMask, sizeof(bmpAnd), &bmpAnd );
-            sizeAnd = bmpAnd.bmHeight * bmpAnd.bmWidthBytes;
+            sizeAnd = bmpAnd.bmHeight * (bmpAnd.bmWidthBytes + 3) / 4 * 4;
 
             //query the 1bpp bitmap data
@@ -1160 +1164 @@
     }
 
+    // CreateDIBits expectes DWORD-aligned scan lines
+    bmpXor.bmWidthBytes = (bmpXor.bmWidthBytes + 3) / 4 * 4;
+    bmpAnd.bmWidthBytes = (bmpAnd.bmWidthBytes + 3) / 4 * 4;
+
     if(bmpXor.bmBitsPixel <= 8) {
          colortablesize = sizeof(RGBQUAD)*(1<<bmpXor.bmBitsPixel);