[SHELL32]

* Partial sync of pidl.c and pidl.h with Wine 1.7.27.
CORE-8540

svn path=/branches/shell-experiments/; revision=65234
This commit is contained in:
Amine Khaldi 2014-11-03 19:58:55 +00:00
parent 6069abeef0
commit 8c29f2837c
2 changed files with 306 additions and 305 deletions

View file

@ -53,7 +53,7 @@ static LPSTR _ILGetSTextPointer(LPCITEMIDLIST pidl);
static LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl); static LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl);
/************************************************************************* /*************************************************************************
* ILGetDisplayNameExA [SHELL32.186] * ILGetDisplayNameExA
* *
* Retrieves the display name of an ItemIDList * Retrieves the display name of an ItemIDList
* *
@ -534,6 +534,8 @@ BOOL WINAPI ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
* parent = a/b, child = a/b/c -> true, c is in folder a/b * parent = a/b, child = a/b/c -> true, c is in folder a/b
* child = a/b/c/d -> false if bImmediate is true, d is not in folder a/b * child = a/b/c/d -> false if bImmediate is true, d is not in folder a/b
* child = a/b/c/d -> true if bImmediate is false, d is in a subfolder of a/b * child = a/b/c/d -> true if bImmediate is false, d is in a subfolder of a/b
* child = a/b -> false if bImmediate is true
* child = a/b -> true if bImmediate is false
*/ */
BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL bImmediate) BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL bImmediate)
{ {
@ -559,7 +561,7 @@ BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL b
pChild = ILGetNext(pChild); pChild = ILGetNext(pChild);
} }
/* child shorter or has equal length to parent */ /* child has shorter name than parent */
if (pParent->mkid.cb || !pChild->mkid.cb) if (pParent->mkid.cb || !pChild->mkid.cb)
return FALSE; return FALSE;
@ -2381,7 +2383,7 @@ DWORD _ILGetFileAttributes(LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize)
/************************************************************************* /*************************************************************************
* ILFreeaPidl * ILFreeaPidl
* *
* free a aPidl struct * frees an aPidl struct
*/ */
void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl) void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl)
{ {

View file

@ -20,10 +20,9 @@
* *
* NOTES: * NOTES:
* *
* DO NOT use this definitions outside the shell32.dll ! * DO NOT use these definitions outside the shell32.dll!
* *
* The contents of a pidl should never used from a application * The contents of a pidl should never be used directly from an application.
* directly.
* *
* Undocumented: * Undocumented:
* MS says: the abID of SHITEMID should be treated as binary data and not * MS says: the abID of SHITEMID should be treated as binary data and not