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

Owen Rudge : shell32: Add support for WantsForDISPLAY and HideAsDeletePerUser to the register_coclasses routine .
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 03a4b8d4b034ebbaaa05b6d15902afe61bee2d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a4b8d4b034ebbaaa05b6d15… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jun 23 18:53:31 2008 +0100 shell32: Add support for WantsForDISPLAY and HideAsDeletePerUser to the register_coclasses routine. --- dlls/shell32/regsvr.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index 199a9dc..4d87896 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -80,8 +80,10 @@ struct regsvr_coclass /* flags for regsvr_coclass.flags */ #define SHELLEX_MAYCHANGEDEFAULTMENU 0x00000001 #define SHELLFOLDER_WANTSFORPARSING 0x00000002 -#define SHELLFOLDER_ATTRIBUTES 0x00000004 -#define SHELLFOLDER_CALLFORATTRIBUTES 0x00000008 +#define SHELLFOLDER_WANTSFORDISPLAY 0x00000004 +#define SHELLFOLDER_ATTRIBUTES 0x00000008 +#define SHELLFOLDER_CALLFORATTRIBUTES 0x00000010 +#define SHELLFOLDER_HIDEASDELETE 0x00000020 static HRESULT register_coclasses(struct regsvr_coclass const *list); static HRESULT unregister_coclasses(struct regsvr_coclass const *list); @@ -133,9 +135,11 @@ static WCHAR const defaulticon_keyname[] = { 'D','e','f','a','u','l','t','I','c','o','n',0}; static char const tmodel_valuename[] = "ThreadingModel"; static char const wfparsing_valuename[] = "WantsFORPARSING"; +static char const wfdisplay_valuename[] = "WantsFORDISPLAY"; static char const attributes_valuename[] = "Attributes"; static char const cfattributes_valuename[] = "CallForAttributes"; static char const localized_valuename[] = "LocalizedString"; +static char const hideasdelete_valuename[] = "HideAsDeletePerUser"; /*********************************************************************** * static helper functions @@ -333,7 +337,7 @@ static HRESULT register_coclasses(struct regsvr_coclass const *list) } if (list->flags & - (SHELLFOLDER_WANTSFORPARSING|SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_CALLFORATTRIBUTES)) + (SHELLFOLDER_WANTSFORPARSING|SHELLFOLDER_WANTSFORDISPLAY|SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_CALLFORATTRIBUTES|SHELLFOLDER_HIDEASDELETE)) { HKEY shellfolder_key; @@ -343,6 +347,10 @@ static HRESULT register_coclasses(struct regsvr_coclass const *list) if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (list->flags & SHELLFOLDER_WANTSFORPARSING) res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (const BYTE *)"", 1); + if (list->flags & SHELLFOLDER_WANTSFORDISPLAY) + res = RegSetValueExA(shellfolder_key, wfdisplay_valuename, 0, REG_SZ, (const BYTE *)"", 1); + if (list->flags & SHELLFOLDER_HIDEASDELETE) + res = RegSetValueExA(shellfolder_key, hideasdelete_valuename, 0, REG_SZ, (const BYTE *)"", 1); if (list->flags & SHELLFOLDER_ATTRIBUTES) res = RegSetValueExA(shellfolder_key, attributes_valuename, 0, REG_DWORD, (const BYTE *)&list->dwAttributes, sizeof(DWORD));

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode::hasChildNodes implementation.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: c592c6e748bf9a20f8d924cc34b36f18c97afb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c592c6e748bf9a20f8d924cc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 20:03:25 2008 -0500 mshtml: Added IHTMLDOMNode::hasChildNodes implementation. --- dlls/mshtml/htmlnode.c | 13 +++++++++++-- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 9b667a1..d46d75c 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -393,8 +393,17 @@ static HRESULT WINAPI HTMLDOMNode_get_parentNode(IHTMLDOMNode *iface, IHTMLDOMNo static HRESULT WINAPI HTMLDOMNode_hasChildNodes(IHTMLDOMNode *iface, VARIANT_BOOL *fChildren) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p)\n", This, fChildren); - return E_NOTIMPL; + PRBool has_child = FALSE; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, fChildren); + + nsres = nsIDOMNode_HasChildNodes(This->nsnode, &has_child); + if(NS_FAILED(nsres)) + ERR("HasChildNodes failed: %08x\n", nsres); + + *fChildren = has_child ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLDOMNode_get_childNodes(IHTMLDOMNode *iface, IDispatch **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9910ce6..9ee1f07 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -836,6 +836,20 @@ static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) return child; } +#define test_node_has_child(u,b) _test_node_has_child(__LINE__,u,b) +static void _test_node_has_child(unsigned line, IUnknown *unk, VARIANT_BOOL exb) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + VARIANT_BOOL b = 0xdead; + HRESULT hres; + + hres = IHTMLDOMNode_hasChildNodes(node, &b); + ok_(__FILE__,line) (hres == S_OK, "hasChildNodes failed: %08x\n", hres); + ok_(__FILE__,line) (b == exb, "hasChildNodes=%x, expected %x\n", b, exb); + + IHTMLDOMNode_Release(node); +} + #define get_node_type(n) _get_node_type(__LINE__,n) static long _get_node_type(unsigned line, IUnknown *unk) { @@ -2095,8 +2109,10 @@ static void test_create_elems(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_body(doc, &body); ok(hres == S_OK, "get_body failed: %08x\n", hres); + test_node_has_child((IUnknown*)body, VARIANT_FALSE); node = test_node_append_child((IUnknown*)body, (IUnknown*)elem); + test_node_has_child((IUnknown*)body, VARIANT_TRUE); elem2 = get_elem_iface((IUnknown*)node); IHTMLElement_Release(elem2); @@ -2111,6 +2127,7 @@ static void test_create_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "get_all failed: %08x\n", hres); test_elem_collection((IUnknown*)disp, NULL, 0); IDispatch_Release(disp); + test_node_has_child((IUnknown*)body, VARIANT_FALSE); IHTMLElement_Release(body); IHTMLElement_Release(elem);

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode::removeChild implementation.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: c3d8d052f6f5e0163aa0853cedb19905db507a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d8d052f6f5e0163aa0853ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 20:03:43 2008 -0500 mshtml: Added IHTMLDOMNode::removeChild implementation. --- dlls/mshtml/htmlnode.c | 22 +++++++++++++++++- dlls/mshtml/tests/dom.c | 53 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 056e38a..9b667a1 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -436,8 +436,26 @@ static HRESULT WINAPI HTMLDOMNode_removeChild(IHTMLDOMNode *iface, IHTMLDOMNode IHTMLDOMNode **node) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, oldChild, node); - return E_NOTIMPL; + HTMLDOMNode *node_obj; + nsIDOMNode *nsnode; + nsresult nsres; + + TRACE("(%p)->(%p %p)\n", This, oldChild, node); + + node_obj = get_node_obj(This->doc, (IUnknown*)oldChild); + if(!node_obj) + return E_FAIL; + + nsres = nsIDOMNode_RemoveChild(This->nsnode, node_obj->nsnode, &nsnode); + if(NS_FAILED(nsres)) { + ERR("RemoveChild failed: %08x\n", nsres); + return E_FAIL; + } + + /* FIXME: Make sure that node != newChild */ + *node = HTMLDOMNODE(get_node(This->doc, nsnode, TRUE)); + IHTMLDOMNode_AddRef(*node); + return S_OK; } static HRESULT WINAPI HTMLDOMNode_replaceChild(IHTMLDOMNode *iface, IHTMLDOMNode *newChild, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4da9110..9910ce6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -769,15 +769,19 @@ static void _test_range_parent(unsigned line, IHTMLTxtRange *range, elem_type_t } #define test_elem_collection(c,t,l) _test_elem_collection(__LINE__,c,t,l) -static void _test_elem_collection(unsigned line, IHTMLElementCollection *col, +static void _test_elem_collection(unsigned line, IUnknown *unk, const elem_type_t *elem_types, long exlen) { + IHTMLElementCollection *col; long len; DWORD i; VARIANT name, index; IDispatch *disp; HRESULT hres; + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElementCollection, (void**)&col); + ok(hres == S_OK, "Could not get IHTMLElementCollection: %08x\n", hres); + test_disp((IUnknown*)col, &DIID_DispHTMLElementCollection); hres = IHTMLElementCollection_get_length(col, &len); @@ -814,6 +818,8 @@ static void _test_elem_collection(unsigned line, IHTMLElementCollection *col, hres = IHTMLElementCollection_item(col, name, index, &disp); ok_(__FILE__,line) (hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + + IHTMLElementCollection_Release(col); } #define get_first_child(n) _get_first_child(__LINE__,n) @@ -1150,10 +1156,25 @@ static IHTMLDOMNode *_test_node_append_child(unsigned line, IUnknown *node_unk, return new_child; } +#define test_node_remove_child(n,c) _test_node_remove_child(__LINE__,n,c) +static void _test_node_remove_child(unsigned line, IUnknown *unk, IHTMLDOMNode *child) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + IHTMLDOMNode *new_node = NULL; + HRESULT hres; + + hres = IHTMLDOMNode_removeChild(node, child, &new_node); + ok_(__FILE__,line) (hres == S_OK, "appendChild failed: %08x\n", hres); + ok_(__FILE__,line) (new_node != NULL, "new_node == NULL\n"); + /* TODO ok_(__FILE__,line) (new_node != child, "new_node == child\n"); */ + + IHTMLDOMNode_Release(node); + IHTMLDOMNode_Release(new_node); +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { - IHTMLElementCollection *elcol; IDispatch *disp; VARIANT name, index; DWORD i; @@ -1166,15 +1187,12 @@ static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, hres = IHTMLElementCollection_item(col, name, index, &disp); ok(hres == S_OK, "item failed: %08x\n", hres); - hres = IDispatch_QueryInterface(disp, &IID_IHTMLElementCollection, (void**)&elcol); + test_elem_collection((IUnknown*)disp, elem_types, len); IDispatch_Release(disp); ok(hres == S_OK, "Could not get IHTMLElementCollection interface: %08x\n", hres); if(hres != S_OK) goto cleanup; - test_elem_collection(elcol, elem_types, len); - IHTMLElementCollection_Release(elcol); - V_VT(&index) = VT_I4; for(i=0; i<len; i++) { @@ -1881,7 +1899,7 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_all(doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); - test_elem_collection(col, all_types, sizeof(all_types)/sizeof(all_types[0])); + test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); test_elem_col_item(col, xW, item_types, sizeof(item_types)/sizeof(item_types[0])); IHTMLElementCollection_Release(col); @@ -1894,7 +1912,7 @@ static void test_elems(IHTMLDocument2 *doc) 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(col, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1); + test_elem_collection((IUnknown*)col, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1); IHTMLElementCollection_Release(col); get_elem_by_id(doc, xxxW, FALSE); @@ -2060,7 +2078,6 @@ static void test_elems(IHTMLDocument2 *doc) static void test_create_elems(IHTMLDocument2 *doc) { - IHTMLElementCollection *col; IHTMLElement *elem, *body, *elem2; IHTMLDOMNode *node; IDispatch *disp; @@ -2081,19 +2098,23 @@ static void test_create_elems(IHTMLDocument2 *doc) node = test_node_append_child((IUnknown*)body, (IUnknown*)elem); elem2 = get_elem_iface((IUnknown*)node); - IHTMLDOMNode_Release(node); + IHTMLElement_Release(elem2); hres = IHTMLElement_get_all(body, &disp); ok(hres == S_OK, "get_all failed: %08x\n", hres); - hres = IDispatch_QueryInterface(disp, &IID_IHTMLElementCollection, (void**)&col); - ok(hres == S_OK, "Could not get IHTMLElementCollection: %08x\n", hres); + test_elem_collection((IUnknown*)disp, types1, sizeof(types1)/sizeof(types1[0])); IDispatch_Release(disp); - test_elem_collection(col, types1, sizeof(types1)/sizeof(types1[0])); + test_node_remove_child((IUnknown*)body, node); + + hres = IHTMLElement_get_all(body, &disp); + ok(hres == S_OK, "get_all failed: %08x\n", hres); + test_elem_collection((IUnknown*)disp, NULL, 0); + IDispatch_Release(disp); - IHTMLElement_Release(elem2); IHTMLElement_Release(body); IHTMLElement_Release(elem); + IHTMLDOMNode_Release(node); node = test_create_text(doc, "test"); test_ifaces((IUnknown*)node, text_iids); @@ -2143,7 +2164,7 @@ static void test_indent(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_all(doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); - test_elem_collection(col, all_types, sizeof(all_types)/sizeof(all_types[0])); + test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); IHTMLElementCollection_Release(col); range = test_create_body_range(doc); @@ -2152,7 +2173,7 @@ static void test_indent(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_all(doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); - test_elem_collection(col, indent_types, sizeof(indent_types)/sizeof(indent_types[0])); + test_elem_collection((IUnknown*)col, indent_types, sizeof(indent_types)/sizeof(indent_types[0])); IHTMLElementCollection_Release(col); }

1 0

Jacek Caban : mshtml: Fixed argument checking in IHTMLDOMChildrenCollection ::item.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 91dcf287c7818eec598e69803da6f864e6b8a8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91dcf287c7818eec598e69803… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 20:03:06 2008 -0500 mshtml: Fixed argument checking in IHTMLDOMChildrenCollection::item. --- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index bfa999f..056e38a 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -166,7 +166,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection TRACE("(%p)->(%ld %p)\n", This, index, ppItem); nsIDOMNodeList_GetLength(This->nslist, &length); - if(index < 0 || index > length) + if(index < 0 || index >= length) return E_INVALIDARG; nsres = nsIDOMNodeList_Item(This->nslist, index, &nsnode); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7d57b24..4da9110 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2042,6 +2042,11 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); ok(disp == (void*)0xdeadbeef, "disp=%p\n", disp); + disp = (void*)0xdeadbeef; + hres = IHTMLDOMChildrenCollection_item(child_col, length, &disp); + ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok(disp == (void*)0xdeadbeef, "disp=%p\n", disp); + test_child_col_disp(child_col); IHTMLDOMChildrenCollection_Release(child_col);

