From ff7e9870ce9209cbf7706903a3e28682f96dd347 Mon Sep 17 00:00:00 2001
From: Brock Mammen <brockmammen@gmail.com>
Date: Fri, 23 Aug 2019 15:33:34 -0500
Subject: [PATCH] [SHELLFIND] Remove unnecessary data member for focus

---
 dll/win32/browseui/shellfind/CSearchBar.cpp | 6 ++----
 dll/win32/browseui/shellfind/CSearchBar.h   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dll/win32/browseui/shellfind/CSearchBar.cpp b/dll/win32/browseui/shellfind/CSearchBar.cpp
index 8ab28b65fd1..74dfd732b61 100644
--- a/dll/win32/browseui/shellfind/CSearchBar.cpp
+++ b/dll/win32/browseui/shellfind/CSearchBar.cpp
@@ -33,8 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shellfind);
 
 CSearchBar::CSearchBar() :
     pSite(NULL),
-    fVisible(FALSE),
-    bFocused(FALSE)
+    fVisible(FALSE)
 {
 }
 
@@ -111,7 +110,6 @@ HRESULT CSearchBar::ExecuteCommand(CComPtr<IContextMenu>& menu, UINT nCmd)
 // *** ATL event handlers ***
 LRESULT CSearchBar::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
-    bFocused = TRUE;
     IUnknown_OnFocusChangeIS(pSite, reinterpret_cast<IUnknown*>(this), TRUE);
     bHandled = FALSE;
     return TRUE;
@@ -470,7 +468,7 @@ HRESULT STDMETHODCALLTYPE CSearchBar::UIActivateIO(BOOL fActivate, LPMSG lpMsg)
 
 HRESULT STDMETHODCALLTYPE CSearchBar::HasFocusIO()
 {
-    return bFocused ? S_OK : S_FALSE;
+    return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE CSearchBar::TranslateAcceleratorIO(LPMSG lpMsg)
diff --git a/dll/win32/browseui/shellfind/CSearchBar.h b/dll/win32/browseui/shellfind/CSearchBar.h
index a94466fd78a..c2df78ed96b 100644
--- a/dll/win32/browseui/shellfind/CSearchBar.h
+++ b/dll/win32/browseui/shellfind/CSearchBar.h
@@ -41,7 +41,6 @@ private:
     CComPtr<IUnknown> pSite;
     CComPtr<IAddressEditBox> fAddressEditBox;
     BOOL fVisible;
-    BOOL bFocused;
 
     HRESULT GetSearchResultsFolder(IShellBrowser **ppShellBrowser, HWND *pHwnd, IShellFolder **ppShellFolder);
     BOOL GetAddressEditBoxPath(WCHAR (&szPath)[MAX_PATH]);
-- 
2.17.1