Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[shell32]

Browse source 
- Fix auto complete init method based on Wine. Autocomplete shell tests should no longer crash now.
- Brought to you by Claudiu Mihail.

svn path=/trunk/; revision=53871
This commit is contained in:
Giannis Adamopoulos 2011-09-27 11:58:19 +00:00
parent 1b664f1b5f
commit d3cccfe25f
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/dll/win32/shell32/autocomplete.cpp
View file

@ -45,6 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
CAutoComplete::CAutoComplete()
{
enabled = TRUE;
initialized = FALSE;
options = ACO_AUTOAPPEND;
wpOrigEditProc = NULL;
hwndListBox = NULL;
@ -105,7 +106,15 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p
if (options & ACO_RTLREADING)
FIXME(" ACO_RTLREADING not supported\n");
hwndEdit = hwndEdit;
if (!hwndEdit || !punkACL)
return E_INVALIDARG;
if (this->initialized)
{
WARN("Autocompletion object is already initialized\n");
/* This->hwndEdit is set to NULL when the edit window is destroyed. */
return this->hwndEdit ? E_FAIL : E_UNEXPECTED;
}
if (!SUCCEEDED (punkACL->QueryInterface(IID_IEnumString, (LPVOID *)&enumstr)))
{
@ -113,6 +122,8 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p
return E_NOINTERFACE;
}
this->hwndEdit = hwndEdit;
this->initialized = TRUE;
wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc);
SetWindowLongPtrW(hwndEdit, GWLP_USERDATA, (LONG_PTR)this);

1
reactos/dll/win32/shell32/autocomplete.h
View file

@ -29,6 +29,7 @@ class CAutoComplete :
{
private:
BOOL enabled;
BOOL initialized;
HWND hwndEdit;
HWND hwndListBox;
WNDPROC wpOrigEditProc;