shell32/autocomplete: Don't call ShowWindow unless auto-suggest listbox is enabled.

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>
This commit is contained in:
Gabriel Ivăncescu 2018-09-10 22:09:34 +03:00 committed by Alexandre Julliard
parent a435fbc646
commit cd8d3c6de6
1 changed files with 6 additions and 3 deletions

View File

@ -144,7 +144,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
switch (uMsg) switch (uMsg)
{ {
case CB_SHOWDROPDOWN: case CB_SHOWDROPDOWN:
ShowWindow(This->hwndListBox, SW_HIDE); if (This->options & ACO_AUTOSUGGEST)
ShowWindow(This->hwndListBox, SW_HIDE);
break; break;
case WM_KILLFOCUS: case WM_KILLFOCUS:
if ((This->options & ACO_AUTOSUGGEST) && ((HWND)wParam != This->hwndListBox)) if ((This->options & ACO_AUTOSUGGEST) && ((HWND)wParam != This->hwndListBox))
@ -175,7 +176,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
} }
} }
ShowWindow(This->hwndListBox, SW_HIDE); if (This->options & ACO_AUTOSUGGEST)
ShowWindow(This->hwndListBox, SW_HIDE);
return 0; return 0;
case VK_LEFT: case VK_LEFT:
case VK_RIGHT: case VK_RIGHT:
@ -310,7 +312,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
} }
default: default:
return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam);
} }
return 0; return 0;
@ -362,6 +363,8 @@ static void create_listbox(IAutoCompleteImpl *This)
This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc); This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc);
SetWindowLongPtrW( This->hwndListBox, GWLP_USERDATA, (LONG_PTR)This); SetWindowLongPtrW( This->hwndListBox, GWLP_USERDATA, (LONG_PTR)This);
} }
else
This->options &= ~ACO_AUTOSUGGEST;
} }
/************************************************************************** /**************************************************************************