wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Jacek Caban : mshtml: Added IHTMLDOMNode::cloneNode implementation.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: d0e9681969b4d565af59e583b7efdfac2e5a1471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e9681969b4d565af59e583b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:54:22 2009 +0200 mshtml: Added IHTMLDOMNode::cloneNode implementation. --- dlls/mshtml/htmlnode.c | 18 +++++++++++++- dlls/mshtml/tests/dom.c | 55 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 8c83e56..1c7b7cb 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -536,8 +536,22 @@ static HRESULT WINAPI HTMLDOMNode_cloneNode(IHTMLDOMNode *iface, VARIANT_BOOL fD IHTMLDOMNode **clonedNode) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%x %p)\n", This, fDeep, clonedNode); - return E_NOTIMPL; + nsIDOMNode *nsnode; + HTMLDOMNode *node; + nsresult nsres; + + TRACE("(%p)->(%x %p)\n", This, fDeep, clonedNode); + + nsres = nsIDOMNode_CloneNode(This->nsnode, fDeep != VARIANT_FALSE, &nsnode); + if(NS_FAILED(nsres) || !nsnode) { + ERR("CloneNode failed: %08x\n", nsres); + return E_FAIL; + } + + node = get_node(This->doc, nsnode, TRUE); + IHTMLDOMNode_AddRef(HTMLDOMNODE(node)); + *clonedNode = HTMLDOMNODE(node); + return S_OK; } static HRESULT WINAPI HTMLDOMNode_removeNode(IHTMLDOMNode *iface, VARIANT_BOOL fDeep, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 862d281..dba424b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -656,6 +656,22 @@ static IHTMLDocument2 *_get_owner_doc(unsigned line, IUnknown *unk) return doc; } +#define clone_node(n,d) _clone_node(__LINE__,n,d) +static IHTMLDOMNode *_clone_node(unsigned line, IUnknown *unk, VARIANT_BOOL deep) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + IHTMLDOMNode *ret = NULL; + HRESULT hres; + + hres = IHTMLDOMNode_cloneNode(node, deep, &ret); + IHTMLDOMNode_Release(node); + ok_(__FILE__,line)(hres == S_OK, "cloneNode failed: %08x\n", hres); + ok_(__FILE__,line)(ret != NULL, "ret == NULL\n"); + + return ret; + +} + #define test_elem_tag(u,n) _test_elem_tag(__LINE__,u,n) static void _test_elem_tag(unsigned line, IUnknown *unk, const char *extag) { @@ -1287,6 +1303,21 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, IHTMLElementCollection_Release(col); } +#define test_elem_all(c,t,l) _test_elem_all(__LINE__,c,t,l) +static void _test_elem_all(unsigned line, IUnknown *unk, const elem_type_t *elem_types, LONG exlen) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + IDispatch *disp; + HRESULT hres; + + hres = IHTMLElement_get_all(elem, &disp); + IHTMLElement_Release(elem); + ok_(__FILE__,line)(hres == S_OK, "get_all failed: %08x\n", hres); + + _test_elem_collection(line, (IUnknown*)disp, elem_types, exlen); + IDispatch_Release(disp); +} + #define test_elem_getelembytag(u,t,l) _test_elem_getelembytag(__LINE__,u,t,l) static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t type, LONG exlen) { @@ -4462,9 +4493,11 @@ static void test_table_elem(IHTMLElement *elem) { IHTMLElementCollection *col; IHTMLTable *table; + IHTMLDOMNode *node; HRESULT hres; static const elem_type_t row_types[] = {ET_TR,ET_TR}; + static const elem_type_t all_types[] = {ET_TBODY,ET_TR,ET_TR,ET_TD,ET_TD}; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable, (void**)&table); ok(hres == S_OK, "Could not get IHTMLTable iface: %08x\n", hres); @@ -4479,6 +4512,18 @@ static void test_table_elem(IHTMLElement *elem) test_elem_collection((IUnknown*)col, row_types, sizeof(row_types)/sizeof(*row_types)); IHTMLElementCollection_Release(col); + test_elem_all((IUnknown*)table, all_types, sizeof(all_types)/sizeof(*all_types)); + + node = clone_node((IUnknown*)table, VARIANT_TRUE); + test_elem_tag((IUnknown*)node, "TABLE"); + test_elem_all((IUnknown*)node, all_types, sizeof(all_types)/sizeof(*all_types)); + IHTMLDOMNode_Release(node); + + node = clone_node((IUnknown*)table, VARIANT_FALSE); + test_elem_tag((IUnknown*)node, "TABLE"); + test_elem_all((IUnknown*)node, NULL, 0); + IHTMLDOMNode_Release(node); + IHTMLTable_Release(table); } @@ -4748,16 +4793,8 @@ static void test_elems(IHTMLDocument2 *doc) } elem = get_doc_elem(doc); - ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); - hres = IHTMLElement_get_all(elem, &disp); + test_elem_all((IUnknown*)elem, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1); IHTMLElement_Release(elem); - ok(hres == S_OK, "get_all failed: %08x\n", hres); - - hres = IDispatch_QueryInterface(disp, &IID_IHTMLElementCollection, (void**)&col); - IDispatch_Release(disp); - ok(hres == S_OK, "Could not get IHTMLElementCollection: %08x\n", hres); - test_elem_collection((IUnknown*)col, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1); - IHTMLElementCollection_Release(col); get_elem_by_id(doc, "xxx", FALSE); elem = get_doc_elem_by_id(doc, "xxx");

