October 2008 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLTable::get_rows implementation.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: ac4117fdb5fc809aac2d23616d849563b2244bdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac4117fdb5fc809aac2d23616… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:45:48 2008 +0200 mshtml: Added IHTMLTable::get_rows implementation. --- dlls/mshtml/htmlelemcol.c | 25 +++++++++++++++++++++++++ dlls/mshtml/htmltable.c | 17 +++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsiface.idl | 14 +++++++++++++- dlls/mshtml/tests/dom.c | 35 ++++++++++++++++++++++++++++++++++- 5 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 768dbee..cf11234 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -503,6 +503,31 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocument *doc, IUnkn return HTMLElementCollection_Create(unk, buf.buf, buf.len); } +IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocument *doc, IUnknown *unk, nsIDOMHTMLCollection *nscol) +{ + PRUint32 length = 0, i; + elem_vector_t buf; + + nsIDOMHTMLCollection_GetLength(nscol, &length); + + buf.len = buf.size = length; + if(buf.len) { + nsIDOMNode *nsnode; + + buf.buf = heap_alloc(buf.size*sizeof(HTMLElement*)); + + for(i=0; i<length; i++) { + nsIDOMHTMLCollection_Item(nscol, i, &nsnode); + buf.buf[i] = HTMLELEM_NODE_THIS(get_node(doc, nsnode, TRUE)); + nsIDOMNode_Release(nsnode); + } + }else { + buf.buf = NULL; + } + + return HTMLElementCollection_Create(unk, buf.buf, buf.len); +} + IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **elems, DWORD len) { diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 622f090..f43433d 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -274,8 +274,21 @@ static HRESULT WINAPI HTMLTable_refresh(IHTMLTable *iface) static HRESULT WINAPI HTMLTable_get_rows(IHTMLTable *iface, IHTMLElementCollection **p) { HTMLTable *This = HTMLTABLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLCollection *nscol; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLTableElement_GetRows(This->nstable, &nscol); + if(NS_FAILED(nsres)) { + ERR("GetRows failed: %08x\n", nsres); + return E_FAIL; + } + + *p = create_collection_from_htmlcol(This->element.node.doc, (IUnknown*)HTMLTABLE(This), nscol); + + nsIDOMHTMLCollection_Release(nscol); + return S_OK; } static HRESULT WINAPI HTMLTable_put_width(IHTMLTable *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b14ad02..247dfa8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -587,6 +587,7 @@ void set_script_mode(HTMLDocument*,SCRIPTMODE); IHTMLElementCollection *HTMLElementCollection_Create(IUnknown*,HTMLElement**,DWORD); IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL); IHTMLElementCollection *create_collection_from_nodelist(HTMLDocument*,IUnknown*,nsIDOMNodeList*); +IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocument*,IUnknown*,nsIDOMHTMLCollection*); /* commands */ typedef struct { diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 525bfd3..5e92dc5 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -115,7 +115,6 @@ typedef nsISupports nsIDOMProcessingInstruction; typedef nsISupports nsIDOMEntityReference; typedef nsISupports nsIDOMHTMLFormElement; typedef nsISupports nsIDOMHTMLOptionsCollection; -typedef nsISupports nsIDOMHTMLCollection; typedef nsISupports nsIWebProgressListener; typedef nsISupports nsIDOMCSSValue; typedef nsISupports nsIPrintSession; @@ -826,6 +825,19 @@ interface nsIDOMNSHTMLElement : nsISupports [ object, + uuid(a6cf9083-15b3-11d2-932e-00805f8add32), + local + /* FROZEN */ +] +interface nsIDOMHTMLCollection : nsISupports +{ + nsresult GetLength(PRUint32 *aLength); + nsresult Item(PRUint32 index, nsIDOMNode **_retval); + nsresult NamedItem(const nsAString *name, nsIDOMNode **_retval); +} + +[ + object, uuid(a6cf9072-15b3-11d2-932e-00805f8add32), local /* FROZEN */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b8e57da..6e05ebb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -45,7 +45,7 @@ static const char elem_test_str[] = "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" title=\"test title\" />" "<select id=\"s\"><option id=\"x\" value=\"val1\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" - "<table><tbody><tr></tr></tbody></table>" + "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"></tr></tbody></table>" "<script id=\"sc\" type=\"text/javascript\"></script>" "<test />" "<img id=\"imgid\"/>" @@ -2243,6 +2243,30 @@ static void test_defaults(IHTMLDocument2 *doc) test_doc_title(doc, ""); } +static void test_table_elem(IHTMLElement *elem) +{ + IHTMLElementCollection *col; + IHTMLTable *table; + HRESULT hres; + + static const elem_type_t row_types[] = {ET_TR,ET_TR}; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable, (void**)&table); + ok(hres == S_OK, "Could not get IHTMLTable iface: %08x\n", hres); + if(FAILED(hres)) + return; + + col = NULL; + hres = IHTMLTable_get_rows(table, &col); + ok(hres == S_OK, "get_rows failed: %08x\n", hres); + ok(col != NULL, "get_ros returned NULL\n"); + + test_elem_collection((IUnknown*)col, row_types, sizeof(row_types)/sizeof(*row_types)); + IHTMLElementCollection_Release(col); + + IHTMLTable_Release(table); +} + static void test_stylesheet(IDispatch *disp) { IHTMLStyleSheetRulesCollection *col = NULL; @@ -2359,6 +2383,7 @@ static void test_elems(IHTMLDocument2 *doc) static const WCHAR sW[] = {'s',0}; static const WCHAR scW[] = {'s','c',0}; static const WCHAR xxxW[] = {'x','x','x',0}; + static const WCHAR tblW[] = {'t','b','l',0}; static const elem_type_t all_types[] = { ET_HTML, @@ -2376,6 +2401,7 @@ static void test_elems(IHTMLDocument2 *doc) ET_TABLE, ET_TBODY, ET_TR, + ET_TR, ET_SCRIPT, ET_TEST, ET_IMG @@ -2537,6 +2563,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, tblW); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_table_elem(elem); + IHTMLElement_Release(elem); + } + hres = IHTMLDocument2_get_body(doc, &elem); ok(hres == S_OK, "get_body failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Store nsIDOMHTMLTableElement in HTMLTable.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: bf9155dbaa2760acde0239aca20ea76af8940c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9155dbaa2760acde0239aca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:45:25 2008 +0200 mshtml: Store nsIDOMHTMLTableElement in HTMLTable. --- dlls/mshtml/htmltable.c | 10 ++++++++++ dlls/mshtml/nsiface.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 247c0ae..622f090 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -37,6 +37,7 @@ typedef struct { const IHTMLTableVtbl *lpHTMLTableVtbl; ConnectionPoint cp; + nsIDOMHTMLTableElement *nstable; } HTMLTable; #define HTMLTABLE(x) ((IHTMLTable*) &(x)->lpHTMLTableVtbl) @@ -529,6 +530,10 @@ static HRESULT HTMLTable_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) static void HTMLTable_destructor(HTMLDOMNode *iface) { HTMLTable *This = HTMLTABLE_NODE_THIS(iface); + + if(This->nstable) + nsIDOMHTMLTableElement_Release(This->nstable); + HTMLElement_destructor(&This->element.node); } @@ -558,6 +563,7 @@ static dispex_static_data_t HTMLTable_dispex = { HTMLElement *HTMLTable_Create(nsIDOMHTMLElement *nselem) { HTMLTable *ret = heap_alloc_zero(sizeof(HTMLTable)); + nsresult nsres; ret->element.node.vtbl = &HTMLTableImplVtbl; ret->lpHTMLTableVtbl = &HTMLTableVtbl; @@ -567,5 +573,9 @@ HTMLElement *HTMLTable_Create(nsIDOMHTMLElement *nselem) ConnectionPoint_Init(&ret->cp, &ret->element.cp_container, &DIID_HTMLTableEvents); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableElement, (void**)&ret->nstable); + if(NS_FAILED(nsres)) + ERR("Could not get nsIDOMHTMLTableElement iface: %08x\n", nsres); + return &ret->element; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 44b426c..525bfd3 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -125,6 +125,8 @@ typedef nsISupports nsIAtom; typedef nsISupports nsISupportsArray; typedef nsISupports nsIContentFilter; typedef nsISupports nsIDOMMediaList; +typedef nsISupports nsIDOMHTMLTableCaptionElement; +typedef nsISupports nsIDOMHTMLTableSectionElement; [ object, @@ -1299,6 +1301,7 @@ interface nsIDOMHTMLScriptElement : nsIDOMHTMLElement object, uuid(a6cf90ab-15b3-11d2-932e-00805f8add32), local + /* FROZEN */ ] interface nsIDOMHTMLImageElement : nsIDOMHTMLElement { @@ -1330,6 +1333,50 @@ interface nsIDOMHTMLImageElement : nsIDOMHTMLElement [ object, + uuid(a6cf90b2-15b3-11d2-932e-00805f8add32), + local + /* FROZEN */ +] +interface nsIDOMHTMLTableElement : nsIDOMHTMLElement +{ + nsresult GetCaption(nsIDOMHTMLTableCaptionElement **aCaption); + nsresult SetCaption(nsIDOMHTMLTableCaptionElement *aCaption); + nsresult GetTHead(nsIDOMHTMLTableSectionElement **aTHead); + nsresult SetTHead(nsIDOMHTMLTableSectionElement *aTHead); + nsresult GetTFoot(nsIDOMHTMLTableSectionElement **aTFoot); + nsresult SetTFoot(nsIDOMHTMLTableSectionElement *aTFoot); + nsresult GetRows(nsIDOMHTMLCollection **aRows); + nsresult GetTBodies(nsIDOMHTMLCollection **aTBodies); + nsresult GetAlign(nsAString *aAlign); + nsresult SetAlign(const nsAString *aAlign); + nsresult GetBgColor(nsAString *aBgColor); + nsresult SetBgColor(const nsAString *aBgColor); + nsresult GetBorder(nsAString *aBorder); + nsresult SetBorder(const nsAString *aBorder); + nsresult GetCellPadding(nsAString *aCellPadding); + nsresult SetCellPadding(const nsAString *aCellPadding); + nsresult GetCellSpacing(nsAString *aCellSpacing); + nsresult SetCellSpacing(const nsAString *aCellSpacing); + nsresult GetFrame(nsAString *aFrame); + nsresult SetFrame(const nsAString *aFrame); + nsresult GetRules(nsAString *aRules); + nsresult SetRules(const nsAString *aRules); + nsresult GetSummary(nsAString *aSummary); + nsresult SetSummary(const nsAString *aSummary); + nsresult GetWidth(nsAString *aWidth); + nsresult SetWidth(const nsAString *aWidth); + nsresult CreateTHead(nsIDOMHTMLElement **_retval); + nsresult DeleteTHead(); + nsresult CreateTFoot(nsIDOMHTMLElement **_retval); + nsresult DeleteTFoot(); + nsresult CreateCaption(nsIDOMHTMLElement **_retval); + nsresult DeleteCaption(); + nsresult InsertRow(PRInt32 index, nsIDOMHTMLElement **_retval); + nsresult DeleteRow(PRInt32 index); +} + +[ + object, uuid(94928ab3-8b63-11d3-989d-001083010e9b), local /* FROZEN */

1 0

Jacek Caban : mshtml: Use create_all_collection in IHTMLElement:: get_all implementation.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 0769ebc8a62db7f7e49e08c0f5d4650f3f645351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0769ebc8a62db7f7e49e08c0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:45:08 2008 +0200 mshtml: Use create_all_collection in IHTMLElement::get_all implementation. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 78 +----------------------------------------- dlls/mshtml/htmlelemcol.c | 5 ++- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 6 insertions(+), 81 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index dd989ff..ebb6538 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -289,7 +289,7 @@ static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCo return S_OK; } - *p = create_all_collection(get_node(This, (nsIDOMNode*)nselem, TRUE)); + *p = create_all_collection(get_node(This, (nsIDOMNode*)nselem, TRUE), TRUE); nsIDOMElement_Release(nselem); return S_OK; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index fb3cccd..d3c0633 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -35,43 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { - HTMLElement **buf; - DWORD len; - DWORD size; -} elem_vector; - -static void elem_vector_add(elem_vector *buf, HTMLElement *elem) -{ - if(buf->len == buf->size) { - buf->size <<= 1; - buf->buf = heap_realloc(buf->buf, buf->size*sizeof(HTMLElement**)); - } - - buf->buf[buf->len++] = elem; -} - -static void elem_vector_normalize(elem_vector *buf) -{ - if(!buf->len) { - heap_free(buf->buf); - buf->buf = NULL; - }else if(buf->size > buf->len) { - buf->buf = heap_realloc(buf->buf, buf->len*sizeof(HTMLElement**)); - } - - buf->size = buf->len; -} - -static BOOL is_elem_node(nsIDOMNode *node) -{ - PRUint16 type=0; - - nsIDOMNode_GetNodeType(node, &type); - - return type == ELEMENT_NODE || type == COMMENT_NODE; -} - #define HTMLELEM_THIS(iface) DEFINE_THIS(HTMLElement, HTMLElement, iface) #define HTMLELEM_NODE_THIS(iface) DEFINE_THIS2(HTMLElement, node, iface) @@ -1230,52 +1193,13 @@ static HRESULT WINAPI HTMLElement_get_children(IHTMLElement *iface, IDispatch ** return S_OK; } -static void create_all_list(HTMLDocument *doc, HTMLDOMNode *elem, elem_vector *buf) -{ - nsIDOMNodeList *nsnode_list; - nsIDOMNode *iter; - PRUint32 list_len = 0, i; - nsresult nsres; - - nsres = nsIDOMNode_GetChildNodes(elem->nsnode, &nsnode_list); - if(NS_FAILED(nsres)) { - ERR("GetChildNodes failed: %08x\n", nsres); - return; - } - - nsIDOMNodeList_GetLength(nsnode_list, &list_len); - if(!list_len) - return; - - for(i=0; i<list_len; i++) { - nsres = nsIDOMNodeList_Item(nsnode_list, i, &iter); - if(NS_FAILED(nsres)) { - ERR("Item failed: %08x\n", nsres); - continue; - } - - if(is_elem_node(iter)) { - HTMLDOMNode *node = get_node(doc, iter, TRUE); - - elem_vector_add(buf, HTMLELEM_NODE_THIS(node)); - create_all_list(doc, node, buf); - } - } -} - static HRESULT WINAPI HTMLElement_get_all(IHTMLElement *iface, IDispatch **p) { HTMLElement *This = HTMLELEM_THIS(iface); - elem_vector buf = {NULL, 0, 8}; TRACE("(%p)->(%p)\n", This, p); - buf.buf = heap_alloc(buf.size*sizeof(HTMLElement**)); - - create_all_list(This->node.doc, &This->node, &buf); - elem_vector_normalize(&buf); - - *p = (IDispatch*)HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len); + *p = (IDispatch*)create_all_collection(&This->node, FALSE); return S_OK; } diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 9a2c710..768dbee 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -463,13 +463,14 @@ static void create_all_list(HTMLDocument *doc, HTMLDOMNode *elem, elem_vector_t } } -IHTMLElementCollection *create_all_collection(HTMLDOMNode *node) +IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_root) { elem_vector_t buf = {NULL, 0, 8}; buf.buf = heap_alloc(buf.size*sizeof(HTMLElement**)); - elem_vector_add(&buf, HTMLELEM_NODE_THIS(node)); + if(include_root) + elem_vector_add(&buf, HTMLELEM_NODE_THIS(node)); create_all_list(node->doc, node, &buf); elem_vector_normalize(&buf); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 80dc5ff..b14ad02 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -585,7 +585,7 @@ IDispatch *script_parse_event(HTMLDocument*,LPCWSTR); void set_script_mode(HTMLDocument*,SCRIPTMODE); IHTMLElementCollection *HTMLElementCollection_Create(IUnknown*,HTMLElement**,DWORD); -IHTMLElementCollection *create_all_collection(HTMLDOMNode*); +IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL); IHTMLElementCollection *create_collection_from_nodelist(HTMLDocument*,IUnknown*,nsIDOMNodeList*); /* commands */

