[ros-diffs] [jimtabor] 28186: Moved Brush Origin to Dc_attr.

Author: jimtabor
Date: Mon Aug  6 12:28:54 2007
New Revision: 28186

URL: http://svn.reactos.org/svn/reactos?rev=28186&view=rev
Log:
Moved Brush Origin to Dc_attr.

Modified:
    trunk/reactos/subsystems/win32/win32k/include/dc.h
    trunk/reactos/subsystems/win32/win32k/objects/brush.c
    trunk/reactos/subsystems/win32/win32k/objects/dc.c
    trunk/reactos/subsystems/win32/win32k/objects/region.c

Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/dc.h (original)
+++ trunk/reactos/subsystems/win32/win32k/include/dc.h Mon Aug  6 12:28:54 2007
@@ -35,9 +35,6 @@
 
     GdiPath       path;
 /* #endif */
-
-  short  brushOrgX;
-  short  brushOrgY;
 
   short  breakTotalExtra;   /* Total extra space for justification */
   short  breakCount;        /* Break char. count */

Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/brush.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/brush.c Mon Aug  6 12:28:54 2007
@@ -717,8 +717,8 @@
    {
       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 @@
       }
    }
 
-   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;

Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Aug  6 12:28:54 2007
@@ -1100,7 +1100,7 @@
 
 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 @@
   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 @@
         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;

Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/region.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/region.c Mon Aug  6 12:28:54 2007
@@ -2575,8 +2575,8 @@
   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 !!!! */