shell32/autocomplete: Hide the auto-suggest listbox when ESC is pressed.

When the listbox is visible, ESC should hide it. Only when it's not visible should it be forwarded to the edit control. This matches Windows behavior. Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32/autocomplete: Hide the auto-suggest listbox when ESC is pressed.
5d5e84a0 · Gabriel Ivăncescu · Alexandre Julliard · b3945207 · 5d5e84a0
Commit 5d5e84a0 authored Sep 28, 2018 by Gabriel Ivăncescu Committed by Alexandre Julliard Oct 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

autocomplete.c dlls/shell32/autocomplete.c +9 -0

No files found.
--- a/dlls/shell32/autocomplete.c
+++ b/dlls/shell32/autocomplete.c
@@ -346,6 +346,15 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT
 {
    switch (wParam)
    {
+        case VK_ESCAPE:
+            /* When pressing ESC, Windows hides the auto-suggest listbox, if visible */
+            if ((ac->options & ACO_AUTOSUGGEST) && IsWindowVisible(ac->hwndListBox))
+            {
+                ShowWindow(ac->hwndListBox, SW_HIDE);
+                ac->no_fwd_char = 0x1B;  /* ESC char */
+                return 0;
+            }
+            break;
        case VK_RETURN:
            /* If quickComplete is set and control is pressed, replace the string */
            if (ac->quickComplete && (GetKeyState(VK_CONTROL) & 0x8000))