1 0

Jacek Caban : mshtml: Use create_collection_from_nodelist in IHTMLElement:: get_children implementation.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 53f00d02218d9d97908ef9a6faa9670768b18845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f00d02218d9d97908ef9a6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:44:50 2008 +0200 mshtml: Use create_collection_from_nodelist in IHTMLElement::get_children implementation. --- dlls/mshtml/htmlelem.c | 41 ++++++++--------------------------------- dlls/mshtml/htmlelemcol.c | 3 ++- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1c623b3..fb3cccd 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1210,48 +1210,23 @@ static HRESULT WINAPI HTMLElement_get_onfilterchange(IHTMLElement *iface, VARIAN return E_NOTIMPL; } -static void create_child_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *buf) +static HRESULT WINAPI HTMLElement_get_children(IHTMLElement *iface, IDispatch **p) { + HTMLElement *This = HTMLELEM_THIS(iface); nsIDOMNodeList *nsnode_list; - nsIDOMNode *iter; - PRUint32 list_len = 0, i; nsresult nsres; - nsres = nsIDOMNode_GetChildNodes(elem->node.nsnode, &nsnode_list); + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMNode_GetChildNodes(This->node.nsnode, &nsnode_list); if(NS_FAILED(nsres)) { ERR("GetChildNodes failed: %08x\n", nsres); - return; - } - - nsIDOMNodeList_GetLength(nsnode_list, &list_len); - if(!list_len) - return; - - buf->size = list_len; - buf->buf = heap_alloc(buf->size*sizeof(HTMLElement**)); - - for(i=0; i<list_len; i++) { - nsres = nsIDOMNodeList_Item(nsnode_list, i, &iter); - if(NS_FAILED(nsres)) { - ERR("Item failed: %08x\n", nsres); - continue; - } - - if(is_elem_node(iter)) - elem_vector_add(buf, HTMLELEM_NODE_THIS(get_node(doc, iter, TRUE))); + return E_FAIL; } -} -static HRESULT WINAPI HTMLElement_get_children(IHTMLElement *iface, IDispatch **p) -{ - HTMLElement *This = HTMLELEM_THIS(iface); - elem_vector buf = {NULL, 0, 0}; + *p = (IDispatch*)create_collection_from_nodelist(This->node.doc, (IUnknown*)HTMLELEM(This), nsnode_list); - TRACE("(%p)->(%p)\n", This, p); - - create_child_list(This->node.doc, This, &buf); - - *p = (IDispatch*)HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len); + nsIDOMNodeList_Release(nsnode_list); return S_OK; } diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 325efdb..9a2c710 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -491,7 +491,8 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocument *doc, IUnkn for(i=0; i<length; i++) { nsIDOMNodeList_Item(nslist, i, &nsnode); - buf.buf[i] = HTMLELEM_NODE_THIS(get_node(doc, nsnode, TRUE)); + if(is_elem_node(nsnode)) + buf.buf[i] = HTMLELEM_NODE_THIS(get_node(doc, nsnode, TRUE)); nsIDOMNode_Release(nsnode); } }else {

1 0

Jacek Caban : mshtml: Move IHTMLElementCollection to separated file.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: c584effc737d5cc058f2cec6b54d456ae0e83ed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c584effc737d5cc058f2cec6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:41:45 2008 +0200 mshtml: Move IHTMLElementCollection to separated file. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 421 ---------------------------------- dlls/mshtml/htmlelemcol.c | 522 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 524 insertions(+), 421 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c584effc737d5cc058f2c…

1 0

Jacek Caban : mshtml: Added IDispatchEx support to IHTMLTable.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 630252c12d3f7f54cf20f2685e41ddfc0f33bf48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630252c12d3f7f54cf20f2685… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:40:58 2008 +0200 mshtml: Added IDispatchEx support to IHTMLTable. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmltable.c | 21 +++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index c329d30..0301a41 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -77,6 +77,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLOptionElement, &DIID_DispHTMLSelectElement, &DIID_DispHTMLStyle, + &DIID_DispHTMLTable, &DIID_DispHTMLTableRow, &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, @@ -103,6 +104,7 @@ static REFIID tid_ids[] = { &IID_IHTMLOptionElement, &IID_IHTMLSelectElement, &IID_IHTMLStyle, + &IID_IHTMLTable, &IID_IHTMLTableRow, &IID_IHTMLTextContainer, &IID_IHTMLUniqueName, diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 3d13205..247c0ae 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -539,15 +539,32 @@ static const NodeImplVtbl HTMLTableImplVtbl = { HTMLTable_destructor }; +static const tid_t HTMLTable_iface_tids[] = { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + IHTMLTable_tid, + 0 +}; + +static dispex_static_data_t HTMLTable_dispex = { + NULL, + DispHTMLTable_tid, + NULL, + HTMLTable_iface_tids +}; + HTMLElement *HTMLTable_Create(nsIDOMHTMLElement *nselem) { HTMLTable *ret = heap_alloc_zero(sizeof(HTMLTable)); - HTMLElement_Init(&ret->element); - ret->element.node.vtbl = &HTMLTableImplVtbl; ret->lpHTMLTableVtbl = &HTMLTableVtbl; + init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLTABLE(ret), &HTMLTable_dispex); + HTMLElement_Init(&ret->element); + ConnectionPoint_Init(&ret->cp, &ret->element.cp_container, &DIID_HTMLTableEvents); return &ret->element; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3332590..afbde54 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -73,6 +73,7 @@ typedef enum { DispHTMLOptionElement_tid, DispHTMLSelectElement_tid, DispHTMLStyle_tid, + DispHTMLTable_tid, DispHTMLTableRow_tid, DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, @@ -99,6 +100,7 @@ typedef enum { IHTMLOptionElement_tid, IHTMLSelectElement_tid, IHTMLStyle_tid, + IHTMLTable_tid, IHTMLTableRow_tid, IHTMLTextContainer_tid, IHTMLUniqueName_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ebb4f17..b8e57da 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -279,7 +279,7 @@ static const elem_type_info_t elem_type_infos[] = { {"BLOCKQUOTE",elem_iids, NULL}, {"P", elem_iids, NULL}, {"BR", elem_iids, NULL}, - {"TABLE", table_iids, NULL}, + {"TABLE", table_iids, &DIID_DispHTMLTable}, {"TBODY", elem_iids, NULL}, {"SCRIPT", script_iids, NULL}, {"TEST", elem_iids, &DIID_DispHTMLUnknownElement},

1 0

Jacek Caban : mshtml: Don' t use IHTMLControlElement in IDispatchEx implementations.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 1ee46d4814dabac5351d2f6a7fb85affdcdf7d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee46d4814dabac5351d2f6a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:41:20 2008 +0200 mshtml: Don't use IHTMLControlElement in IDispatchEx implementations. --- dlls/mshtml/dispex.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/mshtml_private.h | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 0301a41..37deec6 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -84,7 +84,6 @@ static REFIID tid_ids[] = { &IID_IHTMLBodyElement, &IID_IHTMLBodyElement2, &IID_IHTMLCommentElement, - &IID_IHTMLControlElement, &IID_IHTMLDocument2, &IID_IHTMLDocument3, &IID_IHTMLDocument4, diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e5545f5..efe5df8 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -669,7 +669,6 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { static const tid_t HTMLBodyElement_iface_tids[] = { IHTMLBodyElement_tid, IHTMLBodyElement2_tid, - IHTMLControlElement_tid, IHTMLDOMNode_tid, IHTMLDOMNode2_tid, IHTMLElement_tid, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index afbde54..e255bc3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -80,7 +80,6 @@ typedef enum { IHTMLBodyElement_tid, IHTMLBodyElement2_tid, IHTMLCommentElement_tid, - IHTMLControlElement_tid, IHTMLDocument2_tid, IHTMLDocument3_tid, IHTMLDocument4_tid,

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLTableRow.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: ea36413683f9ea7f64d6c0ce7ec181212e0e558d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea36413683f9ea7f64d6c0ce7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:42:34 2008 +0200 mshtml: Added IDispatchEx support to HTMLTableRow. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmltablerow.c | 21 +++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index e176711..c329d30 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -77,6 +77,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLOptionElement, &DIID_DispHTMLSelectElement, &DIID_DispHTMLStyle, + &DIID_DispHTMLTableRow, &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, &IID_IHTMLBodyElement, @@ -102,6 +103,7 @@ static REFIID tid_ids[] = { &IID_IHTMLOptionElement, &IID_IHTMLSelectElement, &IID_IHTMLStyle, + &IID_IHTMLTableRow, &IID_IHTMLTextContainer, &IID_IHTMLUniqueName, &IID_IHTMLWindow2, diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 007d6bd..aaf0567 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -281,14 +281,31 @@ static const NodeImplVtbl HTMLTableRowImplVtbl = { HTMLTableRow_destructor }; +static const tid_t HTMLTableRow_iface_tids[] = { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + IHTMLTableRow_tid, + 0 +}; + +static dispex_static_data_t HTMLTableRow_dispex = { + NULL, + DispHTMLTableRow_tid, + NULL, + HTMLTableRow_iface_tids +}; + HTMLElement *HTMLTableRow_Create(nsIDOMHTMLElement *nselem) { HTMLTableRow *ret = heap_alloc_zero(sizeof(HTMLTableRow)); - HTMLElement_Init(&ret->element); - ret->lpHTMLTableRowVtbl = &HTMLTableRowVtbl; ret->element.node.vtbl = &HTMLTableRowImplVtbl; + init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLTABLEROW(ret), &HTMLTableRow_dispex); + HTMLElement_Init(&ret->element); + return &ret->element; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 646adfd..3332590 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -73,6 +73,7 @@ typedef enum { DispHTMLOptionElement_tid, DispHTMLSelectElement_tid, DispHTMLStyle_tid, + DispHTMLTableRow_tid, DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, IHTMLBodyElement_tid, @@ -98,6 +99,7 @@ typedef enum { IHTMLOptionElement_tid, IHTMLSelectElement_tid, IHTMLStyle_tid, + IHTMLTableRow_tid, IHTMLTextContainer_tid, IHTMLUniqueName_tid, IHTMLWindow2_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a03d11c..ebb4f17 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -286,7 +286,7 @@ static const elem_type_info_t elem_type_infos[] = { {"TEST", generic_iids, &DIID_DispHTMLGenericElement}, {"!", comment_iids, &DIID_DispHTMLCommentElement}, {"IMG", img_iids, &DIID_DispHTMLImg}, - {"TR", tr_iids, NULL} + {"TR", tr_iids, &DIID_DispHTMLTableRow} }; static const char *dbgstr_w(LPCWSTR str)

1 0

Andrew Talbot : dsound: Sign-compare warnings fix.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 3fae4082efba44a3f48805a19c8bb07ed9e03701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fae4082efba44a3f48805a19… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 30 20:41:08 2008 +0100 dsound: Sign-compare warnings fix. --- dlls/dsound/capture.c | 2 +- dlls/dsound/mixer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 7cf7b83..d84a8fe 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -386,7 +386,7 @@ DirectSoundCaptureEnumerateW( static void capture_CheckNotify(IDirectSoundCaptureBufferImpl *This, DWORD from, DWORD len) { - unsigned i; + int i; for (i = 0; i < This->nrofnotifies; ++i) { LPDSBPOSITIONNOTIFY event = This->notifies + i; DWORD offset = event->dwOffset; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 3c13e8f..efcb21b 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -324,7 +324,8 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2) */ void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD len, BOOL inmixer) { - INT i, size; + DWORD i; + INT size; BYTE *ibp, *obp, *obp_begin; INT iAdvance = dsb->pwfx->nBlockAlign; INT oAdvance = dsb->device->pwfx->nBlockAlign;

1 0

Jacek Caban : mshtml: Added IHTMLTableRow stub implementation.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 31ae80233ded69ad7ddee37b9070acbaad67776f URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ae80233ded69ad7ddee37b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:40:19 2008 +0200 mshtml: Added IHTMLTableRow stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 3 + dlls/mshtml/htmltablerow.c | 294 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/main.c | 22 +++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 20 +++- 6 files changed, 340 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31ae80233ded69ad7ddee…

1 0