mirror of
https://github.com/reactos/reactos.git
synced 2024-10-06 09:24:11 +00:00
[WIN32K]
- Simplify EBRUSHOBJ_vInit and EBRUSHOBJ_bRealizeBrush a bit more svn path=/branches/reactos-yarotows/; revision=47304
This commit is contained in:
parent
6e208710a8
commit
57447bb7b6
|
@ -34,17 +34,10 @@ EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc)
|
||||||
|
|
||||||
pebo->psurfTrg = pdc->dclevel.pSurface;
|
pebo->psurfTrg = pdc->dclevel.pSurface;
|
||||||
ASSERT(pebo->psurfTrg);
|
ASSERT(pebo->psurfTrg);
|
||||||
|
ASSERT(pebo->psurfTrg->ppal);
|
||||||
|
|
||||||
if (pebo->psurfTrg->ppal)
|
|
||||||
{
|
|
||||||
pebo->ppalSurf = pebo->psurfTrg->ppal;
|
pebo->ppalSurf = pebo->psurfTrg->ppal;
|
||||||
GDIOBJ_IncrementShareCount(&pebo->ppalSurf->BaseObject);
|
GDIOBJ_IncrementShareCount(&pebo->ppalSurf->BaseObject);
|
||||||
}
|
|
||||||
else
|
|
||||||
pebo->ppalSurf = PALETTE_ShareLockPalette(pdc->ppdev->devinfo.hpalDefault);
|
|
||||||
|
|
||||||
if (!pebo->ppalSurf)
|
|
||||||
pebo->ppalSurf = &gpalRGB;
|
|
||||||
|
|
||||||
if (pbrush->flAttrs & GDIBRUSH_IS_NULL)
|
if (pbrush->flAttrs & GDIBRUSH_IS_NULL)
|
||||||
{
|
{
|
||||||
|
@ -116,7 +109,6 @@ EBRUSHOBJ_vCleanup(EBRUSHOBJ *pebo)
|
||||||
pebo->BrushObject.pvRbrush = NULL;
|
pebo->BrushObject.pvRbrush = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pebo->ppalSurf != &gpalRGB)
|
|
||||||
PALETTE_ShareUnlockPalette(pebo->ppalSurf);
|
PALETTE_ShareUnlockPalette(pebo->ppalSurf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -199,12 +191,8 @@ EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo, BOOL bCallDriver)
|
||||||
PPDEVOBJ ppdev = NULL;
|
PPDEVOBJ ppdev = NULL;
|
||||||
EXLATEOBJ exlo;
|
EXLATEOBJ exlo;
|
||||||
|
|
||||||
// FIXME: all EBRUSHOBJs need a surface, see EBRUSHOBJ_vInit
|
/* All EBRUSHOBJs have a surface, see EBRUSHOBJ_vInit */
|
||||||
if (!pebo->psurfTrg)
|
ASSERT(pebo->psurfTrg);
|
||||||
{
|
|
||||||
DPRINT1("Pattern brush has no target surface!\n");
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
ppdev = (PPDEVOBJ)pebo->psurfTrg->SurfObj.hdev;
|
ppdev = (PPDEVOBJ)pebo->psurfTrg->SurfObj.hdev;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue