Module: wine Branch: master Commit: a690db9f1e78219d09d4a0771556bed3483fda6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a690db9f1e78219d09d4a07715...
Author: David Hedberg david.hedberg@gmail.com Date: Mon Aug 2 14:33:40 2010 +0200
shell32: Replace some checks with calls to _ILIsEmpty().
---
dlls/shell32/brsfolder.c | 4 ++-- dlls/shell32/pidl.c | 4 ++-- dlls/shell32/shfldr_unixfs.c | 12 ++++++------ dlls/shell32/shlfolder.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 83ed1dd..77c55c8 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -239,7 +239,7 @@ static void InitializeTreeView( browse_info *info ) return; }
- if (pidlChild && pidlChild->mkid.cb) { + if (!_ILIsEmpty(pidlChild)) { hr = IShellFolder_BindToObject(lpsfParent, pidlChild, 0, &IID_IShellFolder, (LPVOID*)&lpsfRoot); } else { lpsfRoot = lpsfParent; @@ -519,7 +519,7 @@ static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv if ((pnmtv->itemNew.state & TVIS_EXPANDEDONCE)) return 0;
- if (lptvid->lpi && lptvid->lpi->mkid.cb) { + if (!_ILIsEmpty(lptvid->lpi)) { r = IShellFolder_BindToObject( lptvid->lpsfParent, lptvid->lpi, 0, &IID_IShellFolder, (LPVOID *)&lpsf2 ); } else { diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index a596ebf..1c9cf22 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -217,7 +217,7 @@ BOOL WINAPI ILRemoveLastID(LPITEMIDLIST pidl) { TRACE_(shell)("pidl=%p\n",pidl);
- if (!pidl || !pidl->mkid.cb) + if (_ILIsEmpty(pidl)) return FALSE; ILFindLastID(pidl)->mkid.cb = 0; return TRUE; @@ -2062,7 +2062,7 @@ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) */ LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl) { - if(pidl && pidl->mkid.cb != 0x00) + if(!_ILIsEmpty(pidl)) return (LPPIDLDATA)pidl->mkid.abID; return NULL; } diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 9ae030f..35eb8e3 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -716,7 +716,7 @@ static HRESULT UNIXFS_initialize_target_folder(UnixFolder *This, const char *szB WCHAR *dos_name;
/* Determine the path's length bytes */ - while (current && current->mkid.cb) { + while (!_ILIsEmpty(current)) { dwPathLen += UNIXFS_filename_from_shitemid(current, NULL) + 1; /* For the '/' */ current = ILGetNext(current); }; @@ -734,7 +734,7 @@ static HRESULT UNIXFS_initialize_target_folder(UnixFolder *This, const char *szB pNextDir += strlen(szBasePath); if (This->m_dwPathMode == PATHMODE_UNIX || IsEqualCLSID(&CLSID_MyDocuments, This->m_pCLSID)) This->m_dwAttributes |= SFGAO_FILESYSTEM; - while (current && current->mkid.cb) { + while (!_ILIsEmpty(current)) { pNextDir += UNIXFS_filename_from_shitemid(current, pNextDir); *pNextDir++ = '/'; current = ILGetNext(current); @@ -948,7 +948,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_BindToObject(IShellFolder2* iface TRACE("(iface=%p, pidl=%p, pbcReserver=%p, riid=%p, ppvOut=%p)\n", iface, pidl, pbcReserved, riid, ppvOut);
- if (!pidl || !pidl->mkid.cb) + if (_ILIsEmpty(pidl)) return E_INVALIDARG;
if (IsEqualCLSID(This->m_pCLSID, &CLSID_FolderShortcut)) { @@ -993,8 +993,8 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_CompareIDs(IShellFolder2* iface,
TRACE("(iface=%p, lParam=%ld, pidl1=%p, pidl2=%p)\n", iface, lParam, pidl1, pidl2);
- isEmpty1 = !pidl1 || !pidl1->mkid.cb; - isEmpty2 = !pidl2 || !pidl2->mkid.cb; + isEmpty1 = _ILIsEmpty(pidl1); + isEmpty2 = _ILIsEmpty(pidl2);
if (isEmpty1 && isEmpty2) return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); @@ -1160,7 +1160,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetDisplayNameOf(IShellFolder2* i if ((GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING) && (GET_SHGDN_RELATION(uFlags) != SHGDN_INFOLDER)) { - if (!pidl || !pidl->mkid.cb) { + if (_ILIsEmpty(pidl)) { lpName->uType = STRRET_WSTR; if (This->m_dwPathMode == PATHMODE_UNIX) { UINT len = MultiByteToWideChar(CP_UNIXCP, 0, This->m_pszPath, -1, NULL, 0); diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 230d7c6..9ab34a9 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -271,7 +271,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot,
TRACE("(%p %s %p %s %p)\n", pidlRoot, debugstr_w(pathRoot), pidlComplete, debugstr_guid(riid), ppvOut);
- if (!pidlRoot || !ppvOut || !pidlComplete || !pidlComplete->mkid.cb) + if (!pidlRoot || !ppvOut || _ILIsEmpty(pidlComplete)) return E_INVALIDARG;
*ppvOut = NULL;