[ros-diffs] [jimtabor] 28214: Move Break Extra and Count justification to Dc_Attr.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Tue Aug  7 11:27:12 2007
New Revision: 28214

URL: http://svn.reactos.org/svn/reactos?rev=28214&view=rev
Log:
Move Break Extra and Count justification to Dc_Attr.

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

Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/dc.h?rev=28214&r1=28213&r2=28214&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/dc.h (original)
+++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Aug  7 11:27:12 2007
@@ -35,11 +35,6 @@
 
     GdiPath       path;
 /* #endif */
-
-  short  breakTotalExtra;   /* Total extra space for justification */
-  short  breakCount;        /* Break char. count */
-  short  breakExtra;        /* breakTotalExtra / breakCount */
-  short  breakRem;          /* breakTotalExtra % breakCount */
 
   RECT   totalExtent;
   BYTE   bitsPerPixel;

Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/dc.c?rev=28214&r1=28213&r2=28214&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Aug  7 11:27:12 2007
@@ -1302,10 +1302,8 @@
   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;
-  newdc->w.breakCount       = dc->w.breakCount;
-  newdc->w.breakExtra       = dc->w.breakExtra;
-  newdc->w.breakRem         = dc->w.breakRem;
+  newdc->Dc_Attr.cBreak       = dc->Dc_Attr.cBreak;
+  newdc->Dc_Attr.lBreakExtra       = dc->Dc_Attr.lBreakExtra;
   newdc->Dc_Attr.iMapMode          = dc->Dc_Attr.iMapMode;
   newdc->Dc_Attr.iGraphicsMode     = dc->Dc_Attr.iGraphicsMode;
 #if 0
@@ -1385,10 +1383,8 @@
         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;
-        dc->w.breakCount       = dcs->w.breakCount;
-        dc->w.breakExtra       = dcs->w.breakExtra;
-        dc->w.breakRem         = dcs->w.breakRem;
+        dc->Dc_Attr.cBreak       = dcs->Dc_Attr.cBreak;
+        dc->Dc_Attr.lBreakExtra       = dcs->Dc_Attr.lBreakExtra;
         dc->Dc_Attr.iMapMode          = dcs->Dc_Attr.iMapMode;
         dc->Dc_Attr.iGraphicsMode     = dcs->Dc_Attr.iGraphicsMode;
 #if 0