Francois Gouget : browseui/tests: Skip some tests if IEnumACString is not supported.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 80d8275f814ac44f974e96dc805c896f795becb5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=80d8275f814ac44f974e96dc80...

Author: Francois Gouget <fgouget(a)free.fr>
Date:   Wed Sep 28 17:37:24 2011 +0200

browseui/tests: Skip some tests if IEnumACString is not supported.

---

 dlls/browseui/tests/autocomplete.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c
index bd2117e..120a5b0 100644
--- a/dlls/browseui/tests/autocomplete.c
+++ b/dlls/browseui/tests/autocomplete.c
@@ -238,6 +238,7 @@ static void test_ACLMulti(void)
     WCHAR exp[] = {'A','B','C',0};
     IEnumString *obj;
     IEnumACString *unk;
+    HRESULT hr;
     TestACL *acl1, *acl2;
     IACList *acl;
     IObjMgr *mgr;
@@ -252,9 +253,15 @@ static void test_ACLMulti(void)
         "Unexpected interface IACList2 in ACLMulti\n");
     stop_on_error(obj->lpVtbl->QueryInterface(obj, &IID_IObjMgr, (LPVOID *)&mgr));
 
-    todo_wine ole_ok(obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk));
-    if (unk != NULL)
-        unk->lpVtbl->Release(unk);
+    hr = obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk);
+    if (hr == E_NOINTERFACE)
+        todo_wine win_skip("IEnumACString is not supported, skipping tests\n");
+    else
+    {
+        ok(hr == S_OK, "QueryInterface(IID_IEnumACString) failed: %x\n", hr);
+        if (unk != NULL)
+            unk->lpVtbl->Release(unk);
+    }
 
     ok(obj->lpVtbl->Next(obj, 1, (LPOLESTR *)&tmp, &i) == S_FALSE, "Unexpected return from Next\n");
     ok(i == 0, "Unexpected fetched value %d\n", i);