[SHELL] IPersistFolder::Initialize takes a PCIDLIST_ABSOLUTE. CORE-16385

This commit is contained in:
Thomas Faber 2019-09-20 12:19:34 +02:00
parent b90c24d640
commit c2b476bd77
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
30 changed files with 34 additions and 34 deletions

View file

@ -631,7 +631,7 @@ public:
} }
// IPersistFolder // IPersistFolder
virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl) virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
m_shellPidl = ILClone(pidl); m_shellPidl = ILClone(pidl);

View file

@ -198,7 +198,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::InternalBindToObject(
} }
// IPersistFolder // IPersistFolder
HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(LPCITEMIDLIST pidl) HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
m_shellPidl = ILClone(pidl); m_shellPidl = ILClone(pidl);
@ -208,7 +208,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(LPCITEMIDLIST pidl)
} }
// Internal // Internal
HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath) HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(PCIDLIST_ABSOLUTE pidl, PCWSTR ntPath)
{ {
m_shellPidl = ILClone(pidl); m_shellPidl = ILClone(pidl);

View file

@ -97,10 +97,10 @@ public:
SHCOLUMNID *pscid); SHCOLUMNID *pscid);
// IPersistFolder // IPersistFolder
virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl); virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl);
// Internal // Internal
HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath); HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl, PCWSTR ntPath);
protected: protected:
virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const NtPidlEntry * first, const NtPidlEntry * second); virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const NtPidlEntry * first, const NtPidlEntry * second);

View file

@ -136,7 +136,7 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::InternalBindToObject(
return ShellObjectCreatorInit<CRegistryFolder>(fullPidl, path, m_hRoot, IID_PPV_ARG(IShellFolder, ppsfChild)); return ShellObjectCreatorInit<CRegistryFolder>(fullPidl, path, m_hRoot, IID_PPV_ARG(IShellFolder, ppsfChild));
} }
HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl) HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
m_shellPidl = ILClone(pidl); m_shellPidl = ILClone(pidl);
m_hRoot = NULL; m_hRoot = NULL;
@ -145,7 +145,7 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl)
return S_OK; return S_OK;
} }
HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath, HKEY hRoot) HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(PCIDLIST_ABSOLUTE pidl, PCWSTR ntPath, HKEY hRoot)
{ {
m_shellPidl = ILClone(pidl); m_shellPidl = ILClone(pidl);
m_hRoot = hRoot; m_hRoot = hRoot;

View file

@ -94,10 +94,10 @@ public:
SHCOLUMNID *pscid); SHCOLUMNID *pscid);
// IPersistFolder // IPersistFolder
virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl); virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl);
// Internal // Internal
virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath, HKEY hRoot); virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl, PCWSTR ntPath, HKEY hRoot);
protected: protected:
virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const RegPidlEntry * first, const RegPidlEntry * second); virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const RegPidlEntry * first, const RegPidlEntry * second);

View file

@ -605,7 +605,7 @@ public:
} }
// *** IPersistFolder methods *** // *** IPersistFolder methods ***
STDMETHODIMP Initialize(LPCITEMIDLIST pidl) STDMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
WCHAR tmpPath[MAX_PATH]; WCHAR tmpPath[MAX_PATH];

View file

@ -95,7 +95,7 @@ HRESULT STDMETHODCALLTYPE CACListISF::GetClassID(CLSID *pClassID)
} }
// *** IPersistFolder methods *** // *** IPersistFolder methods ***
HRESULT STDMETHODCALLTYPE CACListISF::Initialize(LPCITEMIDLIST pidl) HRESULT STDMETHODCALLTYPE CACListISF::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
TRACE("(%p, %p)\n", this, pidl); TRACE("(%p, %p)\n", this, pidl);
return S_OK; return S_OK;

View file

@ -55,7 +55,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID); virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID);
// *** IPersistFolder methods *** // *** IPersistFolder methods ***
virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl); virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl);
public: public:

View file

@ -681,7 +681,7 @@ STDMETHODIMP CFindFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl)
} }
// *** IPersistFolder methods *** // *** IPersistFolder methods ***
STDMETHODIMP CFindFolder::Initialize(LPCITEMIDLIST pidl) STDMETHODIMP CFindFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
m_pidl = ILClone(pidl); m_pidl = ILClone(pidl);
if (!m_pidl) if (!m_pidl)

View file

@ -77,7 +77,7 @@ private:
// *** IPersistFolder methods *** // *** IPersistFolder methods ***
STDMETHODIMP Initialize(LPCITEMIDLIST pidl); STDMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidl);
// *** IPersist methods *** // *** IPersist methods ***

View file

@ -168,7 +168,7 @@ HRESULT WINAPI CAdminToolsFolder::GetClassID(CLSID *lpClassId)
return S_OK; return S_OK;
} }
HRESULT WINAPI CAdminToolsFolder::Initialize(LPCITEMIDLIST pidl) HRESULT WINAPI CAdminToolsFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
m_pidlInner = ILClone(pidl); m_pidlInner = ILClone(pidl);
if (!m_pidlInner) if (!m_pidlInner)

View file

@ -60,7 +60,7 @@ class CAdminToolsFolder :
virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
// IPersistFolder // IPersistFolder
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);
// IPersistFolder2 // IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

View file

@ -614,7 +614,7 @@ HRESULT WINAPI CControlPanelFolder::GetClassID(CLSID *lpClassId)
* *
* NOTES: it makes no sense to change the pidl * NOTES: it makes no sense to change the pidl
*/ */
HRESULT WINAPI CControlPanelFolder::Initialize(LPCITEMIDLIST pidl) HRESULT WINAPI CControlPanelFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
if (pidlRoot) if (pidlRoot)
SHFree((LPVOID)pidlRoot); SHFree((LPVOID)pidlRoot);

