Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix wrong GetBitmapDimensionEx() usage

Browse source 
svn path=/trunk/; revision=7962
This commit is contained in:
Gé van Geldorp 2004-02-01 15:52:02 +00:00
parent 32532d4019
commit f28940b24f
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/lib/user32/controls/static.c
View file

@ -1,4 +1,4 @@
/* $Id: static.c,v 1.10 2003/11/08 15:35:58 mf Exp $ /* $Id: static.c,v 1.11 2004/02/01 15:52:02 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS User32 * PROJECT: ReactOS User32
@ -101,17 +101,17 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style )
if (hicon) if (hicon)
{ {
ICONINFO info; ICONINFO info;
SIZE bitmapSize; BITMAP bm;
if (!GetIconInfo(hicon, &info)) if (!GetIconInfo(hicon, &info))
{ {
return 0; return 0;
} }
if (!GetBitmapDimensionEx(info.hbmColor, &bitmapSize)) if (!GetObjectW(info.hbmColor, sizeof(BITMAP), &bm))
{ {
return 0; return 0;
} }
SetWindowPos( hwnd, 0, 0, 0, bitmapSize.cx, bitmapSize.cy, SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight,
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
} }
return prevIcon; return prevIcon;
@ -607,14 +607,12 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style )
if ((hBitmap = (HBITMAP)GetWindowLongA( hwnd, HICON_GWL_OFFSET ))) if ((hBitmap = (HBITMAP)GetWindowLongA( hwnd, HICON_GWL_OFFSET )))
{ {
BITMAP bm; BITMAP bm;
SIZE sz;
if(GetObjectType(hBitmap) != OBJ_BITMAP) return; if(GetObjectType(hBitmap) != OBJ_BITMAP) return;
if (!(hMemDC = CreateCompatibleDC( hdc ))) return; if (!(hMemDC = CreateCompatibleDC( hdc ))) return;
GetObjectW(hBitmap, sizeof(bm), &bm); GetObjectW(hBitmap, sizeof(bm), &bm);
GetBitmapDimensionEx(hBitmap, &sz);
oldbitmap = SelectObject(hMemDC, hBitmap); oldbitmap = SelectObject(hMemDC, hBitmap);
BitBlt(hdc, sz.cx, sz.cy, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, BitBlt(hdc, 0, 0, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0,
SRCCOPY); SRCCOPY);
SelectObject(hMemDC, oldbitmap); SelectObject(hMemDC, oldbitmap);
DeleteDC(hMemDC); DeleteDC(hMemDC);