Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL] IPersistIDList/IShellLink use P(C)IDLIST_ABSOLUTE. CORE-16385

Browse source
This commit is contained in:
Thomas Faber 2019-09-22 16:48:04 +02:00
parent b2992e7a5e
commit be1f95527a
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/shell32/CShellItem.cpp
View file

@ -233,7 +233,7 @@ HRESULT WINAPI CShellItem::GetClassID(CLSID *pClassID)
return S_OK; return S_OK;
} }
HRESULT WINAPI CShellItem::SetIDList(LPCITEMIDLIST pidlx) HRESULT WINAPI CShellItem::SetIDList(PCIDLIST_ABSOLUTE pidlx)
{ {
LPITEMIDLIST new_pidl; LPITEMIDLIST new_pidl;
@ -250,7 +250,7 @@ HRESULT WINAPI CShellItem::SetIDList(LPCITEMIDLIST pidlx)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
HRESULT WINAPI CShellItem::GetIDList(LPITEMIDLIST *ppidl) HRESULT WINAPI CShellItem::GetIDList(PIDLIST_ABSOLUTE *ppidl)
{ {
TRACE("(%p,%p)\n", this, ppidl); TRACE("(%p,%p)\n", this, ppidl);

4
dll/win32/shell32/CShellItem.h
View file

@ -47,8 +47,8 @@ public:
// IPersistIDList // IPersistIDList
virtual HRESULT WINAPI GetClassID(CLSID *pClassID); virtual HRESULT WINAPI GetClassID(CLSID *pClassID);
virtual HRESULT WINAPI SetIDList(LPCITEMIDLIST pidl); virtual HRESULT WINAPI SetIDList(PCIDLIST_ABSOLUTE pidl);
virtual HRESULT WINAPI GetIDList(LPITEMIDLIST *ppidl); virtual HRESULT WINAPI GetIDList(PIDLIST_ABSOLUTE *ppidl);
DECLARE_NO_REGISTRY() DECLARE_NO_REGISTRY()
DECLARE_NOT_AGGREGATABLE(CShellItem) DECLARE_NOT_AGGREGATABLE(CShellItem)

4
dll/win32/shell32/CShellLink.cpp
View file

@ -1097,7 +1097,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetPath(LPSTR pszFile, INT cchMaxPath, WIN
return hr; return hr;
} }
HRESULT STDMETHODCALLTYPE CShellLink::GetIDList(LPITEMIDLIST *ppidl) HRESULT STDMETHODCALLTYPE CShellLink::GetIDList(PIDLIST_ABSOLUTE *ppidl)
{ {
TRACE("(%p)->(ppidl=%p)\n", this, ppidl); TRACE("(%p)->(ppidl=%p)\n", this, ppidl);
@ -1111,7 +1111,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetIDList(LPITEMIDLIST *ppidl)
return S_OK; return S_OK;
} }
HRESULT STDMETHODCALLTYPE CShellLink::SetIDList(LPCITEMIDLIST pidl) HRESULT STDMETHODCALLTYPE CShellLink::SetIDList(PCIDLIST_ABSOLUTE pidl)
{ {
TRACE("(%p)->(pidl=%p)\n", this, pidl); TRACE("(%p)->(pidl=%p)\n", this, pidl);
return SetTargetFromPIDLOrPath(pidl, NULL); return SetTargetFromPIDLOrPath(pidl, NULL);

8
dll/win32/shell32/CShellLink.h
View file

@ -129,8 +129,8 @@ public:
// IShellLinkA // IShellLinkA
virtual HRESULT STDMETHODCALLTYPE GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags); virtual HRESULT STDMETHODCALLTYPE GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags);
virtual HRESULT STDMETHODCALLTYPE GetIDList(LPITEMIDLIST *ppidl); virtual HRESULT STDMETHODCALLTYPE GetIDList(PIDLIST_ABSOLUTE *ppidl);
virtual HRESULT STDMETHODCALLTYPE SetIDList(LPCITEMIDLIST pidl); virtual HRESULT STDMETHODCALLTYPE SetIDList(PCIDLIST_ABSOLUTE pidl);
virtual HRESULT STDMETHODCALLTYPE GetDescription(LPSTR pszName, INT cchMaxName); virtual HRESULT STDMETHODCALLTYPE GetDescription(LPSTR pszName, INT cchMaxName);
virtual HRESULT STDMETHODCALLTYPE SetDescription(LPCSTR pszName); virtual HRESULT STDMETHODCALLTYPE SetDescription(LPCSTR pszName);
virtual HRESULT STDMETHODCALLTYPE GetWorkingDirectory(LPSTR pszDir, INT cchMaxPath); virtual HRESULT STDMETHODCALLTYPE GetWorkingDirectory(LPSTR pszDir, INT cchMaxPath);
@ -149,8 +149,8 @@ public:
// IShellLinkW // IShellLinkW
virtual HRESULT STDMETHODCALLTYPE GetPath(LPWSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags); virtual HRESULT STDMETHODCALLTYPE GetPath(LPWSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags);
// virtual HRESULT STDMETHODCALLTYPE GetIDList(LPITEMIDLIST *ppidl); // virtual HRESULT STDMETHODCALLTYPE GetIDList(PIDLIST_ABSOLUTE *ppidl);
// virtual HRESULT STDMETHODCALLTYPE SetIDList(LPCITEMIDLIST pidl); // virtual HRESULT STDMETHODCALLTYPE SetIDList(PCIDLIST_ABSOLUTE pidl);
virtual HRESULT STDMETHODCALLTYPE GetDescription(LPWSTR pszName, INT cchMaxName); virtual HRESULT STDMETHODCALLTYPE GetDescription(LPWSTR pszName, INT cchMaxName);
virtual HRESULT STDMETHODCALLTYPE SetDescription(LPCWSTR pszName); virtual HRESULT STDMETHODCALLTYPE SetDescription(LPCWSTR pszName);
virtual HRESULT STDMETHODCALLTYPE GetWorkingDirectory(LPWSTR pszDir, INT cchMaxPath); virtual HRESULT STDMETHODCALLTYPE GetWorkingDirectory(LPWSTR pszDir, INT cchMaxPath);

12
sdk/include/psdk/shobjidl.idl
View file

@ -83,8 +83,8 @@ interface IPersistFolder2 : IPersistFolder
] ]
interface IPersistIDList : IPersist interface IPersistIDList : IPersist
{ {
HRESULT SetIDList( [in] LPCITEMIDLIST pidl ); HRESULT SetIDList( [in] PCIDLIST_ABSOLUTE pidl );
HRESULT GetIDList( [out] LPITEMIDLIST *ppidl ); HRESULT GetIDList( [out] PIDLIST_ABSOLUTE *ppidl );
} }
@ -1139,9 +1139,9 @@ interface IShellLinkA : IUnknown
[in, out, unique] WIN32_FIND_DATAA *pfd, [in, out, unique] WIN32_FIND_DATAA *pfd,
[in] DWORD fFlags); [in] DWORD fFlags);
HRESULT GetIDList( [out] LPITEMIDLIST * ppidl ); HRESULT GetIDList( [out] PIDLIST_ABSOLUTE * ppidl );
HRESULT SetIDList( [in] LPCITEMIDLIST pidl ); HRESULT SetIDList( [in] PCIDLIST_ABSOLUTE pidl );
HRESULT GetDescription( HRESULT GetDescription(
[out, size_is(cch)] LPSTR pszName, [out, size_is(cch)] LPSTR pszName,
@ -1206,9 +1206,9 @@ interface IShellLinkW : IUnknown
[in, out] WIN32_FIND_DATAW *pfd, [in, out] WIN32_FIND_DATAW *pfd,
[in] DWORD fFlags); [in] DWORD fFlags);
HRESULT GetIDList( [out] LPITEMIDLIST * ppidl ); HRESULT GetIDList( [out] PIDLIST_ABSOLUTE * ppidl );
HRESULT SetIDList( [in] LPCITEMIDLIST pidl ); HRESULT SetIDList( [in] PCIDLIST_ABSOLUTE pidl );
HRESULT GetDescription( HRESULT GetDescription(
[out, size_is(cch)] LPWSTR pszName, [out, size_is(cch)] LPWSTR pszName,