August 2014 - Wine-commits - list.winehq.org

Zhenbo Li : mshtml: Added IHTMLTable::insertRow/ deleteRow methods implementation.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: bc582f09ff78770f212d61ff5e64e87821871819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc582f09ff78770f212d61ff5… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 16:55:59 2014 +0800 mshtml: Added IHTMLTable::insertRow/deleteRow methods implementation. --- dlls/mshtml/htmltable.c | 34 ++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index e7991da..cfacf35 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -622,15 +622,41 @@ static HRESULT WINAPI HTMLTable_deleteCaption(IHTMLTable *iface) static HRESULT WINAPI HTMLTable_insertRow(IHTMLTable *iface, LONG index, IDispatch **row) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%d %p)\n", This, index, row); - return E_NOTIMPL; + nsIDOMHTMLElement *nselem; + HTMLElement *elem; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%d %p)\n", This, index, row); + nsres = nsIDOMHTMLTableElement_InsertRow(This->nstable, index, &nselem); + if(NS_FAILED(nsres)) { + ERR("Insert Row at %d failed: %08x\n", index, nsres); + return E_FAIL; + } + + hres = HTMLTableRow_Create(This->element.node.doc, nselem, &elem); + nsIDOMHTMLElement_Release(nselem); + if (FAILED(hres)) { + ERR("Create TableRow failed: %08x\n", hres); + return hres; + } + + *row = (IDispatch *)&elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLTable_deleteRow(IHTMLTable *iface, LONG index) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%d)\n", This, index); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, index); + nsres = nsIDOMHTMLTableElement_DeleteRow(This->nstable, index); + if(NS_FAILED(nsres)) { + ERR("Delete Row failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTable_get_readyState(IHTMLTable *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dddb28c..f235835 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5080,6 +5080,25 @@ static void _test_language_string(unsigned line, const WCHAR *lang, LCID lcid) } } +#define test_table_length(t,l) _test_table_length(__LINE__,t,l) +static void _test_table_length(unsigned line, IHTMLTable *table, LONG expect) +{ + IHTMLElementCollection *col; + HRESULT hres; + LONG len; + + hres = IHTMLTable_get_rows(table, &col); + ok_(__FILE__,line)(hres == S_OK, "get_rows failed: %08x\n", hres); + ok_(__FILE__,line)(col != NULL, "col = NULL\n"); + if (hres != S_OK || col == NULL) + return; + hres = IHTMLElementCollection_get_length(col, &len); + ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08x\n", hres); + ok_(__FILE__,line)(len == expect, "Expect %d, got %d\n", expect, len); + + IHTMLElementCollection_Release(col); +} + static void test_navigator(IHTMLDocument2 *doc) { IHTMLWindow2 *window; @@ -5990,6 +6009,40 @@ static void _test_table_cell_spacing(unsigned line, IHTMLTable *table, const cha VariantClear(&v); } +static void test_table_modify(IHTMLTable *table) +{ + IDispatch *disp; + IHTMLTableRow *row; + HRESULT hres; + LONG index; + + test_table_length(table, 2); + + hres = IHTMLTable_insertRow(table, 0, &disp); + ok(hres == S_OK, "insertRow failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + test_table_length(table, 3); + if (hres != S_OK || disp == NULL) + return; + + hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableRow, (void**)&row); + IDispatch_Release(disp); + + ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + ok(row != NULL, "row == NULL\n"); + + index = 0xdeadbeef; + hres = IHTMLTableRow_get_rowIndex(row, &index); + ok(hres == S_OK, "get_rowIndex failed: %08x\n", hres); + ok(index == 0, "index = %d, expected 0\n", index); + + IHTMLTableRow_Release(row); + + hres = IHTMLTable_deleteRow(table, 0); + ok(hres == S_OK, "deleteRow failed: %08x\n", hres); + test_table_length(table, 2); +} + static void test_table_elem(IHTMLElement *elem) { IHTMLElementCollection *col; @@ -6152,6 +6205,8 @@ static void test_table_elem(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + test_table_modify(table); + bstr = a2bstr("summary"); hres = IHTMLTable3_put_summary(table3, bstr); ok(hres == S_OK, "put_summary = %08x\n", hres);

1 0

