Dylan Smith : richedit: Removed some conditions that are always taken.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d306b6b5e901f02c52bb2596b855e4d03a43e650
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d306b6b5e901f02c52bb2596b8...

Author: Dylan Smith 
Date:   Sat Feb  7 13:21:03 2009 -0500

richedit: Removed some conditions that are always taken.

ME_GetCursorCoordinates had two conditions that were always taken.  The
first condition was if(pCursor->pRun->type == diRun) was following an
assertion making the exact same check.  The next one, if(row), should
always be taken, otherwise the richedit controls are in a corrupt state,
therefore an assertion is more appropriate.

---

dlls/riched20/caret.c |  107 ++++++++++++++++++++++---------------------------
 1 files changed, 48 insertions(+), 59 deletions(-)

diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c
index edbdf46..02dbc56 100644
--- a/dlls/riched20/caret.c
+++ b/dlls/riched20/caret.c
@@ -168,69 +168,58 @@ void
 ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor,
                         int *x, int *y, int *height)
 {
-  ME_DisplayItem *pCursorRun = pCursor->pRun;
-  ME_DisplayItem *pSizeRun = pCursor->pRun;
+  ME_DisplayItem *row;
+  ME_DisplayItem *run = pCursor->pRun;
+  ME_DisplayItem *para = ME_GetParagraph(run);
+  ME_DisplayItem *pSizeRun = run;
+  ME_Context c;
+  SIZE sz = {0, 0};

assert(height && x && y);
-  assert(!(ME_GetParagraph(pCursorRun)->member.para.nFlags & MEPF_REWRAP));
-  assert(pCursor->pRun);
-  assert(pCursor->pRun->type == diRun);
-
-  if (pCursorRun->type == diRun) {
-    ME_DisplayItem *row = ME_FindItemBack(pCursorRun, diStartRowOrParagraph);
+  assert(~para->member.para.nFlags & MEPF_REWRAP);
+  assert(run && run->type == diRun);
+  assert(para && para->type == diParagraph);

-    if (row) {
-      HDC hDC = ITextHost_TxGetDC(editor->texthost);
-      ME_Context c;
-      ME_DisplayItem *run = pCursorRun;
-      ME_DisplayItem *para = NULL;
-      SIZE sz = {0, 0};
+  row = ME_FindItemBack(run, diStartRowOrParagraph);
+  assert(row && row->type == diStartRow);

-      ME_InitContext(&c, editor, hDC);
-
-      if (!pCursor->nOffset)
-      {
-        ME_DisplayItem *prev = ME_FindItemBack(pCursorRun, diRunOrParagraph);
-        assert(prev);
-        if (prev->type == diRun)
-          pSizeRun = prev;
-      }
-      assert(row->type == diStartRow); /* paragraph -> run without start row ?*/
-      para = ME_FindItemBack(row, diParagraph);
-      assert(para);
-      assert(para->type == diParagraph);
-      if (editor->bCaretAtEnd && !pCursor->nOffset &&
-          run == ME_FindItemFwd(row, diRun))
-      {
-        ME_DisplayItem *tmp = ME_FindItemBack(row, diRunOrParagraph);
-        assert(tmp);
-        if (tmp->type == diRun)
-        {
-          row = ME_FindItemBack(tmp, diStartRow);
-          pSizeRun = run = tmp;
-          assert(run);
-          assert(run->type == diRun);
-          sz = ME_GetRunSize(&c, &para->member.para,
-                             &run->member.run, ME_StrLen(run->member.run.strText),
-                             row->member.row.nLMargin);
-        }
-      }
-      if (pCursor->nOffset) {
-        sz = ME_GetRunSize(&c, &para->member.para, &run->member.run, pCursor->nOffset,
-                           row->member.row.nLMargin);
-      }
+  ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost));

-      *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent;
-      *x = c.rcView.left + run->member.run.pt.x + sz.cx - editor->horz_si.nPos;
-      *y = c.rcView.top + para->member.para.pt.y + row->member.row.nBaseline
-           + run->member.run.pt.y - pSizeRun->member.run.nAscent - editor->vert_si.nPos;
-      ME_DestroyContext(&c);
-      return;
+  if (!pCursor->nOffset)
+  {
+    ME_DisplayItem *prev = ME_FindItemBack(run, diRunOrParagraph);
+    assert(prev);
+    if (prev->type == diRun)
+      pSizeRun = prev;
+  }
+  if (editor->bCaretAtEnd && !pCursor->nOffset &&
+      run == ME_FindItemFwd(row, diRun))
+  {
+    ME_DisplayItem *tmp = ME_FindItemBack(row, diRunOrParagraph);
+    assert(tmp);
+    if (tmp->type == diRun)
+    {
+      row = ME_FindItemBack(tmp, diStartRow);
+      pSizeRun = run = tmp;
+      assert(run);
+      assert(run->type == diRun);
+      sz = ME_GetRunSize(&c, &para->member.para,
+                         &run->member.run, ME_StrLen(run->member.run.strText),
+                         row->member.row.nLMargin);
     }
   }
-  *height = 10; /* FIXME use global font */
-  *x = 0;
-  *y = 0;
+  if (pCursor->nOffset) {
+    sz = ME_GetRunSize(&c, &para->member.para, &run->member.run,
+                       pCursor->nOffset, row->member.row.nLMargin);
+  }
+
+  *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent;
+  *x = c.rcView.left + run->member.run.pt.x + sz.cx - editor->horz_si.nPos;
+  *y = c.rcView.top + para->member.para.pt.y + row->member.row.nBaseline
+       + run->member.run.pt.y - pSizeRun->member.run.nAscent
+       - editor->vert_si.nPos;
+  ME_DestroyContext(&c);
+  return;
 }