Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:03:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
Fix BRUSH_GetObject. Fixes 4 gdi32_apitests.

svn path=/trunk/; revision=57974
This commit is contained in:
Timo Kreuzer 2012-12-22 22:34:50 +00:00
parent af760d9024
commit 66d645bf61
1 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

74
reactos/win32ss/gdi/ntgdi/brush.c
View file

@ -142,57 +142,56 @@ BRUSH_Cleanup(PVOID ObjectBody)
INT INT
FASTCALL FASTCALL
BRUSH_GetObject(PBRUSH pbrush, INT Count, LPLOGBRUSH Buffer) BRUSH_GetObject(PBRUSH pbrush, INT cjSize, LPLOGBRUSH plogbrush)
{ {
if (Buffer == NULL) return sizeof(LOGBRUSH); /* Check if only size is requested */
if (Count == 0) return 0; if (plogbrush == NULL) return sizeof(LOGBRUSH);
/* Check if size is ok */
if (cjSize == 0) return 0;
/* Set colour */ /* Set colour */
Buffer->lbColor = pbrush->BrushAttr.lbColor; plogbrush->lbColor = pbrush->BrushAttr.lbColor;
/* Set Hatch */ /* Default to 0 */
if ((pbrush->flAttrs & BR_IS_HATCH)!=0) plogbrush->lbHatch = 0;
/* Get the type of style */
if (pbrush->flAttrs & BR_IS_SOLID)
{ {
/* FIXME: This is not the right value */ plogbrush->lbStyle = BS_SOLID;
Buffer->lbHatch = (LONG)pbrush->hbmPattern; }
else if (pbrush->flAttrs & BR_IS_NULL)
{
plogbrush->lbStyle = BS_NULL; // BS_HOLLOW
}
else if (pbrush->flAttrs & BR_IS_HATCH)
{
plogbrush->lbStyle = BS_HATCHED;
plogbrush->lbHatch = pbrush->ulStyle;
}
else if (pbrush->flAttrs & BR_IS_DIB)
{
plogbrush->lbStyle = BS_DIBPATTERN;
plogbrush->lbHatch = (ULONG_PTR)pbrush->hbmClient;
}
else if (pbrush->flAttrs & BR_IS_BITMAP)
{
plogbrush->lbStyle = BS_PATTERN;
} }
else else
{ {
Buffer->lbHatch = 0; plogbrush->lbStyle = 0; // ???
}
Buffer->lbStyle = 0;
/* Get the type of style */
if ((pbrush->flAttrs & BR_IS_SOLID)!=0)
{
Buffer->lbStyle = BS_SOLID;
}
else if ((pbrush->flAttrs & BR_IS_NULL)!=0)
{
Buffer->lbStyle = BS_NULL; // BS_HOLLOW
}
else if ((pbrush->flAttrs & BR_IS_HATCH)!=0)
{
Buffer->lbStyle = BS_HATCHED;
}
else if ((pbrush->flAttrs & BR_IS_BITMAP)!=0)
{
Buffer->lbStyle = BS_PATTERN;
}
else if ((pbrush->flAttrs & BR_IS_DIB)!=0)
{
Buffer->lbStyle = BS_DIBPATTERN;
} }
/* FIXME /* FIXME
else if ((pbrush->flAttrs & )!=0) else if (pbrush->flAttrs & )
{ {
Buffer->lbStyle = BS_INDEXED; plogbrush->lbStyle = BS_INDEXED;
} }
else if ((pbrush->flAttrs & )!=0) else if (pbrush->flAttrs & )
{ {
Buffer->lbStyle = BS_DIBPATTERNPT; plogbrush->lbStyle = BS_DIBPATTERNPT;
} }
*/ */
@ -245,6 +244,7 @@ IntGdiCreateDIBBrush(
pbrush->flAttrs |= BR_IS_BITMAP | BR_IS_DIB; pbrush->flAttrs |= BR_IS_BITMAP | BR_IS_DIB;
pbrush->hbmPattern = hPattern; pbrush->hbmPattern = hPattern;
pbrush->hbmClient = (HBITMAP)PackedDIB;
/* FIXME: Fill in the rest of fields!!! */ /* FIXME: Fill in the rest of fields!!! */
GreSetObjectOwner(hPattern, GDI_OBJ_HMGR_PUBLIC); GreSetObjectOwner(hPattern, GDI_OBJ_HMGR_PUBLIC);