richedit: Simplified the character length delete protection.

The value for nMaxChars can be found easier by using ME_GetTextLength.

richedit: Simplified the character length delete protection.
a490e155 · Dylan Smith · Alexandre Julliard · 1f3fd357 · a490e155
Commit a490e155 authored Feb 06, 2009 by Dylan Smith Committed by Alexandre Julliard Feb 06, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

caret.c dlls/riched20/caret.c +2 -8

No files found.
--- a/dlls/riched20/caret.c
+++ b/dlls/riched20/caret.c
@@ -273,14 +273,8 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars,
  int totalChars = nChars;
  ME_DisplayItem *start_para;

-  {
-    /* Prevent deletion past last end of paragraph run. */
-    ME_DisplayItem *pTextEnd = editor->pBuffer->pLast;
-    int nMaxChars = pTextEnd->member.para.prev_para->member.para.nCharOfs;
-    nMaxChars += ME_FindItemBack(pTextEnd, diRun)->member.run.nCharOfs;
-    nMaxChars -= nOfs;
-    nChars = min(nChars, nMaxChars);
-  }
+  /* Prevent deletion past last end of paragraph run. */
+  nChars = min(nChars, ME_GetTextLength(editor) - nOfs);

  ME_CursorFromCharOfs(editor, nOfs, &c);
  start_para = ME_GetParagraph(c.pRun);