Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge of Wine commit:

Browse source 
Robert Shearman <R.J.Shearman@warwick.ac.uk>
	Allow passing NULL to ILFindLastID.

Patch: http://cvs.winehq.org/patch.py?id=11621

svn path=/trunk/; revision=8884
This commit is contained in:
Martin Fuchs 2004-03-27 09:12:05 +00:00
parent 9477018084
commit 796ec35113
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/lib/shell32/pidl.c
View file

@ -183,10 +183,14 @@ BOOL WINAPI ILGetDisplayName(LPCITEMIDLIST pidl, LPVOID path)
* observed: pidl=Desktop return=pidl * observed: pidl=Desktop return=pidl
*/ */
LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST pidl) LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST pidl)
{ LPCITEMIDLIST pidlLast = pidl; {
LPCITEMIDLIST pidlLast = pidl;
TRACE("(pidl=%p)\n",pidl); TRACE("(pidl=%p)\n",pidl);
if (!pidl)
return NULL;
while (pidl->mkid.cb) while (pidl->mkid.cb)
{ {
pidlLast = pidl; pidlLast = pidl;
@ -1151,7 +1155,7 @@ HRESULT WINAPI SHGetSpecialFolderLocation(
* SHGetFolderLocation [SHELL32.@] * SHGetFolderLocation [SHELL32.@]
* *
* NOTES * NOTES
* the pidl can be a simple one. since we cant get the path out of the pidl * the pidl can be a simple one. since we can't get the path out of the pidl
* we have to take all data from the pidl * we have to take all data from the pidl
*/ */
HRESULT WINAPI SHGetFolderLocation( HRESULT WINAPI SHGetFolderLocation(
@ -1170,7 +1174,7 @@ HRESULT WINAPI SHGetFolderLocation(
* SHGetDataFromIDListA [SHELL32.247] * SHGetDataFromIDListA [SHELL32.247]
* *
* NOTES * NOTES
* the pidl can be a simple one. since we cant get the path out of the pidl * the pidl can be a simple one. since we can't get the path out of the pidl
* we have to take all data from the pidl * we have to take all data from the pidl
*/ */
HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len) HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len)