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

André Hentschel : German translation of 1.1. 44 release news item
by Jeremy Newman 11 May '10

11 May '10

Module: website Branch: master Commit: 5fcc8791dd0596767e78567b5bd892884c810651 URL: http://source.winehq.org/git/website.git/?a=commit;h=5fcc8791dd0596767e7856… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 11 22:13:16 2010 +0200 German translation of 1.1.44 release news item --- news/de/2010050701.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/de/2010050701.xml b/news/de/2010050701.xml new file mode 100644 index 0000000..edec761 --- /dev/null +++ b/news/de/2010050701.xml @@ -0,0 +1,20 @@ +<news> +<date>7. Mai 2010</date> +<title>Wine 1.1.44 Freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.1.44 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.1.44">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele neue Icons.</li> + <li>Unterstützung für 32-Bit Präfixe mit einem 64-Bit Wine.</li> + <li>Viele zusätzliche msvcr80/90 Funktionen.</li> + <li>Verbessertes Bidi Handling.</li> + <li>Vollständigere mmdevapi (Win7 Audio) Unterstützung.</li> + <li>Verbesserte Handhabung von MSI Patches.</li> + <li>Einige Behebungen für die Desktop Menüs.</li> + <li>Optimierung im OLE Storage.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul></p> +<p><p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.44.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</p></body></news>

1 0

André Hentschel : Add Ubuntu 10. 04 to German Download page
by Jeremy Newman 11 May '10

11 May '10

Module: website Branch: master Commit: 0fe78980fccf002077e74e5584c42ff2628a66a5 URL: http://source.winehq.org/git/website.git/?a=commit;h=0fe78980fccf002077e74e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 11 22:13:08 2010 +0200 Add Ubuntu 10.04 to German Download page --- templates/de/download.template | 2 +- templates/de/download/deb.template | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index c1e9e00..6230356 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -62,7 +62,7 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/download/deb">Ubuntu</a></b> - binär und Quellcode .debs für Ubuntu Karmic (9.10), Jaunty (9.04), Intrepid (8.10) und Hardy (8.04) + binär und Quellcode .debs für Ubuntu Lucid (10.04), Ubuntu Karmic (9.10), Jaunty (9.04), Intrepid (8.10) und Hardy (8.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index 5d5b7fd..801044e 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -32,6 +32,8 @@ von Drittanbietern</b>-Reiter und klicke auf <b>Hinzufügen</b>.</p> <p>Dann, <b>copy-paste eine der unteren Zeilen</b> in Abhängigkeit welche Version du benutzt.</p> +<p><b>Für Ubuntu Lucid (10.04):</b><br> +<i>ppa:ubuntu-wine/ppa</i></p> <p><b>Für Ubuntu Karmic (9.10):</b><br> <i>ppa:ubuntu-wine/ppa</i></p> <p><b>Für Ubuntu Jaunty (9.04):</b><br> @@ -84,10 +86,14 @@ Pakete verfügbar unter <p>Es ist auch möglich, das Hinzufügen der Wine Repositories und die Installation mit der Kommandozeile durchzuführen, wie folgt. Die Instruktionen sind nützlich für Kubuntu, Xubuntu und andere Ubuntu -Derivate.</p> +Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Terminal).</p> + +<h3>Für 10.04 (Lucid) und 9.10 (Karmic):</h3> -<p>Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Terminal). Füge dann -den Schlüssel des Repositorys zu der Liste für vertrauenswürdige +<p><i>sudo add-apt-repository ppa:ubuntu-wine/ppa</i></p> + +<h3>Für 9.04 und vorherige:</h3> +<p>Füge Schlüssel des Repositorys zu der Liste für vertrauenswürdige APT-Schlüssel Deines Systems hinzu, indem Du folgendes in das Terminal copy-pastest.:</p> @@ -95,8 +101,6 @@ in das Terminal copy-pastest.:</p> <p>Danach, füge das Repository zu den APT-Quellen Deines Systems hinzu:</p> -<p><b>Für Ubuntu Karmic (9.10):</b><br> -<i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/karmic.list -O /etc/apt/sources.list.d/winehq.list</i></p> <p><b>Für Ubuntu Jaunty (9.04):</b><br> <i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/jaunty.list -O /etc/apt/sources.list.d/winehq.list</i></p> <p><b>Für Ubuntu Intrepid (8.10):</b><br>

