diff options
Diffstat (limited to 'xorg-server/hw/xwin/winmultiwindowicons.c')
| -rw-r--r-- | xorg-server/hw/xwin/winmultiwindowicons.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/xorg-server/hw/xwin/winmultiwindowicons.c b/xorg-server/hw/xwin/winmultiwindowicons.c index 0531ad6c7..74d0af1ba 100644 --- a/xorg-server/hw/xwin/winmultiwindowicons.c +++ b/xorg-server/hw/xwin/winmultiwindowicons.c @@ -237,18 +237,20 @@ NetWMToWinIconAlpha(uint32_t * icon) HDC hdc = GetDC(NULL); uint32_t *DIB_pixels; ICONINFO ii; - BITMAPV4HEADER bmh = { sizeof(bmh) }; + BITMAPV5HEADER bmh; /* Define an ARGB pixel format used for Color+Alpha icons */ - bmh.bV4Width = width; - bmh.bV4Height = -height; /* Invert the image */ - bmh.bV4Planes = 1; - bmh.bV4BitCount = 32; - bmh.bV4V4Compression = BI_BITFIELDS; - bmh.bV4AlphaMask = 0xFF000000; - bmh.bV4RedMask = 0x00FF0000; - bmh.bV4GreenMask = 0x0000FF00; - bmh.bV4BlueMask = 0x000000FF; + ZeroMemory(&bmh,sizeof(bmh)); + bmh.bV5Size = sizeof(bmh); + bmh.bV5Width = width; + bmh.bV5Height = -height; /* Invert the image */ + bmh.bV5Planes = 1; + bmh.bV5BitCount = 32; + bmh.bV5Compression = BI_BITFIELDS; + bmh.bV5AlphaMask = 0xFF000000; + bmh.bV5RedMask = 0x00FF0000; + bmh.bV5GreenMask = 0x0000FF00; + bmh.bV5BlueMask = 0x000000FF; ii.fIcon = TRUE; ii.xHotspot = 0; /* ignored */ @@ -351,7 +353,7 @@ NetWMToWinIcon(int bpp, uint32_t * icon) dwlConditionMask); versionChecked = TRUE; - ErrorF("OS has icon alpha channel support: %s\n", + winDebug("OS has icon alpha channel support: %s\n", hasIconAlphaChannel ? "yes" : "no"); } |