Zhenbo Li : mshtml: Added IHTMLTable::frame property implementation.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 03b377f3e7e898a1798041621d3efdcc4885910c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b377f3e7e898a1798041621… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 16:56:24 2014 +0800 mshtml: Added IHTMLTable::frame property implementation. --- dlls/mshtml/htmltable.c | 27 +++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 11 ++++++++++- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index cfacf35..d938699 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -193,15 +193,34 @@ static HRESULT WINAPI HTMLTable_get_border(IHTMLTable *iface, VARIANT *p) static HRESULT WINAPI HTMLTable_put_frame(IHTMLTable *iface, BSTR v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&str, v); + nsres = nsIDOMHTMLTableElement_SetFrame(This->nstable, &str); + nsAString_Finish(&str); + + if (NS_FAILED(nsres)) { + ERR("SetFrame(%s) failed: %08x\n", debugstr_w(v), nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTable_get_frame(IHTMLTable *iface, BSTR *p) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&str, NULL); + nsres = nsIDOMHTMLTableElement_GetFrame(This->nstable, &str); + + return return_nsstr(nsres, &str, p); } static HRESULT WINAPI HTMLTable_put_rules(IHTMLTable *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f235835..859cdac 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6205,8 +6205,17 @@ static void test_table_elem(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); - test_table_modify(table); + bstr = a2bstr("box"); + hres = IHTMLTable_put_frame(table, bstr); + ok(hres == S_OK, "put_frame = %08x\n", hres); + SysFreeString(bstr); + hres = IHTMLTable_get_frame(table, &bstr); + ok(hres == S_OK, "get_frame = %08x\n", hres); + ok(!strcmp_wa(bstr, "box"), "Expected box, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + test_table_modify(table); bstr = a2bstr("summary"); hres = IHTMLTable3_put_summary(table3, bstr); ok(hres == S_OK, "put_summary = %08x\n", hres);

1 0

Zhenbo Li : mshtml: Added IHTMLTableCell::align property implementation.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 06c66876f3457bee8490396d1c19d46811f236fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c66876f3457bee8490396d1… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 16:56:57 2014 +0800 mshtml: Added IHTMLTableCell::align property implementation. --- dlls/mshtml/htmltablecell.c | 26 ++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 15 +++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index e023e31..eedae5b 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -128,15 +128,33 @@ static HRESULT WINAPI HTMLTableCell_get_colSpan(IHTMLTableCell *iface, LONG *p) static HRESULT WINAPI HTMLTableCell_put_align(IHTMLTableCell *iface, BSTR v) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&str, v); + nsres = nsIDOMHTMLTableCellElement_SetAlign(This->nscell, &str); + nsAString_Finish(&str); + if (NS_FAILED(nsres)) { + ERR("Set Align failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTableCell_get_align(IHTMLTableCell *iface, BSTR *p) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&str, NULL); + nsres = nsIDOMHTMLTableCellElement_GetAlign(This->nscell, &str); + + return return_nsstr(nsres, &str, p); } static HRESULT WINAPI HTMLTableCell_put_vAlign(IHTMLTableCell *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 859cdac..cfde7ac 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5940,6 +5940,7 @@ static void test_td_elem(IHTMLElement *elem) IHTMLTableCell *cell; HRESULT hres; LONG lval; + BSTR str; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTableCell, (void**)&cell); ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08x\n", hres); @@ -5951,6 +5952,20 @@ static void test_td_elem(IHTMLElement *elem) ok(hres == S_OK, "get cellIndex failed: %08x\n", hres); ok(lval == 1, "Expected 1, got %d\n", lval); + str = a2bstr("left"); + hres = IHTMLTableCell_put_align(cell, str); + ok(hres == S_OK, "put_align failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLTableCell_get_align(cell, &str); + ok(hres == S_OK, "get_align failed: %08x\n", hres); + ok(str != NULL, "str is NULL\n"); + if (str != NULL && hres == S_OK) { + ok(!strcmp_wa(str, "left"), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + IHTMLTableCell_Release(cell); }

1 0

Zhenbo Li : mshtml: Added IHTMLImgElement::isMap property implementation.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 5ee21f9a5256f326baeb1e61c886d5045e2f193a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee21f9a5256f326baeb1e61c… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 17:01:55 2014 +0800 mshtml: Added IHTMLImgElement::isMap property implementation. --- dlls/mshtml/htmlimg.c | 30 ++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 21 +++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 212d01e..a793397 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -102,15 +102,37 @@ static HRESULT WINAPI HTMLImgElement_Invoke(IHTMLImgElement *iface, DISPID dispI static HRESULT WINAPI HTMLImgElement_put_isMap(IHTMLImgElement *iface, VARIANT_BOOL v) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLImageElement_SetIsMap(This->nsimg, v != VARIANT_FALSE); + if (NS_FAILED(nsres)) { + ERR("Set IsMap failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLImgElement_get_isMap(IHTMLImgElement *iface, VARIANT_BOOL *p) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool b; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if (p == NULL) + return E_INVALIDARG; + + nsres = nsIDOMHTMLImageElement_GetIsMap(This->nsimg, &b); + if (NS_FAILED(nsres)) { + ERR("Get IsMap failed: %08x\n", nsres); + return E_FAIL; + } + *p = b ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLImgElement_put_useMap(IHTMLImgElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cfde7ac..86a9aa3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2810,6 +2810,25 @@ static void _test_img_complete(unsigned line, IHTMLElement *elem, VARIANT_BOOL e IHTMLImgElement_Release(img); } +#define test_img_isMap(u, c) _test_img_isMap(__LINE__,u, c) +static void _test_img_isMap(unsigned line, IUnknown *unk, VARIANT_BOOL v) +{ + IHTMLImgElement *img = _get_img_iface(line, unk); + VARIANT_BOOL b = 100; + HRESULT hres; + + hres = IHTMLImgElement_put_isMap(img, v); + ok_(__FILE__,line) (hres == S_OK, "put_isMap failed: %08x\n", hres); + + hres = IHTMLImgElement_get_isMap(img, &b); + ok_(__FILE__,line) (hres == S_OK, "get_isMap failed: %08x\n", hres); + ok_(__FILE__,line) (b == v, "isMap = %x, expected %x\n", b, v); + + hres = IHTMLImgElement_get_isMap(img, NULL); + ok_(__FILE__,line) (hres == E_INVALIDARG, "ret = %08x, expected E_INVALIDARG\n", hres); + IHTMLImgElement_Release(img); +} + static void test_dynamic_properties(IHTMLElement *elem) { static const WCHAR attr1W[] = {'a','t','t','r','1',0}; @@ -6958,6 +6977,8 @@ static void test_elems(IHTMLDocument2 *doc) test_img_set_alt((IUnknown*)elem, "alt test"); test_img_name((IUnknown*)elem, "WineImg"); test_img_complete(elem, VARIANT_FALSE); + test_img_isMap((IUnknown*)elem, VARIANT_TRUE); + test_img_isMap((IUnknown*)elem, VARIANT_FALSE); IHTMLElement_Release(elem); }

1 0

Zhenbo Li : mshtml: Added IHTMLInputElement::size property implementation.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: e12cb546f6e7e5b986ddc1a3bdb268c7a318a073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e12cb546f6e7e5b986ddc1a3b… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 17:03:06 2014 +0800 mshtml: Added IHTMLInputElement::size property implementation. --- dlls/mshtml/htmlinput.c | 31 +++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index f832b88..c356ac0 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -262,15 +262,38 @@ static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLF static HRESULT WINAPI HTMLInputElement_put_size(IHTMLInputElement *iface, LONG v) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + UINT32 val = v; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + if (v <= 0) + return CTL_E_INVALIDPROPERTYVALUE; + + nsres = nsIDOMHTMLInputElement_SetSize(This->nsinput, val); + if (NS_FAILED(nsres)) { + ERR("Set Size(%u) failed: %08x\n", val, nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_size(IHTMLInputElement *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + if (p == NULL) + return E_INVALIDARG; + + nsres = nsIDOMHTMLInputElement_GetSize(This->nsinput, &val); + if (NS_FAILED(nsres)) { + ERR("Get Size failed: %08x\n", nsres); + return E_FAIL; + } + *p = val; + return S_OK; } static HRESULT WINAPI HTMLInputElement_put_maxLength(IHTMLInputElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 86a9aa3..ba0c582 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3321,6 +3321,29 @@ static void _test_input_set_src(unsigned line, IHTMLInputElement *input, const c _test_input_src(line, input, src); } +#define test_input_set_size(u,s,r) _test_input_set_size(__LINE__,u,s,r) +static void _test_input_set_size(unsigned line, IHTMLInputElement *input, LONG size, HRESULT exret) +{ + HRESULT hres; + + hres = IHTMLInputElement_put_size(input, size); + ok_(__FILE__,line) (hres == exret, "Expect ret = %08x, got: %08x\n", exret, hres); +} + +#define test_input_get_size(u,s) _test_input_get_size(__LINE__,u,s) +static void _test_input_get_size(unsigned line, IHTMLInputElement *input, LONG exsize) +{ + HRESULT hres; + LONG size; + + hres = IHTMLInputElement_get_size(input, &size); + ok_(__FILE__,line) (hres == S_OK, "get_size failed: %08x\n", hres); + ok_(__FILE__,line) (size == exsize, "Expect %d, got %d\n", exsize, size); + + hres = IHTMLInputElement_get_size(input, NULL); + ok_(__FILE__,line) (hres == E_INVALIDARG, "Expect ret E_INVALIDARG, got: %08x\n", hres); +} + #define test_elem_class(u,c) _test_elem_class(__LINE__,u,c) static void _test_elem_class(unsigned line, IUnknown *unk, const char *exclass) { @@ -6964,6 +6987,13 @@ static void test_elems(IHTMLDocument2 *doc) test_input_src(input, NULL); test_input_set_src(input, "about:blank"); + test_input_set_size(input, 15, S_OK); + test_input_get_size(input, 15); + test_input_set_size(input, -100, CTL_E_INVALIDPROPERTYVALUE); + test_input_get_size(input, 15); + test_input_set_size(input, 0, CTL_E_INVALIDPROPERTYVALUE); + test_input_get_size(input, 15); + IHTMLInputElement_Release(input); IHTMLElement_Release(elem); }

1 0

Zhenbo Li : mshtml: Added IHTMLImgElement::align property implementation.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 6079c56133bfe9e2b026151e11f2c9545de90271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6079c56133bfe9e2b026151e1… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 17:03:11 2014 +0800 mshtml: Added IHTMLImgElement::align property implementation. --- dlls/mshtml/htmlimg.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 20 ++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index a793397..8c1d324 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -412,15 +412,35 @@ static HRESULT WINAPI HTMLImgElement_get_loop(IHTMLImgElement *iface, VARIANT *p static HRESULT WINAPI HTMLImgElement_put_align(IHTMLImgElement *iface, BSTR v) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&str, v); + + nsres = nsIDOMHTMLImageElement_SetAlign(This->nsimg, &str); + nsAString_Finish(&str); + if (NS_FAILED(nsres)){ + ERR("Set Align(%s) failed: %08x\n", debugstr_w(v), nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLImgElement_get_align(IHTMLImgElement *iface, BSTR *p) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&str, NULL); + nsres = nsIDOMHTMLImageElement_GetAlign(This->nsimg, &str); + + return return_nsstr(nsres, &str, p); } static HRESULT WINAPI HTMLImgElement_put_onload(IHTMLImgElement *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ba0c582..7cae345 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2783,6 +2783,24 @@ static void _test_img_set_alt(unsigned line, IUnknown *unk, const char *alt) _test_img_alt(line, unk, alt); } +#define test_img_align(u,a) _test_img_align(__LINE__,u,a) +static void _test_img_align(unsigned line, IUnknown *unk, const char *align) +{ + IHTMLImgElement *img = _get_img_iface(line, unk); + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(align); + hres = IHTMLImgElement_put_align(img, tmp); + ok_(__FILE__,line) (hres == S_OK, "put_align failed: %08x\n", hres); + SysFreeString(tmp); + + hres = IHTMLImgElement_get_align(img, &tmp); + ok_(__FILE__,line) (hres == S_OK, "put_align failed: %08x\n", hres); + ok_(__FILE__,line) (!strcmp_wa(tmp, align), "Expect %s, got %s\n", align, wine_dbgstr_w(tmp)); + SysFreeString(tmp); +} + #define test_img_name(u, c) _test_img_name(__LINE__,u, c) static void _test_img_name(unsigned line, IUnknown *unk, const char *pValue) { @@ -7000,6 +7018,8 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, "imgid", TRUE); if(elem) { + test_img_align((IUnknown*)elem, "left"); + test_img_name((IUnknown*)elem, "WineImg"); test_img_src((IUnknown*)elem, "", NULL); test_img_set_src((IUnknown*)elem, "about:blank"); test_img_src((IUnknown*)elem, "about:blank", NULL);

1 0

Zhenbo Li : mshtml: Added IHTMLInputElement::readOnly property.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: c2ac0f506bbacb2a00cf918be4ac02ade56e3183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ac0f506bbacb2a00cf918be… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 17:03:14 2014 +0800 mshtml: Added IHTMLInputElement::readOnly property. --- dlls/mshtml/htmlinput.c | 26 ++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index c356ac0..f25f437 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -412,15 +412,33 @@ static HRESULT WINAPI HTMLInputElement_get_defaultValue(IHTMLInputElement *iface static HRESULT WINAPI HTMLInputElement_put_readOnly(IHTMLInputElement *iface, VARIANT_BOOL v) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLInputElement_SetReadOnly(This->nsinput, v != VARIANT_FALSE); + if (NS_FAILED(nsres)) { + ERR("Set ReadOnly Failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_readOnly(IHTMLInputElement *iface, VARIANT_BOOL *p) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + cpp_bool b; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLInputElement_GetReadOnly(This->nsinput, &b); + if (NS_FAILED(nsres)) { + ERR("Get ReadOnly Failed: %08x\n", nsres); + return E_FAIL; + } + *p = b ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLInputElement_createTextRange(IHTMLInputElement *iface, IHTMLTxtRange **range) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7cae345..f2b556b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3362,6 +3362,20 @@ static void _test_input_get_size(unsigned line, IHTMLInputElement *input, LONG e ok_(__FILE__,line) (hres == E_INVALIDARG, "Expect ret E_INVALIDARG, got: %08x\n", hres); } +#define test_input_readOnly(u,b) _test_input_readOnly(__LINE__,u,b) +static void _test_input_readOnly(unsigned line, IHTMLInputElement *input, VARIANT_BOOL v) +{ + HRESULT hres; + VARIANT_BOOL b = 100; + + hres = IHTMLInputElement_put_readOnly(input, v); + ok_(__FILE__,line)(hres == S_OK, "put readOnly failed: %08x\n", hres); + + hres = IHTMLInputElement_get_readOnly(input, &b); + ok_(__FILE__,line)(hres == S_OK, "get readOnly failed: %08x\n", hres); + ok_(__FILE__,line)(v == b, "Expect %x, got %x\n", v, b); +} + #define test_elem_class(u,c) _test_elem_class(__LINE__,u,c) static void _test_elem_class(unsigned line, IUnknown *unk, const char *exclass) { @@ -7012,6 +7026,9 @@ static void test_elems(IHTMLDocument2 *doc) test_input_set_size(input, 0, CTL_E_INVALIDPROPERTYVALUE); test_input_get_size(input, 15); + test_input_readOnly(input, VARIANT_TRUE); + test_input_readOnly(input, VARIANT_FALSE); + IHTMLInputElement_Release(input); IHTMLElement_Release(elem); }

1 0

Zhenbo Li : mshtml: Added IHTMLInputElement_get_form method implementation.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: d5d728706bb8fbfa3add7058bb8270a9ca362954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d728706bb8fbfa3add7058b… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 17:03:19 2014 +0800 mshtml: Added IHTMLInputElement_get_form method implementation. --- dlls/mshtml/htmlinput.c | 25 ++++++++++- dlls/mshtml/tests/dom.c | 113 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 101 insertions(+), 37 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index f25f437..2492579 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -255,8 +255,29 @@ static HRESULT WINAPI HTMLInputElement_get_disabled(IHTMLInputElement *iface, VA static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLFormElement **p) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLFormElement *nsform; + HTMLDOMNode *node; + HRESULT hres; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLInputElement_GetForm(This->nsinput, &nsform); + if (NS_FAILED(nsres) || nsform == NULL) { + ERR("GetForm failed: %08x, nsform: %p\n", nsres, nsform); + *p = NULL; + return E_FAIL; + } + + hres = get_node(This->element.node.doc, (nsIDOMNode*)nsform, TRUE, &node); + nsIDOMHTMLFormElement_Release(nsform); + if (FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); + + node_release(node); + return hres; } static HRESULT WINAPI HTMLInputElement_put_size(IHTMLInputElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f2b556b..f558c69 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3069,6 +3069,40 @@ static void _test_attr_specified(unsigned line, IHTMLDOMAttribute *attr, VARIANT ok_(__FILE__,line)(specified == expected, "specified = %x, expected %x\n", specified, expected); } +#define test_elem_id(e,i) _test_elem_id(__LINE__,e,i) +static void _test_elem_id(unsigned line, IUnknown *unk, const char *exid) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + BSTR id = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLElement_get_id(elem, &id); + IHTMLElement_Release(elem); + ok_(__FILE__,line) (hres == S_OK, "get_id failed: %08x\n", hres); + + if(exid) + ok_(__FILE__,line) (!strcmp_wa(id, exid), "unexpected id %s\n", wine_dbgstr_w(id)); + else + ok_(__FILE__,line) (!id, "id=%s\n", wine_dbgstr_w(id)); + + SysFreeString(id); +} + +#define test_elem_put_id(u,i) _test_elem_put_id(__LINE__,u,i) +static void _test_elem_put_id(unsigned line, IUnknown *unk, const char *new_id) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + BSTR tmp = a2bstr(new_id); + HRESULT hres; + + hres = IHTMLElement_put_id(elem, tmp); + IHTMLElement_Release(elem); + SysFreeString(tmp); + ok_(__FILE__,line) (hres == S_OK, "put_id failed: %08x\n", hres); + + _test_elem_id(line, unk, new_id); +} + static void test_contenteditable(IUnknown *unk) { IHTMLElement3 *elem3 = get_elem3_iface(unk); @@ -3246,6 +3280,45 @@ static void _test_input_value(unsigned line, IUnknown *unk, const char *exval) IHTMLInputElement_Release(input); } +#define test_input_get_form(o, t) _test_input_get_form(__LINE__, o, t) +static void _test_input_get_form(unsigned line, IUnknown *unk, const char *id) +{ + IHTMLInputElement *input; + IHTMLFormElement *form; + IHTMLElement *elem; + HRESULT hres; + + ok_(__FILE__,line) (unk != NULL, "unk is NULL!\n"); + hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + ok_(__FILE__,line) (input != NULL, "input == NULL\n"); + if(FAILED(hres) || input == NULL) + return; + + hres = IHTMLInputElement_get_form(input, &form); + ok_(__FILE__, line) (hres == S_OK, "get_form failed: %08x\n", hres); + ok_(__FILE__, line) (form != NULL, "form == NULL\n"); + if(FAILED(hres) || form == NULL){ + IHTMLInputElement_Release(input); + return; + } + + hres = IHTMLFormElement_QueryInterface(form, &IID_IHTMLElement, (void **)&elem); + ok_(__FILE__, line) (hres == S_OK, "QueryInterface(IID_IHTMLElement) failed: %08x\n", hres); + ok_(__FILE__, line) (elem != NULL, "elem == NULL\n"); + if(FAILED(hres) || elem == NULL){ + IHTMLInputElement_Release(input); + IHTMLFormElement_Release(form); + return; + } + + _test_elem_id(line, (IUnknown*)elem, id); + + IHTMLInputElement_Release(input); + IHTMLFormElement_Release(form); + IHTMLElement_Release(elem); +} + #define test_input_put_value(o,v) _test_input_put_value(__LINE__,o,v) static void _test_input_put_value(unsigned line, IUnknown *unk, const char *val) { @@ -3536,40 +3609,6 @@ static void _test_elem_set_class(unsigned line, IUnknown *unk, const char *class _test_elem_class(line, unk, class); } -#define test_elem_id(e,i) _test_elem_id(__LINE__,e,i) -static void _test_elem_id(unsigned line, IUnknown *unk, const char *exid) -{ - IHTMLElement *elem = _get_elem_iface(line, unk); - BSTR id = (void*)0xdeadbeef; - HRESULT hres; - - hres = IHTMLElement_get_id(elem, &id); - IHTMLElement_Release(elem); - ok_(__FILE__,line) (hres == S_OK, "get_id failed: %08x\n", hres); - - if(exid) - ok_(__FILE__,line) (!strcmp_wa(id, exid), "unexpected id %s\n", wine_dbgstr_w(id)); - else - ok_(__FILE__,line) (!id, "id=%s\n", wine_dbgstr_w(id)); - - SysFreeString(id); -} - -#define test_elem_put_id(u,i) _test_elem_put_id(__LINE__,u,i) -static void _test_elem_put_id(unsigned line, IUnknown *unk, const char *new_id) -{ - IHTMLElement *elem = _get_elem_iface(line, unk); - BSTR tmp = a2bstr(new_id); - HRESULT hres; - - hres = IHTMLElement_put_id(elem, tmp); - IHTMLElement_Release(elem); - SysFreeString(tmp); - ok_(__FILE__,line) (hres == S_OK, "put_id failed: %08x\n", hres); - - _test_elem_id(line, unk, new_id); -} - #define test_elem_title(u,t) _test_elem_title(__LINE__,u,t) static void _test_elem_title(unsigned line, IUnknown *unk, const char *extitle) { @@ -7544,7 +7583,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_insert_adjacent_elems(doc, div); test_elem_set_innerhtml((IUnknown*)div, - "<form id=\"form\"><input type=\"button\" /><div><input type=\"text\" /></div></textarea>"); + "<form id=\"form\"><input type=\"button\" /><div><input type=\"text\" id=\"inputid\"/></div></textarea>"); elem = get_elem_by_id(doc, "form", TRUE); if(elem) { test_form_length((IUnknown*)elem, 2); @@ -7566,6 +7605,10 @@ static void test_elems2(IHTMLDocument2 *doc) test_form_reset((IUnknown*)elem); test_form_target((IUnknown*)elem); IHTMLElement_Release(elem); + + elem = get_elem_by_id(doc, "inputid", TRUE); + test_input_get_form((IUnknown*)elem, "form"); + IHTMLElement_Release(elem); } test_attr(div);

1 0

Jacek Caban : mshtml: Fixed handling NULL argument in IHTMLElement:: contains implementation.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 7c7a594692406182ddb1fc44fc45221e06de4be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7a594692406182ddb1fc44f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 18 17:32:27 2014 +0200 mshtml: Fixed handling NULL argument in IHTMLElement::contains implementation. --- dlls/mshtml/htmlelem.c | 24 ++++++++++++------------ dlls/mshtml/tests/dom.c | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a02baa7..363a89a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -882,22 +882,22 @@ static HRESULT WINAPI HTMLElement_contains(IHTMLElement *iface, IHTMLElement *pC VARIANT_BOOL *pfResult) { HTMLElement *This = impl_from_IHTMLElement(iface); - HTMLElement *child; - cpp_bool result; - nsresult nsres; + cpp_bool result = FALSE; TRACE("(%p)->(%p %p)\n", This, pChild, pfResult); - child = unsafe_impl_from_IHTMLElement(pChild); - if(!child) { - ERR("not our element\n"); - return E_FAIL; - } + if(pChild) { + HTMLElement *child; + nsresult nsres; - nsres = nsIDOMNode_Contains(This->node.nsnode, child->node.nsnode, &result); - if(NS_FAILED(nsres)) { - ERR("failed\n"); - return E_FAIL; + child = unsafe_impl_from_IHTMLElement(pChild); + if(!child) { + ERR("not our element\n"); + return E_FAIL; + } + + nsres = nsIDOMNode_Contains(This->node.nsnode, child->node.nsnode, &result); + assert(nsres == NS_OK); } *pfResult = result ? VARIANT_TRUE : VARIANT_FALSE; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f558c69..05f58a3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6913,6 +6913,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_contains(elem, elem3, VARIANT_FALSE); test_elem_contains(elem, elem2, VARIANT_FALSE); test_elem_contains(elem, elem, VARIANT_TRUE); + test_elem_contains(elem, NULL, VARIANT_FALSE); IHTMLElement_Release(elem2); elem2 = test_elem_get_parent((IUnknown*)elem3);

1 0

Vincent Povirk : mscoree: Implement corruntimehost_CreateDomainSetup.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 88dfdded620358e458929556443c3410336e56ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=88dfdded620358e4589295564… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 13 14:32:29 2014 -0500 mscoree: Implement corruntimehost_CreateDomainSetup. --- dlls/mscoree/corruntimehost.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 5b7e833..b44fb6a 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -463,8 +463,23 @@ static HRESULT WINAPI corruntimehost_CreateDomainSetup( ICorRuntimeHost* iface, IUnknown **appDomainSetup) { - FIXME("stub %p\n", iface); - return E_NOTIMPL; + RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); + HRESULT hr; + MonoDomain *domain; + MonoObject *obj; + static const WCHAR classnameW[] = {'S','y','s','t','e','m','.','A','p','p','D','o','m','a','i','n','S','e','t','u','p',',','m','s','c','o','r','l','i','b',0}; + + TRACE("(%p)\n", iface); + + hr = RuntimeHost_GetDefaultDomain(This, &domain); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_CreateManagedInstance(This, classnameW, domain, &obj); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_GetIUnknownForObject(This, obj, appDomainSetup); + + return hr; } static HRESULT WINAPI corruntimehost_CreateEvidence(

1 0