https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f04890c2afdd8089e895db...
commit f04890c2afdd8089e895dbc4f6aed6768b4d9b3a Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Thu Feb 25 20:36:20 2021 +0900 Commit: GitHub noreply@github.com CommitDate: Thu Feb 25 20:36:20 2021 +0900
[BROWSEUI] Fix and small improvement (#3486)
Fix a mistake in CAutoComplete PR #3472 (6bfb76b) and improve. - Fix confusion between m_hwndEdit and hwndEdit. - Delete extra this-> codes. CORE-9281 --- dll/win32/browseui/CAutoComplete.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index fed833e0fba..ffd14267d3e 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -134,14 +134,14 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p if (m_options & ACO_RTLREADING) FIXME(" ACO_RTLREADING not supported\n");
- if (!m_hwndEdit || !punkACL) + if (!hwndEdit || !punkACL) return E_INVALIDARG;
- if (this->m_initialized) + if (m_initialized) { WARN("Autocompletion object is already initialized\n"); /* This->hwndEdit is set to NULL when the edit window is destroyed. */ - return this->m_hwndEdit ? E_FAIL : E_UNEXPECTED; + return m_hwndEdit ? E_FAIL : E_UNEXPECTED; }
if (!SUCCEEDED(punkACL->QueryInterface(IID_PPV_ARG(IEnumString, &m_enumstr)))) @@ -150,11 +150,11 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p return E_NOINTERFACE; }
- this->m_hwndEdit = hwndEdit; - this->m_initialized = TRUE; + m_hwndEdit = hwndEdit; + m_initialized = TRUE;
/* Keep at least one reference to the object until the edit window is destroyed. */ - this->AddRef(); + AddRef();
/* If another AutoComplete object was previously assigned to this edit control, release it but keep the same callback on the control, to avoid an infinite @@ -163,20 +163,20 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p
if (prev && prev->m_initialized) { - this->m_wpOrigEditProc = prev->m_wpOrigEditProc; + m_wpOrigEditProc = prev->m_wpOrigEditProc; SetPropW(m_hwndEdit, autocomplete_propertyW, this); prev->m_wpOrigEditProc = NULL; prev->Release(); } else { - SetPropW(this->m_hwndEdit, autocomplete_propertyW, (HANDLE)this); - this->m_wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(m_hwndEdit, GWLP_WNDPROC, (LONG_PTR)ACEditSubclassProc); + SetPropW(m_hwndEdit, autocomplete_propertyW, (HANDLE)this); + m_wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(m_hwndEdit, GWLP_WNDPROC, (LONG_PTR)ACEditSubclassProc); }
if (m_options & ACO_AUTOSUGGEST) { - this->CreateListbox(); + CreateListbox(); }
if (pwzsRegKeyPath)