From 193a80a7794227a45acbb7bbc2728de6a4a81986 Mon Sep 17 00:00:00 2001 From: David Hedberg Date: Mon, 8 Nov 2010 00:22:10 +0100 Subject: [PATCH] shell32: Remove reliance on the ability to bind to files in UnixFolder CompareIDs. --- dlls/shell32/shfldr_unixfs.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 35eb8e3a384..7772c98d18c 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -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); }