1 0

Jacek Caban : mshtml: Added IHTMLOptionElement:: selected property implementation.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: 85f079362f9e9712732209c5721a80d0f0e0ecc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f079362f9e9712732209c57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 17:56:29 2010 +0200 mshtml: Added IHTMLOptionElement::selected property implementation. --- dlls/mshtml/htmloption.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 24 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 3e03762..b816634 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -98,15 +98,35 @@ static HRESULT WINAPI HTMLOptionElement_Invoke(IHTMLOptionElement *iface, DISPID static HRESULT WINAPI HTMLOptionElement_put_selected(IHTMLOptionElement *iface, VARIANT_BOOL v) { HTMLOptionElement *This = HTMLOPTION_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLOptionElement_SetSelected(This->nsoption, v != VARIANT_FALSE); + if(NS_FAILED(nsres)) { + ERR("SetSelected failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLOptionElement_get_selected(IHTMLOptionElement *iface, VARIANT_BOOL *p) { HTMLOptionElement *This = HTMLOPTION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool selected; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLOptionElement_GetSelected(This->nsoption, &selected); + if(NS_FAILED(nsres)) { + ERR("GetSelected failed: %08x\n", nsres); + return E_FAIL; + } + + *p = selected ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLOptionElement_put_value(IHTMLOptionElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 69c87cd..ad5fb26 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1135,6 +1135,27 @@ static void _test_option_put_value(unsigned line, IHTMLOptionElement *option, co _test_option_value(line, option, value); } +#define test_option_selected(o,s) _test_option_selected(__LINE__,o,s) +static void _test_option_selected(unsigned line, IHTMLOptionElement *option, VARIANT_BOOL ex) +{ + VARIANT_BOOL b = 0x100; + HRESULT hres; + + hres = IHTMLOptionElement_get_selected(option, &b); + ok_(__FILE__,line)(hres == S_OK, "get_selected failed: %08x\n", hres); + ok_(__FILE__,line)(b == ex, "selected = %x, expected %x\n", b, ex); +} + +#define test_option_put_selected(o,s) _test_option_put_selected(__LINE__,o,s) +static void _test_option_put_selected(unsigned line, IHTMLOptionElement *option, VARIANT_BOOL b) +{ + HRESULT hres; + + hres = IHTMLOptionElement_put_selected(option, b); + ok_(__FILE__,line)(hres == S_OK, "put_selected failed: %08x\n", hres); + _test_option_selected(line, option, b); +} + #define test_comment_text(c,t) _test_comment_text(__LINE__,c,t) static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) { @@ -1183,6 +1204,7 @@ static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *do _test_option_text(line, option, txt); _test_option_value(line, option, val); + _test_option_selected(line, option, VARIANT_FALSE); return option; } @@ -2872,6 +2894,8 @@ static void test_create_option_elem(IHTMLDocument2 *doc) test_option_put_text(option, "new text"); test_option_put_value(option, "new value"); + test_option_put_selected(option, VARIANT_TRUE); + test_option_put_selected(option, VARIANT_FALSE); IHTMLOptionElement_Release(option); }

1 0

Jacek Caban : mshtml: Added IHTMLTextAreaElement::put_value implementation.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: 061fee45c0606dceadd3ff3af81193072b9e21a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061fee45c0606dceadd3ff3af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 17:56:58 2010 +0200 mshtml: Added IHTMLTextAreaElement::put_value implementation. --- dlls/mshtml/htmltextarea.c | 24 ++++++++++++---- dlls/mshtml/tests/dom.c | 63 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 75 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 9ded8ac..afa9c8f 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -105,8 +105,20 @@ static HRESULT WINAPI HTMLTextAreaElement_get_type(IHTMLTextAreaElement *iface, static HRESULT WINAPI HTMLTextAreaElement_put_value(IHTMLTextAreaElement *iface, BSTR v) { HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString value_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&value_str, v); + nsres = nsIDOMHTMLTextAreaElement_SetValue(This->nstextarea, &value_str); + nsAString_Finish(&value_str); + if(NS_FAILED(nsres)) { + ERR("SetValue failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTextAreaElement_get_value(IHTMLTextAreaElement *iface, BSTR *p) @@ -115,6 +127,7 @@ static HRESULT WINAPI HTMLTextAreaElement_get_value(IHTMLTextAreaElement *iface, nsAString value_str; const PRUnichar *value; nsresult nsres; + HRESULT hres = S_OK; TRACE("(%p)->(%p)\n", This, p); @@ -123,15 +136,14 @@ static HRESULT WINAPI HTMLTextAreaElement_get_value(IHTMLTextAreaElement *iface, nsres = nsIDOMHTMLTextAreaElement_GetValue(This->nstextarea, &value_str); if(NS_SUCCEEDED(nsres)) { nsAString_GetData(&value_str, &value); - *p = SysAllocString(value); + *p = *value ? SysAllocString(value) : NULL; }else { ERR("GetValue failed: %08x\n", nsres); + hres = E_FAIL; } nsAString_Finish(&value_str); - - TRACE("%s\n", debugstr_w(*p)); - return S_OK; + return hres; } static HRESULT WINAPI HTMLTextAreaElement_put_name(IHTMLTextAreaElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ad5fb26..a66b13c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -673,6 +673,17 @@ static IHTMLAnchorElement *_get_anchor_iface(unsigned line, IUnknown *unk) return anchor; } +#define get_textarea_iface(u) _get_textarea_iface(__LINE__,u) +static IHTMLTextAreaElement *_get_textarea_iface(unsigned line, IUnknown *unk) +{ + IHTMLTextAreaElement *textarea; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLTextAreaElement, (void**)&textarea); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextAreaElement: %08x\n", hres); + return textarea; +} + #define get_select_iface(u) _get_select_iface(__LINE__,u) static IHTMLSelectElement *_get_select_iface(unsigned line, IUnknown *unk) { @@ -1156,6 +1167,38 @@ static void _test_option_put_selected(unsigned line, IHTMLOptionElement *option, _test_option_selected(line, option, b); } +#define test_textarea_value(t,v) _test_textarea_value(__LINE__,t,v) +static void _test_textarea_value(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + BSTR value = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLTextAreaElement_get_value(textarea, &value); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "get_value failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(value, exval), "value = %s, expected %s\n", wine_dbgstr_w(value), exval); + else + ok_(__FILE__,line)(!value, "value = %p\n", value); + SysFreeString(value); +} + +#define test_textarea_put_value(t,v) _test_textarea_put_value(__LINE__,t,v) +static void _test_textarea_put_value(unsigned line, IUnknown *unk, const char *value) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + BSTR tmp = a2bstr(value); + HRESULT hres; + + hres = IHTMLTextAreaElement_put_value(textarea, tmp); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "put_value failed: %08x\n", hres); + SysFreeString(tmp); + + _test_textarea_value(line, unk, value); +} + #define test_comment_text(c,t) _test_comment_text(__LINE__,c,t) static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) { @@ -6004,29 +6047,37 @@ static void test_elems(IHTMLDocument2 *doc) static void test_elems2(IHTMLDocument2 *doc) { - IHTMLElement *elem, *elem2; + IHTMLElement *elem, *elem2, *div; static const elem_type_t outer_types[] = { ET_BR, ET_A }; - elem = get_doc_elem_by_id(doc, "divid"); + div = get_doc_elem_by_id(doc, "divid"); - test_elem_set_innerhtml((IUnknown*)elem, "<div id=\"innerid\"></div>"); + test_elem_set_innerhtml((IUnknown*)div, "<div id=\"innerid\"></div>"); elem2 = get_doc_elem_by_id(doc, "innerid"); ok(elem2 != NULL, "elem2 == NULL\n"); test_elem_set_outerhtml((IUnknown*)elem2, "<br><a href=\"about:blank\" id=\"aid\">a</a>"); - test_elem_all((IUnknown*)elem, outer_types, sizeof(outer_types)/sizeof(*outer_types)); + test_elem_all((IUnknown*)div, outer_types, sizeof(outer_types)/sizeof(*outer_types)); IHTMLElement_Release(elem2); elem2 = get_doc_elem_by_id(doc, "aid"); ok(elem2 != NULL, "elem2 == NULL\n"); test_elem_set_outerhtml((IUnknown*)elem2, ""); - test_elem_all((IUnknown*)elem, outer_types, 1); + test_elem_all((IUnknown*)div, outer_types, 1); IHTMLElement_Release(elem2); - IHTMLElement_Release(elem); + test_elem_set_innerhtml((IUnknown*)div, "<textarea id=\"ta\"></textarea>"); + elem = get_elem_by_id(doc, "ta", TRUE); + if(elem) { + test_textarea_value((IUnknown*)elem, NULL); + test_textarea_put_value((IUnknown*)elem, "test"); + IHTMLElement_Release(elem); + } + + IHTMLElement_Release(div); } static void test_create_elems(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml: Moved getting select' s option element by index to separated function.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: b52bdff841b3d6654c47a0d72997c24498e5a47d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b52bdff841b3d6654c47a0d72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 17:57:27 2010 +0200 mshtml: Moved getting select's option element by index to separated function. --- dlls/mshtml/htmlselect.c | 71 ++++++++++++++++++++++++++++----------------- 1 files changed, 44 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ee5d214..b9be897 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -42,6 +42,43 @@ typedef struct { #define HTMLSELECT(x) ((IHTMLSelectElement*) &(x)->lpHTMLSelectElementVtbl) +static HRESULT htmlselect_item(HTMLSelectElement *This, int i, IDispatch **ret) +{ + nsIDOMHTMLOptionsCollection *nscol; + nsIDOMNode *nsnode; + nsresult nsres; + + nsres = nsIDOMHTMLSelectElement_GetOptions(This->nsselect, &nscol); + if(NS_FAILED(nsres)) { + ERR("GetOptions failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMHTMLOptionsCollection_Item(nscol, i, &nsnode); + nsIDOMHTMLOptionsCollection_Release(nscol); + if(NS_FAILED(nsres)) { + ERR("Item failed: %08x\n", nsres); + return E_FAIL; + } + + if(nsnode) { + HTMLDOMNode *node; + + node = get_node(This->element.node.doc, nsnode, TRUE); + nsIDOMNode_Release(nsnode); + if(!node) { + ERR("Could not find node\n"); + return E_FAIL; + } + + IHTMLDOMNode_AddRef(HTMLDOMNODE(node)); + *ret = (IDispatch*)HTMLDOMNODE(node); + }else { + *ret = NULL; + } + return S_OK; +} + #define HTMLSELECT_THIS(iface) DEFINE_THIS(HTMLSelectElement, HTMLSelectElement, iface) static HRESULT WINAPI HTMLSelectElement_QueryInterface(IHTMLSelectElement *iface, @@ -534,36 +571,16 @@ static HRESULT HTMLSelectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid switch(flags) { case DISPATCH_PROPERTYGET: { - nsIDOMHTMLOptionsCollection *nscol; - nsIDOMNode *nsnode; - nsresult nsres; - - nsres = nsIDOMHTMLSelectElement_GetOptions(This->nsselect, &nscol); - if(NS_FAILED(nsres)) { - ERR("GetOptions failed: %08x\n", nsres); - return E_FAIL; - } - - nsres = nsIDOMHTMLOptionsCollection_Item(nscol, id-DISPID_OPTIONCOL_0, &nsnode); - nsIDOMHTMLOptionsCollection_Release(nscol); - if(NS_FAILED(nsres)) { - ERR("Item failed: %08x\n", nsres); - return E_FAIL; - } - - if(nsnode) { - HTMLDOMNode *node; + IDispatch *ret; + HRESULT hres; - node = get_node(This->element.node.doc, nsnode, TRUE); - nsIDOMNode_Release(nsnode); - if(!node) { - ERR("Could not find node\n"); - return E_FAIL; - } + hres = htmlselect_item(This, id-DISPID_OPTIONCOL_0, &ret); + if(FAILED(hres)) + return hres; - IHTMLDOMNode_AddRef(HTMLDOMNODE(node)); + if(ret) { V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = (IDispatch*)HTMLDOMNODE(node); + V_DISPATCH(res) = ret; }else { V_VT(res) = VT_NULL; }

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement::item implementation.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: 5847928bc63faec8ffcdbd0a36ce32a056d48b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5847928bc63faec8ffcdbd0a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 17:57:39 2010 +0200 mshtml: Added IHTMLSelectElement::item implementation. --- dlls/mshtml/htmlselect.c | 15 ++++++++++++++- dlls/mshtml/tests/dom.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index b9be897..f3aa36f 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -445,7 +445,20 @@ static HRESULT WINAPI HTMLSelectElement_item(IHTMLSelectElement *iface, VARIANT VARIANT index, IDispatch **pdisp) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(v v %p)\n", This, pdisp); + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&name), debugstr_variant(&index), pdisp); + + if(!pdisp) + return E_POINTER; + *pdisp = NULL; + + if(V_VT(&name) == VT_I4) { + if(V_I4(&name) < 0) + return E_INVALIDARG; + return htmlselect_item(This, V_I4(&name), pdisp); + } + + FIXME("Unsupported args\n"); return E_NOTIMPL; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a66b13c..c91adda 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2906,7 +2906,8 @@ static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, const char *id) static void test_select_elem(IHTMLSelectElement *select) { - IDispatch *disp; + IDispatch *disp, *disp2; + VARIANT name, index; HRESULT hres; test_select_type(select, "select-one"); @@ -2927,6 +2928,40 @@ static void test_select_elem(IHTMLSelectElement *select) ok(disp != NULL, "options == NULL\n"); ok(iface_cmp((IUnknown*)disp, (IUnknown*)select), "disp != select\n"); IDispatch_Release(disp); + + V_VT(&index) = VT_EMPTY; + V_VT(&name) = VT_I4; + V_I4(&name) = -1; + disp = (void*)0xdeadbeef; + hres = IHTMLSelectElement_item(select, name, index, &disp); + ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok(!disp, "disp = %p\n", disp); + + V_I4(&name) = 2; + disp = (void*)0xdeadbeef; + hres = IHTMLSelectElement_item(select, name, index, &disp); + ok(hres == S_OK, "item failed: %08x\n", hres); + ok(!disp, "disp = %p\n", disp); + + V_I4(&name) = 1; + hres = IHTMLSelectElement_item(select, name, index, NULL); + ok(hres == E_POINTER, "item failed: %08x, expected E_POINTER\n", hres); + + disp = NULL; + hres = IHTMLSelectElement_item(select, name, index, &disp); + ok(hres == S_OK, "item failed: %08x\n", hres); + ok(disp != NULL, "disp = NULL\n"); + test_disp((IUnknown*)disp, &DIID_DispHTMLOptionElement, NULL); + + V_VT(&index) = VT_I4; + V_I4(&index) = 1; + disp2 = NULL; + hres = IHTMLSelectElement_item(select, name, index, &disp2); + ok(hres == S_OK, "item failed: %08x\n", hres); + ok(disp2 != NULL, "disp = NULL\n"); + ok(iface_cmp((IUnknown*)disp, (IUnknown*)disp2), "disp != disp2\n"); + IDispatch_Release(disp2); + IDispatch_Release(disp); } static void test_create_option_elem(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml: Moved getting form' s elements by index to separated function.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: 68e9bd281eaa15e9a9e854b501ebe34b3b82e5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e9bd281eaa15e9a9e854b50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 17:57:54 2010 +0200 mshtml: Moved getting form's elements by index to separated function. --- dlls/mshtml/htmlform.c | 68 +++++++++++++++++++++++++++++++---------------- 1 files changed, 45 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index c33937d..bcb6e6e 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -41,6 +41,41 @@ struct HTMLFormElement { #define HTMLFORM(x) (&(x)->lpHTMLFormElementVtbl) +static HRESULT htmlform_item(HTMLFormElement *This, int i, IDispatch **ret) +{ + nsIDOMHTMLCollection *elements; + nsIDOMNode *item; + HTMLDOMNode *node; + nsresult nsres; + + nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); + if(NS_FAILED(nsres)) { + FIXME("GetElements failed: 0x%08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMHTMLCollection_Item(elements, i, &item); + nsIDOMHTMLCollection_Release(elements); + if(NS_FAILED(nsres)) { + FIXME("Item failed: 0x%08x\n", nsres); + return E_FAIL; + } + + if(item) { + node = get_node(This->element.node.doc, item, TRUE); + if(!node) + return E_OUTOFMEMORY; + + IHTMLDOMNode_AddRef(HTMLDOMNODE(node)); + nsIDOMNode_Release(item); + *ret = (IDispatch*)HTMLDOMNODE(node); + }else { + *ret = NULL; + } + + return S_OK; +} + #define HTMLFORM_THIS(iface) DEFINE_THIS(HTMLFormElement, HTMLFormElement, iface) static HRESULT WINAPI HTMLFormElement_QueryInterface(IHTMLFormElement *iface, @@ -439,34 +474,21 @@ static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, EXCEPINFO *ei, IServiceProvider *caller) { HTMLFormElement *This = HTMLFORM_NODE_THIS(iface); - nsIDOMHTMLCollection *elements; - nsIDOMNode *item; - HTMLDOMNode *node; - nsresult nsres; + IDispatch *ret; + HRESULT hres; TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); - nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); - if(NS_FAILED(nsres)) { - FIXME("GetElements failed: 0x%08x\n", nsres); - return E_FAIL; - } + hres = htmlform_item(This, id - MSHTML_DISPID_CUSTOM_MIN, &ret); + if(FAILED(hres)) + return hres; - nsres = nsIDOMHTMLCollection_Item(elements, id - MSHTML_DISPID_CUSTOM_MIN, &item); - nsIDOMHTMLCollection_Release(elements); - if(NS_FAILED(nsres)) { - FIXME("Item failed: 0x%08x\n", nsres); - return E_FAIL; + if(ret) { + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = ret; + }else { + V_VT(res) = VT_NULL; } - - node = get_node(This->element.node.doc, item, TRUE); - - V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = (IDispatch*)node; - - IHTMLDOMNode_AddRef(HTMLDOMNODE(node)); - nsIDOMNode_Release(item); - return S_OK; }

1 0

Jacek Caban : mshtml: Added IHTMLFormElement::item implementation.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: 5bb9172af2fcc53ba36ebe7a2540664998f3e0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb9172af2fcc53ba36ebe7a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 17:58:09 2010 +0200 mshtml: Added IHTMLFormElement::item implementation. --- dlls/mshtml/htmlform.c | 15 ++++++++++++- dlls/mshtml/tests/dom.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index bcb6e6e..6ca8e92 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -299,7 +299,20 @@ static HRESULT WINAPI HTMLFormElement_item(IHTMLFormElement *iface, VARIANT name VARIANT index, IDispatch **pdisp) { HTMLFormElement *This = HTMLFORM_THIS(iface); - FIXME("(%p)->(v v %p)\n", This, pdisp); + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&name), debugstr_variant(&index), pdisp); + + if(!pdisp) + return E_INVALIDARG; + *pdisp = NULL; + + if(V_VT(&name) == VT_I4) { + if(V_I4(&name) < 0) + return E_INVALIDARG; + return htmlform_item(This, V_I4(&name), pdisp); + } + + FIXME("Unsupported args\n"); return E_NOTIMPL; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c91adda..e8657f4 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2964,6 +2964,48 @@ static void test_select_elem(IHTMLSelectElement *select) IDispatch_Release(disp); } +static void test_form_item(IHTMLElement *elem) +{ + IHTMLFormElement *form = get_form_iface((IUnknown*)elem); + IDispatch *disp, *disp2; + VARIANT name, index; + HRESULT hres; + + V_VT(&index) = VT_EMPTY; + V_VT(&name) = VT_I4; + V_I4(&name) = -1; + disp = (void*)0xdeadbeef; + hres = IHTMLFormElement_item(form, name, index, &disp); + ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok(!disp, "disp = %p\n", disp); + + V_I4(&name) = 2; + disp = (void*)0xdeadbeef; + hres = IHTMLFormElement_item(form, name, index, &disp); + ok(hres == S_OK, "item failed: %08x\n", hres); + ok(!disp, "disp = %p\n", disp); + + V_I4(&name) = 1; + hres = IHTMLFormElement_item(form, name, index, NULL); + ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + + disp = NULL; + hres = IHTMLFormElement_item(form, name, index, &disp); + ok(hres == S_OK, "item failed: %08x\n", hres); + ok(disp != NULL, "disp = NULL\n"); + test_disp((IUnknown*)disp, &DIID_DispHTMLInputElement, NULL); + + V_VT(&index) = VT_I4; + V_I4(&index) = 1; + disp2 = NULL; + hres = IHTMLFormElement_item(form, name, index, &disp2); + ok(hres == S_OK, "item failed: %08x\n", hres); + ok(disp2 != NULL, "disp = NULL\n"); + ok(iface_cmp((IUnknown*)disp, (IUnknown*)disp2), "disp != disp2\n"); + IDispatch_Release(disp2); + IDispatch_Release(disp); +} + static void test_create_option_elem(IHTMLDocument2 *doc) { IHTMLOptionElement *option; @@ -6112,6 +6154,15 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_elem_set_innerhtml((IUnknown*)div, + "<form id=\"form\"><input type=\"button\"></input><input type=\"text\"></input></textarea>"); + elem = get_elem_by_id(doc, "form", TRUE); + if(elem) { + test_form_length((IUnknown*)elem, 2); + test_form_item(elem); + IHTMLElement_Release(elem); + } + IHTMLElement_Release(div); }

1 0

Jacek Caban : mshtml: Added IHTMLFormElement:: action property implementation.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: d9427e39222e3c3603b430b7dbd035f2f71b1819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9427e39222e3c3603b430b7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 17:58:24 2010 +0200 mshtml: Added IHTMLFormElement::action property implementation. --- dlls/mshtml/htmlform.c | 36 ++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 6ca8e92..8e16917 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -133,15 +133,43 @@ static HRESULT WINAPI HTMLFormElement_Invoke(IHTMLFormElement *iface, DISPID dis static HRESULT WINAPI HTMLFormElement_put_action(IHTMLFormElement *iface, BSTR v) { HTMLFormElement *This = HTMLFORM_THIS(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_w(v)); - return E_NOTIMPL; + nsAString action_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(v)); + + nsAString_InitDepend(&action_str, v); + nsres = nsIDOMHTMLFormElement_SetAction(This->nsform, &action_str); + nsAString_Finish(&action_str); + if(NS_FAILED(nsres)) { + ERR("SetAction failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLFormElement_get_action(IHTMLFormElement *iface, BSTR *p) { HTMLFormElement *This = HTMLFORM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString action_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&action_str, NULL); + nsres = nsIDOMHTMLFormElement_GetAction(This->nsform, &action_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *action; + nsAString_GetData(&action_str, &action); + hres = nsuri_to_url(action, FALSE, p); + }else { + ERR("GetAction failed: %08x\n", nsres); + hres = E_FAIL; + } + + return hres; } static HRESULT WINAPI HTMLFormElement_put_dir(IHTMLFormElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e8657f4..c344509 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2519,6 +2519,38 @@ static void _test_form_length(unsigned line, IUnknown *unk, LONG exlen) IHTMLFormElement_Release(form); } +#define test_form_action(f,a) _test_form_action(__LINE__,f,a) +static void _test_form_action(unsigned line, IUnknown *unk, const char *ex) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + BSTR action = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLFormElement_get_action(form, &action); + ok_(__FILE__,line)(hres == S_OK, "get_action failed: %08x\n", hres); + if(ex) + ok_(__FILE__,line)(!strcmp_wa(action, ex), "action=%s, expected %s\n", wine_dbgstr_w(action), ex); + else + ok_(__FILE__,line)(!action, "action=%p\n", action); + + IHTMLFormElement_Release(form); +} + +#define test_form_put_action(f,a) _test_form_put_action(__LINE__,f,a) +static void _test_form_put_action(unsigned line, IUnknown *unk, const char *action) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + BSTR tmp = a2bstr(action); + HRESULT hres; + + hres = IHTMLFormElement_put_action(form, tmp); + ok_(__FILE__,line)(hres == S_OK, "put_action failed: %08x\n", hres); + SysFreeString(tmp); + IHTMLFormElement_Release(form); + + _test_form_action(line, unk, action); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -6160,6 +6192,8 @@ static void test_elems2(IHTMLDocument2 *doc) if(elem) { test_form_length((IUnknown*)elem, 2); test_form_item(elem); + test_form_action((IUnknown*)elem, NULL); + test_form_put_action((IUnknown*)elem, "about:blank"); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Added IHTMLTextAreaElement:: readOnly property implementation.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: 25d8616d48747ca0c7c5d64f7a73b721f5d18edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d8616d48747ca0c7c5d64f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 17:58:40 2010 +0200 mshtml: Added IHTMLTextAreaElement::readOnly property implementation. --- dlls/mshtml/htmltextarea.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index afa9c8f..dd33c72 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -265,15 +265,35 @@ static HRESULT WINAPI HTMLTextAreaElement_get_onselect(IHTMLTextAreaElement *ifa static HRESULT WINAPI HTMLTextAreaElement_put_readOnly(IHTMLTextAreaElement *iface, VARIANT_BOOL v) { HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLTextAreaElement_SetReadOnly(This->nstextarea, v != VARIANT_FALSE); + if(NS_FAILED(nsres)) { + ERR("SetReadOnly failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTextAreaElement_get_readOnly(IHTMLTextAreaElement *iface, VARIANT_BOOL *p) { HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool b; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLTextAreaElement_GetReadOnly(This->nstextarea, &b); + if(NS_FAILED(nsres)) { + ERR("GetReadOnly failed: %08x\n", nsres); + return E_FAIL; + } + + *p = b ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLTextAreaElement_put_rows(IHTMLTextAreaElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c344509..7be4fe7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1199,6 +1199,32 @@ static void _test_textarea_put_value(unsigned line, IUnknown *unk, const char *v _test_textarea_value(line, unk, value); } +#define test_textarea_readonly(t,v) _test_textarea_readonly(__LINE__,t,v) +static void _test_textarea_readonly(unsigned line, IUnknown *unk, VARIANT_BOOL ex) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + VARIANT_BOOL b = 0x100; + HRESULT hres; + + hres = IHTMLTextAreaElement_get_readOnly(textarea, &b); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "get_readOnly failed: %08x\n", hres); + ok_(__FILE__,line)(b == ex, "readOnly = %x, expected %x\n", b, ex); +} + +#define test_textarea_put_readonly(t,v) _test_textarea_put_readonly(__LINE__,t,v) +static void _test_textarea_put_readonly(unsigned line, IUnknown *unk, VARIANT_BOOL b) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + HRESULT hres; + + hres = IHTMLTextAreaElement_put_readOnly(textarea, b); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "put_readOnly failed: %08x\n", hres); + + _test_textarea_readonly(line, unk, b); +} + #define test_comment_text(c,t) _test_comment_text(__LINE__,c,t) static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) { @@ -6183,6 +6209,9 @@ static void test_elems2(IHTMLDocument2 *doc) if(elem) { test_textarea_value((IUnknown*)elem, NULL); test_textarea_put_value((IUnknown*)elem, "test"); + test_textarea_readonly((IUnknown*)elem, VARIANT_FALSE); + test_textarea_put_readonly((IUnknown*)elem, VARIANT_TRUE); + test_textarea_put_readonly((IUnknown*)elem, VARIANT_FALSE); IHTMLElement_Release(elem); }

1 0