mirror of
https://github.com/reactos/reactos.git
synced 2024-10-16 06:04:13 +00:00
Moved Brush Origin to Dc_attr.
svn path=/trunk/; revision=28186
This commit is contained in:
parent
3137bd861c
commit
5a8a0a1af7
|
@ -36,9 +36,6 @@ typedef struct _WIN_DC_INFO
|
|||
GdiPath path;
|
||||
/* #endif */
|
||||
|
||||
short brushOrgX;
|
||||
short brushOrgY;
|
||||
|
||||
short breakTotalExtra; /* Total extra space for justification */
|
||||
short breakCount; /* Break char. count */
|
||||
short breakExtra; /* breakTotalExtra / breakCount */
|
||||
|
|
|
@ -717,8 +717,8 @@ NtGdiSetBrushOrgEx(HDC hDC, INT XOrg, INT YOrg, LPPOINT Point)
|
|||
{
|
||||
NTSTATUS Status = STATUS_SUCCESS;
|
||||
POINT SafePoint;
|
||||
SafePoint.x = dc->w.brushOrgX;
|
||||
SafePoint.y = dc->w.brushOrgY;
|
||||
SafePoint.x = dc->Dc_Attr.ptlBrushOrigin.x;
|
||||
SafePoint.y = dc->Dc_Attr.ptlBrushOrigin.y;
|
||||
_SEH_TRY
|
||||
{
|
||||
ProbeForWrite(Point,
|
||||
|
@ -740,8 +740,8 @@ NtGdiSetBrushOrgEx(HDC hDC, INT XOrg, INT YOrg, LPPOINT Point)
|
|||
}
|
||||
}
|
||||
|
||||
dc->w.brushOrgX = XOrg;
|
||||
dc->w.brushOrgY = YOrg;
|
||||
dc->Dc_Attr.ptlBrushOrigin.x = XOrg;
|
||||
dc->Dc_Attr.ptlBrushOrigin.y = YOrg;
|
||||
DC_UnlockDc(dc);
|
||||
|
||||
return TRUE;
|
||||
|
|
|
@ -1100,7 +1100,7 @@ NtGdiEnumObjects(
|
|||
|
||||
DC_GET_VAL( COLORREF, NtGdiGetBkColor, Dc_Attr.crBackgroundClr )
|
||||
DC_GET_VAL( INT, NtGdiGetBkMode, Dc_Attr.jBkMode )
|
||||
DC_GET_VAL_EX( GetBrushOrgEx, w.brushOrgX, w.brushOrgY, POINT, x, y )
|
||||
DC_GET_VAL_EX( GetBrushOrgEx, Dc_Attr.ptlBrushOrigin.x, Dc_Attr.ptlBrushOrigin.y, POINT, x, y )
|
||||
DC_GET_VAL( HRGN, NtGdiGetClipRgn, w.hClipRgn )
|
||||
|
||||
HGDIOBJ STDCALL
|
||||
|
@ -1272,8 +1272,8 @@ IntGdiGetDCState(HDC hDC)
|
|||
newdc->Dc_Attr.jBkMode = dc->Dc_Attr.jBkMode;
|
||||
newdc->Dc_Attr.crBackgroundClr = dc->Dc_Attr.crBackgroundClr;
|
||||
newdc->Dc_Attr.crForegroundClr = dc->Dc_Attr.crForegroundClr;
|
||||
newdc->w.brushOrgX = dc->w.brushOrgX;
|
||||
newdc->w.brushOrgY = dc->w.brushOrgY;
|
||||
newdc->Dc_Attr.ptlBrushOrigin.x = dc->Dc_Attr.ptlBrushOrigin.x;
|
||||
newdc->Dc_Attr.ptlBrushOrigin.y = dc->Dc_Attr.ptlBrushOrigin.y;
|
||||
newdc->Dc_Attr.lTextAlign = dc->Dc_Attr.lTextAlign;
|
||||
newdc->Dc_Attr.lTextExtra = dc->Dc_Attr.lTextExtra;
|
||||
newdc->w.breakTotalExtra = dc->w.breakTotalExtra;
|
||||
|
@ -1355,8 +1355,8 @@ IntGdiSetDCState ( HDC hDC, HDC hDCSave )
|
|||
dc->Dc_Attr.jBkMode = dcs->Dc_Attr.jBkMode;
|
||||
dc->Dc_Attr.crBackgroundClr = dcs->Dc_Attr.crBackgroundClr;
|
||||
dc->Dc_Attr.crForegroundClr = dcs->Dc_Attr.crForegroundClr;
|
||||
dc->w.brushOrgX = dcs->w.brushOrgX;
|
||||
dc->w.brushOrgY = dcs->w.brushOrgY;
|
||||
dc->Dc_Attr.ptlBrushOrigin.x = dcs->Dc_Attr.ptlBrushOrigin.x;
|
||||
dc->Dc_Attr.ptlBrushOrigin.y = dcs->Dc_Attr.ptlBrushOrigin.y;
|
||||
dc->Dc_Attr.lTextAlign = dcs->Dc_Attr.lTextAlign;
|
||||
dc->Dc_Attr.lTextExtra = dcs->Dc_Attr.lTextExtra;
|
||||
dc->w.breakTotalExtra = dcs->w.breakTotalExtra;
|
||||
|
|
|
@ -2575,8 +2575,8 @@ NtGdiPaintRgn(HDC hDC,
|
|||
ASSERT(pBrush);
|
||||
IntGdiInitBrushInstance(&BrushInst, pBrush, dc->XlateBrush);
|
||||
|
||||
BrushOrigin.x = dc->w.brushOrgX;
|
||||
BrushOrigin.y = dc->w.brushOrgY;
|
||||
BrushOrigin.x = dc->Dc_Attr.ptlBrushOrigin.x;
|
||||
BrushOrigin.y = dc->Dc_Attr.ptlBrushOrigin.y;
|
||||
BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
|
||||
/* FIXME - Handle BitmapObj == NULL !!!! */
|
||||
|
||||
|
|
Loading…
Reference in a new issue