[PATCH 3/8] mshtml: Use the common base implementation for HTMLFormElement enumerator.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/htmlform.c | 78 +++++++-----------------------------------
 1 file changed, 13 insertions(+), 65 deletions(-)

diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c
index 29986158ca7..8e2a570a839 100644
--- a/dlls/mshtml/htmlform.c
+++ b/dlls/mshtml/htmlform.c
@@ -43,12 +43,8 @@ struct HTMLFormElement {
 };

typedef struct {
-    IEnumVARIANT IEnumVARIANT_iface;
-
-    LONG ref;
-
+    CollectionEnum colenum;
     ULONG iter;
-    HTMLFormElement *elem;
 } HTMLFormElementEnum;

HRESULT return_nsform(nsresult nsres, nsIDOMHTMLFormElement *form, IHTMLFormElement **p)
@@ -120,57 +116,18 @@ static HRESULT htmlform_item(HTMLFormElement *This, int i, IDispatch **ret)

static inline HTMLFormElementEnum *impl_from_IEnumVARIANT(IEnumVARIANT *iface)
 {
-    return CONTAINING_RECORD(iface, HTMLFormElementEnum, IEnumVARIANT_iface);
-}
-
-static HRESULT WINAPI HTMLFormElementEnum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv)
-{
-    HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface);
-
-    TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
-
-    if(IsEqualGUID(riid, &IID_IUnknown)) {
-        *ppv = &This->IEnumVARIANT_iface;
-    }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) {
-        *ppv = &This->IEnumVARIANT_iface;
-    }else {
-        FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
-        *ppv = NULL;
-        return E_NOINTERFACE;
-    }
-
-    IUnknown_AddRef((IUnknown*)*ppv);
-    return S_OK;
+    return CONTAINING_RECORD(iface, HTMLFormElementEnum, colenum.IEnumVARIANT_iface);
 }

-static ULONG WINAPI HTMLFormElementEnum_AddRef(IEnumVARIANT *iface)
-{
-    HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface);
-    LONG ref = InterlockedIncrement(&This->ref);
-
-    TRACE("(%p) ref=%ld\n", This, ref);
-
-    return ref;
-}
-
-static ULONG WINAPI HTMLFormElementEnum_Release(IEnumVARIANT *iface)
+static inline HTMLFormElement *impl_from_DispatchEx(DispatchEx *iface)
 {
-    HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface);
-    LONG ref = InterlockedDecrement(&This->ref);
-
-    TRACE("(%p) ref=%ld\n", This, ref);
-
-    if(!ref) {
-        IHTMLFormElement_Release(&This->elem->IHTMLFormElement_iface);
-        free(This);
-    }
-
-    return ref;
+    return CONTAINING_RECORD(iface, HTMLFormElement, element.node.event_target.dispex);
 }

static HRESULT WINAPI HTMLFormElementEnum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched)
 {
     HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface);
+    HTMLFormElement *elem = impl_from_DispatchEx(This->colenum.disp);
     nsresult nsres;
     HRESULT hres;
     ULONG num, i;
@@ -178,13 +135,13 @@ static HRESULT WINAPI HTMLFormElementEnum_Next(IEnumVARIANT *iface, ULONG celt,

TRACE("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched);

-    nsres = nsIDOMHTMLFormElement_GetLength(This->elem->nsform, &len);
+    nsres = nsIDOMHTMLFormElement_GetLength(elem->nsform, &len);
     if(NS_FAILED(nsres))
         return E_FAIL;
     num = min(len - This->iter, celt);

for(i = 0; i < num; i++) {
-        hres = htmlform_item(This->elem, This->iter + i, &V_DISPATCH(&rgVar[i]));
+        hres = htmlform_item(elem, This->iter + i, &V_DISPATCH(&rgVar[i]));
         if(FAILED(hres)) {
             while(i--)
                 VariantClear(&rgVar[i]);
@@ -202,12 +159,13 @@ static HRESULT WINAPI HTMLFormElementEnum_Next(IEnumVARIANT *iface, ULONG celt,
 static HRESULT WINAPI HTMLFormElementEnum_Skip(IEnumVARIANT *iface, ULONG celt)
 {
     HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface);
+    HTMLFormElement *elem = impl_from_DispatchEx(This->colenum.disp);
     nsresult nsres;
     LONG len;

TRACE("(%p)->(%lu)\n", This, celt);

-    nsres = nsIDOMHTMLFormElement_GetLength(This->elem->nsform, &len);
+    nsres = nsIDOMHTMLFormElement_GetLength(elem->nsform, &len);
     if(NS_FAILED(nsres))
         return E_FAIL;

@@ -238,9 +196,9 @@ static HRESULT WINAPI HTMLFormElementEnum_Clone(IEnumVARIANT *iface, IEnumVARIAN
 }

static const IEnumVARIANTVtbl HTMLFormElementEnumVtbl = {
-    HTMLFormElementEnum_QueryInterface,
-    HTMLFormElementEnum_AddRef,
-    HTMLFormElementEnum_Release,
+    CollectionEnum_QueryInterface,
+    CollectionEnum_AddRef,
+    CollectionEnum_Release,
     HTMLFormElementEnum_Next,
     HTMLFormElementEnum_Skip,
     HTMLFormElementEnum_Reset,
@@ -641,14 +599,9 @@ static HRESULT WINAPI HTMLFormElement__newEnum(IHTMLFormElement *iface, IUnknown
     if(!ret)
         return E_OUTOFMEMORY;

-    ret->IEnumVARIANT_iface.lpVtbl = &HTMLFormElementEnumVtbl;
-    ret->ref = 1;
     ret->iter = 0;

-    HTMLFormElement_AddRef(&This->IHTMLFormElement_iface);
-    ret->elem = This;
-
-    *p = (IUnknown*)&ret->IEnumVARIANT_iface;
+    *p = CollectionEnum_init(&ret->colenum, &This->element.node.event_target.dispex, &HTMLFormElementEnumVtbl);
     return S_OK;
 }

@@ -718,11 +671,6 @@ static const IHTMLFormElementVtbl HTMLFormElementVtbl = {
     HTMLFormElement_tags
 };

-static inline HTMLFormElement *impl_from_DispatchEx(DispatchEx *iface)
-{
-    return CONTAINING_RECORD(iface, HTMLFormElement, element.node.event_target.dispex);
-}
-
 static void *HTMLFormElement_query_interface(DispatchEx *dispex, REFIID riid)
 {
     HTMLFormElement *This = impl_from_DispatchEx(dispex);