1 0

Jacek Caban : mshtml: Use document.defaultView to get iframe contentWindow.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: b1a9b4fd2d014f95a16922caa2b3a1a534404303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a9b4fd2d014f95a16922caa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:53:52 2009 +0200 mshtml: Use document.defaultView to get iframe contentWindow. --- dlls/mshtml/htmliframe.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 5f3cafb..a482a5b 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -43,6 +43,40 @@ typedef struct { #define HTMLFRAMEBASE2(x) (&(x)->lpIHTMLFrameBase2Vtbl) +static HRESULT create_content_window(HTMLIFrame *This, nsIDOMHTMLDocument *nsdoc, HTMLWindow **ret) +{ + nsIDOMDocumentView *nsdocview; + nsIDOMAbstractView *nsview; + nsIDOMWindow *nswindow; + nsresult nsres; + HRESULT hres; + + nsres = nsIDOMHTMLDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentView, (void**)&nsdocview); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMDocumentView: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMDocumentView_GetDefaultView(nsdocview, &nsview); + nsIDOMDocumentView_Release(nsdocview); + if(NS_FAILED(nsres)) { + ERR("GetDefaultView failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMAbstractView_QueryInterface(nsview, &IID_nsIDOMWindow, (void**)&nswindow); + nsIDOMAbstractView_Release(nsview); + if(NS_FAILED(nsres)) { + ERR("Coult not get nsIDOMWindow iface: %08x\n", nsres); + return E_FAIL; + } + + hres = HTMLWindow_Create(This->element.node.doc->basedoc.doc_obj, nswindow, ret); + + nsIDOMWindow_Release(nswindow); + return hres; +} + #define HTMLFRAMEBASE2_THIS(iface) DEFINE_THIS(HTMLIFrame, IHTMLFrameBase2, iface) static HRESULT WINAPI HTMLIFrameBase2_QueryInterface(IHTMLFrameBase2 *iface, REFIID riid, void **ppv) @@ -130,10 +164,10 @@ static HRESULT WINAPI HTMLIFrameBase2_get_contentWindow(IHTMLFrameBase2 *iface, return E_FAIL; } - hres = HTMLWindow_Create(This->element.node.doc->basedoc.doc_obj, NULL, &window); + hres = create_content_window(This, nshtmldoc, &window); if(FAILED(hres)) { - nsIDOMDocument_Release(nsdoc); - return hres; + nsIDOMHTMLDocument_Release(nshtmldoc); + return E_FAIL; } hres = create_doc_from_nsdoc(nshtmldoc, This->element.node.doc->basedoc.doc_obj, window, &content_doc);

1 0

Jacek Caban : mshtml: Added IHTMLAnchorElement::get_href tests.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: d3a3af755b59e14e188776f899073ec00aac1ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a3af755b59e14e188776f89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:53:17 2009 +0200 mshtml: Added IHTMLAnchorElement::get_href tests. --- dlls/mshtml/tests/dom.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b8a7e8a..862d281 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -42,7 +42,7 @@ static const char range_test2_str[] = static const char elem_test_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" "<body onload=\"Testing()\">text test" - "<a href=\"http://test\" name=\"x\">link</a>" + "<a id=\"a\" href=\"http://test\" name=\"x\">link</a>" "<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>" @@ -610,6 +610,17 @@ static IHTMLImgElement *_get_img_iface(unsigned line, IUnknown *unk) return img; } +#define get_anchor_iface(u) _get_anchor_iface(__LINE__,u) +static IHTMLAnchorElement *_get_anchor_iface(unsigned line, IUnknown *unk) +{ + IHTMLAnchorElement *anchor; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLAnchorElement, (void**)&anchor); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLAnchorElement: %08x\n", hres); + return anchor; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -898,6 +909,21 @@ static IHTMLElement *_get_doc_elem(unsigned line, IHTMLDocument2 *doc) return elem; } +#define test_anchor_href(a,h) _test_anchor_href(__LINE__,a,h) +static void _test_anchor_href(unsigned line, IUnknown *unk, const char *exhref) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_href(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, exhref), "href = %s, expected %s\n", wine_dbgstr_w(str), exhref); + SysFreeString(str); + + _test_disp_value(line, unk, exhref); +} + #define test_option_text(o,t) _test_option_text(__LINE__,o,t) static void _test_option_text(unsigned line, IHTMLOptionElement *option, const char *text) { @@ -4932,6 +4958,12 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_elem_by_id(doc, "a", TRUE); + if(elem) { + test_anchor_href((IUnknown*)elem, "http://test/"); + IHTMLElement_Release(elem); + } + hres = IHTMLDocument2_get_body(doc, &elem); ok(hres == S_OK, "get_body failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLAnchorElement::get_href implementation.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 407e54be8957733feccae5ae609d86a6ecf0ec01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=407e54be8957733feccae5ae6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:52:36 2009 +0200 mshtml: Added IHTMLAnchorElement::get_href implementation. --- dlls/mshtml/htmlanchor.c | 33 +++++++++++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 7797e7e..09c7eda 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -36,6 +36,8 @@ typedef struct { HTMLElement element; const IHTMLAnchorElementVtbl *lpHTMLAnchorElementVtbl; + + nsIDOMHTMLAnchorElement *nsanchor; } HTMLAnchorElement; #define HTMLANCHOR(x) (&(x)->lpHTMLAnchorElementVtbl) @@ -104,8 +106,26 @@ static HRESULT WINAPI HTMLAnchorElement_put_href(IHTMLAnchorElement *iface, BSTR static HRESULT WINAPI HTMLAnchorElement_get_href(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString href_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&href_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *href; + + nsAString_GetData(&href_str, &href); + hres = nsuri_to_url(href, TRUE, p); + }else { + ERR("GetHref failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&href_str); + return hres; } static HRESULT WINAPI HTMLAnchorElement_put_target(IHTMLAnchorElement *iface, BSTR v) @@ -464,6 +484,10 @@ static HRESULT HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) static void HTMLAnchorElement_destructor(HTMLDOMNode *iface) { HTMLAnchorElement *This = HTMLANCHOR_NODE_THIS(iface); + + if(This->nsanchor) + nsIDOMHTMLAnchorElement_Release(This->nsanchor); + HTMLElement_destructor(&This->element.node); } @@ -497,11 +521,16 @@ static dispex_static_data_t HTMLAnchorElement_dispex = { HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement *nselem) { HTMLAnchorElement *ret = heap_alloc_zero(sizeof(HTMLAnchorElement)); + nsresult nsres; ret->lpHTMLAnchorElementVtbl = &HTMLAnchorElementVtbl; ret->element.node.vtbl = &HTMLAnchorElementImplVtbl; HTMLElement_Init(&ret->element, &HTMLAnchorElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLAnchorElement, (void**)&ret->nsanchor); + if(NS_FAILED(nsres)) + ERR("Could not get nsIDOMHTMLAnchorElement iface: %08x\n", nsres); + return &ret->element; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index cb8f768..571c023 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1353,6 +1353,42 @@ interface nsIDOMHTMLImageElement : nsIDOMHTMLElement [ object, + uuid(a6cf90aa-15b3-11d2-932e-00805f8add32), + local + /* FROZEN */ +] +interface nsIDOMHTMLAnchorElement : nsIDOMHTMLElement +{ + nsresult GetAccessKey(nsAString *aAccessKey); + nsresult SetAccessKey(const nsAString *aAccessKey); + nsresult GetCharset(nsAString *aCharset); + nsresult SetCharset(const nsAString *aCharset); + nsresult GetCoords(nsAString *aCoords); + nsresult SetCoords(const nsAString *aCoords); + nsresult GetHref(nsAString *aHref); + nsresult SetHref(const nsAString *aHref); + nsresult GetHreflang(nsAString *aHreflang); + nsresult SetHreflang(const nsAString *aHreflang); + nsresult GetName(nsAString *aName); + nsresult SetName(const nsAString *aName); + nsresult GetRel(nsAString *aRel); + nsresult SetRel(const nsAString *aRel); + nsresult GetRev(nsAString *aRev); + nsresult SetRev(const nsAString *aRev); + nsresult GetShape(nsAString *aShape); + nsresult SetShape(const nsAString *aShape); + nsresult GetTabIndex(PRInt32 *aTabIndex); + nsresult SetTabIndex(PRInt32 aTabIndex); + nsresult GetTarget(nsAString *aTarget); + nsresult SetTarget(const nsAString *aTarget); + nsresult GetType(nsAString *aType); + nsresult SetType(const nsAString *aType); + nsresult Blur(); + nsresult Focus(); +} + +[ + object, uuid(a6cf90b2-15b3-11d2-932e-00805f8add32), local /* FROZEN */

