Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-28 13:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHLWAPI] Follow-up of #3230 (f496a5f)

Browse source 
CORE-9281
This commit is contained in:
Katayama Hirofumi MZ 2020-09-27 15:47:10 +09:00
parent f496a5fc4f
commit fe41acdc11
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dll/win32/shlwapi/autocomp.cpp
View file

@ -42,7 +42,7 @@ AutoComplete_AddMRU(CComPtr<IObjMgr> pManager, LPCWSTR pszKey)
} }
static HRESULT static HRESULT
IUnknown_SetOptions(CComPtr<IUnknown> punk, DWORD dwACLO) IUnknown_AddOptions(CComPtr<IUnknown> punk, DWORD dwACLO)
{ {
CComPtr<IACList2> pList; CComPtr<IACList2> pList;
HRESULT hr = punk->QueryInterface(IID_IACList2, (LPVOID *)&pList); HRESULT hr = punk->QueryInterface(IID_IACList2, (LPVOID *)&pList);
@ -52,7 +52,10 @@ IUnknown_SetOptions(CComPtr<IUnknown> punk, DWORD dwACLO)
return hr; return hr;
} }
hr = pList->SetOptions(dwACLO); DWORD dwOptions = 0;
pList->GetOptions(&dwOptions);
dwOptions |= dwACLO;
hr = pList->SetOptions(dwOptions);
if (FAILED(hr)) if (FAILED(hr))
ERR("pList->SetOptions failed: 0x%08lX\n", hr); ERR("pList->SetOptions failed: 0x%08lX\n", hr);
return hr; return hr;
@ -97,8 +100,8 @@ AutoComplete_LoadList(DWORD dwSHACF, DWORD dwACLO)
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
pManager->Append(pHistory); // Add to the manager pManager->Append(pHistory); // Add to the manager
// Set ACLO_* options // Add ACLO_* options
IUnknown_SetOptions(pHistory, dwACLO | ACLO_CURRENTDIR | ACLO_MYCOMPUTER); IUnknown_AddOptions(pHistory, dwACLO);
} }
else else
{ {
@ -115,8 +118,8 @@ AutoComplete_LoadList(DWORD dwSHACF, DWORD dwACLO)
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
pManager->Append(pISF); // Add to the manager pManager->Append(pISF); // Add to the manager
// Set ACLO_* options // Add ACLO_* options
IUnknown_SetOptions(pISF, dwACLO | ACLO_CURRENTDIR | ACLO_MYCOMPUTER); IUnknown_AddOptions(pISF, dwACLO);
} }
else else
{ {