Module: wine Branch: master Commit: cefa84e5d9e9542475007a23fe18efe35549ce7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cefa84e5d9e9542475007a23f...
Author: Gabriel Ivăncescu gabrielopcode@gmail.com Date: Thu Sep 20 14:55:36 2018 +0300
shell32/autocomplete: Forward to the edit control outside of the switch to simplify the code.
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
---
dlls/shell32/autocomplete.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 40e0866..ef835b9 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -348,13 +348,13 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case CB_SHOWDROPDOWN: if (This->options & ACO_AUTOSUGGEST) ShowWindow(This->hwndListBox, SW_HIDE); - break; + return 0; case WM_KILLFOCUS: if ((This->options & ACO_AUTOSUGGEST) && ((HWND)wParam != This->hwndListBox)) { ShowWindow(This->hwndListBox, SW_HIDE); } - return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + break; case WM_KEYDOWN: return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam); case WM_CHAR: @@ -382,11 +382,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, destroy_autocomplete_object(This); return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); } - default: - return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); } - - return 0; + return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); }
static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)