October 2008 - Wine-commits

Jacek Caban : mshtml: Fixed increasing buffer size logic in text range implementation.
by Alexandre Julliard 14 Oct '08

14 Oct '08

Module: wine Branch: master Commit: 3fc0c731592dc82d8f6a2614b3ab02fb2556a999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc0c731592dc82d8f6a2614b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 14:50:13 2008 -0500 mshtml: Fixed increasing buffer size logic in text range implementation. --- dlls/mshtml/txtrange.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 78ca90c..5a71ab3 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -193,7 +193,7 @@ static inline void wstrbuf_finish(wstrbuf_t *buf) static void wstrbuf_append_len(wstrbuf_t *buf, LPCWSTR str, int len) { if(buf->len+len >= buf->size) { - buf->size = 2*buf->len+len; + buf->size = 2*buf->size+len; buf->buf = heap_realloc(buf->buf, buf->size * sizeof(WCHAR)); } @@ -210,7 +210,7 @@ static void wstrbuf_append_nodetxt(wstrbuf_t *buf, LPCWSTR str, int len) TRACE("%s\n", debugstr_wn(str, len)); if(buf->len+len >= buf->size) { - buf->size = 2*buf->len+len; + buf->size = 2*buf->size+len; buf->buf = heap_realloc(buf->buf, buf->size * sizeof(WCHAR)); }

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_innerText implementation.
by Alexandre Julliard 14 Oct '08

14 Oct '08

Module: wine Branch: master Commit: d05e328db2bb9fa5992c9d18c87e0f028e61e040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05e328db2bb9fa5992c9d18c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 14:49:58 2008 -0500 mshtml: Added IHTMLElement::get_innerText implementation. --- dlls/mshtml/htmlelem.c | 6 ++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 15 +++++++++++++++ dlls/mshtml/txtrange.c | 38 +++++++++++++++++++++++++++++++++++++- 4 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a8c0786..e682095 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -839,8 +839,10 @@ static HRESULT WINAPI HTMLElement_put_innerText(IHTMLElement *iface, BSTR v) static HRESULT WINAPI HTMLElement_get_innerText(IHTMLElement *iface, BSTR *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_text(&This->node, p); } static HRESULT WINAPI HTMLElement_put_outerHTML(IHTMLElement *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cdd4293..ebdc251 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -550,6 +550,7 @@ IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetLis void detach_selection(HTMLDocument*); void detach_ranges(HTMLDocument*); +HRESULT get_node_text(HTMLDOMNode*,BSTR*); HTMLDOMNode *HTMLDOMTextNode_Create(HTMLDocument*,nsIDOMNode*); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 87d372d..e8fce39 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1014,6 +1014,19 @@ static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t ty HeapFree(GetProcessHeap(), 0, types); } +#define test_elem_innertext(e,t) _test_elem_innertext(__LINE__,e,t) +static void _test_elem_innertext(unsigned line, IHTMLElement *elem, const char *extext) +{ + BSTR text = NULL; + HRESULT hres; + + hres = IHTMLElement_get_innerText(elem, &text); + ok_(__FILE__,line) (hres == S_OK, "get_innerText failed: %08x\n", hres); + ok_(__FILE__,line) (!strcmp_wa(text, extext), "get_innerText returned %s expected %s\n", + dbgstr_w(text), extext); + SysFreeString(text); +} + #define get_first_child(n) _get_first_child(__LINE__,n) static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) { @@ -2942,6 +2955,8 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_getelembytag((IUnknown*)elem, ET_SELECT, 0); test_elem_getelembytag((IUnknown*)elem, ET_HTML, 0); + test_elem_innertext(elem, "opt1opt2"); + IHTMLElement_Release(elem); } diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 3f383d1..78ca90c 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -252,7 +252,7 @@ static void wstrbuf_append_node(wstrbuf_t *buf, nsIDOMNode *node) wstrbuf_append_nodetxt(buf, data, strlenW(data)); nsAString_Finish(&data_str); - nsIDOMText_Release(nstext); + nsIDOMText_Release(nstext); break; } @@ -267,6 +267,21 @@ static void wstrbuf_append_node(wstrbuf_t *buf, nsIDOMNode *node) } } +static void wstrbuf_append_node_rec(wstrbuf_t *buf, nsIDOMNode *node) +{ + nsIDOMNode *iter, *tmp; + + wstrbuf_append_node(buf, node); + + nsIDOMNode_GetFirstChild(node, &iter); + while(iter) { + wstrbuf_append_node_rec(buf, iter); + nsIDOMNode_GetNextSibling(iter, &tmp); + nsIDOMNode_Release(iter); + iter = tmp; + } +} + static BOOL fill_nodestr(dompos_t *pos) { nsIDOMText *text; @@ -529,6 +544,27 @@ static void range_to_string(HTMLTxtRange *This, wstrbuf_t *buf) } } +HRESULT get_node_text(HTMLDOMNode *node, BSTR *ret) +{ + wstrbuf_t buf; + HRESULT hres = S_OK; + + wstrbuf_init(&buf); + wstrbuf_append_node_rec(&buf, node->nsnode); + if(buf.buf) { + *ret = SysAllocString(buf.buf); + if(!*ret) + hres = E_OUTOFMEMORY; + }else { + *ret = NULL; + } + wstrbuf_finish(&buf); + + if(SUCCEEDED(hres)) + TRACE("ret %s\n", debugstr_w(*ret)); + return hres; +} + static WCHAR get_pos_char(const dompos_t *pos) { switch(pos->type) {

1 0

Jacek Caban : mshtml: Added IHTMLElement::put_innerText implementation.
by Alexandre Julliard 14 Oct '08

14 Oct '08

Module: wine Branch: master Commit: 59c66e34a94fc3d1cc670786f61f3169792cd01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c66e34a94fc3d1cc670786f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 14:50:27 2008 -0500 mshtml: Added IHTMLElement::put_innerText implementation. --- dlls/mshtml/htmlelem.c | 43 +++++++++++++- dlls/mshtml/tests/dom.c | 147 ++++++++++++++++++++++++++++++----------------- 2 files changed, 136 insertions(+), 54 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e682095..4e7b747 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -832,8 +832,47 @@ static HRESULT WINAPI HTMLElement_get_innerHTML(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_put_innerText(IHTMLElement *iface, BSTR v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsIDOMNode *nschild, *tmp; + nsIDOMText *text_node; + nsAString text_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + while(1) { + nsres = nsIDOMHTMLElement_GetLastChild(This->nselem, &nschild); + if(NS_FAILED(nsres)) { + ERR("GetLastChild failed: %08x\n", nsres); + return E_FAIL; + } + if(!nschild) + break; + + nsres = nsIDOMHTMLElement_RemoveChild(This->nselem, nschild, &tmp); + nsIDOMNode_Release(nschild); + if(NS_FAILED(nsres)) { + ERR("RemoveChild failed: %08x\n", nsres); + return E_FAIL; + } + nsIDOMNode_Release(tmp); + } + + nsAString_Init(&text_str, v); + nsres = nsIDOMHTMLDocument_CreateTextNode(This->node.doc->nsdoc, &text_str, &text_node); + nsAString_Finish(&text_str); + if(NS_FAILED(nsres)) { + ERR("CreateTextNode failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMHTMLElement_AppendChild(This->nselem, (nsIDOMNode*)text_node, &tmp); + if(NS_FAILED(nsres)) { + ERR("AppendChild failed: %08x\n", nsres); + return E_FAIL; + } + + nsIDOMNode_Release(tmp); + return S_OK; } static HRESULT WINAPI HTMLElement_get_innerText(IHTMLElement *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e8fce39..f230389 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -559,6 +559,58 @@ static void _test_elem_type(unsigned line, IUnknown *unk, elem_type_t type) _test_disp(line, unk, elem_type_infos[type].dispiid); } +#define get_node_type(n) _get_node_type(__LINE__,n) +static long _get_node_type(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + long type = -1; + HRESULT hres; + + hres = IHTMLDOMNode_get_nodeType(node, &type); + ok(hres == S_OK, "get_nodeType failed: %08x\n", hres); + + IHTMLDOMNode_Release(node); + + return type; +} + +#define get_child_nodes(u) _get_child_nodes(__LINE__,u) +static IHTMLDOMChildrenCollection *_get_child_nodes(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + IHTMLDOMChildrenCollection *col = NULL; + IDispatch *disp; + HRESULT hres; + + 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); + + node = _get_node_iface(line, (IUnknown*)disp); + IDispatch_Release(disp); + + return node; +} + #define test_elem_attr(e,n,v) _test_elem_attr(__LINE__,e,n,v) static void _test_elem_attr(unsigned line, IHTMLElement *elem, LPCWSTR name, LPCWSTR exval) { @@ -1027,6 +1079,44 @@ static void _test_elem_innertext(unsigned line, IHTMLElement *elem, const char * SysFreeString(text); } +#define test_elem_set_innertext(e,t) _test_elem_set_innertext(__LINE__,e,t) +static void _test_elem_set_innertext(unsigned line, IHTMLElement *elem, const char *text) +{ + IHTMLDOMChildrenCollection *col; + BSTR str; + HRESULT hres; + + str = a2bstr(text); + hres = IHTMLElement_put_innerText(elem, str); + ok_(__FILE__,line) (hres == S_OK, "put_innerText failed: %08x\n", hres); + SysFreeString(str); + + _test_elem_innertext(line, elem, text); + + + col = _get_child_nodes(line, (IUnknown*)elem); + ok(col != NULL, "col == NULL\n"); + if(col) { + long length = 0, type; + IHTMLDOMNode *node; + + hres = IHTMLDOMChildrenCollection_get_length(col, &length); + ok(hres == S_OK, "get_length failed: %08x\n", hres); + ok(length == 1, "length = %ld\n", length); + + node = _get_child_item(line, col, 0); + ok(node != NULL, "node == NULL\n"); + if(node) { + type = _get_node_type(line, (IUnknown*)node); + ok(type == 3, "type=%ld\n", type); + IHTMLDOMNode_Release(node); + } + + IHTMLDOMChildrenCollection_Release(col); + } + +} + #define get_first_child(n) _get_first_child(__LINE__,n) static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) { @@ -1069,21 +1159,6 @@ static IHTMLDOMNode *_test_node_get_parent(unsigned line, IUnknown *unk) return parent; } -#define get_node_type(n) _get_node_type(__LINE__,n) -static long _get_node_type(unsigned line, IUnknown *unk) -{ - IHTMLDOMNode *node = _get_node_iface(line, unk); - long type = -1; - HRESULT hres; - - hres = IHTMLDOMNode_get_nodeType(node, &type); - ok(hres == S_OK, "get_nodeType failed: %08x\n", hres); - - IHTMLDOMNode_Release(node); - - return type; -} - #define test_elem_get_parent(u) _test_elem_get_parent(__LINE__,u) static IHTMLElement *_test_elem_get_parent(unsigned line, IUnknown *unk) { @@ -1351,27 +1426,6 @@ static void _test_input_put_value(unsigned line, IUnknown *unk, const char *val) IHTMLInputElement_Release(input); } -#define get_child_nodes(u) _get_child_nodes(__LINE__,u) -static IHTMLDOMChildrenCollection *_get_child_nodes(unsigned line, IUnknown *unk) -{ - IHTMLDOMNode *node = _get_node_iface(line, unk); - IHTMLDOMChildrenCollection *col = NULL; - IDispatch *disp; - HRESULT hres; - - 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 test_elem_class(u,c) _test_elem_class(__LINE__,u,c) static void _test_elem_class(unsigned line, IUnknown *unk, const char *exclass) { @@ -1431,22 +1485,6 @@ static void _test_elem_set_class(unsigned line, IUnknown *unk, const char *class _test_elem_class(line, unk, class); } -#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); - - node = _get_node_iface(line, (IUnknown*)disp); - IDispatch_Release(disp); - - return node; -} - #define test_elem_id(e,i) _test_elem_id(__LINE__,e,i) static void _test_elem_id(unsigned line, IUnknown *unk, const char *exid) { @@ -3141,6 +3179,11 @@ static void test_elems(IHTMLDocument2 *doc) test_stylesheets(doc); test_create_option_elem(doc); + elem = get_doc_elem_by_id(doc, tblW); + ok(elem != NULL, "elem = NULL\n"); + test_elem_set_innertext(elem, "inner text"); + IHTMLElement_Release(elem); + test_doc_title(doc, "test"); test_doc_set_title(doc, "test title"); test_doc_title(doc, "test title");

1 0

Jacek Caban : mshtml: Added IHTMImgElement::get_src implementation.
by Alexandre Julliard 14 Oct '08

14 Oct '08

Module: wine Branch: master Commit: aae2c59dfde4a95afd83219e460e16457e4a26e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae2c59dfde4a95afd83219e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 14:50:37 2008 -0500 mshtml: Added IHTMImgElement::get_src implementation. --- dlls/mshtml/htmlimg.c | 21 +++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/nsio.c | 17 +++++++++++++++++ dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 795d6f9..e5c0372 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -280,8 +280,25 @@ static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v) static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) { HTMLImgElement *This = HTMLIMG_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + const PRUnichar *src; + nsAString src_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&src_str, NULL); + nsres = nsIDOMHTMLImageElement_GetSrc(This->nsimg, &src_str); + if(NS_FAILED(nsres)) { + ERR("GetSrc failed: %08x\n", nsres); + return E_FAIL; + } + + nsAString_GetData(&src_str, &src); + hres = nsuri_to_url(src, p); + nsAString_Finish(&src_str); + + return hres; } static HRESULT WINAPI HTMLImgElement_put_lowsrc(IHTMLImgElement *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ebdc251..888669f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -502,6 +502,8 @@ void register_nsservice(nsIComponentRegistrar*,nsIServiceManager*); void init_nsio(nsIComponentManager*,nsIComponentRegistrar*); BOOL install_wine_gecko(BOOL); +HRESULT nsuri_to_url(LPCWSTR,BSTR*); + void hlink_frame_navigate(HTMLDocument*,IHlinkFrame*,LPCWSTR,nsIInputStream*,DWORD); void call_property_onchanged(ConnectionPoint*,DISPID); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f23254a..82f7c0d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -67,6 +67,23 @@ typedef struct { static nsresult create_uri(nsIURI*,NSContainer*,nsIWineURI**); +HRESULT nsuri_to_url(LPCWSTR nsuri, BSTR *ret) +{ + const WCHAR *ptr = nsuri; + + static const WCHAR wine_prefixW[] = {'w','i','n','e',':'}; + + if(!strncmpW(nsuri, wine_prefixW, sizeof(wine_prefixW)/sizeof(WCHAR))) + ptr += sizeof(wine_prefixW)/sizeof(WCHAR); + + *ret = SysAllocString(ptr); + if(!*ret) + return E_OUTOFMEMORY; + + TRACE("%s -> %s\n", debugstr_w(nsuri), debugstr_w(*ret)); + return S_OK; +} + static BOOL exec_shldocvw_67(HTMLDocument *doc, LPCWSTR url) { IOleCommandTarget *cmdtrg = NULL; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f230389..350eb24 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1316,6 +1316,20 @@ static void _elem_get_scroll_left(unsigned line, IUnknown *unk) ok(l == l2, "unexpected left %ld, expected %ld\n", l2, l); } +#define test_img_src(i,s) _test_img_src(__LINE__,i,s) +static void _test_img_src(unsigned line, IUnknown *unk, const char *exsrc) +{ + IHTMLImgElement *img = _get_img_iface(line, unk); + BSTR src; + HRESULT hres; + + hres = IHTMLImgElement_get_src(img, &src); + IHTMLImgElement_Release(img); + ok_(__FILE__,line) (hres == S_OK, "get_src failed: %08x\n", hres); + ok_(__FILE__,line) (!strcmp_wa(src, exsrc), "get_src returned %s expected %s\n", dbgstr_w(src), exsrc); + SysFreeString(src); +} + #define test_img_set_src(u,s) _test_img_set_src(__LINE__,u,s) static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) { @@ -1328,6 +1342,8 @@ static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) IHTMLImgElement_Release(img); SysFreeString(tmp); ok_(__FILE__,line) (hres == S_OK, "put_src failed: %08x\n", hres); + + _test_img_src(line, unk, src); } #define test_img_alt(u,a) _test_img_alt(__LINE__,u,a) @@ -3077,6 +3093,7 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, imgidW, TRUE); if(elem) { + test_img_src((IUnknown*)elem, ""); test_img_set_src((IUnknown*)elem, "about:blank"); test_img_alt((IUnknown*)elem, NULL); test_img_set_alt((IUnknown*)elem, "alt test");

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode::insertBefore implementation.
by Alexandre Julliard 14 Oct '08

14 Oct '08

Module: wine Branch: master Commit: beec20f2f5fdfc393c597bb1f767803f5ade4251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beec20f2f5fdfc393c597bb1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 14:50:52 2008 -0500 mshtml: Added IHTMLDOMNode::insertBefore implementation. --- dlls/mshtml/htmlnode.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index a3eaaaf..e102951 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -446,8 +446,48 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode VARIANT refChild, IHTMLDOMNode **node) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p v %p)\n", This, newChild, node); - return E_NOTIMPL; + nsIDOMNode *nsnode, *nsref = NULL; + HTMLDOMNode *new_child; + nsresult nsres; + + TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), node); + + new_child = get_node_obj(This->doc, (IUnknown*)newChild); + if(!new_child) { + ERR("invalid newChild\n"); + return E_INVALIDARG; + } + + switch(V_VT(&refChild)) { + case VT_NULL: + break; + case VT_DISPATCH: { + HTMLDOMNode *ref_node; + + ref_node = get_node_obj(This->doc, (IUnknown*)V_DISPATCH(&refChild)); + if(!ref_node) { + ERR("unvalid node\n"); + return E_FAIL; + } + + nsref = ref_node->nsnode; + break; + } + default: + FIXME("unimplemented vt %d\n", V_VT(&refChild)); + return E_NOTIMPL; + } + + nsres = nsIDOMNode_InsertBefore(This->nsnode, new_child->nsnode, nsref, &nsnode); + if(NS_FAILED(nsres)) { + ERR("InsertBefore failed: %08x\n", nsres); + return E_FAIL; + } + + *node = HTMLDOMNODE(get_node(This->doc, nsnode, TRUE)); + nsIDOMNode_Release(nsnode); + IHTMLDOMNode_AddRef(*node); + return S_OK; } static HRESULT WINAPI HTMLDOMNode_removeChild(IHTMLDOMNode *iface, IHTMLDOMNode *oldChild, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 350eb24..58b9594 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1674,6 +1674,23 @@ static IHTMLDOMNode *_test_node_append_child(unsigned line, IUnknown *node_unk, return new_child; } +#define test_node_insertbefore(n,c,v) _test_node_insertbefore(__LINE__,n,c,v) +static IHTMLDOMNode *_test_node_insertbefore(unsigned line, IUnknown *node_unk, IHTMLDOMNode *child, VARIANT *var) +{ + IHTMLDOMNode *node = _get_node_iface(line, node_unk); + IHTMLDOMNode *new_child = NULL; + HRESULT hres; + + hres = IHTMLDOMNode_insertBefore(node, child, *var, &new_child); + ok_(__FILE__,line) (hres == S_OK, "insertBefore failed: %08x\n", hres); + ok_(__FILE__,line) (new_child != NULL, "new_child == NULL\n"); + /* TODO ok_(__FILE__,line) (new_child != child, "new_child == child\n"); */ + + IHTMLDOMNode_Release(node); + + 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) { @@ -1682,7 +1699,7 @@ static void _test_node_remove_child(unsigned line, IUnknown *unk, IHTMLDOMNode * HRESULT hres; hres = IHTMLDOMNode_removeChild(node, child, &new_node); - ok_(__FILE__,line) (hres == S_OK, "appendChild failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "removeChild 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"); */ @@ -3209,8 +3226,9 @@ static void test_elems(IHTMLDocument2 *doc) static void test_create_elems(IHTMLDocument2 *doc) { IHTMLElement *elem, *body, *elem2; - IHTMLDOMNode *node; + IHTMLDOMNode *node, *node2, *node3; IDispatch *disp; + VARIANT var; long type; HRESULT hres; @@ -3245,14 +3263,29 @@ static void test_create_elems(IHTMLDocument2 *doc) IDispatch_Release(disp); test_node_has_child((IUnknown*)body, VARIANT_FALSE); - IHTMLElement_Release(body); IHTMLElement_Release(elem); IHTMLDOMNode_Release(node); node = test_create_text(doc, "test"); test_ifaces((IUnknown*)node, text_iids); test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode); + + V_VT(&var) = VT_NULL; + node2 = test_node_insertbefore((IUnknown*)body, node, &var); IHTMLDOMNode_Release(node); + + node = test_create_text(doc, "insert "); + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (IDispatch*)node2; + node3 = test_node_insertbefore((IUnknown*)body, node, &var); + IHTMLDOMNode_Release(node); + IHTMLDOMNode_Release(node2); + IHTMLDOMNode_Release(node3); + + test_elem_innertext(body, "insert test"); + + IHTMLElement_Release(body); } static void test_exec(IUnknown *unk, const GUID *grpid, DWORD cmdid, VARIANT *in, VARIANT *out)

