Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 05:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELLFIND] Rename data members

Browse source
This commit is contained in:
Brock Mammen 2019-08-24 09:40:43 -05:00 committed by Giannis Adamopoulos
parent fe5c76a034
commit 641988a386
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dll/win32/browseui/shellfind/CSearchBar.cpp
View file

@ -21,8 +21,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shellfind);
#endif #endif
CSearchBar::CSearchBar() : CSearchBar::CSearchBar() :
pSite(NULL), m_pSite(NULL),
fVisible(FALSE) m_bVisible(FALSE)
{ {
} }
@ -47,15 +47,15 @@ LRESULT CSearchBar::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &
return hResult; return hResult;
CComPtr<IShellService> pShellService; CComPtr<IShellService> pShellService;
hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IShellService, &pShellService)); hResult = m_AddressEditBox->QueryInterface(IID_PPV_ARG(IShellService, &pShellService));
if (FAILED_UNEXPECTEDLY(hResult)) if (FAILED_UNEXPECTEDLY(hResult))
return hResult; return hResult;
hResult = fAddressEditBox->Init(hCombobox, fEditControl, 0, pSite); hResult = m_AddressEditBox->Init(hCombobox, hEditControl, 0, m_pSite);
if (FAILED_UNEXPECTEDLY(hResult)) if (FAILED_UNEXPECTEDLY(hResult))
return hResult; return hResult;
CComPtr<IDispatch> pDispatch; CComPtr<IDispatch> pDispatch;
hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IDispatch, &pDispatch)); hResult = m_AddressEditBox->QueryInterface(IID_PPV_ARG(IDispatch, &pDispatch));
if (FAILED_UNEXPECTEDLY(hResult)) if (FAILED_UNEXPECTEDLY(hResult))
return hResult; return hResult;
DISPPARAMS params = {0}; DISPPARAMS params = {0};
@ -75,7 +75,7 @@ HRESULT CSearchBar::ExecuteCommand(CComPtr<IContextMenu>& menu, UINT nCmd)
HWND browserWnd; HWND browserWnd;
HRESULT hr; HRESULT hr;
hr = IUnknown_QueryService(pSite, SID_SShellBrowser, IID_PPV_ARG(IOleWindow, &pBrowserOleWnd)); hr = IUnknown_QueryService(m_pSite, SID_SShellBrowser, IID_PPV_ARG(IOleWindow, &pBrowserOleWnd));
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return hr; return hr;
@ -99,7 +99,7 @@ HRESULT CSearchBar::ExecuteCommand(CComPtr<IContextMenu>& menu, UINT nCmd)
// *** ATL event handlers *** // *** ATL event handlers ***
LRESULT CSearchBar::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) LRESULT CSearchBar::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{ {
IUnknown_OnFocusChangeIS(pSite, reinterpret_cast<IUnknown*>(this), TRUE); IUnknown_OnFocusChangeIS(m_pSite, reinterpret_cast<IUnknown*>(this), TRUE);
bHandled = FALSE; bHandled = FALSE;
return TRUE; return TRUE;
} }
@ -163,7 +163,7 @@ LRESULT CSearchBar::OnSearchButtonClicked(WORD wNotifyCode, WORD wID, HWND hWndC
} }
CComPtr<IShellBrowser> pShellBrowser; CComPtr<IShellBrowser> pShellBrowser;
HRESULT hr = IUnknown_QueryService(pSite, SID_SShellBrowser, IID_PPV_ARG(IShellBrowser, &pShellBrowser)); HRESULT hr = IUnknown_QueryService(m_pSite, SID_SShellBrowser, IID_PPV_ARG(IShellBrowser, &pShellBrowser));
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return hr; return hr;
@ -305,7 +305,7 @@ HRESULT STDMETHODCALLTYPE CSearchBar::ResizeBorderDW(const RECT *prcBorder, IUnk
HRESULT STDMETHODCALLTYPE CSearchBar::ShowDW(BOOL fShow) HRESULT STDMETHODCALLTYPE CSearchBar::ShowDW(BOOL fShow)
{ {
fVisible = fShow; m_bVisible = fShow;
ShowWindow(fShow); ShowWindow(fShow);
return S_OK; return S_OK;
} }
@ -366,7 +366,7 @@ HRESULT STDMETHODCALLTYPE CSearchBar::SetSite(IUnknown *pUnkSite)
HRESULT hr; HRESULT hr;
HWND parentWnd; HWND parentWnd;
if (pUnkSite == pSite) if (pUnkSite == m_pSite)
return S_OK; return S_OK;
TRACE("SetSite called \n"); TRACE("SetSite called \n");
@ -376,9 +376,9 @@ HRESULT STDMETHODCALLTYPE CSearchBar::SetSite(IUnknown *pUnkSite)
m_hWnd = NULL; m_hWnd = NULL;
} }
if (pUnkSite != pSite) if (pUnkSite != m_pSite)
{ {
pSite = NULL; m_pSite = NULL;
} }
if(!pUnkSite) if(!pUnkSite)
@ -391,7 +391,7 @@ HRESULT STDMETHODCALLTYPE CSearchBar::SetSite(IUnknown *pUnkSite)
return E_INVALIDARG; return E_INVALIDARG;
} }
pSite = pUnkSite; m_pSite = pUnkSite;
if (m_hWnd) if (m_hWnd)
{ {
@ -410,7 +410,7 @@ HRESULT STDMETHODCALLTYPE CSearchBar::GetSite(REFIID riid, void **ppvSite)
{ {
if (!ppvSite) if (!ppvSite)
return E_POINTER; return E_POINTER;
*ppvSite = pSite; *ppvSite = m_pSite;
return S_OK; return S_OK;
} }
@ -433,7 +433,7 @@ HRESULT STDMETHODCALLTYPE CSearchBar::Exec(const GUID *pguidCmdGroup, DWORD nCmd
HRESULT STDMETHODCALLTYPE CSearchBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) HRESULT STDMETHODCALLTYPE CSearchBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
{ {
/* FIXME: we probably want to handle more services here */ /* FIXME: we probably want to handle more services here */
return IUnknown_QueryService(pSite, SID_SShellBrowser, riid, ppvObject); return IUnknown_QueryService(m_pSite, SID_SShellBrowser, riid, ppvObject);
} }

6
dll/win32/browseui/shellfind/CSearchBar.h
View file

@ -27,9 +27,9 @@ class CSearchBar :
private: private:
// *** BaseBarSite information *** // *** BaseBarSite information ***
CComPtr<IUnknown> pSite; CComPtr<IUnknown> m_pSite;
CComPtr<IAddressEditBox> fAddressEditBox; CComPtr<IAddressEditBox> m_AddressEditBox;
BOOL fVisible; BOOL m_bVisible;
HRESULT GetSearchResultsFolder(IShellBrowser **ppShellBrowser, HWND *pHwnd, IShellFolder **ppShellFolder); HRESULT GetSearchResultsFolder(IShellBrowser **ppShellBrowser, HWND *pHwnd, IShellFolder **ppShellFolder);
BOOL GetAddressEditBoxPath(WCHAR (&szPath)[MAX_PATH]); BOOL GetAddressEditBoxPath(WCHAR (&szPath)[MAX_PATH]);