From 7fcebd1a17ac878aed8e047fa4ddca6428b55ec8 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Miko=C5=82aj_Zalewski?= Date: Wed, 13 Feb 2008 18:24:19 +0100 Subject: [PATCH] browseui: tests: make the ACLMulti test pass under Windows Vista --- dlls/browseui/tests/autocomplete.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index ba52b66..bddaa52 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -273,7 +273,8 @@ static void test_ACLMulti(void) ole_ok(acl->lpVtbl->Expand(acl, exp)); ok(acl1->expcount == 1, "expcount - expected 1, got %d\n", acl1->expcount); - ok(acl2->expcount == 0, "expcount - expected 0, got %d\n", acl2->expcount); + ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 1 /* Vista */, + "expcount - expected 0 or 1, got %d\n", acl2->expcount); ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); ok(i == 1, "Expected i == 1, got %d\n", i); @@ -282,15 +283,18 @@ static void test_ACLMulti(void) ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); ole_ok(acl->lpVtbl->Expand(acl, exp)); ok(acl1->expcount == 2, "expcount - expected 1, got %d\n", acl1->expcount); - ok(acl2->expcount == 0, "expcount - expected 0, got %d\n", acl2->expcount); + ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 2 /* Vista */, + "expcount - expected 0 or 2, got %d\n", acl2->expcount); acl1->expret = S_FALSE; ole_ok(acl->lpVtbl->Expand(acl, exp)); ok(acl1->expcount == 3, "expcount - expected 1, got %d\n", acl1->expcount); - ok(acl2->expcount == 1, "expcount - expected 0, got %d\n", acl2->expcount); + ok(acl2->expcount == 1 /* XP */ || acl2->expcount == 3 /* Vista */, + "expcount - expected 0 or 3, got %d\n", acl2->expcount); acl1->expret = E_NOTIMPL; ole_ok(acl->lpVtbl->Expand(acl, exp)); ok(acl1->expcount == 4, "expcount - expected 1, got %d\n", acl1->expcount); - ok(acl2->expcount == 2, "expcount - expected 0, got %d\n", acl2->expcount); + ok(acl2->expcount == 2 /* XP */ || acl2->expcount == 4 /* Vista */, + "expcount - expected 0 or 4, got %d\n", acl2->expcount); acl2->expret = E_OUTOFMEMORY; ok(acl->lpVtbl->Expand(acl, exp) == E_OUTOFMEMORY, "Unexpected Expand return\n"); acl2->expret = E_FAIL; -- 1.4.4.2