ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Initialize hbmColor only for color icons in GetIconInfo.

This commit is contained in:
Dmitry Timoshkov 2003-05-19 19:01:31 +00:00 committed by Alexandre Julliard
parent d0af123a41
commit cdbe1570df
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
windows/cursoricon.c
View File

@ -1607,8 +1607,10 @@ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name)
/********************************************************************** /**********************************************************************
* GetIconInfo (USER32.@) * GetIconInfo (USER32.@)
*/ */
BOOL WINAPI GetIconInfo(HICON hIcon,PICONINFO iconinfo) { BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo)
{
CURSORICONINFO *ciconinfo; CURSORICONINFO *ciconinfo;
INT height;
ciconinfo = GlobalLock16(HICON_16(hIcon)); ciconinfo = GlobalLock16(HICON_16(hIcon));
if (!ciconinfo) if (!ciconinfo)
@ -1628,12 +1630,22 @@ BOOL WINAPI GetIconInfo(HICON hIcon,PICONINFO iconinfo) {
iconinfo->yHotspot = ciconinfo->ptHotSpot.y; iconinfo->yHotspot = ciconinfo->ptHotSpot.y;
} }
iconinfo->hbmColor = CreateBitmap ( ciconinfo->nWidth, ciconinfo->nHeight, if (ciconinfo->bBitsPerPixel > 1)
{
iconinfo->hbmColor = CreateBitmap( ciconinfo->nWidth, ciconinfo->nHeight,
ciconinfo->bPlanes, ciconinfo->bBitsPerPixel, ciconinfo->bPlanes, ciconinfo->bBitsPerPixel,
(char *)(ciconinfo + 1) (char *)(ciconinfo + 1)
+ ciconinfo->nHeight * + ciconinfo->nHeight *
get_bitmap_width_bytes (ciconinfo->nWidth,1) ); get_bitmap_width_bytes (ciconinfo->nWidth,1) );
iconinfo->hbmMask = CreateBitmap ( ciconinfo->nWidth, ciconinfo->nHeight, height = ciconinfo->nHeight;
}
else
{
iconinfo->hbmColor = 0;
height = ciconinfo->nHeight * 2;
}
iconinfo->hbmMask = CreateBitmap ( ciconinfo->nWidth, height,
1, 1, (char *)(ciconinfo + 1)); 1, 1, (char *)(ciconinfo + 1));
GlobalUnlock16(HICON_16(hIcon)); GlobalUnlock16(HICON_16(hIcon));