1 0

Jacek Caban : mshtml: Don't fail in IHTMLDOMNode:: appendChild if AppendChild failed.
by Alexandre Julliard 14 Oct '08

14 Oct '08

Module: wine Branch: master Commit: 7c8cdd519b3a471992c2dcc68ce458c4563d2a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8cdd519b3a471992c2dcc68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 14:51:04 2008 -0500 mshtml: Don't fail in IHTMLDOMNode::appendChild if AppendChild failed. --- dlls/mshtml/htmlnode.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index e102951..bee0376 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -512,6 +512,7 @@ static HRESULT WINAPI HTMLDOMNode_removeChild(IHTMLDOMNode *iface, IHTMLDOMNode /* FIXME: Make sure that node != newChild */ *node = HTMLDOMNODE(get_node(This->doc, nsnode, TRUE)); + nsIDOMNode_Release(nsnode); IHTMLDOMNode_AddRef(*node); return S_OK; } @@ -572,8 +573,8 @@ static HRESULT WINAPI HTMLDOMNode_appendChild(IHTMLDOMNode *iface, IHTMLDOMNode nsres = nsIDOMNode_AppendChild(This->nsnode, node_obj->nsnode, &nsnode); if(NS_FAILED(nsres)) { - ERR("AppendChild failed: %08x\n", nsres); - return E_FAIL; + WARN("AppendChild failed: %08x\n", nsres); + nsnode = node_obj->nsnode; } /* FIXME: Make sure that node != newChild */

