Module: wine Branch: master Commit: 7234ddd2634b1ce92b641f00a4a8f3d6a2bac2f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7234ddd2634b1ce92b641f00a4...
Author: Greg Geldorp ggeldorp@vmware.com Date: Mon Dec 27 20:54:38 2010 +0100
shell32/tests: Support for IShellFolderView::RemoveObject was removed in Win7.
---
dlls/shell32/tests/shlview.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 6534970..101cdf3 100644 --- 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);