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

diff --git a/dll/shellext/ntobjshex/foldercommon.h b/dll/shellext/ntobjshex/foldercommon.h
index 2780d63..ae04fd4 100644 (file)
--- a/dll/shellext/ntobjshex/foldercommon.h
+++ b/dll/shellext/ntobjshex/foldercommon.h
@@ -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);
 

diff --git a/dll/shellext/ntobjshex/ntobjfolder.cpp b/dll/shellext/ntobjshex/ntobjfolder.cpp
index 24571ca..38a4cab 100644 (file)
--- a/dll/shellext/ntobjshex/ntobjfolder.cpp
+++ b/dll/shellext/ntobjshex/ntobjfolder.cpp
@@ -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);
 

diff --git a/dll/shellext/ntobjshex/ntobjfolder.h b/dll/shellext/ntobjshex/ntobjfolder.h
index 5192e29..556ce57 100644 (file)
--- a/dll/shellext/ntobjshex/ntobjfolder.h
+++ b/dll/shellext/ntobjshex/ntobjfolder.h
@@ -97,10 +97,10 @@ public:
         SHCOLUMNID *pscid);
 
     // IPersistFolder
         SHCOLUMNID *pscid);
 
     // 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:
     virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const NtPidlEntry * first, const NtPidlEntry * second);
 
 protected:
     virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const NtPidlEntry * first, const NtPidlEntry * second);

diff --git a/dll/shellext/ntobjshex/regfolder.cpp b/dll/shellext/ntobjshex/regfolder.cpp
index a314ad7..c75c79c 100644 (file)
--- a/dll/shellext/ntobjshex/regfolder.cpp
+++ b/dll/shellext/ntobjshex/regfolder.cpp
@@ -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_hRoot = NULL;
 {
     m_shellPidl = ILClone(pidl);
     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_hRoot = hRoot;
 {
     m_shellPidl = ILClone(pidl);
     m_hRoot = hRoot;

diff --git a/dll/shellext/ntobjshex/regfolder.h b/dll/shellext/ntobjshex/regfolder.h
index 1de5db4..08f687f 100644 (file)
--- a/dll/shellext/ntobjshex/regfolder.h
+++ b/dll/shellext/ntobjshex/regfolder.h
@@ -94,10 +94,10 @@ public:
         SHCOLUMNID *pscid);
 
     // IPersistFolder
         SHCOLUMNID *pscid);
 
     // 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:
     virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const RegPidlEntry * first, const RegPidlEntry * second);
 
 protected:
     virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const RegPidlEntry * first, const RegPidlEntry * second);

diff --git a/dll/shellext/zipfldr/CZipFolder.hpp b/dll/shellext/zipfldr/CZipFolder.hpp
index e240745..e56ea3a 100644 (file)
--- a/dll/shellext/zipfldr/CZipFolder.hpp
+++ b/dll/shellext/zipfldr/CZipFolder.hpp
@@ -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];
 

diff --git a/dll/win32/browseui/aclistisf.cpp b/dll/win32/browseui/aclistisf.cpp
index b1bc8b7..72045b3 100644 (file)
--- a/dll/win32/browseui/aclistisf.cpp
+++ b/dll/win32/browseui/aclistisf.cpp
@@ -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);
     return S_OK;
 {
     TRACE("(%p, %p)\n", this, pidl);
     return S_OK;

diff --git a/dll/win32/browseui/aclistisf.h b/dll/win32/browseui/aclistisf.h
index e50c309..ddb5309 100644 (file)
--- a/dll/win32/browseui/aclistisf.h
+++ b/dll/win32/browseui/aclistisf.h
@@ -55,7 +55,7 @@ public:
     virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID);
 
     // *** IPersistFolder methods ***
     virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID);
 
     // *** IPersistFolder methods ***

-    virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl);
+    virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl);

 
 public:
 
 
 public:
 

diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp
index 749fe92..0a2aec8 100644 (file)
--- a/dll/win32/browseui/shellfind/CFindFolder.cpp
+++ b/dll/win32/browseui/shellfind/CFindFolder.cpp
@@ -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);
     if (!m_pidl)
 {
     m_pidl = ILClone(pidl);
     if (!m_pidl)

diff --git a/dll/win32/browseui/shellfind/CFindFolder.h b/dll/win32/browseui/shellfind/CFindFolder.h
index 43be568..a19651b 100644 (file)
--- a/dll/win32/browseui/shellfind/CFindFolder.h
+++ b/dll/win32/browseui/shellfind/CFindFolder.h
@@ -77,7 +77,7 @@ private:
 
 
     // *** IPersistFolder methods ***
 
 
     // *** IPersistFolder methods ***

-    STDMETHODIMP Initialize(LPCITEMIDLIST pidl);
+    STDMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidl);

 
 
     // *** IPersist methods ***
 
 
     // *** IPersist methods ***

diff --git a/dll/win32/shell32/folders/CAdminToolsFolder.cpp b/dll/win32/shell32/folders/CAdminToolsFolder.cpp
index f461a8b..25ecc24 100644 (file)
--- a/dll/win32/shell32/folders/CAdminToolsFolder.cpp
+++ b/dll/win32/shell32/folders/CAdminToolsFolder.cpp
@@ -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);
     if (!m_pidlInner)
 {
     m_pidlInner = ILClone(pidl);
     if (!m_pidlInner)

diff --git a/dll/win32/shell32/folders/CAdminToolsFolder.h b/dll/win32/shell32/folders/CAdminToolsFolder.h
index 25478f0..e87a87f 100644 (file)
--- a/dll/win32/shell32/folders/CAdminToolsFolder.h
+++ b/dll/win32/shell32/folders/CAdminToolsFolder.h
@@ -60,7 +60,7 @@ class CAdminToolsFolder :
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder

-        virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
+        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);

 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp
index 2782ad8..53bd9cb 100644 (file)
--- a/dll/win32/shell32/folders/CControlPanelFolder.cpp
+++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp
@@ -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)
         SHFree((LPVOID)pidlRoot);
 {
     if (pidlRoot)
         SHFree((LPVOID)pidlRoot);

diff --git a/dll/win32/shell32/folders/CControlPanelFolder.h b/dll/win32/shell32/folders/CControlPanelFolder.h
index e3ced86..1fa7969 100644 (file)
--- a/dll/win32/shell32/folders/CControlPanelFolder.h
+++ b/dll/win32/shell32/folders/CControlPanelFolder.h
@@ -65,7 +65,7 @@ class CControlPanelFolder :
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder

-        virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
+        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);

 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

diff --git a/dll/win32/shell32/folders/CDesktopFolder.h b/dll/win32/shell32/folders/CDesktopFolder.h
index 90de48f..3ac8443 100644 (file)
--- a/dll/win32/shell32/folders/CDesktopFolder.h
+++ b/dll/win32/shell32/folders/CDesktopFolder.h
@@ -71,7 +71,7 @@ class CDesktopFolder :
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // *** IPersistFolder methods ***
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // *** IPersistFolder methods ***

-        virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
+        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);

 
         // *** IPersistFolder2 methods ***
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
 
         // *** IPersistFolder2 methods ***
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

diff --git a/dll/win32/shell32/folders/CDrivesFolder.h b/dll/win32/shell32/folders/CDrivesFolder.h
index 8d37ac2..21a04ea 100644 (file)
--- a/dll/win32/shell32/folders/CDrivesFolder.h
+++ b/dll/win32/shell32/folders/CDrivesFolder.h
@@ -65,7 +65,7 @@ class CDrivesFolder :
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder

-        virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
+        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);

 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

diff --git a/dll/win32/shell32/folders/CFSFolder.h b/dll/win32/shell32/folders/CFSFolder.h
index 11276c7..39b5c09 100644 (file)
--- a/dll/win32/shell32/folders/CFSFolder.h
+++ b/dll/win32/shell32/folders/CFSFolder.h
@@ -73,7 +73,7 @@ class CFSFolder :
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder

-        virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
+        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);

 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

diff --git a/dll/win32/shell32/folders/CFontsFolder.cpp b/dll/win32/shell32/folders/CFontsFolder.cpp
index 355354c..b094c4d 100644 (file)
--- a/dll/win32/shell32/folders/CFontsFolder.cpp
+++ b/dll/win32/shell32/folders/CFontsFolder.cpp
@@ -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);
     if (!m_pidlInner)
 {
     m_pidlInner = ILClone(pidl);
     if (!m_pidlInner)

diff --git a/dll/win32/shell32/folders/CFontsFolder.h b/dll/win32/shell32/folders/CFontsFolder.h
index 0229485..02345a3 100644 (file)
--- a/dll/win32/shell32/folders/CFontsFolder.h
+++ b/dll/win32/shell32/folders/CFontsFolder.h
@@ -60,7 +60,7 @@ class CFontsFolder :
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder

-        virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
+        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);

 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl);
 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl);

diff --git a/dll/win32/shell32/folders/CMyDocsFolder.cpp b/dll/win32/shell32/folders/CMyDocsFolder.cpp
index 8c28b67..ae7e467 100644 (file)
--- a/dll/win32/shell32/folders/CMyDocsFolder.cpp
+++ b/dll/win32/shell32/folders/CMyDocsFolder.cpp
@@ -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);
     if (!m_pidlInner)
 {
     m_pidlInner = ILClone(pidl);
     if (!m_pidlInner)

diff --git a/dll/win32/shell32/folders/CMyDocsFolder.h b/dll/win32/shell32/folders/CMyDocsFolder.h
index 7c0e521..9f89621 100644 (file)
--- a/dll/win32/shell32/folders/CMyDocsFolder.h
+++ b/dll/win32/shell32/folders/CMyDocsFolder.h
@@ -60,7 +60,7 @@ class CMyDocsFolder :
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder

-        virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
+        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);

 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

diff --git a/dll/win32/shell32/folders/CNetFolder.cpp b/dll/win32/shell32/folders/CNetFolder.cpp
index a2384b1..93d91ab 100644 (file)
--- a/dll/win32/shell32/folders/CNetFolder.cpp
+++ b/dll/win32/shell32/folders/CNetFolder.cpp
@@ -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)
         SHFree((LPVOID)pidlRoot);
 {
     if (pidlRoot)
         SHFree((LPVOID)pidlRoot);

diff --git a/dll/win32/shell32/folders/CNetFolder.h b/dll/win32/shell32/folders/CNetFolder.h
index 7a540db..33d807d 100644 (file)
--- a/dll/win32/shell32/folders/CNetFolder.h
+++ b/dll/win32/shell32/folders/CNetFolder.h
@@ -62,7 +62,7 @@ class CNetFolder :
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder

-        virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
+        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);

 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

diff --git a/dll/win32/shell32/folders/CPrinterFolder.cpp b/dll/win32/shell32/folders/CPrinterFolder.cpp
index 69565af..83290cc 100644 (file)
--- a/dll/win32/shell32/folders/CPrinterFolder.cpp
+++ b/dll/win32/shell32/folders/CPrinterFolder.cpp
@@ -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)
         SHFree((LPVOID)pidlRoot);
 {
     if (pidlRoot)
         SHFree((LPVOID)pidlRoot);

diff --git a/dll/win32/shell32/folders/CPrinterFolder.h b/dll/win32/shell32/folders/CPrinterFolder.h
index 5ba3408..18daf65 100644 (file)
--- a/dll/win32/shell32/folders/CPrinterFolder.h
+++ b/dll/win32/shell32/folders/CPrinterFolder.h
@@ -65,7 +65,7 @@ class CPrinterFolder :
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder
         virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
 
         // IPersistFolder

-        virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
+        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);

 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp
index 5a6b72b..23e7e20 100644 (file)
--- a/dll/win32/shell32/folders/CRecycleBin.cpp
+++ b/dll/win32/shell32/folders/CRecycleBin.cpp
@@ -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);
 

diff --git a/dll/win32/shell32/folders/CRecycleBin.h b/dll/win32/shell32/folders/CRecycleBin.h
index de62270..80945c4 100644 (file)
--- a/dll/win32/shell32/folders/CRecycleBin.h
+++ b/dll/win32/shell32/folders/CRecycleBin.h
@@ -46,7 +46,7 @@ class CRecycleBin :
 
         // IPersistFolder
         virtual HRESULT WINAPI GetClassID(CLSID *pClassID);
 
         // IPersistFolder
         virtual HRESULT WINAPI GetClassID(CLSID *pClassID);

-        virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl);
+        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);

 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);
 
         // IPersistFolder2
         virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl);

diff --git a/dll/win32/shell32/shellmenu/CMergedFolder.cpp b/dll/win32/shell32/shellmenu/CMergedFolder.cpp
index 04a2fd4..17337d0 100644 (file)
--- a/dll/win32/shell32/shellmenu/CMergedFolder.cpp
+++ b/dll/win32/shell32/shellmenu/CMergedFolder.cpp
@@ -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);
     return S_OK;
 {
     m_shellPidl = ILClone(pidl);
     return S_OK;

diff --git a/dll/win32/shell32/shellmenu/CMergedFolder.h b/dll/win32/shell32/shellmenu/CMergedFolder.h
index c4c10ac..4bc9ee2 100644 (file)
--- a/dll/win32/shell32/shellmenu/CMergedFolder.h
+++ b/dll/win32/shell32/shellmenu/CMergedFolder.h
@@ -191,7 +191,7 @@ public:
     virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *lpClassId);
 
     // IPersistFolder
     virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *lpClassId);
 
     // IPersistFolder

-    virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl);
+    virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidl);

 
     // IPersistFolder2
     virtual HRESULT STDMETHODCALLTYPE GetCurFolder(PIDLIST_ABSOLUTE * pidl);
 
     // IPersistFolder2
     virtual HRESULT STDMETHODCALLTYPE GetCurFolder(PIDLIST_ABSOLUTE * pidl);

diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl
index 7c2aab3..f8fb81a 100644 (file)
--- a/sdk/include/psdk/shobjidl.idl
+++ b/sdk/include/psdk/shobjidl.idl
@@ -53,7 +53,7 @@ interface IPersistFolder : IPersist
 {
     typedef IPersistFolder *LPPERSISTFOLDER;
 
 {
     typedef IPersistFolder *LPPERSISTFOLDER;
 

-    HRESULT Initialize( [in] LPCITEMIDLIST pidl );
+    HRESULT Initialize( [in] PCIDLIST_ABSOLUTE pidl );

 }
 
 
 }