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

Timestamp:

Nov 9, 2000, 9:20:33 PM (25 years ago)

Author:

sandervl

Message:

icon bugfixes

File:

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

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.11 2000-11-09 18:15:23 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.12 2000-11-09 20:20:33 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -470 +470 @@
     HDC hdc = 0;
     BOOL DoStretch;
-    INT size, colortablesize;
+    INT size, colortablesize, bwsize, colorsize;
 
     hotspot.x = ICON_HOTSPOT;
@@ -497 +497 @@
     DoStretch = (bmi->bmiHeader.biHeight/2 != height) || (bmi->bmiHeader.biWidth != width);
 
+    colorsize = DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight/2, bmi->bmiHeader.biBitCount);
+    bwsize    = (bmi->bmiHeader.biWidth * bmi->bmiHeader.biHeight/2)/8;
+
     /* Check bitmap header */
-    if ( (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) &&
-     (bmi->bmiHeader.biSize != sizeof(BITMAPINFOHEADER)  ||
-      bmi->bmiHeader.biCompression != BI_RGB) )
+    if((bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) &&
+       (bmi->bmiHeader.biSize != sizeof(BITMAPINFOHEADER)  ||
+        bmi->bmiHeader.biCompression != BI_RGB) )
     {
         return 0;
@@ -590 +593 @@
                 if (DoStretch)
                 {
+                    //TODO: rearrange mask if and & xor mask present!!!!!
+                    if(cbSize - size - colorsize - bwsize == bwsize)
+                    {
+                        dprintf(("TODO: rearrange mask because and & xor mask present!!!!!"));
+                    }
                     if ((hAndBits = CreateBitmap(width, height, 1, 1, NULL)))
                     {
@@ -619 +627 @@
                     newpix += ((height-1)*linewidth);
 
-                    for(int i=0;i<height;i++) {
-                        memcpy(newpix, xbits, linewidth);
-                        newpix -= linewidth;
-                        xbits  += linewidth;
+                    if(cbSize - size - colorsize - bwsize == bwsize)
+                    {//this means an AND and XOR mask is present (interleaved; and/xor)
+                        for(int i=0;i<height;i++) {
+                            memcpy(newpix, xbits, linewidth);
+                            newpix -= linewidth;
+                            xbits  += linewidth*2;
+                        }
+                    }
+                    else {
+                        for(int i=0;i<height;i++) {
+                            memcpy(newpix, xbits, linewidth);
+                            newpix -= linewidth;
+                            xbits  += linewidth;
+                        }
                     }
                     newpix += linewidth;