[BROWSEUI_WINETEST]

[reactos.git] / rostests / winetests / browseui / autocomplete.c

diff --git a/rostests/winetests/browseui/autocomplete.c b/rostests/winetests/browseui/autocomplete.c
index 89f864d..120a5b0 100644 (file)
--- a/rostests/winetests/browseui/autocomplete.c
+++ b/rostests/winetests/browseui/autocomplete.c
@@ -17,12 +17,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
 #include <stdarg.h>
 
 #include <initguid.h>
 #include <windows.h>
 #include <shlobj.h>
+#include <shldisp.h>
 #include <shlwapi.h>
 #include <shlguid.h>
 
@@ -55,8 +55,8 @@ static LPWSTR strdup_AtoW(LPCSTR str)
 
 typedef struct
 {
-    IEnumStringVtbl *vtbl;
-    IACListVtbl *aclVtbl;
+    IEnumString IEnumString_iface;
+    IACList IACList_iface;
     LONG ref;
     HRESULT expret;
     INT expcount;
@@ -68,17 +68,22 @@ typedef struct
 extern IEnumStringVtbl TestACLVtbl;
 extern IACListVtbl TestACL_ACListVtbl;
 
+static inline TestACL *impl_from_IEnumString(IEnumString *iface)
+{
+    return CONTAINING_RECORD(iface, TestACL, IEnumString_iface);
+}
+
 static TestACL *impl_from_IACList(IACList *iface)
 {
-    return (TestACL *)((char *)iface - FIELD_OFFSET(TestACL, aclVtbl));
+    return CONTAINING_RECORD(iface, TestACL, IACList_iface);
 }
 
 static TestACL *TestACL_Constructor(int limit, const char **strings)
 {
     TestACL *This = CoTaskMemAlloc(sizeof(TestACL));
     ZeroMemory(This, sizeof(*This));
-    This->vtbl = &TestACLVtbl;
-    This->aclVtbl = &TestACL_ACListVtbl;
+    This->IEnumString_iface.lpVtbl = &TestACLVtbl;
+    This->IACList_iface.lpVtbl = &TestACL_ACListVtbl;
     This->ref = 1;
     This->expret = S_OK;
     This->limit = limit;
@@ -88,14 +93,14 @@ static TestACL *TestACL_Constructor(int limit, const char **strings)
 
 static ULONG STDMETHODCALLTYPE TestACL_AddRef(IEnumString *iface)
 {
-    TestACL *This = (TestACL *)iface;
+    TestACL *This = impl_from_IEnumString(iface);
     trace("ACL(%p): addref (%d)\n", This, This->ref+1);
     return InterlockedIncrement(&This->ref);
 }
 
 static ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface)
 {
-    TestACL *This = (TestACL *)iface;
+    TestACL *This = impl_from_IEnumString(iface);
     ULONG res;
 
     res = InterlockedDecrement(&This->ref);
@@ -105,7 +110,7 @@ static ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface)
 
 static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut)
 {
-    TestACL *This = (TestACL *)iface;
+    TestACL *This = impl_from_IEnumString(iface);
     *ppvOut = NULL;
     if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IEnumString))
     {
@@ -113,7 +118,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFI
     }
     else if (IsEqualGUID(iid, &IID_IACList))
     {
-        *ppvOut = &This->aclVtbl;
+        *ppvOut = &This->IACList_iface;
     }
 
     if (*ppvOut)
@@ -122,16 +127,14 @@ static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFI
         return S_OK;
     }
 
-#if 0   /* IID_IEnumACString not defined yet in wine */
     if (!IsEqualGUID(iid, &IID_IEnumACString))
         trace("unknown interface queried\n");
-#endif
     return E_NOINTERFACE;
 }
 
 static HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched)
 {
-    TestACL *This = (TestACL *)iface;
+    TestACL *This = impl_from_IEnumString(iface);
     ULONG i;
 
     trace("ACL(%p): read %d item(s)\n", This, celt);
@@ -164,7 +167,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_Clone(IEnumString *iface, IEnumString *
 
 static HRESULT STDMETHODCALLTYPE TestACL_Reset(IEnumString *iface)
 {
-    TestACL *This = (TestACL *)iface;
+    TestACL *This = impl_from_IEnumString(iface);
     trace("ACL(%p): Reset\n", This);
     This->pos = 0;
     return S_OK;
@@ -173,7 +176,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_Reset(IEnumString *iface)
 static HRESULT STDMETHODCALLTYPE TestACL_Expand(IACList *iface, LPCOLESTR str)
 {
     TestACL *This = impl_from_IACList(iface);
-    trace("ACL(%p): Expand\n", impl_from_IACList(iface));
+    trace("ACL(%p): Expand\n", This);
     This->expcount++;
     return This->expret;
 }
@@ -192,17 +195,20 @@ IEnumStringVtbl TestACLVtbl =
 
 static ULONG STDMETHODCALLTYPE TestACL_ACList_AddRef(IACList *iface)
 {
-    return TestACL_AddRef((IEnumString *)impl_from_IACList(iface));
+    TestACL *This = impl_from_IACList(iface);
+    return TestACL_AddRef(&This->IEnumString_iface);
 }
 
 static ULONG STDMETHODCALLTYPE TestACL_ACList_Release(IACList *iface)
 {
-    return TestACL_Release((IEnumString *)impl_from_IACList(iface));
+    TestACL *This = impl_from_IACList(iface);
+    return TestACL_Release(&This->IEnumString_iface);
 }
 
 static HRESULT STDMETHODCALLTYPE TestACL_ACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvout)
 {
-    return TestACL_QueryInterface((IEnumString *)impl_from_IACList(iface), iid, ppvout);
+    TestACL *This = impl_from_IACList(iface);
+    return TestACL_QueryInterface(&This->IEnumString_iface, iid, ppvout);
 }
 
 IACListVtbl TestACL_ACListVtbl =
@@ -231,6 +237,8 @@ static void test_ACLMulti(void)
     const char *strings2[] = {"a", "b", "d"};
     WCHAR exp[] = {'A','B','C',0};
     IEnumString *obj;
+    IEnumACString *unk;
+    HRESULT hr;
     TestACL *acl1, *acl2;
     IACList *acl;
     IObjMgr *mgr;
@@ -244,11 +252,16 @@ static void test_ACLMulti(void)
     ok(obj->lpVtbl->QueryInterface(obj, &IID_IACList2, &tmp) == E_NOINTERFACE,
         "Unexpected interface IACList2 in ACLMulti\n");
     stop_on_error(obj->lpVtbl->QueryInterface(obj, &IID_IObjMgr, (LPVOID *)&mgr));
-#if 0        /* IID_IEnumACString not defined yet in wine */
-    ole_ok(obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, &unk));
-    if (unk != NULL)
-        unk->lpVtbl->Release(unk);
-#endif
+
+    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);
@@ -259,8 +272,8 @@ static void test_ACLMulti(void)
 
     acl1 = TestACL_Constructor(3, strings1);
     acl2 = TestACL_Constructor(3, strings2);
-    stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)acl1));
-    stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)acl2));
+    stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)&acl1->IACList_iface));
+    stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)&acl2->IACList_iface));
     ok(mgr->lpVtbl->Append(mgr, NULL) == E_FAIL, "Unexpected return from Append\n");
     expect_str(obj, "a");
     expect_str(obj, "c");
@@ -307,7 +320,7 @@ static void test_ACLMulti(void)
     acl2->expret = E_FAIL;
     ok(acl->lpVtbl->Expand(acl, exp) == E_FAIL, "Unexpected Expand return\n");
 
-    stop_on_error(mgr->lpVtbl->Remove(mgr, (IUnknown *)acl1));
+    stop_on_error(mgr->lpVtbl->Remove(mgr, (IUnknown *)&acl1->IACList_iface));
     ok(acl1->ref == 1, "acl1 not released\n");
     expect_end(obj);
     obj->lpVtbl->Reset(obj);