commit 2e2988dec6215c0e65e4d08172df260156fe5abf
author Paul Rupe <prupe@myrealbox.com> Mon Jun 10 22:47:58 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jun 10 22:47:58 2002 +0000
tree 324acf2b18592d7d035f7d617b09890dddeb91b1
parent 21fbb40cb7e675107390002915ae2209d09aff92

Faster performance in TEXT_Ellipsify for long strings.

dlls/user/text.c

diff --git a/dlls/user/text.c b/dlls/user/text.c
index 886c374..22ebc0c 100644
--- a/dlls/user/text.c
+++ b/dlls/user/text.c
@@ -135,12 +135,31 @@
                             int *len_before, int *len_ellip)
 {
     unsigned int len_ellipsis;
+    unsigned int lo, mid, hi;
 
     len_ellipsis = strlenW (ELLIPSISW);
     if (len_ellipsis > max_len) len_ellipsis = max_len;
     if (*len_str > max_len - len_ellipsis)
         *len_str = max_len - len_ellipsis;
 
+    /* First do a quick binary search to get an upper bound for *len_str. */
+    if (*len_str > 0 &&
+        GetTextExtentExPointW(hdc, str, *len_str, width, NULL, NULL, size) &&
+        size->cx > width)
+    {
+        for (lo = 0, hi = *len_str; lo < hi; )
+        {
+            mid = (lo + hi) / 2;
+            if (!GetTextExtentExPointW(hdc, str, mid, width, NULL, NULL, size))
+                break;
+            if (size->cx > width)
+                hi = mid;
+            else
+                lo = mid + 1;
+        }
+        *len_str = hi;
+    }
+    /* Now this should take only a couple iterations at most. */
     for ( ; ; )
     {
         strncpyW (str + *len_str, ELLIPSISW, len_ellipsis);