system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 20:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

shell32: Fix marshalling of 1-bpp systray icons.

Browse source
This commit is contained in:
Alexandre Julliard 2010-05-07 12:45:55 +02:00
parent 159145cefe
commit 96a939eee1
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
dlls/shell32/systray.c
View file

@ -163,43 +163,54 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid)
BITMAP bmMask;
BITMAP bmColour;
LONG cbMaskBits;
LONG cbColourBits;
LONG cbColourBits = 0;
char *buffer;
if (!GetIconInfo(nid->hIcon, &iconinfo))
goto noicon;
if (!GetObjectW(iconinfo.hbmMask, sizeof(bmMask), &bmMask) ||
!GetObjectW(iconinfo.hbmColor, sizeof(bmColour), &bmColour))
(iconinfo.hbmColor && !GetObjectW(iconinfo.hbmColor, sizeof(bmColour), &bmColour)))
{
DeleteObject(iconinfo.hbmMask);
DeleteObject(iconinfo.hbmColor);
if (iconinfo.hbmColor) DeleteObject(iconinfo.hbmColor);
goto noicon;
}
cbMaskBits = (bmMask.bmPlanes * bmMask.bmWidth * bmMask.bmHeight * bmMask.bmBitsPixel + 15) / 16 * 2;
cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel + 15) / 16 * 2;
if (iconinfo.hbmColor)
cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel + 15) / 16 * 2;
cds.cbData = sizeof(*data) + cbMaskBits + cbColourBits;
buffer = HeapAlloc(GetProcessHeap(), 0, cds.cbData);
if (!buffer)
{
DeleteObject(iconinfo.hbmMask);
DeleteObject(iconinfo.hbmColor);
if (iconinfo.hbmColor) DeleteObject(iconinfo.hbmColor);
return FALSE;
}
data = (struct notify_data *)buffer;
memset( data, 0, sizeof(*data) );
data->width = bmColour.bmWidth;
data->height = bmColour.bmHeight;
data->planes = bmColour.bmPlanes;
data->bpp = bmColour.bmBitsPixel;
buffer += sizeof(*data);
GetBitmapBits(iconinfo.hbmMask, cbMaskBits, buffer);
buffer += cbMaskBits;
GetBitmapBits(iconinfo.hbmColor, cbColourBits, buffer);
if (!iconinfo.hbmColor)
{
data->width = bmMask.bmWidth;
data->height = bmMask.bmHeight / 2;
data->planes = 1;
data->bpp = 1;
}
else
{
data->width = bmColour.bmWidth;
data->height = bmColour.bmHeight;
data->planes = bmColour.bmPlanes;
data->bpp = bmColour.bmBitsPixel;
buffer += cbMaskBits;
GetBitmapBits(iconinfo.hbmColor, cbColourBits, buffer);
DeleteObject(iconinfo.hbmColor);
}
DeleteObject(iconinfo.hbmMask);
DeleteObject(iconinfo.hbmColor);
}
noicon: