shell32/tests: Support for IShellFolderView::RemoveObject was removed in Win7.

7234ddd2 · Greg Geldorp · Alexandre Julliard · a131886a · 7234ddd2
Commit 7234ddd2 authored Dec 27, 2010 by Greg Geldorp Committed by Alexandre Julliard Dec 28, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

shlview.c dlls/shell32/tests/shlview.c +3 -3

No files found.
--- a/dlls/shell32/tests/shlview.c
+++ b/dlls/shell32/tests/shlview.c
@@ -776,9 +776,9 @@ static void test_IShellFolderView(void)
    /* ::RemoveObject */
    i = 0xdeadbeef;
    hr = IShellFolderView_RemoveObject(folderview, NULL, &i);
-    ok(hr == S_OK, "got (0x%08x)\n", hr);
-    ok(i == 0 || i == -1 /* Win7 */ || broken(i == 0xdeadbeef) /* Vista, 2k8 */,
-        "got %d\n", i);
+    ok(hr == S_OK || hr == E_FAIL, "got (0x%08x)\n", hr);
+    if (hr == S_OK) ok(i == 0 || broken(i == 0xdeadbeef) /* Vista, 2k8 */,
+                       "got %d\n", i);

    IShellFolderView_Release(folderview);