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

Remove IntGdiSelectBrush and IntGdiSelectBrush, they are not needed anymore and superceded by DC_vUpdateFillBrush and DC_vUpdateLineBrush.

Browse source 
svn path=/trunk/; revision=40420
This commit is contained in:
Timo Kreuzer 2009-04-08 18:10:33 +00:00
parent 428a48a083
commit 60cd063c0a
5 changed files with 27 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsystems/win32/win32k/include/dc.h
View file

@ -180,8 +180,6 @@ VOID FASTCALL IntGdiUnreferencePdev(PPDEVOBJ pPDev, DWORD CleanUpType);
HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC);
BOOL FASTCALL IntGdiCleanDC(HDC hDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC);
VOID FASTCALL IntvGetDeviceCaps(PPDEVOBJ, PDEVCAPS); VOID FASTCALL IntvGetDeviceCaps(PPDEVOBJ, PDEVCAPS);
HPEN FASTCALL IntGdiSelectPen(PDC,HPEN);
HBRUSH FASTCALL IntGdiSelectBrush(PDC,HBRUSH);
INT FASTCALL IntGdiGetDeviceCaps(PDC,INT); INT FASTCALL IntGdiGetDeviceCaps(PDC,INT);
extern PPDEVOBJ pPrimarySurface; extern PPDEVOBJ pPrimarySurface;

8
reactos/subsystems/win32/win32k/objects/bitblt.c
View file

