Fix problem comparing pidls and return correct code.

607c810a · Guy Albertelli · Alexandre Julliard · 2bdbf30b · 607c810a
Commit 607c810a authored Sep 19, 2001 by Guy Albertelli Committed by Alexandre Julliard Sep 19, 2001
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

shlfolder.c dlls/shell32/shlfolder.c +6 -2

No files found.
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -896,9 +896,13 @@ static HRESULT WINAPI  IShellFolder_fnCompareIDs(
 	        }
 	        ILFree(pidlTemp);
 	      }
-	      else
+	      else                                      /* no deeper on #1  */
 	      {
-	        hr = ResultFromShort(nReturn);		/* two equal simple pidls */
+	        pidl2 = ILGetNext(pidl2);
+		if (pidl2 && pidl2->mkid.cb)		/* go deeper on #2 ? */
+		    hr = ResultFromShort(-1);           /* two different */
+		else
+		    hr = ResultFromShort(nReturn);      /* two equal simple pidls */
 	      }
 	    }
 	    else