1 0

Jacek Caban : mshtml: Added support to accessing child nodes by index in IHTMLDOMChildrenCollection .
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 8d7066b264c5ba741dfacd6ff281ff2f14c3ed78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d7066b264c5ba741dfacd6ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 20:02:42 2008 -0500 mshtml: Added support to accessing child nodes by index in IHTMLDOMChildrenCollection. --- dlls/mshtml/htmlnode.c | 79 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 46 +++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 6886508..bfa999f 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -180,6 +180,58 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection return S_OK; } +#define DISPID_CHILDCOL_0 MSHTML_DISPID_CUSTOM_MIN + +static HRESULT HTMLDOMChildrenCollection_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DISPID *dispid) +{ + HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + WCHAR *ptr; + DWORD idx=0; + PRUint32 len = 0; + + for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + idx = idx*10 + (*ptr-'0'); + if(*ptr) + return DISP_E_UNKNOWNNAME; + + nsIDOMNodeList_GetLength(This->nslist, &len); + if(idx >= len) + return DISP_E_UNKNOWNNAME; + + *dispid = DISPID_CHILDCOL_0 + idx; + TRACE("ret %x\n", *dispid); + return S_OK; +} + +static HRESULT HTMLDOMChildrenCollection_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); + + switch(flags) { + case INVOKE_PROPERTYGET: { + IDispatch *disp = NULL; + HRESULT hres; + + hres = IHTMLDOMChildrenCollection_item(HTMLCHILDCOL(This), id - DISPID_CHILDCOL_0, &disp); + if(0&&FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = disp; + break; + } + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + #undef HTMLCHILDCOL_THIS static const IHTMLDOMChildrenCollectionVtbl HTMLDOMChildrenCollectionVtbl = { @@ -199,8 +251,14 @@ static const tid_t HTMLDOMChildrenCollection_iface_tids[] = { IHTMLDOMChildrenCollection_tid, 0 }; + +static const dispex_static_data_vtbl_t HTMLDOMChildrenCollection_dispex_vtbl = { + HTMLDOMChildrenCollection_get_dispid, + HTMLDOMChildrenCollection_invoke +}; + static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { - NULL, + &HTMLDOMChildrenCollection_dispex_vtbl, DispDOMChildrenCollection_tid, NULL, HTMLDOMChildrenCollection_iface_tids @@ -374,11 +432,11 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode return E_NOTIMPL; } -static HRESULT WINAPI HTMLDOMNode_removeChild(IHTMLDOMNode *iface, IHTMLDOMNode *newChild, +static HRESULT WINAPI HTMLDOMNode_removeChild(IHTMLDOMNode *iface, IHTMLDOMNode *oldChild, IHTMLDOMNode **node) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, newChild, node); + FIXME("(%p)->(%p %p)\n", This, oldChild, node); return E_NOTIMPL; } @@ -548,8 +606,19 @@ static HRESULT WINAPI HTMLDOMNode_get_firstChild(IHTMLDOMNode *iface, IHTMLDOMNo static HRESULT WINAPI HTMLDOMNode_get_lastChild(IHTMLDOMNode *iface, IHTMLDOMNode **p) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNode *nschild = NULL; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMNode_GetLastChild(This->nsnode, &nschild); + if(nschild) { + *p = HTMLDOMNODE(get_node(This->doc, nschild, TRUE)); + IHTMLDOMNode_AddRef(*p); + }else { + *p = NULL; + } + + return S_OK; } static HRESULT WINAPI HTMLDOMNode_get_previousSibling(IHTMLDOMNode *iface, IHTMLDOMNode **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ae8f6de..7d57b24 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1792,6 +1792,50 @@ static void test_stylesheets(IHTMLDocument2 *doc) IHTMLStyleSheetsCollection_Release(col); } +static void test_child_col_disp(IHTMLDOMChildrenCollection *col) +{ + IDispatchEx *dispex; + IHTMLDOMNode *node; + DISPPARAMS dp = {NULL, NULL, 0, 0}; + VARIANT var; + EXCEPINFO ei; + long type; + DISPID id; + BSTR bstr; + HRESULT hres; + + static const WCHAR w0[] = {'0',0}; + static const WCHAR w100[] = {'1','0','0',0}; + + hres = IHTMLDOMChildrenCollection_QueryInterface(col, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx: %08x\n", hres); + + bstr = SysAllocString(w0); + hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + SysFreeString(bstr); + + VariantInit(&var); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH, "V_VT(var)=%d\n", V_VT(&var)); + ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(var) == NULL\n"); + node = get_node_iface((IUnknown*)V_DISPATCH(&var)); + type = get_node_type((IUnknown*)node); + ok(type == 3, "type=%ld\n", type); + IHTMLDOMNode_Release(node); + VariantClear(&var); + + bstr = SysAllocString(w100); + hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); + ok(hres == DISP_E_UNKNOWNNAME, "GetDispID failed: %08x, expected DISP_E_UNKNOWNNAME\n", hres); + SysFreeString(bstr); + + IDispatchEx_Release(dispex); +} + + + static void test_elems(IHTMLDocument2 *doc) { IHTMLElementCollection *col; @@ -1998,6 +2042,8 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); ok(disp == (void*)0xdeadbeef, "disp=%p\n", disp); + test_child_col_disp(child_col); + IHTMLDOMChildrenCollection_Release(child_col); }

