commit 74aa295f55b335b4b89cc8739a1dcf229bcce05c
author Phil Krylov <phil@newstar.rinet.ru> Mon Jan 09 17:12:34 2006 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Jan 09 17:12:34 2006 +0100
tree f02a5dcde653e512e282869e92c2075b4c3bb44c
parent 3022ade359fbf35efbeacf120fc0e53eafee84bd

riched20: Simplified logic in ME_StrRelPos().

dlls/riched20/string.c

diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c
index 6abd22a..c9057bf 100644
--- a/dlls/riched20/string.c
+++ b/dlls/riched20/string.c
@@ -155,29 +155,22 @@
   return s->nLen;
 }
 
-/* FIXME we use widechars, not multibytes, inside, no need for complex logic anymore */
 int ME_StrRelPos(ME_String *s, int nVChar, int *pRelChars)
 {
+  int nRelChars = *pRelChars;
+  
   TRACE("%s,%d,&%d\n", debugstr_w(s->szData), nVChar, *pRelChars);
 
   assert(*pRelChars);
-  if (!*pRelChars) return nVChar;
-  
-  if (*pRelChars>0)
-  {
-    while(nVChar<s->nLen && *pRelChars>0)
-    {
-      nVChar++;
-      (*pRelChars)--;
-    }
+  if (!nRelChars)
     return nVChar;
-  }
-
-  while(nVChar>0 && *pRelChars<0)
-  {
-    nVChar--;
-    (*pRelChars)++;
-  }
+  
+  if (nRelChars>0)
+    nRelChars = min(*pRelChars, s->nLen - nVChar);
+  else
+    nRelChars = max(*pRelChars, -nVChar);
+  nVChar += nRelChars;
+  *pRelChars -= nRelChars;
   return nVChar;
 }