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

user32: Use the stored color and mask bitmaps instead of the raw bits in GetIconInfo.

Browse Source
This commit is contained in:
Alexandre Julliard 2010-05-20 14:27:08 +02:00
parent 072d0b3483
commit efe1c945f2
1 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/user32/cursoricon.c
View File

@ -2049,47 +2049,30 @@ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name)
*/ */
BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo)
{ {
struct cursoricon_object *ciconinfo; struct cursoricon_object *ptr;
INT height;
if (!(ciconinfo = get_icon_ptr( hIcon ))) return FALSE; if (!(ptr = get_icon_ptr( hIcon ))) return FALSE;
TRACE("%p => %dx%d, %d bpp\n", hIcon, TRACE("%p => %dx%d, %d bpp\n", hIcon,
ciconinfo->data.nWidth, ciconinfo->data.nHeight, ciconinfo->data.bBitsPerPixel); ptr->data.nWidth, ptr->data.nHeight, ptr->data.bBitsPerPixel);
if ( (ciconinfo->data.ptHotSpot.x == ICON_HOTSPOT) && if ( (ptr->data.ptHotSpot.x == ICON_HOTSPOT) &&
(ciconinfo->data.ptHotSpot.y == ICON_HOTSPOT) ) (ptr->data.ptHotSpot.y == ICON_HOTSPOT) )
{ {
iconinfo->fIcon = TRUE; iconinfo->fIcon = TRUE;
iconinfo->xHotspot = ciconinfo->data.nWidth / 2; iconinfo->xHotspot = ptr->data.nWidth / 2;
iconinfo->yHotspot = ciconinfo->data.nHeight / 2; iconinfo->yHotspot = ptr->data.nHeight / 2;
} }
else else
{ {
iconinfo->fIcon = FALSE; iconinfo->fIcon = FALSE;
iconinfo->xHotspot = ciconinfo->data.ptHotSpot.x; iconinfo->xHotspot = ptr->data.ptHotSpot.x;
iconinfo->yHotspot = ciconinfo->data.ptHotSpot.y; iconinfo->yHotspot = ptr->data.ptHotSpot.y;
} }
height = ciconinfo->data.nHeight; iconinfo->hbmColor = copy_bitmap( ptr->color );
iconinfo->hbmMask = copy_bitmap( ptr->mask );
if (ciconinfo->data.bBitsPerPixel > 1) release_icon_ptr( hIcon, ptr );
{
iconinfo->hbmColor = CreateBitmap( ciconinfo->data.nWidth, ciconinfo->data.nHeight,
ciconinfo->data.bPlanes, ciconinfo->data.bBitsPerPixel,
(char *)(ciconinfo + 1)
+ ciconinfo->data.nHeight *
get_bitmap_width_bytes (ciconinfo->data.nWidth,1) );
}
else
{
iconinfo->hbmColor = 0;
height *= 2;
}
iconinfo->hbmMask = CreateBitmap ( ciconinfo->data.nWidth, height,
1, 1, ciconinfo + 1);
release_icon_ptr( hIcon, ciconinfo );
return TRUE; return TRUE;
} }