Changeset 7733 for trunk/src/user32/icon.cpp

Timestamp:

Jan 7, 2002, 12:17:52 PM (24 years ago)

Author:

sandervl

Message:

allocate more memory for 40x40 icon

File:

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

trunk/src/user32/icon.cpp

@@ -1 @@
-/* $Id: icon.cpp,v 1.13 2001-08-09 15:02:11 sandervl Exp $ */
+/* $Id: icon.cpp,v 1.14 2002-01-07 11:17:52 sandervl Exp $ */
 
 /*
@@ -197 +197 @@
         int i, linesize;
 
+        //TODO:
+        dprintf(("TODO: icon conversion not correct"));
         linesize = DIB_GetDIBWidthBytes(bmpHdr->biWidth, 1);
         q = (char *)rgb + orgcolorsize;
@@ -296 +298 @@
         groupsize += QueryConvertedIconSize((WINBITMAPINFOHEADER *)LockResource(LoadResource(hInstance, hRes)),
                                             SizeofResource(hInstance, hRes));
-        if(rdir->bWidth == 32 && rdir->bHeight == 32 && rdir->wBitCount >= 4) {
+        //add centered icon if size is 32x32
+        if(rdir->bWidth == 32 && rdir->bHeight == 32 && rdir->wBitCount >= 4) 
+        {
             groupsize += QueryConvertedIconSize((WINBITMAPINFOHEADER *)LockResource(LoadResource(hInstance, hRes)),
                                                 SizeofResource(hInstance, hRes), TRUE);
+            //extra pixels
+            groupsize += (40*8 + 8*32)*rdir->wBitCount/8;
             nricons++;
         }