[PATCH 5/8] mshtml: Use the common base implementation for HTMLRectCollection enumerator.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

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

diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index 354f521697c..7925d762aef 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -816,67 +816,24 @@ typedef struct {
 } HTMLRectCollection;

typedef struct {
-    IEnumVARIANT IEnumVARIANT_iface;
-
-    LONG ref;
-
+    CollectionEnum colenum;
     ULONG iter;
-    HTMLRectCollection *col;
 } HTMLRectCollectionEnum;

static inline HTMLRectCollectionEnum *HTMLRectCollectionEnum_from_IEnumVARIANT(IEnumVARIANT *iface)
 {
-    return CONTAINING_RECORD(iface, HTMLRectCollectionEnum, IEnumVARIANT_iface);
+    return CONTAINING_RECORD(iface, HTMLRectCollectionEnum, colenum.IEnumVARIANT_iface);
 }

-static HRESULT WINAPI HTMLRectCollectionEnum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv)
-{
-    HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_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;
-}
-
-static ULONG WINAPI HTMLRectCollectionEnum_AddRef(IEnumVARIANT *iface)
-{
-    HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface);
-    LONG ref = InterlockedIncrement(&This->ref);
-
-    TRACE("(%p) ref=%ld\n", This, ref);
-
-    return ref;
-}
-
-static ULONG WINAPI HTMLRectCollectionEnum_Release(IEnumVARIANT *iface)
+static inline HTMLRectCollection *HTMLRectCollection_from_DispatchEx(DispatchEx *iface)
 {
-    HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface);
-    LONG ref = InterlockedDecrement(&This->ref);
-
-    TRACE("(%p) ref=%ld\n", This, ref);
-
-    if(!ref) {
-        IHTMLRectCollection_Release(&This->col->IHTMLRectCollection_iface);
-        free(This);
-    }
-
-    return ref;
+    return CONTAINING_RECORD(iface, HTMLRectCollection, dispex);
 }

static HRESULT WINAPI HTMLRectCollectionEnum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched)
 {
     HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface);
+    HTMLRectCollection *col = HTMLRectCollection_from_DispatchEx(This->colenum.disp);
     VARIANT index;
     HRESULT hres;
     ULONG num, i;
@@ -884,13 +841,13 @@ static HRESULT WINAPI HTMLRectCollectionEnum_Next(IEnumVARIANT *iface, ULONG cel

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

-    nsIDOMClientRectList_GetLength(This->col->rect_list, &len);
+    nsIDOMClientRectList_GetLength(col->rect_list, &len);
     num = min(len - This->iter, celt);
     V_VT(&index) = VT_I4;

for(i = 0; i < num; i++) {
         V_I4(&index) = This->iter + i;
-        hres = IHTMLRectCollection_item(&This->col->IHTMLRectCollection_iface, &index, &rgVar[i]);
+        hres = IHTMLRectCollection_item(&col->IHTMLRectCollection_iface, &index, &rgVar[i]);
         if(FAILED(hres)) {
             while(i--)
                 VariantClear(&rgVar[i]);
@@ -907,11 +864,12 @@ static HRESULT WINAPI HTMLRectCollectionEnum_Next(IEnumVARIANT *iface, ULONG cel
 static HRESULT WINAPI HTMLRectCollectionEnum_Skip(IEnumVARIANT *iface, ULONG celt)
 {
     HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface);
+    HTMLRectCollection *col = HTMLRectCollection_from_DispatchEx(This->colenum.disp);
     UINT32 len;

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

-    nsIDOMClientRectList_GetLength(This->col->rect_list, &len);
+    nsIDOMClientRectList_GetLength(col->rect_list, &len);
     if(This->iter + celt > len) {
         This->iter = len;
         return S_FALSE;
@@ -939,9 +897,9 @@ static HRESULT WINAPI HTMLRectCollectionEnum_Clone(IEnumVARIANT *iface, IEnumVAR
 }

static const IEnumVARIANTVtbl HTMLRectCollectionEnumVtbl = {
-    HTMLRectCollectionEnum_QueryInterface,
-    HTMLRectCollectionEnum_AddRef,
-    HTMLRectCollectionEnum_Release,
+    CollectionEnum_QueryInterface,
+    CollectionEnum_AddRef,
+    CollectionEnum_Release,
     HTMLRectCollectionEnum_Next,
     HTMLRectCollectionEnum_Skip,
     HTMLRectCollectionEnum_Reset,
@@ -980,14 +938,9 @@ static HRESULT WINAPI HTMLRectCollection_get__newEnum(IHTMLRectCollection *iface
     if(!ret)
         return E_OUTOFMEMORY;

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

-    HTMLRectCollection_AddRef(&This->IHTMLRectCollection_iface);
-    ret->col = This;
-
-    *p = (IUnknown*)&ret->IEnumVARIANT_iface;
+    *p = CollectionEnum_init(&ret->colenum, &This->dispex, &HTMLRectCollectionEnumVtbl);
     return S_OK;
 }

@@ -1037,11 +990,6 @@ static const IHTMLRectCollectionVtbl HTMLRectCollectionVtbl = {
     HTMLRectCollection_item
 };

-static inline HTMLRectCollection *HTMLRectCollection_from_DispatchEx(DispatchEx *iface)
-{
-    return CONTAINING_RECORD(iface, HTMLRectCollection, dispex);
-}
-
 static void *HTMLRectCollection_query_interface(DispatchEx *dispex, REFIID riid)
 {
     HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex);