[4/5] richedit: Removed redundant variable ptLastSplittableRun.

Dylan Smith dylan.ah.smith at gmail.com
Wed Jul 28 20:17:53 CDT 2010


---
 dlls/riched20/editstr.h |    1 -
 dlls/riched20/wrap.c    |    5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h
index 9b8d645..c9c55da 100644
--- a/dlls/riched20/editstr.h
+++ b/dlls/riched20/editstr.h
@@ -414,7 +414,6 @@ typedef struct tagME_WrapContext
   ME_DisplayItem *pRowStart;
 
   ME_DisplayItem *pLastSplittableRun;
-  POINT ptLastSplittableRun;
 } ME_WrapContext;
 
 #endif
diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c
index 8d75b7f..d2ebd94 100644
--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -271,7 +271,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem
   {
     if (wc->pLastSplittableRun->member.run.nFlags & (MERF_GRAPHICS|MERF_TAB))
     {
-      wc->pt = wc->ptLastSplittableRun;
+      wc->pt = wc->pLastSplittableRun->member.run.pt;
       return wc->pLastSplittableRun;
     }
     else if (wc->pLastSplittableRun->member.run.nFlags & MERF_SPLITTABLE)
@@ -299,7 +299,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem
     else
     {
       /* restart from the first run beginning with spaces */
-      wc->pt = wc->ptLastSplittableRun;
+      wc->pt = wc->pLastSplittableRun->member.run.pt;
       return wc->pLastSplittableRun;
     }
   }
@@ -451,7 +451,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
     || ((run->nFlags & (MERF_GRAPHICS|MERF_TAB)) && (p != wc->pRowStart)))
   {
     wc->pLastSplittableRun = p;
-    wc->ptLastSplittableRun = wc->pt;
   }
   wc->pt.x += run->nWidth;
   return p->next;
-- 
1.7.0.4




More information about the wine-patches mailing list