user32: Merge create_icon_bitmaps with CURSORICON_CreateIconFromBMI.
This commit is contained in:
Erich Hoover
Alexandre Julliard
parent
28e9b99728
commit
7b333de867
|
|
@ -788,99 +788,22 @@ done:
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* create_icon_bitmaps
|
* create_icon_from_bmi
|
||||||
*
|
*
|
||||||
* Create the color, mask and alpha bitmaps from the DIB info.
|
* Create an icon from its BITMAPINFO.
|
||||||
*/
|
*/
|
||||||
static BOOL create_icon_bitmaps( const BITMAPINFO *bmi, int width, int height,
|
static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resname, HRSRC rsrc,
|
||||||
HBITMAP *color, HBITMAP *mask, HBITMAP *alpha )
|
|
||||||
{
|
|
||||||
BOOL monochrome = is_dib_monochrome( bmi );
|
|
||||||
unsigned int size = bitmap_info_size( bmi, DIB_RGB_COLORS );
|
|
||||||
BITMAPINFO *info;
|
|
||||||
const void *color_bits, *mask_bits;
|
|
||||||
BOOL ret = FALSE;
|
|
||||||
HDC hdc = 0;
|
|
||||||
|
|
||||||
if (!(info = HeapAlloc( GetProcessHeap(), 0, max( size, FIELD_OFFSET( BITMAPINFO, bmiColors[2] )))))
|
|
||||||
return FALSE;
|
|
||||||
if (!(hdc = CreateCompatibleDC( 0 ))) goto done;
|
|
||||||
|
|
||||||
memcpy( info, bmi, size );
|
|
||||||
info->bmiHeader.biHeight /= 2;
|
|
||||||
|
|
||||||
color_bits = (const char*)bmi + size;
|
|
||||||
mask_bits = (const char*)color_bits +
|
|
||||||
get_dib_width_bytes( bmi->bmiHeader.biWidth,
|
|
||||||
bmi->bmiHeader.biBitCount ) * abs(info->bmiHeader.biHeight);
|
|
||||||
|
|
||||||
*alpha = 0;
|
|
||||||
if (monochrome)
|
|
||||||
{
|
|
||||||
if (!(*mask = CreateBitmap( width, height * 2, 1, 1, NULL ))) goto done;
|
|
||||||
*color = 0;
|
|
||||||
|
|
||||||
/* copy color data into second half of mask bitmap */
|
|
||||||
SelectObject( hdc, *mask );
|
|
||||||
StretchDIBits( hdc, 0, height, width, height,
|
|
||||||
0, 0, info->bmiHeader.biWidth, info->bmiHeader.biHeight,
|
|
||||||
color_bits, info, DIB_RGB_COLORS, SRCCOPY );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (!(*mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done;
|
|
||||||
if (!(*color = CreateBitmap( width, height, GetDeviceCaps( screen_dc, PLANES ),
|
|
||||||
GetDeviceCaps( screen_dc, BITSPIXEL ), NULL )))
|
|
||||||
{
|
|
||||||
DeleteObject( *mask );
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
SelectObject( hdc, *color );
|
|
||||||
StretchDIBits( hdc, 0, 0, width, height,
|
|
||||||
0, 0, info->bmiHeader.biWidth, info->bmiHeader.biHeight,
|
|
||||||
color_bits, info, DIB_RGB_COLORS, SRCCOPY );
|
|
||||||
|
|
||||||
if (bmi_has_alpha( info, color_bits ))
|
|
||||||
*alpha = create_alpha_bitmap( *color, *mask, info, color_bits );
|
|
||||||
|
|
||||||
/* convert info to monochrome to copy the mask */
|
|
||||||
info->bmiHeader.biBitCount = 1;
|
|
||||||
if (info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER))
|
|
||||||
{
|
|
||||||
RGBQUAD *rgb = info->bmiColors;
|
|
||||||
|
|
||||||
info->bmiHeader.biClrUsed = info->bmiHeader.biClrImportant = 2;
|
|
||||||
rgb[0].rgbBlue = rgb[0].rgbGreen = rgb[0].rgbRed = 0x00;
|
|
||||||
rgb[1].rgbBlue = rgb[1].rgbGreen = rgb[1].rgbRed = 0xff;
|
|
||||||
rgb[0].rgbReserved = rgb[1].rgbReserved = 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)info) + 1);
|
|
||||||
|
|
||||||
rgb[0].rgbtBlue = rgb[0].rgbtGreen = rgb[0].rgbtRed = 0x00;
|
|
||||||
rgb[1].rgbtBlue = rgb[1].rgbtGreen = rgb[1].rgbtRed = 0xff;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
SelectObject( hdc, *mask );
|
|
||||||
StretchDIBits( hdc, 0, 0, width, height,
|
|
||||||
0, 0, info->bmiHeader.biWidth, info->bmiHeader.biHeight,
|
|
||||||
mask_bits, info, DIB_RGB_COLORS, SRCCOPY );
|
|
||||||
ret = TRUE;
|
|
||||||
|
|
||||||
done:
|
|
||||||
DeleteDC( hdc );
|
|
||||||
HeapFree( GetProcessHeap(), 0, info );
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, HMODULE module, LPCWSTR resname, HRSRC rsrc,
|
|
||||||
POINT hotspot, BOOL bIcon, INT width, INT height, UINT cFlag )
|
POINT hotspot, BOOL bIcon, INT width, INT height, UINT cFlag )
|
||||||
{
|
{
|
||||||
HICON hObj;
|
unsigned int size = bitmap_info_size( bmi, DIB_RGB_COLORS );
|
||||||
|
BOOL monochrome = is_dib_monochrome( bmi );
|
||||||
HBITMAP color = 0, mask = 0, alpha = 0;
|
HBITMAP color = 0, mask = 0, alpha = 0;
|
||||||
|
const void *color_bits, *mask_bits;
|
||||||
|
BITMAPINFO *bmi_copy;
|
||||||
|
BOOL ret = FALSE;
|
||||||
BOOL do_stretch;
|
BOOL do_stretch;
|
||||||
|
HICON hObj = 0;
|
||||||
|
HDC hdc = 0;
|
||||||
|
|
||||||
/* Check bitmap header */
|
/* Check bitmap header */
|
||||||
|
|
||||||
|
|
@ -920,8 +843,78 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, HMODULE module, LPCW
|
||||||
if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL );
|
if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL );
|
||||||
if (!screen_dc) return 0;
|
if (!screen_dc) return 0;
|
||||||
|
|
||||||
if (!create_icon_bitmaps( bmi, width, height, &color, &mask, &alpha )) return 0;
|
if (!(bmi_copy = HeapAlloc( GetProcessHeap(), 0, max( size, FIELD_OFFSET( BITMAPINFO, bmiColors[2] )))))
|
||||||
|
return 0;
|
||||||
|
if (!(hdc = CreateCompatibleDC( 0 ))) goto done;
|
||||||
|
|
||||||
|
memcpy( bmi_copy, bmi, size );
|
||||||
|
bmi_copy->bmiHeader.biHeight /= 2;
|
||||||
|
|
||||||
|
color_bits = (const char*)bmi + size;
|
||||||
|
mask_bits = (const char*)color_bits +
|
||||||
|
get_dib_width_bytes( bmi->bmiHeader.biWidth,
|
||||||
|
bmi->bmiHeader.biBitCount ) * abs(bmi_copy->bmiHeader.biHeight);
|
||||||
|
|
||||||
|
alpha = 0;
|
||||||
|
if (monochrome)
|
||||||
|
{
|
||||||
|
if (!(mask = CreateBitmap( width, height * 2, 1, 1, NULL ))) goto done;
|
||||||
|
color = 0;
|
||||||
|
|
||||||
|
/* copy color data into second half of mask bitmap */
|
||||||
|
SelectObject( hdc, mask );
|
||||||
|
StretchDIBits( hdc, 0, height, width, height,
|
||||||
|
0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight,
|
||||||
|
color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (!(mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done;
|
||||||
|
if (!(color = CreateBitmap( width, height, GetDeviceCaps( screen_dc, PLANES ),
|
||||||
|
GetDeviceCaps( screen_dc, BITSPIXEL ), NULL )))
|
||||||
|
{
|
||||||
|
DeleteObject( mask );
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
SelectObject( hdc, color );
|
||||||
|
StretchDIBits( hdc, 0, 0, width, height,
|
||||||
|
0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight,
|
||||||
|
color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY );
|
||||||
|
|
||||||
|
if (bmi_has_alpha( bmi_copy, color_bits ))
|
||||||
|
alpha = create_alpha_bitmap( color, mask, bmi_copy, color_bits );
|
||||||
|
|
||||||
|
/* convert info to monochrome to copy the mask */
|
||||||
|
bmi_copy->bmiHeader.biBitCount = 1;
|
||||||
|
if (bmi_copy->bmiHeader.biSize != sizeof(BITMAPCOREHEADER))
|
||||||
|
{
|
||||||
|
RGBQUAD *rgb = bmi_copy->bmiColors;
|
||||||
|
|
||||||
|
bmi_copy->bmiHeader.biClrUsed = bmi_copy->bmiHeader.biClrImportant = 2;
|
||||||
|
rgb[0].rgbBlue = rgb[0].rgbGreen = rgb[0].rgbRed = 0x00;
|
||||||
|
rgb[1].rgbBlue = rgb[1].rgbGreen = rgb[1].rgbRed = 0xff;
|
||||||
|
rgb[0].rgbReserved = rgb[1].rgbReserved = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)bmi_copy) + 1);
|
||||||
|
|
||||||
|
rgb[0].rgbtBlue = rgb[0].rgbtGreen = rgb[0].rgbtRed = 0x00;
|
||||||
|
rgb[1].rgbtBlue = rgb[1].rgbtGreen = rgb[1].rgbtRed = 0xff;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
SelectObject( hdc, mask );
|
||||||
|
StretchDIBits( hdc, 0, 0, width, height,
|
||||||
|
0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight,
|
||||||
|
mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY );
|
||||||
|
ret = TRUE;
|
||||||
|
|
||||||
|
done:
|
||||||
|
DeleteDC( hdc );
|
||||||
|
HeapFree( GetProcessHeap(), 0, bmi_copy );
|
||||||
|
|
||||||
|
if (ret)
|
||||||
hObj = alloc_icon_handle( FALSE, 1 );
|
hObj = alloc_icon_handle( FALSE, 1 );
|
||||||
if (hObj)
|
if (hObj)
|
||||||
{
|
{
|
||||||
|
|
@ -1175,7 +1168,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Grab a frame from the animation */
|
/* Grab a frame from the animation */
|
||||||
hIconFrame = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)bmi, NULL, NULL, NULL, info->hotspot,
|
hIconFrame = create_icon_from_bmi( (BITMAPINFO *)bmi, NULL, NULL, NULL, info->hotspot,
|
||||||
FALSE, frameWidth, frameHeight, loadflags );
|
FALSE, frameWidth, frameHeight, loadflags );
|
||||||
if (!hIconFrame)
|
if (!hIconFrame)
|
||||||
{
|
{
|
||||||
|
|
@ -1266,7 +1259,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize,
|
||||||
bmi = (BITMAPINFO *)(pt + 2);
|
bmi = (BITMAPINFO *)(pt + 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
return CURSORICON_CreateIconFromBMI( bmi, NULL, NULL, NULL, hotspot, bIcon, width, height, cFlag );
|
return create_icon_from_bmi( bmi, NULL, NULL, NULL, hotspot, bIcon, width, height, cFlag );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1327,7 +1320,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename,
|
||||||
|
|
||||||
hotspot.x = entry->xHotspot;
|
hotspot.x = entry->xHotspot;
|
||||||
hotspot.y = entry->yHotspot;
|
hotspot.y = entry->yHotspot;
|
||||||
hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)&bits[entry->dwDIBOffset], NULL, NULL, NULL,
|
hIcon = create_icon_from_bmi( (BITMAPINFO *)&bits[entry->dwDIBOffset], NULL, NULL, NULL,
|
||||||
hotspot, !fCursor, width, height, loadflags );
|
hotspot, !fCursor, width, height, loadflags );
|
||||||
end:
|
end:
|
||||||
TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon );
|
TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon );
|
||||||
|
|
@ -1419,7 +1412,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name,
|
||||||
hotspot.y = pt[1];
|
hotspot.y = pt[1];
|
||||||
bits += 2 * sizeof(SHORT);
|
bits += 2 * sizeof(SHORT);
|
||||||
}
|
}
|
||||||
hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)bits, hInstance, name, hRsrc,
|
hIcon = create_icon_from_bmi( (BITMAPINFO *)bits, hInstance, name, hRsrc,
|
||||||
hotspot, !fCursor, width, height, loadflags );
|
hotspot, !fCursor, width, height, loadflags );
|
||||||
FreeResource( handle );
|
FreeResource( handle );
|
||||||
return hIcon;
|
return hIcon;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue