[ros-diffs] [reactos] 01/01: [SHELL] IShellExtInit::Initialize uses PCIDLIST_ABSOLUTE. CORE-16385

[Thomas Faber]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2992e7a5ee7c4d6bd6ec…

commit b2992e7a5ee7c4d6bd6ec3d68563b3f00cdcfb84
Author:     Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sun Sep 22 16:36:01 2019 +0200
Commit:     Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Sun Sep 29 12:09:02 2019 +0200

    [SHELL] IShellExtInit::Initialize uses PCIDLIST_ABSOLUTE. CORE-16385
---
 dll/shellext/acppage/CLayerUIPropPage.cpp | 2 +-
 dll/shellext/acppage/CLayerUIPropPage.hpp | 2 +-
 dll/shellext/zipfldr/CZipFolder.hpp       | 2 +-
 dll/win32/shell32/CFolderOptions.cpp      | 2 +-
 dll/win32/shell32/CFolderOptions.h        | 2 +-
 dll/win32/shell32/CNewMenu.cpp            | 2 +-
 dll/win32/shell32/CNewMenu.h              | 2 +-
 dll/win32/shell32/COpenWithMenu.cpp       | 2 +-
 dll/win32/shell32/COpenWithMenu.h         | 2 +-
 dll/win32/shell32/CShellLink.cpp          | 2 +-
 dll/win32/shell32/CShellLink.h            | 2 +-
 dll/win32/shell32/dialogs/drvdefext.cpp   | 2 +-
 dll/win32/shell32/dialogs/drvdefext.h     | 2 +-
 dll/win32/shell32/dialogs/filedefext.cpp  | 2 +-
 dll/win32/shell32/dialogs/filedefext.h    | 2 +-
 dll/win32/shell32/folders/CRecycleBin.cpp | 2 +-
 dll/win32/shell32/folders/CRecycleBin.h   | 2 +-
 sdk/include/psdk/shobjidl.idl             | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dll/shellext/acppage/CLayerUIPropPage.cpp
b/dll/shellext/acppage/CLayerUIPropPage.cpp
index c18caa1dc53..42c56aa3d53 100644
--- a/dll/shellext/acppage/CLayerUIPropPage.cpp
+++ b/dll/shellext/acppage/CLayerUIPropPage.cpp
@@ -447,7 +447,7 @@ static BOOL DisableShellext()
     return Disable;
 }
 
-STDMETHODIMP CLayerUIPropPage::Initialize(LPCITEMIDLIST pidlFolder, LPDATAOBJECT
pDataObj, HKEY hkeyProgID)
+STDMETHODIMP CLayerUIPropPage::Initialize(PCIDLIST_ABSOLUTE pidlFolder, LPDATAOBJECT
pDataObj, HKEY hkeyProgID)
 {
     FORMATETC etc = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
     STGMEDIUM stg;
diff --git a/dll/shellext/acppage/CLayerUIPropPage.hpp
b/dll/shellext/acppage/CLayerUIPropPage.hpp
index b7886fc8c4b..fa578450d18 100644
--- a/dll/shellext/acppage/CLayerUIPropPage.hpp
+++ b/dll/shellext/acppage/CLayerUIPropPage.hpp
@@ -21,7 +21,7 @@ public:
     ~CLayerUIPropPage();
 
     // IShellExtInit
-    STDMETHODIMP Initialize(LPCITEMIDLIST pidlFolder, LPDATAOBJECT pdtobj, HKEY
hkeyProgID);
+    STDMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidlFolder, LPDATAOBJECT pdtobj, HKEY
hkeyProgID);
 
 
     // IShellPropSheetExt
diff --git a/dll/shellext/zipfldr/CZipFolder.hpp b/dll/shellext/zipfldr/CZipFolder.hpp
index e56ea3aedcd..7b51a750eba 100644
--- a/dll/shellext/zipfldr/CZipFolder.hpp
+++ b/dll/shellext/zipfldr/CZipFolder.hpp
@@ -542,7 +542,7 @@ public:
     }
 
     // *** IShellExtInit methods ***
-    STDMETHODIMP Initialize(LPCITEMIDLIST pidlFolder, LPDATAOBJECT pDataObj, HKEY
hkeyProgID)
+    STDMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidlFolder, LPDATAOBJECT pDataObj, HKEY
hkeyProgID)
     {
         FORMATETC etc = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
         STGMEDIUM stg;
diff --git a/dll/win32/shell32/CFolderOptions.cpp b/dll/win32/shell32/CFolderOptions.cpp
index 3abb2555c77..3c0428af9b3 100644
--- a/dll/win32/shell32/CFolderOptions.cpp
+++ b/dll/win32/shell32/CFolderOptions.cpp
@@ -83,7 +83,7 @@ HRESULT STDMETHODCALLTYPE CFolderOptions::ReplacePage(EXPPS uPageID,
LPFNSVADDPR
  * FolderOptions IShellExtInit interface
  */
 
-HRESULT STDMETHODCALLTYPE CFolderOptions::Initialize(LPCITEMIDLIST pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID)
+HRESULT STDMETHODCALLTYPE CFolderOptions::Initialize(PCIDLIST_ABSOLUTE pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID)
 {
     return S_OK;
 }
diff --git a/dll/win32/shell32/CFolderOptions.h b/dll/win32/shell32/CFolderOptions.h
index 37e4b5efb1d..cba4ee07832 100644
--- a/dll/win32/shell32/CFolderOptions.h
+++ b/dll/win32/shell32/CFolderOptions.h
@@ -47,7 +47,7 @@ class CFolderOptions :
         virtual HRESULT STDMETHODCALLTYPE ReplacePage(EXPPS uPageID,
LPFNSVADDPROPSHEETPAGE pfnReplaceWith, LPARAM lParam);
         
         // IShellExtInit
-        virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID);
+        virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID);
 
         // IObjectWithSite
         virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite);
diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp
index 3445ebdcfe9..b0e8052070c 100644
--- a/dll/win32/shell32/CNewMenu.cpp
+++ b/dll/win32/shell32/CNewMenu.cpp
@@ -767,7 +767,7 @@ CNewMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam,
LRESULT *plRes
 }
 
 HRESULT WINAPI
-CNewMenu::Initialize(LPCITEMIDLIST pidlFolder,
+CNewMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder,
                      IDataObject *pdtobj, HKEY hkeyProgID)
 {
     m_pidlFolder = ILClone(pidlFolder);
diff --git a/dll/win32/shell32/CNewMenu.h b/dll/win32/shell32/CNewMenu.h
index 738fae02139..45aaa624f26 100644
--- a/dll/win32/shell32/CNewMenu.h
+++ b/dll/win32/shell32/CNewMenu.h
@@ -97,7 +97,7 @@ public:
     virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam);
 
     // IShellExtInit
-    virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject
*pdtobj, HKEY hkeyProgID);
+    virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID);
 
 DECLARE_REGISTRY_RESOURCEID(IDR_NEWMENU)
 DECLARE_NOT_AGGREGATABLE(CNewMenu)
diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp
index c2a2f19efe7..db2a76eac05 100644
--- a/dll/win32/shell32/COpenWithMenu.cpp
+++ b/dll/win32/shell32/COpenWithMenu.cpp
@@ -1327,7 +1327,7 @@ HRESULT WINAPI COpenWithMenu::HandleMenuMsg(
 }
 
 HRESULT WINAPI
-COpenWithMenu::Initialize(LPCITEMIDLIST pidlFolder,
+COpenWithMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder,
                           IDataObject *pdtobj,
                           HKEY hkeyProgID)
 {
diff --git a/dll/win32/shell32/COpenWithMenu.h b/dll/win32/shell32/COpenWithMenu.h
index 739fe05931e..77f59d50c91 100644
--- a/dll/win32/shell32/COpenWithMenu.h
+++ b/dll/win32/shell32/COpenWithMenu.h
@@ -54,7 +54,7 @@ class COpenWithMenu :
         virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam);
 
         // IShellExtInit
-        virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID);
+        virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID);
 
         DECLARE_REGISTRY_RESOURCEID(IDR_OPENWITHMENU)
         DECLARE_NOT_AGGREGATABLE(COpenWithMenu)
diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp
index 7b402eb1867..695b83d8bb5 100644
--- a/dll/win32/shell32/CShellLink.cpp
+++ b/dll/win32/shell32/CShellLink.cpp
@@ -2539,7 +2539,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetFlags(DWORD dwFlags)
  *
  * Loads the shelllink from the dataobject the shell is pointing to.
  */
-HRESULT STDMETHODCALLTYPE CShellLink::Initialize(LPCITEMIDLIST pidlFolder, IDataObject
*pdtobj, HKEY hkeyProgID)
+HRESULT STDMETHODCALLTYPE CShellLink::Initialize(PCIDLIST_ABSOLUTE pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID)
 {
     TRACE("%p %p %p %p\n", this, pidlFolder, pdtobj, hkeyProgID);
 
diff --git a/dll/win32/shell32/CShellLink.h b/dll/win32/shell32/CShellLink.h
index 3380a526c38..958eb9d6eff 100644
--- a/dll/win32/shell32/CShellLink.h
+++ b/dll/win32/shell32/CShellLink.h
@@ -183,7 +183,7 @@ public:
     virtual HRESULT STDMETHODCALLTYPE GetIconLocation(UINT uFlags, PWSTR pszIconFile,
UINT cchMax, int *piIndex, UINT *pwFlags);
 
     // IShellExtInit
-    virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject
*pdtobj, HKEY hkeyProgID);
+    virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID);
 
     // IContextMenu
     virtual HRESULT STDMETHODCALLTYPE QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT
idCmdFirst, UINT idCmdLast, UINT uFlags);
diff --git a/dll/win32/shell32/dialogs/drvdefext.cpp
b/dll/win32/shell32/dialogs/drvdefext.cpp
index 09e17965830..f65091f55cc 100644
--- a/dll/win32/shell32/dialogs/drvdefext.cpp
+++ b/dll/win32/shell32/dialogs/drvdefext.cpp
@@ -571,7 +571,7 @@ CDrvDefExt::~CDrvDefExt()
 }
 
 HRESULT WINAPI
-CDrvDefExt::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pDataObj, HKEY hkeyProgID)
+CDrvDefExt::Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pDataObj, HKEY
hkeyProgID)
 {
     FORMATETC format;
     STGMEDIUM stgm;
diff --git a/dll/win32/shell32/dialogs/drvdefext.h
b/dll/win32/shell32/dialogs/drvdefext.h
index 4611f88f9a2..a054b83b1da 100644
--- a/dll/win32/shell32/dialogs/drvdefext.h
+++ b/dll/win32/shell32/dialogs/drvdefext.h
@@ -44,7 +44,7 @@ public:
 	~CDrvDefExt();
 
 	// IShellExtInit
-	virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject
*pDataObj, HKEY hkeyProgID);
+	virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject
*pDataObj, HKEY hkeyProgID);
 
     // IContextMenu
 	virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst,
UINT idCmdLast, UINT uFlags);
diff --git a/dll/win32/shell32/dialogs/filedefext.cpp
b/dll/win32/shell32/dialogs/filedefext.cpp
index 8abb4076824..1fe3215f80f 100644
--- a/dll/win32/shell32/dialogs/filedefext.cpp
+++ b/dll/win32/shell32/dialogs/filedefext.cpp
@@ -1172,7 +1172,7 @@ CFileDefExt::~CFileDefExt()
 }
 
 HRESULT WINAPI
-CFileDefExt::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pDataObj, HKEY
hkeyProgID)
+CFileDefExt::Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pDataObj, HKEY
hkeyProgID)
 {
     FORMATETC format;
     STGMEDIUM stgm;
diff --git a/dll/win32/shell32/dialogs/filedefext.h
b/dll/win32/shell32/dialogs/filedefext.h
index 31a513e2ee1..ce56b84bff1 100644
--- a/dll/win32/shell32/dialogs/filedefext.h
+++ b/dll/win32/shell32/dialogs/filedefext.h
@@ -104,7 +104,7 @@ public:
     void UpdateFolderIcon(HWND hwndDlg);
 
 	// IShellExtInit
-	virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject
*pdtobj, HKEY hkeyProgID);
+	virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject
*pdtobj, HKEY hkeyProgID);
 
     // IContextMenu
 	virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst,
UINT idCmdLast, UINT uFlags);
diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp
b/dll/win32/shell32/folders/CRecycleBin.cpp
index 23e7e201f12..d227720fe34 100644
--- a/dll/win32/shell32/folders/CRecycleBin.cpp
+++ b/dll/win32/shell32/folders/CRecycleBin.cpp
@@ -862,7 +862,7 @@ HRESULT WINAPI CRecycleBin::ReplacePage(EXPPS uPageID,
LPFNSVADDPROPSHEETPAGE pf
  * RecycleBin IShellExtInit interface
  */
 
-HRESULT WINAPI CRecycleBin::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj,
HKEY hkeyProgID)
+HRESULT WINAPI CRecycleBin::Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj,
HKEY hkeyProgID)
 {
     TRACE("%p %p %p %p\n", this, pidlFolder, pdtobj, hkeyProgID );
     return S_OK;
diff --git a/dll/win32/shell32/folders/CRecycleBin.h
b/dll/win32/shell32/folders/CRecycleBin.h
index 80945c42376..c01e9b7a746 100644
--- a/dll/win32/shell32/folders/CRecycleBin.h
+++ b/dll/win32/shell32/folders/CRecycleBin.h
@@ -82,7 +82,7 @@ class CRecycleBin :
         virtual HRESULT WINAPI ReplacePage(EXPPS uPageID, LPFNSVADDPROPSHEETPAGE
pfnReplaceWith, LPARAM lParam);
 
         // IShellExtInit
-        virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID);
+        virtual HRESULT STDMETHODCALLTYPE Initialize(PCIDLIST_ABSOLUTE pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID);
 
         DECLARE_REGISTRY_RESOURCEID(IDR_RECYCLEBIN)
         DECLARE_NOT_AGGREGATABLE(CRecycleBin)
diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl
index f8fb81adcd4..85c9be1c1e9 100644
--- a/sdk/include/psdk/shobjidl.idl
+++ b/sdk/include/psdk/shobjidl.idl
@@ -1273,7 +1273,7 @@ interface IShellExtInit : IUnknown
     typedef IShellExtInit *LPSHELLEXTINIT;
 
     HRESULT Initialize(
-        [in] LPCITEMIDLIST pidlFolder,
+        [in] PCIDLIST_ABSOLUTE pidlFolder,
         [in] IDataObject *pdtobj,
         [in] HKEY hkeyProgID);
 }