1 0

Jacek Caban : mshtml: Added IHTMLDocument4::focus implementation.
by Alexandre Julliard 14 Oct '08

14 Oct '08

Module: wine Branch: master Commit: a0ba631d86a97e6f900c25282701276cdc1b799e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ba631d86a97e6f900c25282… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 14:49:37 2008 -0500 mshtml: Added IHTMLDocument4::focus implementation. --- dlls/mshtml/htmldoc3.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index b0efb7c..533dedd 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -569,8 +569,33 @@ static HRESULT WINAPI HTMLDocument4_Invoke(IHTMLDocument4 *iface, DISPID dispIdM static HRESULT WINAPI HTMLDocument4_focus(IHTMLDocument4 *iface) { HTMLDocument *This = HTMLDOC4_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + nsIDOMHTMLElement *nsbody; + nsresult nsres; + + TRACE("(%p)->()\n", This); + + nsres = nsIDOMHTMLDocument_GetBody(This->nsdoc, &nsbody); + if(NS_FAILED(nsres) || !nsbody) { + ERR("GetBody failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMHTMLElement_QueryInterface(nsbody, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + nsIDOMHTMLElement_Release(nsbody); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSHTMLElement: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMNSHTMLElement_focus(nselem); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) { + ERR("Focus failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument4_hasFocus(IHTMLDocument4 *iface, VARIANT_BOOL *pfFocus)

1 0

Dylan Smith : richedit: Fixed centering and right align with word wrap disabled.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 1ed84f0dcc475db75ba54250407065e0b0dffd42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed84f0dcc475db75ba542504… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 10 17:50:44 2008 -0400 richedit: Fixed centering and right align with word wrap disabled. --- dlls/riched20/editstr.h | 2 +- dlls/riched20/wrap.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index edbeb13..7299ab3 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -401,7 +401,7 @@ typedef struct tagME_WrapContext int nAvailWidth; int nRow; POINT pt; - BOOL bOverflown; + BOOL bOverflown, bWordWrap; ME_DisplayItem *pRowStart; ME_DisplayItem *pLastSplittableRun; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e03f398..53f0bfb 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -50,8 +50,10 @@ static void ME_BeginRow(ME_WrapContext *wc, ME_DisplayItem *para) wc->pRowStart = NULL; wc->bOverflown = FALSE; wc->pLastSplittableRun = NULL; + wc->bWordWrap = wc->context->editor->bWordWrap; if (para->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND)) { wc->nAvailWidth = 0; + wc->bWordWrap = FALSE; if (para->member.para.nFlags & MEPF_ROWEND) { ME_Cell *cell = &ME_FindItemBack(para, diCell)->member.cell; @@ -73,12 +75,11 @@ static void ME_BeginRow(ME_WrapContext *wc, ME_DisplayItem *para) wc->nAvailWidth = cell->nWidth - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; - } else if (wc->context->editor->bWordWrap) { + wc->bWordWrap = TRUE; + } else { wc->nAvailWidth = wc->context->rcView.right - wc->context->rcView.left - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin - wc->context->editor->selofs; - } else { - wc->nAvailWidth = ~0u >> 1; } wc->pt.x = wc->context->pt.x; if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ @@ -149,9 +150,9 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) assert(para->member.para.pFmt->dwMask & PFM_ALIGNMENT); align = para->member.para.pFmt->wAlignment; if (align == PFA_CENTER) - shift = (wc->nAvailWidth-width)/2; + shift = max((wc->nAvailWidth-width)/2, 0); if (align == PFA_RIGHT) - shift = wc->nAvailWidth-width; + shift = max(wc->nAvailWidth-width, 0); for (p = wc->pRowStart; p!=pEnd; p = p->next) { if (p->type==diRun) { /* FIXME add more run types */ @@ -378,7 +379,8 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) } /* will current run fit? */ - if (wc->pt.x + run->nWidth - wc->context->pt.x > wc->nAvailWidth) + if (wc->bWordWrap && + wc->pt.x + run->nWidth - wc->context->pt.x > wc->nAvailWidth) { int loc = wc->context->pt.x + wc->nAvailWidth - wc->pt.x; /* total white run ? */

1 0

Dylan Smith : richedit: Account for selection bar in calculating available width.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: a32f1f2c1c434c31436941414fead711223b926d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32f1f2c1c434c31436941414… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 10 17:50:40 2008 -0400 richedit: Account for selection bar in calculating available width. --- dlls/riched20/wrap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index d6a2492..e03f398 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -75,7 +75,8 @@ static void ME_BeginRow(ME_WrapContext *wc, ME_DisplayItem *para) - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; } else if (wc->context->editor->bWordWrap) { wc->nAvailWidth = wc->context->rcView.right - wc->context->rcView.left - - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; + - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin + - wc->context->editor->selofs; } else { wc->nAvailWidth = ~0u >> 1; }

1 0

James Hawkins : msi: Fix the returned format of REG_BINARY data.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 47ac325f82756eabf2e558e6c9e944f02abe4b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ac325f82756eabf2e558e6c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 13 03:57:43 2008 -0500 msi: Fix the returned format of REG_BINARY data. --- dlls/msi/appsearch.c | 14 +++++++++----- dlls/msi/tests/package.c | 5 +---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index ed02f83..70bf13a 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -245,7 +245,9 @@ static void ACTION_ConvertRegValue(DWORD regType, const BYTE *value, DWORD sz, LPWSTR *appValue) { static const WCHAR dwordFmt[] = { '#','%','d','\0' }; - static const WCHAR binFmt[] = { '#','x','%','x','\0' }; + static const WCHAR binPre[] = { '#','x','\0' }; + static const WCHAR binFmt[] = { '%','0','2','X','\0' }; + LPWSTR ptr; DWORD i; switch (regType) @@ -277,10 +279,12 @@ static void ACTION_ConvertRegValue(DWORD regType, const BYTE *value, DWORD sz, ExpandEnvironmentStringsW((LPCWSTR)value, *appValue, sz); break; case REG_BINARY: - /* 3 == length of "#x<nibble>" */ - *appValue = msi_alloc((sz * 3 + 1) * sizeof(WCHAR)); - for (i = 0; i < sz; i++) - sprintfW(*appValue + i * 3, binFmt, value[i]); + /* #x<nibbles>\0 */ + *appValue = msi_alloc((sz * 2 + 3) * sizeof(WCHAR)); + lstrcpyW(*appValue, binPre); + ptr = *appValue + lstrlenW(binPre); + for (i = 0; i < sz; i++, ptr += 2) + sprintfW(ptr, binFmt, value[i]); break; default: WARN("unimplemented for values of type %d\n", regType); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 31f5ad6..581ffd5 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6339,10 +6339,7 @@ static void test_appsearch_reglocator(void) lstrcpyA(path, "#xCDAB3412EF907856"); r = MsiGetPropertyA(hpkg, "SIGPROP7", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP8", prop, &size);

1 0