1 0

Jacek Caban : mshtml: Added IHTMLElement2::put_tabIndex implementation.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: c8284724abcac810772d223f760050cc4950341c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8284724abcac810772d223f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 20:02:22 2008 -0500 mshtml: Added IHTMLElement2::put_tabIndex implementation. --- dlls/mshtml/htmlelem2.c | 19 +++++++++++++++++-- dlls/mshtml/tests/dom.c | 15 +++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 572841c..d12c60c 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -383,8 +383,23 @@ static HRESULT WINAPI HTMLElement2_removeExpression(IHTMLElement2 *iface, BSTR p static HRESULT WINAPI HTMLElement2_put_tabIndex(IHTMLElement2 *iface, short v) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMHTMLNSElement: %08x\n", nsres); + return S_OK; + } + + nsres = nsIDOMNSHTMLElement_SetTabIndex(nselem, v); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) + ERR("GetTabIndex failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLElement2_get_tabIndex(IHTMLElement2 *iface, short *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 65e9de6..ae8f6de 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -965,6 +965,19 @@ static void _test_elem_tabindex(unsigned line, IUnknown *unk, short exindex) ok_(__FILE__,line) (index == exindex, "unexpected index %d\n", index); } +#define test_elem_set_tabindex(u,i) _test_elem_set_tabindex(__LINE__,u,i) +static void _test_elem_set_tabindex(unsigned line, IUnknown *unk, short index) +{ + IHTMLElement2 *elem2 = _get_elem2_iface(line, unk); + HRESULT hres; + + hres = IHTMLElement2_put_tabIndex(elem2, index); + IHTMLElement2_Release(elem2); + ok_(__FILE__,line) (hres == S_OK, "get_tabIndex failed: %08x\n", hres); + + _test_elem_tabindex(line, unk, index); +} + #define test_elem_set_class(u,c) _test_elem_set_class(__LINE__,u,c) static void _test_elem_set_class(unsigned line, IUnknown *unk, const char *class) { @@ -1854,6 +1867,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_set_class((IUnknown*)elem, "cl"); test_elem_set_class((IUnknown*)elem, NULL); test_elem_tabindex((IUnknown*)elem, 0); + test_elem_set_tabindex((IUnknown*)elem, 1); IHTMLElement_Release(elem); } @@ -1916,6 +1930,7 @@ static void test_elems(IHTMLDocument2 *doc) test_input_value((IUnknown*)elem, NULL); test_elem_class((IUnknown*)elem, "testclass"); test_elem_tabindex((IUnknown*)elem, 2); + test_elem_set_tabindex((IUnknown*)elem, 3); IHTMLInputElement_Release(input); IHTMLElement_Release(elem);

1 0

Jacek Caban : mshtml: Added IHTMLElement2::get_tabIndex implementation.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 807f5c78849318497163cb471d5e18898d1e811d URL: http://source.winehq.org/git/wine.git/?a=commit;h=807f5c78849318497163cb471… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 20:02:03 2008 -0500 mshtml: Added IHTMLElement2::get_tabIndex implementation. --- dlls/mshtml/htmlelem2.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 17 ++++++++++++++++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index fa4457a..572841c 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -390,8 +390,27 @@ static HRESULT WINAPI HTMLElement2_put_tabIndex(IHTMLElement2 *iface, short v) static HRESULT WINAPI HTMLElement2_get_tabIndex(IHTMLElement2 *iface, short *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 index = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMHTMLNSElement: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMNSHTMLElement_GetTabIndex(nselem, &index); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) { + ERR("GetTabIndex failed: %08x\n", nsres); + return E_FAIL; + } + + *p = index; + return S_OK; } static HRESULT WINAPI HTMLElement2_focus(IHTMLElement2 *iface) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6ff4201..65e9de6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -42,7 +42,7 @@ 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>" - "<input id=\"in\" class=\"testclass\"/>" + "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" />" "<select id=\"s\"><option id=\"x\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" "<table><tbody></tbody></table>" @@ -952,6 +952,19 @@ static void _test_elem_class(unsigned line, IUnknown *unk, const char *exclass) SysFreeString(class); } +#define test_elem_tabindex(u,i) _test_elem_tabindex(__LINE__,u,i) +static void _test_elem_tabindex(unsigned line, IUnknown *unk, short exindex) +{ + IHTMLElement2 *elem2 = _get_elem2_iface(line, unk); + short index = -3; + HRESULT hres; + + hres = IHTMLElement2_get_tabIndex(elem2, &index); + IHTMLElement2_Release(elem2); + ok_(__FILE__,line) (hres == S_OK, "get_tabIndex failed: %08x\n", hres); + ok_(__FILE__,line) (index == exindex, "unexpected index %d\n", index); +} + #define test_elem_set_class(u,c) _test_elem_set_class(__LINE__,u,c) static void _test_elem_set_class(unsigned line, IUnknown *unk, const char *class) { @@ -1840,6 +1853,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_class((IUnknown*)elem, NULL); test_elem_set_class((IUnknown*)elem, "cl"); test_elem_set_class((IUnknown*)elem, NULL); + test_elem_tabindex((IUnknown*)elem, 0); IHTMLElement_Release(elem); } @@ -1901,6 +1915,7 @@ static void test_elems(IHTMLDocument2 *doc) test_input_put_value((IUnknown*)elem, "test"); test_input_value((IUnknown*)elem, NULL); test_elem_class((IUnknown*)elem, "testclass"); + test_elem_tabindex((IUnknown*)elem, 2); IHTMLInputElement_Release(input); IHTMLElement_Release(elem);

1 0

Jacek Caban : mshtml: Added IHTMLElement::put_onkeyup implementation.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 9eb4ee2e06d7865d5f7a6ffc404bd0e71fe19287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb4ee2e06d7865d5f7a6ffc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 20:01:25 2008 -0500 mshtml: Added IHTMLElement::put_onkeyup implementation. --- dlls/mshtml/htmlelem.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3968156..91e4b6a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -487,8 +487,10 @@ static HRESULT WINAPI HTMLElement_get_onkeydown(IHTMLElement *iface, VARIANT *p) static HRESULT WINAPI HTMLElement_put_onkeyup(IHTMLElement *iface, VARIANT v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->node, EVENTID_KEYUP, &v); } static HRESULT WINAPI HTMLElement_get_onkeyup(IHTMLElement *iface, VARIANT *p)