1 0

Jacek Caban : mshtml: Get rid of no longer needed HTMLLocation_value.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 8085b7085c700e09f483f851a846795f287b0042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8085b7085c700e09f483f851a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:52:05 2009 +0200 mshtml: Get rid of no longer needed HTMLLocation_value. --- dlls/mshtml/htmllocation.c | 36 +----------------------------------- 1 files changed, 1 insertions(+), 35 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 67ebf99..45899b4 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -343,34 +343,6 @@ static HRESULT WINAPI HTMLLocation_toString(IHTMLLocation *iface, BSTR *String) return E_NOTIMPL; } -static HRESULT HTMLLocation_value(IUnknown *iface, LCID lcid, WORD flags, DISPPARAMS *params, - VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) -{ - HTMLLocation *This = HTMLLOCATION_THIS(iface); - HRESULT hres; - - TRACE("(%p)\n", This); - - switch(flags) { - case DISPATCH_PROPERTYGET: { - BSTR str; - - hres = IHTMLLocation_get_href(HTMLLOCATION(This), &str); - if(FAILED(hres)) - return hres; - - V_VT(res) = VT_BSTR; - V_BSTR(res) = str; - break; - } - default: - FIXME("unimplemented flags %x\n", flags); - return E_NOTIMPL; - } - - return S_OK; -} - #undef HTMLLOCATION_THIS static const IHTMLLocationVtbl HTMLLocationVtbl = { @@ -403,18 +375,12 @@ static const IHTMLLocationVtbl HTMLLocationVtbl = { HTMLLocation_toString }; -static const dispex_static_data_vtbl_t HTMLLocation_dispex_vtbl = { - HTMLLocation_value, - NULL, - NULL -}; - static const tid_t HTMLLocation_iface_tids[] = { IHTMLLocation_tid, 0 }; static dispex_static_data_t HTMLLocation_dispex = { - &HTMLLocation_dispex_vtbl, + NULL, DispHTMLLocation_tid, NULL, HTMLLocation_iface_tids

