[SHELL] IPersistFolder2::GetCurFolder takes a PIDLIST_ABSOLUTE*. CORE-16385

This commit is contained in:
Thomas Faber 2019-09-10 12:24:11 +02:00
parent 4328daa6e4
commit b90c24d640
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
28 changed files with 28 additions and 28 deletions

View file

@ -641,7 +641,7 @@ public:
}
// IPersistFolder2
virtual HRESULT STDMETHODCALLTYPE GetCurFolder(LPITEMIDLIST * pidl)
virtual HRESULT STDMETHODCALLTYPE GetCurFolder(PIDLIST_ABSOLUTE * pidl)
{
if (pidl)
*pidl = ILClone(m_shellPidl);

View file

@ -598,7 +598,7 @@ public:
//STDMETHODIMP GetCurFile(LPOLESTR *ppszFileName);
//// *** IPersistFolder2 methods ***
STDMETHODIMP GetCurFolder(LPITEMIDLIST * pidl)
STDMETHODIMP GetCurFolder(PIDLIST_ABSOLUTE * pidl)
{
*pidl = ILClone(m_CurDir);
return S_OK;

View file

@ -674,7 +674,7 @@ STDMETHODIMP CFindFolder::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam)
}
//// *** IPersistFolder2 methods ***
STDMETHODIMP CFindFolder::GetCurFolder(LPITEMIDLIST *pidl)
STDMETHODIMP CFindFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl)
{
*pidl = ILClone(m_pidl);
return S_OK;

View file

@ -73,7 +73,7 @@ private:
static DWORD WINAPI SearchThreadProc(LPVOID lpParameter);
//// *** IPersistFolder2 methods ***
STDMETHODIMP GetCurFolder(LPITEMIDLIST *pidl);
STDMETHODIMP GetCurFolder(PIDLIST_ABSOLUTE *pidl);
// *** IPersistFolder methods ***

View file

@ -233,7 +233,7 @@ HRESULT WINAPI CDefaultContextMenu::Initialize(const DEFCONTEXTMENU *pdcm, LPFND
CComPtr<IPersistFolder2> pf = NULL;
if (SUCCEEDED(m_psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pf))))
{
if (FAILED(pf->GetCurFolder(reinterpret_cast<LPITEMIDLIST*>(&m_pidlFolder))))
if (FAILED(pf->GetCurFolder(&m_pidlFolder)))
ERR("GetCurFolder failed\n");
}
TRACE("pidlFolder %p\n", m_pidlFolder);

View file

@ -180,7 +180,7 @@ HRESULT WINAPI CAdminToolsFolder::Initialize(LPCITEMIDLIST pidl)
IID_PPV_ARG(IShellFolder2, &m_pisfInner));
}
HRESULT WINAPI CAdminToolsFolder::GetCurFolder(LPITEMIDLIST *pidl)
HRESULT WINAPI CAdminToolsFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl)
{
if (!pidl)
return E_POINTER;

View file

@ -63,7 +63,7 @@ class CAdminToolsFolder :
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
// IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl);
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
DECLARE_REGISTRY_RESOURCEID(IDR_ADMINFOLDERSHORTCUT)
DECLARE_NOT_AGGREGATABLE(CAdminToolsFolder)

View file

@ -638,7 +638,7 @@ HRESULT WINAPI CControlPanelFolder::Initialize(LPCITEMIDLIST pidl)
/**************************************************************************
* CControlPanelFolder::GetCurFolder
*/
HRESULT WINAPI CControlPanelFolder::GetCurFolder(LPITEMIDLIST * pidl)
HRESULT WINAPI CControlPanelFolder::GetCurFolder(PIDLIST_ABSOLUTE * pidl)
{
TRACE("(%p)->(%p)\n", this, pidl);

View file

@ -68,7 +68,7 @@ class CControlPanelFolder :
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
// IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl);
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
DECLARE_REGISTRY_RESOURCEID(IDR_CONTROLPANEL)
DECLARE_NOT_AGGREGATABLE(CControlPanelFolder)

View file

@ -825,7 +825,7 @@ HRESULT WINAPI CDesktopFolder::Initialize(LPCITEMIDLIST pidl)
return E_INVALIDARG;
}
HRESULT WINAPI CDesktopFolder::GetCurFolder(LPITEMIDLIST * pidl)
HRESULT WINAPI CDesktopFolder::GetCurFolder(PIDLIST_ABSOLUTE * pidl)
{
TRACE ("(%p)->(%p)\n", this, pidl);

View file

@ -74,7 +74,7 @@ class CDesktopFolder :
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
// *** IPersistFolder2 methods ***
virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl);
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
// IContextMenuCB
virtual HRESULT WINAPI CallBack(IShellFolder *psf, HWND hwndOwner, IDataObject *pdtobj, UINT uMsg, WPARAM wParam, LPARAM lParam);

View file

@ -1062,7 +1062,7 @@ HRESULT WINAPI CDrivesFolder::Initialize(LPCITEMIDLIST pidl)
/**************************************************************************
* CDrivesFolder::GetCurFolder
*/
HRESULT WINAPI CDrivesFolder::GetCurFolder(LPITEMIDLIST *pidl)
HRESULT WINAPI CDrivesFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl)
{
TRACE("(%p)->(%p)\n", this, pidl);

View file

@ -68,7 +68,7 @@ class CDrivesFolder :
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
// IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl);
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
// IContextMenuCB
virtual HRESULT WINAPI CallBack(IShellFolder *psf, HWND hwndOwner, IDataObject *pdtobj, UINT uMsg, WPARAM wParam, LPARAM lParam);

View file

@ -1398,7 +1398,7 @@ HRESULT WINAPI CFSFolder::Initialize(LPCITEMIDLIST pidl)
/**************************************************************************
* CFSFolder::GetCurFolder
*/
HRESULT WINAPI CFSFolder::GetCurFolder(LPITEMIDLIST * pidl)
HRESULT WINAPI CFSFolder::GetCurFolder(PIDLIST_ABSOLUTE * pidl)
{
TRACE ("(%p)->(%p)\n", this, pidl);

View file

@ -76,7 +76,7 @@ class CFSFolder :
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
// IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl);
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
// IPersistFolder3
virtual HRESULT WINAPI InitializeEx(IBindCtx *pbc, LPCITEMIDLIST pidlRoot, const PERSIST_FOLDER_TARGET_INFO *ppfti);

View file

@ -181,7 +181,7 @@ HRESULT WINAPI CFontsFolder::Initialize(LPCITEMIDLIST pidl)
IID_PPV_ARG(IShellFolder2, &m_pisfInner));
}
HRESULT WINAPI CFontsFolder::GetCurFolder(LPITEMIDLIST *pidl)
HRESULT WINAPI CFontsFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl)
{
if (!pidl)
return E_POINTER;

View file

@ -63,7 +63,7 @@ class CFontsFolder :
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
// IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST *pidl);
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl);
DECLARE_REGISTRY_RESOURCEID(IDR_FONTSFOLDERSHORTCUT)
DECLARE_NOT_AGGREGATABLE(CFontsFolder)

