Merge of Wine commit:

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

View file

@ -183,10 +183,14 @@ BOOL WINAPI ILGetDisplayName(LPCITEMIDLIST pidl, LPVOID path)
* observed: pidl=Desktop return=pidl
*/
LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST pidl)
{ LPCITEMIDLIST pidlLast = pidl;
{
LPCITEMIDLIST pidlLast = pidl;
TRACE("(pidl=%p)\n",pidl);
if (!pidl)
return NULL;
while (pidl->mkid.cb)
{
pidlLast = pidl;
@ -1151,7 +1155,7 @@ HRESULT WINAPI SHGetSpecialFolderLocation(
* SHGetFolderLocation [SHELL32.@]
*
* 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
*/
HRESULT WINAPI SHGetFolderLocation(
@ -1170,7 +1174,7 @@ HRESULT WINAPI SHGetFolderLocation(
* SHGetDataFromIDListA [SHELL32.247]
*
* 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
*/
HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len)