shell32: Remove reliance on the ability to bind to files in UnixFolder CompareIDs.

This commit is contained in:
David Hedberg 2010-11-08 00:22:10 +01:00 committed by Alexandre Julliard
parent c9372a1c3c
commit 193a80a779
1 changed files with 11 additions and 3 deletions

View File

@ -1023,9 +1023,17 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_CompareIDs(IShellFolder2* iface,
firstpidl = ILCloneFirst(pidl1);
pidl1 = ILGetNext(pidl1);
pidl2 = ILGetNext(pidl2);
hr = IShellFolder2_BindToObject(iface, firstpidl, NULL, &IID_IShellFolder, (LPVOID*)&psf);
if (SUCCEEDED(hr)) {
isEmpty1 = _ILIsEmpty(pidl1);
isEmpty2 = _ILIsEmpty(pidl2);
if (isEmpty1 && isEmpty2)
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0);
else if (isEmpty1)
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)-1);
else if (isEmpty2)
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)1);
else if (SUCCEEDED(IShellFolder2_BindToObject(iface, firstpidl, NULL, &IID_IShellFolder, (void**)&psf))) {
hr = IShellFolder_CompareIDs(psf, lParam, pidl1, pidl2);
IShellFolder2_Release(psf);
}