1 0

Jacek Caban : mshtml: Use dispinterface DISPID_VALUE implementation if available.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 1c60a21a53a00b6b395d9d61efd15100f9ebe689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c60a21a53a00b6b395d9d61e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:51:48 2009 +0200 mshtml: Use dispinterface DISPID_VALUE implementation if available. --- dlls/mshtml/dispex.c | 52 ++++++++++++++++++++++++++++++------------------- 1 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 3cfae67..4092374 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; + typedef struct { DISPID id; BSTR name; @@ -244,10 +246,12 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) TRACE("(%p)\n", This); - hres = get_typeinfo(This->data->disp_tid, &dti); - if(FAILED(hres)) { - ERR("Could not get disp type info: %08x\n", hres); - return NULL; + if(This->data->disp_tid) { + hres = get_typeinfo(This->data->disp_tid, &dti); + if(FAILED(hres)) { + ERR("Could not get disp type info: %08x\n", hres); + return NULL; + } } data = heap_alloc(sizeof(dispex_data_t)); @@ -421,8 +425,6 @@ HRESULT dispex_get_dprop_ref(DispatchEx *This, const WCHAR *name, BOOL alloc, VA static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { - static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; - if(This->data->vtbl && This->data->vtbl->value) return This->data->vtbl->value(This->outer, lcid, flags, params, res, ei, caller); @@ -537,11 +539,13 @@ static const dispex_static_data_vtbl_t function_dispex_vtbl = { NULL }; +static const tid_t function_iface_tids[] = {0}; + static dispex_static_data_t function_dispex = { &function_dispex_vtbl, - LAST_tid, + NULL_tid, NULL, - NULL + function_iface_tids }; static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info) @@ -572,6 +576,18 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, case DISPATCH_PROPERTYGET: { dispex_dynamic_data_t *dynamic_data; + if(func->id == DISPID_VALUE) { + BSTR ret; + + ret = SysAllocString(objectW); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = ret; + return S_OK; + } + dynamic_data = get_dynamic_data(This, TRUE); if(!dynamic_data) return E_OUTOFMEMORY; @@ -613,8 +629,10 @@ static HRESULT get_builtin_func(dispex_data_t *data, DISPID id, func_info_t **re while(min <= max) { n = (min+max)/2; - if(data->funcs[n].id == id) - break; + if(data->funcs[n].id == id) { + *ret = data->funcs+n; + return S_OK; + } if(data->funcs[n].id < id) min = n+1; @@ -622,13 +640,8 @@ static HRESULT get_builtin_func(dispex_data_t *data, DISPID id, func_info_t **re max = n-1; } - if(min > max) { - WARN("invalid id %x\n", id); - return DISP_E_UNKNOWNNAME; - } - - *ret = data->funcs+n; - return S_OK; + WARN("invalid id %x\n", id); + return DISP_E_UNKNOWNNAME; } #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) @@ -777,9 +790,6 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - if(id == DISPID_VALUE) - return dispex_value(This, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - if(is_custom_dispid(id) && This->data->vtbl && This->data->vtbl->invoke) return This->data->vtbl->invoke(This->outer, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); @@ -853,6 +863,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return E_FAIL; hres = get_builtin_func(data, id, &func); + if(id == DISPID_VALUE && hres == DISP_E_UNKNOWNNAME) + return dispex_value(This, lcid, wFlags, pdp, pvarRes, pei, pspCaller); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Added HTMLAnchorElement dispex data.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: df90f665bb11e2d01ff3e061d6f989ce2589cadb URL: http://source.winehq.org/git/wine.git/?a=commit;h=df90f665bb11e2d01ff3e061d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:51:19 2009 +0200 mshtml: Added HTMLAnchorElement dispex data. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlanchor.c | 24 ++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 10 ++++++---- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a2d3468..3cfae67 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -79,6 +79,7 @@ static REFIID tid_ids[] = { &IID_NULL, &DIID_DispCEventObj, &DIID_DispDOMChildrenCollection, + &DIID_DispHTMLAnchorElement, &DIID_DispHTMLBody, &DIID_DispHTMLCommentElement, &DIID_DispHTMLCurrentStyle, @@ -98,6 +99,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLTableRow, &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, + &IID_IHTMLAnchorElement, &IID_IHTMLBodyElement, &IID_IHTMLBodyElement2, &IID_IHTMLCommentElement, diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 7e5fd3f..7797e7e 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -474,14 +474,34 @@ static const NodeImplVtbl HTMLAnchorElementImplVtbl = { HTMLAnchorElement_destructor }; +static const tid_t HTMLAnchorElement_iface_tids[] = { + IHTMLAnchorElement_tid, + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + IHTMLElement3_tid, + IHTMLElement4_tid, + IHTMLTextContainer_tid, + IHTMLUniqueName_tid, + 0 +}; + +static dispex_static_data_t HTMLAnchorElement_dispex = { + NULL, + DispHTMLAnchorElement_tid, + NULL, + HTMLAnchorElement_iface_tids +}; + HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement *nselem) { HTMLAnchorElement *ret = heap_alloc_zero(sizeof(HTMLAnchorElement)); - HTMLElement_Init(&ret->element, NULL); - ret->lpHTMLAnchorElementVtbl = &HTMLAnchorElementVtbl; ret->element.node.vtbl = &HTMLAnchorElementImplVtbl; + HTMLElement_Init(&ret->element, &HTMLAnchorElement_dispex); + return &ret->element; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 085dd1d..18719fe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -59,6 +59,7 @@ typedef enum { NULL_tid, DispCEventObj_tid, DispDOMChildrenCollection_tid, + DispHTMLAnchorElement_tid, DispHTMLBody_tid, DispHTMLCommentElement_tid, DispHTMLCurrentStyle_tid, @@ -78,6 +79,7 @@ typedef enum { DispHTMLTableRow_tid, DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, + IHTMLAnchorElement_tid, IHTMLBodyElement_tid, IHTMLBodyElement2_tid, IHTMLCommentElement_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 626445e..b8a7e8a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -353,7 +353,7 @@ static const elem_type_info_t elem_type_infos[] = { {"HEAD", elem_iids, NULL}, {"TITLE", elem_iids, NULL}, {"BODY", body_iids, &DIID_DispHTMLBody}, - {"A", anchor_iids, NULL}, + {"A", anchor_iids, &DIID_DispHTMLAnchorElement}, {"INPUT", input_iids, &DIID_DispHTMLInputElement}, {"SELECT", select_iids, &DIID_DispHTMLSelectElement}, {"TEXTAREA", textarea_iids, NULL}, @@ -527,7 +527,8 @@ static void _test_disp(unsigned line, IUnknown *unk, const IID *diid, const char if(_test_get_dispid(line, unk, &iid)) ok_(__FILE__,line) (IsEqualGUID(&iid, diid), "unexpected guid %s\n", dbgstr_guid(&iid)); - _test_disp_value(line, unk, val); + if(val) + _test_disp_value(line, unk, val); } #define test_disp2(u,id,id2,v) _test_disp2(__LINE__,u,id,id2,v) @@ -539,7 +540,8 @@ static void _test_disp2(unsigned line, IUnknown *unk, const IID *diid, const IID ok_(__FILE__,line) (IsEqualGUID(&iid, diid) || broken(IsEqualGUID(&iid, diid2)), "unexpected guid %s\n", dbgstr_guid(&iid)); - _test_disp_value(line, unk, val); + if(val) + _test_disp_value(line, unk, val); } #define get_elem_iface(u) _get_elem_iface(__LINE__,u) @@ -664,7 +666,7 @@ static void _test_elem_type(unsigned line, IUnknown *unk, elem_type_t type) _test_elem_tag(line, unk, elem_type_infos[type].tag); _test_ifaces(line, unk, elem_type_infos[type].iids); - if(elem_type_infos[type].dispiid) + if(elem_type_infos[type].dispiid && type != ET_A) _test_disp(line, unk, elem_type_infos[type].dispiid, "[object]"); }

1 0

Jacek Caban : mshtml: Moved init_dispex call to HTMLElement_Init.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: a70bbf82856963a90057f805fcb0a800b0e6c555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70bbf82856963a90057f805f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:50:48 2009 +0200 mshtml: Moved init_dispex call to HTMLElement_Init. --- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlbody.c | 6 ++---- dlls/mshtml/htmlcomment.c | 3 +-- dlls/mshtml/htmlelem.c | 7 +++---- dlls/mshtml/htmlgeneric.c | 3 +-- dlls/mshtml/htmliframe.c | 3 +-- dlls/mshtml/htmlimg.c | 3 +-- dlls/mshtml/htmlinput.c | 3 +-- dlls/mshtml/htmloption.c | 3 +-- dlls/mshtml/htmlscript.c | 4 ++-- dlls/mshtml/htmlselect.c | 3 +-- dlls/mshtml/htmltable.c | 3 +-- dlls/mshtml/htmltablerow.c | 3 +-- dlls/mshtml/htmltextarea.c | 4 ++-- dlls/mshtml/htmltextcont.c | 6 +++--- dlls/mshtml/mshtml_private.h | 4 ++-- 16 files changed, 24 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a70bbf82856963a90057f…

1 0

Jacek Caban : mshtml.idl: Added DispHTMLAnchorElement declaration.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 356d60df0b78d5889643ff771574aac7fcc5e29a URL: http://source.winehq.org/git/wine.git/?a=commit;h=356d60df0b78d5889643ff771… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:50:16 2009 +0200 mshtml.idl: Added DispHTMLAnchorElement declaration. --- include/mshtmdid.h | 109 +++++ include/mshtml.idl | 1316 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 1417 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=356d60df0b78d5889643f…

1 0

Paul Vriens : fltlib: Add a stub for FilterConnectCommunicationPort.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 30004df784c7edd922e931860360dd7bfb0ad2d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30004df784c7edd922e931860… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 2 13:41:50 2009 +0200 fltlib: Add a stub for FilterConnectCommunicationPort. --- dlls/fltlib/fltlib.c | 15 +++++++++++++++ dlls/fltlib/fltlib.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c index 08baf8f..acd202f 100644 --- a/dlls/fltlib/fltlib.c +++ b/dlls/fltlib/fltlib.c @@ -43,3 +43,18 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/********************************************************************** + * FilterConnectCommunicationPort (FLTLIB.@) + */ +HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOptions, + LPVOID lpContext, DWORD dwSizeOfContext, + LPSECURITY_ATTRIBUTES lpSecurityAttributes, + HANDLE *hPort) +{ + FIXME("(%s, %d, %p, %d, %p, %p) stub\n", debugstr_w(lpPortName), dwOptions, + lpContext, dwSizeOfContext, lpSecurityAttributes, hPort); + + *hPort = INVALID_HANDLE_VALUE; + return E_NOTIMPL; +} diff --git a/dlls/fltlib/fltlib.spec b/dlls/fltlib/fltlib.spec index ac1d7ec..9c84601 100644 --- a/dlls/fltlib/fltlib.spec +++ b/dlls/fltlib/fltlib.spec @@ -1,7 +1,7 @@ @ stub FilterAttach @ stub FilterAttachAtAltitude @ stub FilterClose -@ stub FilterConnectCommunicationPort +@ stdcall FilterConnectCommunicationPort(wstr long ptr long ptr ptr) @ stub FilterCreate @ stub FilterDetach @ stub FilterFindClose

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009