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

user: Reimplement GetIconInfo16 using the 16-bit icon structure directly.

This commit is contained in:
Alexandre Julliard 2010-02-01 17:31:27 +01:00
parent 7e42fd8b4e
commit e474bfe0f3
1 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dlls/user.exe16/user.c
View File

@ -265,6 +265,8 @@ struct cache_entry
static struct list icon_cache = LIST_INIT( icon_cache ); static struct list icon_cache = LIST_INIT( icon_cache );
static const WORD ICON_HOTSPOT = 0x4242;
static HICON16 alloc_icon_handle( unsigned int size ) static HICON16 alloc_icon_handle( unsigned int size )
{ {
HGLOBAL16 handle = GlobalAlloc16( GMEM_MOVEABLE, size ); HGLOBAL16 handle = GlobalAlloc16( GMEM_MOVEABLE, size );
@ -2117,15 +2119,43 @@ BOOL16 WINAPI DrawIconEx16(HDC16 hdc, INT16 xLeft, INT16 yTop, HICON16 hIcon,
*/ */
BOOL16 WINAPI GetIconInfo16(HICON16 hIcon, LPICONINFO16 iconinfo) BOOL16 WINAPI GetIconInfo16(HICON16 hIcon, LPICONINFO16 iconinfo)
{ {
ICONINFO ii32; CURSORICONINFO *info = get_icon_ptr( hIcon );
BOOL16 ret = GetIconInfo(HICON_32(hIcon), &ii32); INT height;
iconinfo->fIcon = ii32.fIcon; if (!info) return FALSE;
iconinfo->xHotspot = ii32.xHotspot;
iconinfo->yHotspot = ii32.yHotspot; if ((info->ptHotSpot.x == ICON_HOTSPOT) && (info->ptHotSpot.y == ICON_HOTSPOT))
iconinfo->hbmMask = HBITMAP_16(ii32.hbmMask); {
iconinfo->hbmColor = HBITMAP_16(ii32.hbmColor); iconinfo->fIcon = TRUE;
return ret; iconinfo->xHotspot = info->nWidth / 2;
iconinfo->yHotspot = info->nHeight / 2;
}
else
{
iconinfo->fIcon = FALSE;
iconinfo->xHotspot = info->ptHotSpot.x;
iconinfo->yHotspot = info->ptHotSpot.y;
}
height = info->nHeight;
if (info->bBitsPerPixel > 1)
{
iconinfo->hbmColor = HBITMAP_16( CreateBitmap( info->nWidth, info->nHeight,
info->bPlanes, info->bBitsPerPixel,
(char *)(info + 1)
+ info->nHeight *
get_bitmap_width_bytes(info->nWidth,1) ));
}
else
{
iconinfo->hbmColor = 0;
height *= 2;
}
iconinfo->hbmMask = HBITMAP_16( CreateBitmap( info->nWidth, height, 1, 1, info + 1 ));
release_icon_ptr( hIcon, info );
return TRUE;
} }
@ -2167,7 +2197,6 @@ HICON16 WINAPI CreateIcon16( HINSTANCE16 hInstance, INT16 nWidth,
INT16 nHeight, BYTE bPlanes, BYTE bBitsPixel, INT16 nHeight, BYTE bPlanes, BYTE bBitsPixel,
LPCVOID lpANDbits, LPCVOID lpXORbits ) LPCVOID lpANDbits, LPCVOID lpXORbits )
{ {
static const WORD ICON_HOTSPOT = 0x4242;
CURSORICONINFO info; CURSORICONINFO info;
info.ptHotSpot.x = ICON_HOTSPOT; info.ptHotSpot.x = ICON_HOTSPOT;