ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Return IHTMLElementCollection instead of IDispatch from HTMLElementCollection_Create.

Browse Source
This commit is contained in:
Jacek Caban 2007-10-04 02:12:02 +02:00 committed by Alexandre Julliard
parent e581609082
commit e9cb14646c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/mshtml/htmlelem.c
View File

@ -38,7 +38,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml); WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static HRESULT HTMLElementCollection_Create(IUnknown*,HTMLElement**,DWORD,IDispatch**); static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown*,HTMLElement**,DWORD);
typedef struct { typedef struct {
HTMLElement **buf; HTMLElement **buf;
@ -1083,7 +1083,8 @@ static HRESULT WINAPI HTMLElement_get_children(IHTMLElement *iface, IDispatch **
create_child_list(This->node.doc, This, &buf); create_child_list(This->node.doc, This, &buf);
return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len, p); *p = (IDispatch*)HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len);
return S_OK;
} }
static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *buf) static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *buf)
@ -1133,7 +1134,8 @@ static HRESULT WINAPI HTMLElement_get_all(IHTMLElement *iface, IDispatch **p)
create_all_list(This->node.doc, This, &buf); create_all_list(This->node.doc, This, &buf);
elem_vector_normalize(&buf); elem_vector_normalize(&buf);
return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len, p); *p = (IDispatch*)HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len);
return S_OK;
} }
#undef HTMLELEM_THIS #undef HTMLELEM_THIS
@ -1526,7 +1528,8 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface,
} }
elem_vector_normalize(&buf); elem_vector_normalize(&buf);
TRACE("Returning %d element(s).\n", buf.len); TRACE("Returning %d element(s).\n", buf.len);
return HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len, pdisp); *pdisp = (IDispatch*)HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len);
return S_OK;
} }
FIXME("unsupported arguments\n"); FIXME("unsupported arguments\n");
@ -1570,7 +1573,8 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface,
TRACE("fount %d tags\n", buf.len); TRACE("fount %d tags\n", buf.len);
return HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len, pdisp); *pdisp = (IDispatch*)HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len);
return S_OK;
} }
#undef ELEMCOL_THIS #undef ELEMCOL_THIS
@ -1591,8 +1595,8 @@ static const IHTMLElementCollectionVtbl HTMLElementCollectionVtbl = {
HTMLElementCollection_tags HTMLElementCollection_tags
}; };
static HRESULT HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **elems, DWORD len, static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk,
IDispatch **p) HTMLElement **elems, DWORD len)
{ {
HTMLElementCollection *ret = mshtml_alloc(sizeof(HTMLElementCollection)); HTMLElementCollection *ret = mshtml_alloc(sizeof(HTMLElementCollection));
@ -1606,6 +1610,5 @@ static HRESULT HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **ele
TRACE("ret=%p len=%d\n", ret, len); TRACE("ret=%p len=%d\n", ret, len);
*p = (IDispatch*)ret; return HTMLELEMCOL(ret);
return S_OK;
} }