Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 23:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed FillRect() to properly handle system color constants (thanks to Royce for spotting this bug)

Browse source 
svn path=/trunk/; revision=9447
This commit is contained in:
Thomas Bluemel 2004-05-20 14:12:21 +00:00
parent f44bcb1cdb
commit 0a242842b2
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/lib/user32/windows/draw.c
View file

@ -45,6 +45,8 @@
#define SPI_SETFOCUSBORDERWIDTH (8207)
#define SPI_GETFOCUSBORDERHEIGHT (8208)
#define SPI_SETFOCUSBORDERHEIGHT (8209)
#define COLOR_MENUHILIGHT (29)
#define COLOR_MENUBAR (30)
/* GLOBALS *******************************************************************/
@ -1823,13 +1825,18 @@ INT STDCALL
FillRect(HDC hDC, CONST RECT *lprc, HBRUSH hbr)
{
HBRUSH prevhbr;
if ((DWORD)hbr < 0x4000)
hbr = GetSysColorBrush((DWORD)hbr);
if ((prevhbr = SelectObject(hDC, hbr)) == NULL)
if (hbr <= (HBRUSH)(COLOR_MENUBAR + 1))
{
hbr = GetSysColorBrush((int)hbr - 1);
}
if ((prevhbr = NtGdiSelectObject(hDC, hbr)) == NULL)
{
return FALSE;
PatBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left,
}
NtGdiPatBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left,
lprc->bottom - lprc->top, PATCOPY);
SelectObject(hDC, prevhbr);
NtGdiSelectObject(hDC, prevhbr);
return TRUE;
}