Gabriel Ivăncescu : shell32/autocomplete: Reduce the strlen calls because they are redundant.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a435fbc646a9f9d3f6b56eab66d17eacd8cd7be1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a435fbc646a9f9d3f6b56eab6...

Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
Date:   Mon Sep 10 22:09:33 2018 +0300

shell32/autocomplete: Reduce the strlen calls because they are redundant.

We can retrieve the length of the string from the SendMessage calls already.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/shell32/autocomplete.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c
index 6a77ddb..4160235 100644
--- a/dlls/shell32/autocomplete.c
+++ b/dlls/shell32/autocomplete.c
@@ -212,13 +212,15 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
                                 len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0);
                                 if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR))))
                                     return 0;
-                                SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg);
+                                len = SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg);
                                 SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg);
-                                SendMessageW(hwnd, EM_SETSEL, lstrlenW(msg), lstrlenW(msg));
+                                SendMessageW(hwnd, EM_SETSEL, len, len);
                                 heap_free(msg);
                             } else {
+                                UINT len;
                                 SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)This->txtbackup);
-                                SendMessageW(hwnd, EM_SETSEL, lstrlenW(This->txtbackup), lstrlenW(This->txtbackup));
+                                len = strlenW(This->txtbackup);
+                                SendMessageW(hwnd, EM_SETSEL, len, len);
                             }
                         }
                         return 0;
@@ -332,9 +334,9 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
             len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0);
             if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR))))
                 break;
-            SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg);
+            len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg);
             SendMessageW(This->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg);
-            SendMessageW(This->hwndEdit, EM_SETSEL, 0, lstrlenW(msg));
+            SendMessageW(This->hwndEdit, EM_SETSEL, 0, len);
             ShowWindow(hwnd, SW_HIDE);
             heap_free(msg);
             break;