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

Timestamp:

Feb 7, 2012, 9:10:49 AM (14 years ago)

Author:

dmik

Message:

Fix shifted icon AND masks (r21951 regression).

Turns out that ony GetDIBits needs 4-byte alignment while
GetBitmapBits (used to get the AND mask) needs 2-byte alignment.

File:

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

trunk/src/user32/winicon.cpp

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