@ -1047,8 +1047,8 @@ IntGdiPolyPatBlt(
pdcattr = dc->pdcattr; pdcattr = dc->pdcattr;
if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
IntGdiSelectBrush(dc,pdcattr->hbrush); DC_vUpdateFillBrush(dc);
for (r = pRects, i = 0; i < cRects; i++) for (r = pRects, i = 0; i < cRects; i++)
{ {
@ -1110,8 +1110,8 @@ NtGdiPatBlt(
pdcattr = dc->pdcattr; pdcattr = dc->pdcattr;
if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
IntGdiSelectBrush(dc,pdcattr->hbrush); DC_vUpdateFillBrush(dc);
pbrush = BRUSH_LockBrush(pdcattr->hbrush); pbrush = BRUSH_LockBrush(pdcattr->hbrush);
if (pbrush == NULL) if (pbrush == NULL)

55
reactos/subsystems/win32/win32k/objects/dcobjs.c
View file

@ -284,49 +284,6 @@ GdiSelectPalette(
return oldPal; return oldPal;
} }
HBRUSH
FASTCALL
IntGdiSelectBrush(
PDC pDC,
HBRUSH hBrush)
{
PDC_ATTR pdcattr;
HBRUSH hOrgBrush;
if (pDC == NULL || hBrush == NULL) return NULL;
pdcattr = pDC->pdcattr;
hOrgBrush = pdcattr->hbrush;
pdcattr->hbrush = hBrush;
DC_vUpdateFillBrush(pDC);
return hOrgBrush;
}
HPEN
FASTCALL
IntGdiSelectPen(
PDC pDC,
HPEN hPen)
{
PDC_ATTR pdcattr;
HPEN hOrgPen = NULL;
if (pDC == NULL || hPen == NULL) return NULL;
pdcattr = pDC->pdcattr;
hOrgPen = pdcattr->hpen;
pdcattr->hpen = hPen;
DC_vUpdateLineBrush(pDC);
return hOrgPen;
}
/* /*
* @implemented * @implemented
*/ */
@ -347,7 +304,7 @@ NtGdiSelectBrush(
return NULL; return NULL;
} }
// hOrgBrush = IntGdiSelectBrush(pDC,hBrush); /* Simply return the user mode value, without checking */
hOrgBrush = pDC->pdcattr->hbrush; hOrgBrush = pDC->pdcattr->hbrush;
pDC->pdcattr->hbrush = hBrush; pDC->pdcattr->hbrush = hBrush;
DC_vUpdateFillBrush(pDC); DC_vUpdateFillBrush(pDC);
@ -377,7 +334,7 @@ NtGdiSelectPen(
return NULL; return NULL;
} }
// hOrgPen = IntGdiSelectPen(pDC, hPen); /* Simply return the user mode value, without checking */
hOrgPen = pDC->pdcattr->hpen; hOrgPen = pDC->pdcattr->hpen;
pDC->pdcattr->hpen = hPen; pDC->pdcattr->hpen = hPen;
DC_vUpdateLineBrush(pDC); DC_vUpdateLineBrush(pDC);
@ -547,11 +504,11 @@ NtGdiGetDCObject(HDC hDC, INT ObjectType)
} }
pdcattr = pdc->pdcattr; pdcattr = pdc->pdcattr;
if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
IntGdiSelectBrush(pdc, pdcattr->hbrush); DC_vUpdateFillBrush(pdc);
if (pdcattr->ulDirty_ & DC_PEN_DIRTY) if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
IntGdiSelectPen(pdc, pdcattr->hpen); DC_vUpdateLineBrush(pdc);
switch(ObjectType) switch(ObjectType)
{ {

16
reactos/subsystems/win32/win32k/objects/fillshap.c
View file

@ -243,11 +243,11 @@ NtGdiEllipse(
pdcattr = dc->pdcattr; pdcattr = dc->pdcattr;
if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
IntGdiSelectBrush(dc,pdcattr->hbrush); DC_vUpdateFillBrush(dc);
if (pdcattr->ulDirty_ & DC_PEN_DIRTY) if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
IntGdiSelectPen(dc,pdcattr->hpen); DC_vUpdateLineBrush(dc);
pbrush = PEN_LockPen(pdcattr->hpen); pbrush = PEN_LockPen(pdcattr->hpen);
if (!pbrush) if (!pbrush)
@ -726,11 +726,11 @@ IntRoundRect(
pdcattr = dc->pdcattr; pdcattr = dc->pdcattr;
if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
IntGdiSelectBrush(dc,pdcattr->hbrush); DC_vUpdateFillBrush(dc);
if (pdcattr->ulDirty_ & DC_PEN_DIRTY) if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
IntGdiSelectPen(dc,pdcattr->hpen); DC_vUpdateLineBrush(dc);
pbrushLine = PEN_LockPen(pdcattr->hpen); pbrushLine = PEN_LockPen(pdcattr->hpen);
if (!pbrushLine) if (!pbrushLine)

17
reactos/subsystems/win32/win32k/objects/path.c
View file

@ -2294,8 +2294,8 @@ NtGdiFillPath(HDC hDC)
pdcattr = dc->pdcattr; pdcattr = dc->pdcattr;
if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
IntGdiSelectBrush(dc,pdcattr->hbrush); DC_vUpdateLineBrush(dc);
ret = PATH_FillPath( dc, pPath ); ret = PATH_FillPath( dc, pPath );
if ( ret ) if ( ret )
@ -2569,10 +2569,11 @@ NtGdiStrokeAndFillPath(HDC hDC)
pdcattr = pDc->pdcattr; pdcattr = pDc->pdcattr;
if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
IntGdiSelectBrush(pDc,pdcattr->hbrush); DC_vUpdateFillBrush(pDc);
if (pdcattr->ulDirty_ & DC_PEN_DIRTY)
IntGdiSelectPen(pDc,pdcattr->hpen); if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
DC_vUpdateLineBrush(pDc);
bRet = PATH_FillPath(pDc, pPath); bRet = PATH_FillPath(pDc, pPath);
if (bRet) bRet = PATH_StrokePath(pDc, pPath); if (bRet) bRet = PATH_StrokePath(pDc, pPath);
@ -2608,8 +2609,8 @@ NtGdiStrokePath(HDC hDC)
pdcattr = pDc->pdcattr; pdcattr = pDc->pdcattr;
if (pdcattr->ulDirty_ & DC_PEN_DIRTY) if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
IntGdiSelectPen(pDc,pdcattr->hpen); DC_vUpdateLineBrush(pDc);
bRet = PATH_StrokePath(pDc, pPath); bRet = PATH_StrokePath(pDc, pPath);
PATH_EmptyPath(pPath); PATH_EmptyPath(pPath);