May 2008 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added IDispatchEx support to HTMLCommentElement.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: cecb2652486ee7e2b1110f387e1ee59f06a2f61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecb2652486ee7e2b1110f387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:20:48 2008 +0200 mshtml: Added IDispatchEx support to HTMLCommentElement. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlcomment.c | 11 +++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 +- 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f0cfc59..13319cc 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -52,6 +52,7 @@ static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { &IID_NULL, &DIID_DispDOMChildrenCollection, + &DIID_DispHTMLCommentElement, &DIID_DispHTMLDocument, &DIID_DispHTMLDOMTextNode, &DIID_DispHTMLElementCollection, @@ -59,6 +60,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLOptionElement, &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, + &IID_IHTMLCommentElement, &IID_IHTMLDocument2, &IID_IHTMLDocument3, &IID_IHTMLDocument4, diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 8dffa2d..2155a16 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -175,6 +175,16 @@ static const NodeImplVtbl HTMLCommentElementImplVtbl = { HTMLCommentElement_destructor }; +static dispex_static_data_t HTMLCommentElement_dispex = { + NULL, + DispHTMLCommentElement_tid, + NULL, + { + IHTMLCommentElement_tid, + 0 + } +}; + HTMLElement *HTMLCommentElement_Create(nsIDOMNode *nsnode) { HTMLCommentElement *ret = heap_alloc_zero(sizeof(*ret)); @@ -182,6 +192,7 @@ HTMLElement *HTMLCommentElement_Create(nsIDOMNode *nsnode) ret->element.node.vtbl = &HTMLCommentElementImplVtbl; ret->lpIHTMLCommentElementVtbl = &HTMLCommentElementVtbl; + init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLCOMMENT(ret), &HTMLCommentElement_dispex); HTMLElement_Init(&ret->element); return &ret->element; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3b5ac51..78f7e05 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -62,6 +62,7 @@ typedef struct event_target_t event_target_t; typedef enum { NULL_tid, DispDOMChildrenCollection_tid, + DispHTMLCommentElement_tid, DispHTMLDocument_tid, DispHTMLDOMTextNode_tid, DispHTMLElementCollection_tid, @@ -69,6 +70,7 @@ typedef enum { DispHTMLOptionElement_tid, DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, + IHTMLCommentElement_tid, IHTMLDocument2_tid, IHTMLDocument3_tid, IHTMLDocument4_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e21a71f..f1c2548 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -246,7 +246,7 @@ static const elem_type_info_t elem_type_infos[] = { {"TBODY", elem_iids, NULL}, {"SCRIPT", script_iids, NULL}, {"TEST", elem_iids, &DIID_DispHTMLUnknownElement}, - {"!", comment_iids, NULL} + {"!", comment_iids, &DIID_DispHTMLCommentElement} }; static const char *dbgstr_w(LPCWSTR str)

1 0

Roderick Colenbrander : opengl32: Get rid of X/GLX leftovers.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 18e704f9aa15c563d3b161a11cd8d3c140cb4d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e704f9aa15c563d3b161a11… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Apr 30 19:06:13 2008 +0000 opengl32: Get rid of X/GLX leftovers. --- dlls/opengl32/opengl_ext.h | 1 - dlls/opengl32/wgl.c | 3 --- dlls/winex11.drv/opengl.c | 2 +- 3 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index 93afd05..8ae7c2f 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -26,7 +26,6 @@ #define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */ #define GL_GLEXT_PROTOTYPES #include <GL/gl.h> -#include <GL/glx.h> #ifdef HAVE_GL_GLEXT_H # include <GL/glext.h> #endif diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index df15b5b..6944f37 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -82,9 +82,6 @@ static char* internal_gl_extensions = NULL; typedef struct wine_glcontext { HDC hdc; - XVisualInfo *vis; - GLXFBConfig fb_conf; - GLXContext ctx; BOOL do_escape; /* ... more stuff here */ } Wine_GLContext; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index cf5dff7..dbe66f1 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -104,10 +104,10 @@ typedef struct wine_glpixelformat { typedef struct wine_glcontext { HDC hdc; + BOOL do_escape; XVisualInfo *vis; WineGLPixelFormat *fmt; GLXContext ctx; - BOOL do_escape; HDC read_hdc; Drawable drawables[2]; BOOL refresh_drawables;

1 0

Jacek Caban : mshtml.idl: Added DispHTMLCommentElement declaration.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: ac00714c401c6060b2a697f12adb541cad089ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac00714c401c6060b2a697f12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:20:33 2008 +0200 mshtml.idl: Added DispHTMLCommentElement declaration. --- include/mshtml.idl | 879 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 879 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac00714c401c6060b2a69…

1 0

Jacek Caban : mshtml: Added comment and childNodes test.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 57a373afb36d2efb5fe0c7827b0ab848aa6e06aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a373afb36d2efb5fe0c7827… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:20:05 2008 +0200 mshtml: Added comment and childNodes test. --- dlls/mshtml/tests/dom.c | 102 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 98 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7a9b05d..e21a71f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -40,7 +40,8 @@ static const char range_test2_str[] = "<html><body>abc<hr />123<br /><hr />def</body></html>"; static const char elem_test_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" - "<body>text test<a href=\"http://test\" name=\"x\">link</a>" + "<body>text test" + "<a href=\"http://test\" name=\"x\">link</a>" "<input id=\"in\" />" "<select id=\"s\"><option id=\"x\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" @@ -79,7 +80,8 @@ typedef enum { ET_TABLE, ET_TBODY, ET_SCRIPT, - ET_TEST + ET_TEST, + ET_COMMENT } elem_type_t; static REFIID const none_iids[] = { @@ -208,6 +210,17 @@ static REFIID const window_iids[] = { NULL }; +static REFIID const comment_iids[] = { + &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, + &IID_IHTMLElement, + &IID_IHTMLElement2, + &IID_IHTMLCommentElement, + &IID_IDispatchEx, + &IID_IConnectionPointContainer, + NULL +}; + typedef struct { const char *tag; REFIID *iids; @@ -232,7 +245,8 @@ static const elem_type_info_t elem_type_infos[] = { {"TABLE", table_iids, NULL}, {"TBODY", elem_iids, NULL}, {"SCRIPT", script_iids, NULL}, - {"TEST", elem_iids, &DIID_DispHTMLUnknownElement} + {"TEST", elem_iids, &DIID_DispHTMLUnknownElement}, + {"!", comment_iids, NULL} }; static const char *dbgstr_w(LPCWSTR str) @@ -795,6 +809,49 @@ static void _test_input_get_disabled(unsigned line, IHTMLInputElement *input, VA ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); } +#define get_child_nodes(u) _get_child_nodes(__LINE__,u) +static IHTMLDOMChildrenCollection *_get_child_nodes(unsigned line, IUnknown *unk) +{ + IHTMLDOMChildrenCollection *col = NULL; + IHTMLDOMNode *node; + IDispatch *disp; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08x\n", hres); + if(FAILED(hres)) + return NULL; + + hres = IHTMLDOMNode_get_childNodes(node, &disp); + IHTMLDOMNode_Release(node); + ok_(__FILE__,line) (hres == S_OK, "get_childNodes failed: %08x\n", hres); + if(FAILED(hres)) + return NULL; + + hres = IDispatch_QueryInterface(disp, &IID_IHTMLDOMChildrenCollection, (void**)&col); + IDispatch_Release(disp); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMChildrenCollection: %08x\n", hres); + + return col; +} + +#define get_child_item(c,i) _get_child_item(__LINE__,c,i) +static IHTMLDOMNode *_get_child_item(unsigned line, IHTMLDOMChildrenCollection *col, long idx) +{ + IHTMLDOMNode *node = NULL; + IDispatch *disp; + HRESULT hres; + + hres = IHTMLDOMChildrenCollection_item(col, idx, &disp); + ok(hres == S_OK, "item failed: %08x\n", hres); + + hres = IDispatch_QueryInterface(disp, &IID_IHTMLDOMNode, (void**)&node); + IDispatch_Release(disp); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08x\n", hres); + + return node; +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1435,6 +1492,7 @@ static void test_stylesheets(IHTMLDocument2 *doc) static void test_elems(IHTMLDocument2 *doc) { IHTMLElementCollection *col; + IHTMLDOMChildrenCollection *child_col; IHTMLElement *elem; IHTMLDOMNode *node, *node2; IDispatch *disp; @@ -1453,6 +1511,7 @@ static void test_elems(IHTMLDocument2 *doc) ET_TITLE, ET_STYLE, ET_BODY, + ET_COMMENT, ET_A, ET_INPUT, ET_SELECT, @@ -1462,7 +1521,7 @@ static void test_elems(IHTMLDocument2 *doc) ET_TABLE, ET_TBODY, ET_SCRIPT, - ET_TEST + ET_TEST, }; static const elem_type_t item_types[] = { @@ -1572,6 +1631,41 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(node); } + child_col = get_child_nodes((IUnknown*)elem); + ok(child_col != NULL, "child_coll == NULL\n"); + if(child_col) { + long length = 0; + + test_disp((IUnknown*)child_col, &DIID_DispDOMChildrenCollection); + + hres = IHTMLDOMChildrenCollection_get_length(child_col, &length); + ok(hres == S_OK, "get_length failed: %08x\n", hres); + ok(length, "length=0\n"); + + node = get_child_item(child_col, 0); + ok(node != NULL, "node == NULL\n"); + if(node) { + type = get_node_type((IUnknown*)node); + ok(type == 3, "type=%ld\n", type); + IHTMLDOMNode_Release(node); + } + + node = get_child_item(child_col, 1); + ok(node != NULL, "node == NULL\n"); + if(node) { + type = get_node_type((IUnknown*)node); + ok(type == 8, "type=%ld\n", type); + IHTMLDOMNode_Release(node); + } + + disp = (void*)0xdeadbeef; + hres = IHTMLDOMChildrenCollection_item(child_col, 6000, &disp); + ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok(disp == (void*)0xdeadbeef, "disp=%p\n", disp); + + IHTMLDOMChildrenCollection_Release(child_col); + } + IHTMLElement_Release(elem); test_stylesheets(doc);

1 0

Jacek Caban : mshtml: Added IHTMLCommentElement stub implementation.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 67333a2a19e78a0d1fc35f65181a3c9a1a4d5d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67333a2a19e78a0d1fc35f651… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:19:49 2008 +0200 mshtml: Added IHTMLCommentElement stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlcomment.c | 188 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlnode.c | 3 + dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 193 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 0794ccb..e76092b 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ hlink.c \ htmlanchor.c \ htmlbody.c \ + htmlcomment.c \ htmldoc.c \ htmldoc3.c \ htmldoc5.c \ diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c new file mode 100644 index 0000000..8dffa2d --- /dev/null +++ b/dlls/mshtml/htmlcomment.c @@ -0,0 +1,188 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "mshtml_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +typedef struct { + HTMLElement element; + const IHTMLCommentElementVtbl *lpIHTMLCommentElementVtbl; +} HTMLCommentElement; + +#define HTMLCOMMENT(x) ((IHTMLCommentElement*) &(x)->lpIHTMLCommentElementVtbl) + +#define HTMLCOMMENT_THIS(iface) DEFINE_THIS(HTMLCommentElement, IHTMLCommentElement, iface) + +static HRESULT WINAPI HTMLCommentElement_QueryInterface(IHTMLCommentElement *iface, + REFIID riid, void **ppv) +{ + HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv); +} + +static ULONG WINAPI HTMLCommentElement_AddRef(IHTMLCommentElement *iface) +{ + HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); +} + +static ULONG WINAPI HTMLCommentElement_Release(IHTMLCommentElement *iface) +{ + HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); +} + +static HRESULT WINAPI HTMLCommentElement_GetTypeInfoCount(IHTMLCommentElement *iface, UINT *pctinfo) +{ + HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLCommentElement_GetTypeInfo(IHTMLCommentElement *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLCommentElement_GetIDsOfNames(IHTMLCommentElement *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLCommentElement_Invoke(IHTMLCommentElement *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLCommentElement_put_text(IHTMLCommentElement *iface, BSTR v) +{ + HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLCommentElement_get_text(IHTMLCommentElement *iface, BSTR *p) +{ + HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLCommentElement_put_atomic(IHTMLCommentElement *iface, long v) +{ + HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + FIXME("(%p)->(%ld)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLCommentElement_get_atomic(IHTMLCommentElement *iface, long *p) +{ + HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +#undef HTMLCOMMENT_THIS + +static const IHTMLCommentElementVtbl HTMLCommentElementVtbl = { + HTMLCommentElement_QueryInterface, + HTMLCommentElement_AddRef, + HTMLCommentElement_Release, + HTMLCommentElement_GetTypeInfoCount, + HTMLCommentElement_GetTypeInfo, + HTMLCommentElement_GetIDsOfNames, + HTMLCommentElement_Invoke, + HTMLCommentElement_put_text, + HTMLCommentElement_get_text, + HTMLCommentElement_put_atomic, + HTMLCommentElement_get_atomic +}; + +#define HTMLCOMMENT_NODE_THIS(iface) DEFINE_THIS2(HTMLCommentElement, element.node, iface) + +HRESULT HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) +{ + HTMLCommentElement *This = HTMLCOMMENT_NODE_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IHTMLCommentElement, riid)) { + TRACE("(%p)->(IID_IHTMLCommentElement %p)\n", This, ppv); + *ppv = HTMLCOMMENT(This); + }else { + return HTMLElement_QI(&This->element.node, riid, ppv); + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +void HTMLCommentElement_destructor(HTMLDOMNode *iface) +{ + HTMLCommentElement *This = HTMLCOMMENT_NODE_THIS(iface); + + HTMLElement_destructor(&This->element.node); +} + +#undef HTMLCOMMENT_NODE_THIS + +static const NodeImplVtbl HTMLCommentElementImplVtbl = { + HTMLCommentElement_QI, + HTMLCommentElement_destructor +}; + +HTMLElement *HTMLCommentElement_Create(nsIDOMNode *nsnode) +{ + HTMLCommentElement *ret = heap_alloc_zero(sizeof(*ret)); + + ret->element.node.vtbl = &HTMLCommentElementImplVtbl; + ret->lpIHTMLCommentElementVtbl = &HTMLCommentElementVtbl; + + HTMLElement_Init(&ret->element); + + return &ret->element; +} diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 1a9bea3..f330d15 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -682,6 +682,9 @@ static HTMLDOMNode *create_node(HTMLDocument *doc, nsIDOMNode *nsnode) case TEXT_NODE: ret = HTMLDOMTextNode_Create(nsnode); break; + case COMMENT_NODE: + ret = &HTMLCommentElement_Create(nsnode)->node; + break; default: ret = heap_alloc_zero(sizeof(HTMLDOMNode)); ret->vtbl = &HTMLDOMNodeImplVtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 92d63a2..3b5ac51 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -512,6 +512,7 @@ void detach_ranges(HTMLDocument*); HTMLDOMNode *HTMLDOMTextNode_Create(nsIDOMNode*); HTMLElement *HTMLElement_Create(nsIDOMNode*); +HTMLElement *HTMLCommentElement_Create(nsIDOMNode*); HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement*);

1 0

Jacek Caban : mshtml: Handle COMMENT_NODE like ELEMENT_NODE in element collection.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: cfb8975444eed4994df10bb99fbd4b2ac62c49a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb8975444eed4994df10bb99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:19:08 2008 +0200 mshtml: Handle COMMENT_NODE like ELEMENT_NODE in element collection. --- dlls/mshtml/htmlelem.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 39e8ebb..8a8e1cc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -65,6 +65,15 @@ static void elem_vector_normalize(elem_vector *buf) 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) @@ -1081,7 +1090,6 @@ static void create_child_list(HTMLDocument *doc, HTMLElement *elem, elem_vector nsIDOMNodeList *nsnode_list; nsIDOMNode *iter; PRUint32 list_len = 0, i; - PRUint16 node_type; nsresult nsres; nsres = nsIDOMNode_GetChildNodes(elem->node.nsnode, &nsnode_list); @@ -1104,8 +1112,7 @@ static void create_child_list(HTMLDocument *doc, HTMLElement *elem, elem_vector continue; } - nsres = nsIDOMNode_GetNodeType(iter, &node_type); - if(NS_SUCCEEDED(nsres) && node_type == ELEMENT_NODE) + if(is_elem_node(iter)) elem_vector_add(buf, HTMLELEM_NODE_THIS(get_node(doc, iter, TRUE))); } } @@ -1128,7 +1135,6 @@ static void create_all_list(HTMLDocument *doc, HTMLDOMNode *elem, elem_vector *b nsIDOMNodeList *nsnode_list; nsIDOMNode *iter; PRUint32 list_len = 0, i; - PRUint16 node_type; nsresult nsres; nsres = nsIDOMNode_GetChildNodes(elem->nsnode, &nsnode_list); @@ -1148,8 +1154,7 @@ static void create_all_list(HTMLDocument *doc, HTMLDOMNode *elem, elem_vector *b continue; } - nsres = nsIDOMNode_GetNodeType(iter, &node_type); - if(NS_SUCCEEDED(nsres) && node_type == ELEMENT_NODE) { + if(is_elem_node(iter)) { HTMLDOMNode *node = get_node(doc, iter, TRUE); elem_vector_add(buf, HTMLELEM_NODE_THIS(node));

1 0

Jacek Caban : mshtml: Moved IDispatchEx initialization to HTMLElement_Init.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 791dd9558e67cee1b26c4029f5ef687ea2e32527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791dd9558e67cee1b26c4029f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:18:24 2008 +0200 mshtml: Moved IDispatchEx initialization to HTMLElement_Init. --- dlls/mshtml/htmlelem.c | 10 +++++----- dlls/mshtml/htmlinput.c | 3 +-- dlls/mshtml/htmloption.c | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f9b416a..f87bb44 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1297,12 +1297,14 @@ static dispex_static_data_t HTMLElement_dispex = { void HTMLElement_Init(HTMLElement *This) { - This->node.vtbl = &HTMLElementImplVtbl; This->lpHTMLElementVtbl = &HTMLElementVtbl; ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)HTMLELEM(This)); HTMLElement2_Init(This); + + if(!This->node.dispex.data) + init_dispex(&This->node.dispex, (IUnknown*)HTMLELEM(This), &HTMLElement_dispex); } HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) @@ -1351,15 +1353,13 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) if(!ret) { ret = heap_alloc_zero(sizeof(HTMLElement)); HTMLElement_Init(ret); - } + ret->node.vtbl = &HTMLElementImplVtbl; + } nsAString_Finish(&class_name_str); ret->nselem = nselem; - if(!ret->node.dispex.data) - init_dispex(&ret->node.dispex, (IUnknown*)HTMLELEM(ret), &HTMLElement_dispex); - return ret; } diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 3ba954f..c4f2750 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1078,12 +1078,11 @@ HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement *nselem) HTMLInputElement *ret = heap_alloc_zero(sizeof(HTMLInputElement)); nsresult nsres; - HTMLElement_Init(&ret->element); - ret->lpHTMLInputElementVtbl = &HTMLInputElementVtbl; ret->element.node.vtbl = &HTMLInputElementImplVtbl; init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLINPUT(ret), &HTMLInputElement_dispex); + HTMLElement_Init(&ret->element); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLInputElement, (void**)&ret->nsinput); diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index a642295..0753810 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -350,17 +350,16 @@ HTMLElement *HTMLOptionElement_Create(nsIDOMHTMLElement *nselem) HTMLOptionElement *ret = heap_alloc_zero(sizeof(HTMLOptionElement)); nsresult nsres; - HTMLElement_Init(&ret->element); - ret->lpHTMLOptionElementVtbl = &HTMLOptionElementVtbl; ret->element.node.vtbl = &HTMLOptionElementImplVtbl; + HTMLElement_Init(&ret->element); + init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLOPTION(ret), &HTMLOptionElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLOptionElement, (void**)&ret->nsoption); if(NS_FAILED(nsres)) ERR("Could not get nsIDOMHTMLOptionElement interface: %08x\n", nsres); - init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLOPTION(ret), &HTMLOptionElement_dispex); - return &ret->element; }

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLDOMChildrenCollection.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 30d204753704cc1ff4c714e274effba98d1a21b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d204753704cc1ff4c714e27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:18:09 2008 +0200 mshtml: Added IDispatchEx support to HTMLDOMChildrenCollection. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlnode.c | 16 ++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 6f17a9d..f0cfc59 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -51,6 +51,7 @@ static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { &IID_NULL, + &DIID_DispDOMChildrenCollection, &DIID_DispHTMLDocument, &DIID_DispHTMLDOMTextNode, &DIID_DispHTMLElementCollection, @@ -62,6 +63,7 @@ static REFIID tid_ids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IHTMLDOMChildrenCollection, &IID_IHTMLDOMNode, &IID_IHTMLDOMNode2, &IID_IHTMLDOMTextNode, diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index dbb35e1..1a9bea3 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + DispatchEx dispex; const IHTMLDOMChildrenCollectionVtbl *lpIHTMLDOMChildrenCollectionVtbl; LONG ref; @@ -58,6 +59,9 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_QueryInterface(IHTMLDOMChildrenC }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = HTMLCHILDCOL(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IHTMLDOMChildrenCollection, riid)) { TRACE("(%p)->(IID_IHTMLDOMChildrenCollection %p)\n", This, ppv); *ppv = HTMLCHILDCOL(This); @@ -189,6 +193,16 @@ static const IHTMLDOMChildrenCollectionVtbl HTMLDOMChildrenCollectionVtbl = { HTMLDOMChildrenCollection_item }; +static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { + NULL, + DispDOMChildrenCollection_tid, + NULL, + { + IHTMLDOMChildrenCollection_tid, + 0 + } +}; + static IHTMLDOMChildrenCollection *create_child_collection(HTMLDocument *doc, nsIDOMNodeList *nslist) { HTMLDOMChildrenCollection *ret; @@ -201,6 +215,8 @@ static IHTMLDOMChildrenCollection *create_child_collection(HTMLDocument *doc, ns ret->nslist = nslist; ret->doc = doc; + init_dispex(&ret->dispex, (IUnknown*)HTMLCHILDCOL(ret), &HTMLDOMChildrenCollection_dispex); + return HTMLCHILDCOL(ret); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 55c0090..92d63a2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -61,6 +61,7 @@ typedef struct event_target_t event_target_t; /* NOTE: make sure to keep in sync with dispex.c */ typedef enum { NULL_tid, + DispDOMChildrenCollection_tid, DispHTMLDocument_tid, DispHTMLDOMTextNode_tid, DispHTMLElementCollection_tid, @@ -72,6 +73,7 @@ typedef enum { IHTMLDocument3_tid, IHTMLDocument4_tid, IHTMLDocument5_tid, + IHTMLDOMChildrenCollection_tid, IHTMLDOMNode_tid, IHTMLDOMNode2_tid, IHTMLDOMTextNode_tid,

1 0

Jacek Caban : mshtml: Don't assume that nselem is valid in HTMLElement.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: af529308f3bc1d4711778cf24e972e277d996f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=af529308f3bc1d4711778cf24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:18:46 2008 +0200 mshtml: Don't assume that nselem is valid in HTMLElement. --- dlls/mshtml/htmlelem.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlelem2.c | 10 ++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f87bb44..39e8ebb 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -138,6 +138,11 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr WARN("(%p)->(%s . %08x)\n", This, debugstr_w(strAttributeName), lFlags); + if(!This->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + VariantInit(&AttributeValueChanged); hres = VariantChangeType(&AttributeValueChanged, &AttributeValue, 0, VT_BSTR); @@ -178,6 +183,11 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr WARN("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); + if(!This->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + V_VT(AttributeValue) = VT_NULL; nsAString_Init(&attr_str, strAttributeName); @@ -245,6 +255,11 @@ static HRESULT WINAPI HTMLElement_get_className(IHTMLElement *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); + if(!This->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + nsAString_Init(&class_str, NULL); nsres = nsIDOMHTMLElement_GetClassName(This->nselem, &class_str); @@ -286,6 +301,15 @@ static HRESULT WINAPI HTMLElement_get_tagName(IHTMLElement *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); + if(!This->nselem) { + static const WCHAR comment_tagW[] = {'!',0}; + + WARN("NULL nselem, assuming comment\n"); + + *p = SysAllocString(comment_tagW); + return S_OK; + } + nsAString_Init(&tag_str, NULL); nsres = nsIDOMHTMLElement_GetTagName(This->nselem, &tag_str); if(NS_SUCCEEDED(nsres)) { @@ -316,6 +340,11 @@ static HRESULT WINAPI HTMLElement_get_style(IHTMLElement *iface, IHTMLStyle **p) TRACE("(%p)->(%p)\n", This, p); + if(!This->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMElementCSSInlineStyle, (void**)&nselemstyle); if(NS_FAILED(nsres)) { @@ -627,6 +656,11 @@ static HRESULT WINAPI HTMLElement_put_innerHTML(IHTMLElement *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + if(!This->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_FAILED(nsres)) { ERR("Could not get nsIDOMNSHTMLElement: %08x\n", nsres); @@ -702,6 +736,11 @@ static HRESULT HTMLElement_InsertAdjacentNode(HTMLElement *This, BSTR where, nsI static const WCHAR wszAfterEnd[] = {'a','f','t','e','r','E','n','d',0}; nsresult nsres; + if(!This->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + if (!strcmpiW(where, wszBeforeBegin)) { nsIDOMNode *unused; @@ -1513,6 +1552,9 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) static const PRUnichar nameW[] = {'n','a','m','e',0}; + if(!elem->nselem) + return FALSE; + nsAString_Init(&nsstr, NULL); nsIDOMHTMLElement_GetId(elem->nselem, &nsstr); nsAString_GetData(&nsstr, &str); diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 01c88fa..4430703 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -651,6 +651,11 @@ static HRESULT WINAPI HTMLElement2_put_scrollTop(IHTMLElement2 *iface, long v) TRACE("(%p)->(%ld)\n", This, v); + if(!This->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { nsIDOMNSHTMLElement_SetScrollTop(nselem, v); @@ -677,6 +682,11 @@ static HRESULT WINAPI HTMLElement2_put_scrollLeft(IHTMLElement2 *iface, long v) TRACE("(%p)->(%ld)\n", This, v); + if(!This->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { nsIDOMNSHTMLElement_SetScrollLeft(nselem, v);

1 0

Jacek Caban : mshtml: Added IHTMLDOMChildrenCollection::item implementation .
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 6da1c730476930f086286ef02de9aa71f6f79914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da1c730476930f086286ef02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:17:56 2008 +0200 mshtml: Added IHTMLDOMChildrenCollection::item implementation. --- dlls/mshtml/htmlnode.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 73c588a..dbb35e1 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -153,8 +153,25 @@ static HRESULT WINAPI HTMLDOMChildrenCollection__newEnum(IHTMLDOMChildrenCollect static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection *iface, long index, IDispatch **ppItem) { HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); - FIXME("(%p)->(%ld %p)\n", This, index, ppItem); - return E_NOTIMPL; + nsIDOMNode *nsnode = NULL; + PRUint32 length=0; + nsresult nsres; + + TRACE("(%p)->(%ld %p)\n", This, index, ppItem); + + nsIDOMNodeList_GetLength(This->nslist, &length); + if(index < 0 || index > length) + return E_INVALIDARG; + + nsres = nsIDOMNodeList_Item(This->nslist, index, &nsnode); + if(NS_FAILED(nsres) || !nsnode) { + ERR("Item failed: %08x\n", nsres); + return E_FAIL; + } + + *ppItem = (IDispatch*)get_node(This->doc, nsnode, TRUE); + IDispatch_AddRef(*ppItem); + return S_OK; } #undef HTMLCHILDCOL_THIS

1 0