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>
This commit is contained in:
Gabriel Ivăncescu 2018-09-20 14:55:36 +03:00 committed by Alexandre Julliard
parent a2cb1ab0b3
commit cefa84e5d9
1 changed files with 3 additions and 6 deletions

View File

@ -348,13 +348,13 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
case CB_SHOWDROPDOWN: case CB_SHOWDROPDOWN:
if (This->options & ACO_AUTOSUGGEST) if (This->options & ACO_AUTOSUGGEST)
ShowWindow(This->hwndListBox, SW_HIDE); ShowWindow(This->hwndListBox, SW_HIDE);
break; return 0;
case WM_KILLFOCUS: case WM_KILLFOCUS:
if ((This->options & ACO_AUTOSUGGEST) && ((HWND)wParam != This->hwndListBox)) if ((This->options & ACO_AUTOSUGGEST) && ((HWND)wParam != This->hwndListBox))
{ {
ShowWindow(This->hwndListBox, SW_HIDE); ShowWindow(This->hwndListBox, SW_HIDE);
} }
return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); break;
case WM_KEYDOWN: case WM_KEYDOWN:
return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam); return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam);
case WM_CHAR: case WM_CHAR:
@ -382,11 +382,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
destroy_autocomplete_object(This); destroy_autocomplete_object(This);
return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam);
} }
default:
return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam);
} }
return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam);
return 0;
} }
static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)