richedit: Got rid of useless function ME_VPosToPos.

The function was just returning the second parameter. It had some commented out code that indicated that previously backslashes weren't included in the length. Native wordpad doesn't handle backspaces in a special way, so this must have been an internal representation that complicated finding the position of characters.

richedit: Got rid of useless function ME_VPosToPos.
f148d820 · Dylan Smith · Alexandre Julliard · d306b6b5 · f148d820 · f148d820
Commit f148d820 authored Feb 07, 2009 by Dylan Smith Committed by Alexandre Julliard Feb 09, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 22 deletions

editor.h dlls/riched20/editor.h +0 -1

run.c dlls/riched20/run.c +1 -2

string.c dlls/riched20/string.c +0 -19

No files found.
--- a/dlls/riched20/editor.h
+++ b/dlls/riched20/editor.h
@@ -107,7 +107,6 @@ int ME_GetCharFwd(const ME_String *s, int nPos); /* get char starting from start
 int ME_GetCharBack(const ME_String *s, int nPos); /* get char starting from \0  */
 int ME_StrRelPos(const ME_String *s, int nVChar, int *pRelChars);
 int ME_StrRelPos2(const ME_String *s, int nVChar, int nRelChars);
-int ME_VPosToPos(ME_String *s, int nVPos);
 int ME_PosToVPos(const ME_String *s, int nPos);
 void ME_StrDeleteV(ME_String *s, int nVChar, int nChars);
 /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */

--- a/dlls/riched20/run.c
+++ b/dlls/riched20/run.c
@@ -310,8 +310,7 @@ ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_DisplayItem *item, i
  item2 = ME_MakeRun(run->style,
      ME_VSplitString(run->strText, nVChar), run->nFlags&MERF_SPLITMASK);

-  item2->member.run.nCharOfs = item->member.run.nCharOfs+
-    ME_VPosToPos(item->member.run.strText, nVChar);
+  item2->member.run.nCharOfs = item->member.run.nCharOfs + nVChar;

  run2 = &item2->member.run;
  ME_InsertBefore(item->next, item2);

--- a/dlls/riched20/string.c
+++ b/dlls/riched20/string.c
@@ -184,25 +184,6 @@ int ME_StrRelPos2(const ME_String *s, int nVChar, int nRelChars)
  return ME_StrRelPos(s, nVChar, &nRelChars);
 }

-int ME_VPosToPos(ME_String *s, int nVPos)
-{
-  return nVPos;
-  /*
-  int i = 0, len = 0;
-  if (!nVPos)
-    return 0;
-  while (i < s->nLen)
-  {
-    if (i == nVPos)
-      return len;
-    if (s->szData[i]=='\\') i++;
-    i++;
-    len++;
-  }
-  return len;
-  */
-}
-
 int ME_PosToVPos(const ME_String *s, int nPos)
 {
  if (!nPos)