View file

@ -65,7 +65,7 @@ class CControlPanelFolder :
virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
// IPersistFolder // IPersistFolder
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);
// IPersistFolder2 // IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

View file

@ -71,7 +71,7 @@ class CDesktopFolder :
virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
// *** IPersistFolder methods *** // *** IPersistFolder methods ***
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);
// *** IPersistFolder2 methods *** // *** IPersistFolder2 methods ***
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

View file

@ -65,7 +65,7 @@ class CDrivesFolder :
virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
// IPersistFolder // IPersistFolder
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);
// IPersistFolder2 // IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

View file

@ -73,7 +73,7 @@ class CFSFolder :
virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
// IPersistFolder // IPersistFolder
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);
// IPersistFolder2 // IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

View file

@ -169,7 +169,7 @@ HRESULT WINAPI CFontsFolder::GetClassID(CLSID *lpClassId)
return S_OK; return S_OK;
} }
HRESULT WINAPI CFontsFolder::Initialize(LPCITEMIDLIST pidl) HRESULT WINAPI CFontsFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
m_pidlInner = ILClone(pidl); m_pidlInner = ILClone(pidl);
if (!m_pidlInner) if (!m_pidlInner)

View file

@ -60,7 +60,7 @@ class CFontsFolder :
virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
// IPersistFolder // IPersistFolder
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);
// IPersistFolder2 // IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl); virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl);

View file

@ -168,7 +168,7 @@ HRESULT WINAPI CMyDocsFolder::GetClassID(CLSID *lpClassId)
return S_OK; return S_OK;
} }
HRESULT WINAPI CMyDocsFolder::Initialize(LPCITEMIDLIST pidl) HRESULT WINAPI CMyDocsFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
m_pidlInner = ILClone(pidl); m_pidlInner = ILClone(pidl);
if (!m_pidlInner) if (!m_pidlInner)

View file

@ -60,7 +60,7 @@ class CMyDocsFolder :
virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
// IPersistFolder // IPersistFolder
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);
// IPersistFolder2 // IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

View file

@ -571,7 +571,7 @@ HRESULT WINAPI CNetFolder::GetClassID(CLSID *lpClassId)
* *
* NOTES: it makes no sense to change the pidl * NOTES: it makes no sense to change the pidl
*/ */
HRESULT WINAPI CNetFolder::Initialize(LPCITEMIDLIST pidl) HRESULT WINAPI CNetFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
if (pidlRoot) if (pidlRoot)
SHFree((LPVOID)pidlRoot); SHFree((LPVOID)pidlRoot);

View file

@ -62,7 +62,7 @@ class CNetFolder :
virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
// IPersistFolder // IPersistFolder
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);
// IPersistFolder2 // IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

View file

@ -479,7 +479,7 @@ HRESULT WINAPI CPrinterFolder::GetClassID(CLSID *lpClassId)
/************************************************************************ /************************************************************************
* CPrinterFolder::Initialize * CPrinterFolder::Initialize
*/ */
HRESULT WINAPI CPrinterFolder::Initialize(LPCITEMIDLIST pidl) HRESULT WINAPI CPrinterFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
if (pidlRoot) if (pidlRoot)
SHFree((LPVOID)pidlRoot); SHFree((LPVOID)pidlRoot);

View file

@ -65,7 +65,7 @@ class CPrinterFolder :
virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
// IPersistFolder // IPersistFolder
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);
// IPersistFolder2 // IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

View file

@ -432,7 +432,7 @@ HRESULT WINAPI CRecycleBin::GetClassID(CLSID *pClassID)
return S_OK; return S_OK;
} }
HRESULT WINAPI CRecycleBin::Initialize(LPCITEMIDLIST pidl) HRESULT WINAPI CRecycleBin::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
TRACE("(%p, %p)\n", this, pidl); TRACE("(%p, %p)\n", this, pidl);

View file

@ -46,7 +46,7 @@ class CRecycleBin :
// IPersistFolder // IPersistFolder
virtual HRESULT WINAPI GetClassID(CLSID *pClassID); virtual HRESULT WINAPI GetClassID(CLSID *pClassID);
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);
// IPersistFolder2 // IPersistFolder2
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

View file

@ -697,7 +697,7 @@ HRESULT STDMETHODCALLTYPE CMergedFolder::GetClassID(CLSID *lpClassId)
} }
// IPersistFolder // IPersistFolder
HRESULT STDMETHODCALLTYPE CMergedFolder::Initialize(LPCITEMIDLIST pidl) HRESULT STDMETHODCALLTYPE CMergedFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
{ {
m_shellPidl = ILClone(pidl); m_shellPidl = ILClone(pidl);
return S_OK; return S_OK;

View file

@ -191,7 +191,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *lpClassId); virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *lpClassId);
// IPersistFolder // IPersistFolder
virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl); virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl);
// IPersistFolder2 // IPersistFolder2
virtual HRESULT STDMETHODCALLTYPE GetCurFolder(PIDLIST_ABSOLUTE * pidl); virtual HRESULT STDMETHODCALLTYPE GetCurFolder(PIDLIST_ABSOLUTE * pidl);

View file

@ -53,7 +53,7 @@ interface IPersistFolder : IPersist
{ {
typedef IPersistFolder *LPPERSISTFOLDER; typedef IPersistFolder *LPPERSISTFOLDER;
HRESULT Initialize( [in] LPCITEMIDLIST pidl ); HRESULT Initialize( [in] PCIDLIST_ABSOLUTE pidl );
} }