View file

@ -180,7 +180,7 @@ HRESULT WINAPI CMyDocsFolder::Initialize(LPCITEMIDLIST pidl)
IID_PPV_ARG(IShellFolder2, &m_pisfInner));
}
HRESULT WINAPI CMyDocsFolder::GetCurFolder(LPITEMIDLIST *pidl)
HRESULT WINAPI CMyDocsFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl)
{
if (!pidl)
return E_POINTER;

View file

@ -63,7 +63,7 @@ class CMyDocsFolder :
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
// IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl);
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
DECLARE_REGISTRY_RESOURCEID(IDR_MYDOCUMENTS)
DECLARE_NOT_AGGREGATABLE(CMyDocsFolder)

View file

@ -583,7 +583,7 @@ HRESULT WINAPI CNetFolder::Initialize(LPCITEMIDLIST pidl)
/**************************************************************************
* CNetFolder::GetCurFolder
*/
HRESULT WINAPI CNetFolder::GetCurFolder(LPITEMIDLIST *pidl)
HRESULT WINAPI CNetFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl)
{
TRACE("(%p)->(%p)\n", this, pidl);

View file

@ -65,7 +65,7 @@ class CNetFolder :
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
// IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl);
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
DECLARE_REGISTRY_RESOURCEID(IDR_NETWORKPLACES)
DECLARE_NOT_AGGREGATABLE(CNetFolder)

View file

@ -491,7 +491,7 @@ HRESULT WINAPI CPrinterFolder::Initialize(LPCITEMIDLIST pidl)
/**************************************************************************
* CPrinterFolder::GetCurFolder
*/
HRESULT WINAPI CPrinterFolder::GetCurFolder(LPITEMIDLIST * pidl)
HRESULT WINAPI CPrinterFolder::GetCurFolder(PIDLIST_ABSOLUTE * pidl)
{
TRACE ("(%p)->(%p)\n", this, pidl);

View file

@ -68,7 +68,7 @@ class CPrinterFolder :
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
// IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl);
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
DECLARE_REGISTRY_RESOURCEID(IDR_PRINTERS)
DECLARE_NOT_AGGREGATABLE(CPrinterFolder)

View file

@ -443,7 +443,7 @@ HRESULT WINAPI CRecycleBin::Initialize(LPCITEMIDLIST pidl)
return S_OK;
}
HRESULT WINAPI CRecycleBin::GetCurFolder(LPITEMIDLIST *ppidl)
HRESULT WINAPI CRecycleBin::GetCurFolder(PIDLIST_ABSOLUTE *ppidl)
{
TRACE("\n");
*ppidl = ILClone(pidl);

View file

@ -49,7 +49,7 @@ class CRecycleBin :
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
// IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl);
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
// IShellFolder
virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes);

View file

@ -704,7 +704,7 @@ HRESULT STDMETHODCALLTYPE CMergedFolder::Initialize(LPCITEMIDLIST pidl)
}
// IPersistFolder2
HRESULT STDMETHODCALLTYPE CMergedFolder::GetCurFolder(LPITEMIDLIST * pidl)
HRESULT STDMETHODCALLTYPE CMergedFolder::GetCurFolder(PIDLIST_ABSOLUTE * pidl)
{
if (pidl)
*pidl = m_shellPidl;

View file

@ -194,7 +194,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl);
// IPersistFolder2
virtual HRESULT STDMETHODCALLTYPE GetCurFolder(LPITEMIDLIST * pidl);
virtual HRESULT STDMETHODCALLTYPE GetCurFolder(PIDLIST_ABSOLUTE * pidl);
// IAugmentedShellFolder2
virtual HRESULT STDMETHODCALLTYPE AddNameSpace(LPGUID lpGuid, IShellFolder * psf, LPCITEMIDLIST pcidl, ULONG dwUnknown);

View file

@ -69,7 +69,7 @@ interface IPersistFolder2 : IPersistFolder
{
typedef IPersistFolder2 *LPPERSISTFOLDER2;
HRESULT GetCurFolder( [out] LPITEMIDLIST *ppidl );
HRESULT GetCurFolder( [out] PIDLIST_ABSOLUTE *ppidl );
}