1 0

Jacek Caban : mshtml: Added keyup event support.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 0848cc977f0aefaa389ba261aaa108ae94da0684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0848cc977f0aefaa389ba261a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 23 20:01:04 2008 -0500 mshtml: Added keyup event support. --- dlls/mshtml/htmlevent.c | 4 ++++ dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cfd6ebc..82ee58b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -38,6 +38,9 @@ struct event_target_t { static const WCHAR clickW[] = {'c','l','i','c','k',0}; static const WCHAR onclickW[] = {'o','n','c','l','i','c','k',0}; +static const WCHAR keyupW[] = {'k','e','y','u','p',0}; +static const WCHAR onkeyupW[] = {'o','n','k','e','y','u','p',0}; + static const WCHAR loadW[] = {'l','o','a','d',0}; static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; @@ -51,6 +54,7 @@ typedef struct { static const event_info_t event_info[] = { {clickW, onclickW, EVENT_DEFAULTLISTENER}, + {keyupW, onkeyupW, EVENT_DEFAULTLISTENER}, {loadW, onloadW, 0} }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3842591..ceacde1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -100,6 +100,7 @@ typedef enum { typedef enum { EVENTID_CLICK, + EVENTID_KEYUP, EVENTID_LOAD, EVENTID_LAST } eventid_t;

1 0

Michael Stefaniuc : winedbg: Fix "floating pointer" typo.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 7057d7a91432e6c97a046b91c5e715a08e5fc1ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7057d7a91432e6c97a046b91c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 24 01:02:40 2008 +0200 winedbg: Fix "floating pointer" typo. --- programs/winedbg/tgt_active.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index d334d17..5fba6fa 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -380,10 +380,10 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance dbg_printf("invalid float operation"); break; case EXCEPTION_FLT_OVERFLOW: - dbg_printf("floating pointer overflow"); + dbg_printf("floating point overflow"); break; case EXCEPTION_FLT_UNDERFLOW: - dbg_printf("floating pointer underflow"); + dbg_printf("floating point underflow"); break; case EXCEPTION_FLT_STACK_CHECK: dbg_printf("floating point stack check");

1 0