[PATCH v3 03/10] shell32/autocomplete: Reduce the strlen calls because they are redundant

[Huw Davies]

On Sat, Sep 08, 2018 at 02:50:49PM +0300, Gabriel Ivăncescu wrote:
> We can retrieve the length of the string from the SendMessage calls already.

Looks good.

> 
> Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
> ---
>  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 2f9d16f..7319d84 100644
> --- a/dlls/shell32/autocomplete.c
> +++ b/dlls/shell32/autocomplete.c
> @@ -213,13 +213,15 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
>  
>                                  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;
> @@ -334,9 +336,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;
> -- 
> 1.9.1
> 
> 
>