Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-09 06:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USER32]

Browse source 
- WINE creates an alpha bitmap on icon creation, we do it when drawing it, so we need to create a bitmap which holds alpha information.
  - Add error handling to CreateIconIndirect.

svn path=/trunk/; revision=48041
This commit is contained in:
Jérôme Gardou 2010-07-14 15:42:44 +00:00
parent d61b5efe6c
commit 746e0c9afd
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
reactos/dll/win32/user32/windows/cursoricon.c
View file

@ -485,8 +485,8 @@ static BOOL create_icon_bitmaps( const BITMAPINFO *bmi, int width, int height,
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 )))
if (!(*color = CreateBitmap( width, height, bmi->bmiHeader.biPlanes,
bmi->bmiHeader.biBitCount, NULL )))
{
DeleteObject( *mask );
goto done;
@ -1475,10 +1475,29 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
height = bmpXor.bmHeight;
if (bmpXor.bmPlanes * bmpXor.bmBitsPixel != 1)
{
color = CreateCompatibleBitmap( screen_dc, width, height );
color = CreateBitmap( width, height, bmpXor.bmPlanes, bmpXor.bmBitsPixel, NULL );
if(!color)
{
ERR("Unable to create color bitmap!\n");
return NULL;
}
mask = CreateBitmap( width, height, 1, 1, NULL );
if(!mask)
{
ERR("Unable to create mask bitmap!\n");
DeleteObject(color);
return NULL;
}
}
else mask = CreateBitmap( width, height * 2, 1, 1, NULL );
else
{
mask = CreateBitmap( width, height * 2, 1, 1, NULL );
if(!mask)
{
ERR("Unable to create mask bitmap!\n");
return NULL;
}
}
}
else
{