wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Frédéric Delanoy : French translation for release 1.9.1
by Jeremy Newman 11 Jan '16

11 Jan '16

Module: website Branch: master Commit: 99db3d24fc2566a3087198cf4bca6b24d23fbd80 URL: http://source.winehq.org/git/website.git/?a=commit;h=99db3d24fc2566a3087198… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 9 13:14:39 2016 +0100 French translation for release 1.9.1 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016010901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2016010901.xml b/news/fr/2016010901.xml new file mode 100644 index 0000000..26a7907 --- /dev/null +++ b/news/fr/2016010901.xml @@ -0,0 +1,15 @@ +<news> +<date>9 janvier 2016</date> +<title>Sortie de Wine 1.9.1</title> +<body> +La version de développement 1.9.1 de Wine est disponible. +<a href="{$root}/announce/1.9.1">Nouveautés</a> de cette version : +<ul> + <li>Quelques correctifs différés supplémentaires.</li> + <li>Prise en charge des registres de débogage sous x86-64.</li> + <li>Instructions Shader Model 4 additionnelles.</li> + <li>Prise en charge de la chaîne de compilation Mingw ARM.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.1.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Nikolay Sivov : dwrite: Fix a leak on error path.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 0f67df657db77ea8aef9c2b9498fb5fa1f514a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f67df657db77ea8aef9c2b94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 11 16:15:55 2016 +0300 dwrite: Fix a leak on error path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 2f75fba..02772ff 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4054,6 +4054,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * free_layout_range(strike); free_layout_range(effect); free_layout_range(spacing); + free_layout_range(typography); hr = E_OUTOFMEMORY; goto fail; }

1 0

Nikolay Sivov : dwrite: Make position snapping more compact.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: f6862b13b7c4c4dd540e4023e8fa31ebc57bcf1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6862b13b7c4c4dd540e4023e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 11 16:15:54 2016 +0300 dwrite: Make position snapping more compact. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 3909511..2f75fba 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2904,7 +2904,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, skiptransform = should_skip_transform(&m, &det); } -#define SNAP_COORD(x) renderer_apply_snapping((x), skiptransform, ppdip, det, &m) +#define SNAP_COORD(x) (disabled ? (x) : renderer_apply_snapping((x), skiptransform, ppdip, det, &m)) /* 1. Regular runs */ LIST_FOR_EACH_ENTRY(run, &This->eruns, struct layout_effective_run, entry) { const struct regular_layout_run *regular = &run->run->u.regular; @@ -2934,7 +2934,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, IDWriteTextRenderer_DrawGlyphRun(renderer, context, run->origin_x + run->align_dx + origin_x, - disabled ? run->origin_y + origin_y : SNAP_COORD(run->origin_y + origin_y), + SNAP_COORD(run->origin_y + origin_y), This->measuringmode, &glyph_run, &descr, @@ -2946,7 +2946,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, IDWriteTextRenderer_DrawInlineObject(renderer, context, inlineobject->origin_x + inlineobject->align_dx + origin_x, - disabled ? inlineobject->origin_y + origin_y : SNAP_COORD(inlineobject->origin_y + origin_y), + SNAP_COORD(inlineobject->origin_y + origin_y), inlineobject->object, inlineobject->is_sideways, inlineobject->is_rtl, @@ -2960,7 +2960,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, IDWriteTextRenderer_DrawStrikethrough(renderer, context, s->run->origin_x, - disabled ? s->run->origin_y : SNAP_COORD(s->run->origin_y), + SNAP_COORD(s->run->origin_y), &s->s, NULL); }

1 0

Nikolay Sivov : dwrite: Consistently use explicit float literals.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 74f00fa17d33c181a67202ce3d0495ac65dca826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f00fa17d33c181a67202ce3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 11 16:15:53 2016 +0300 dwrite: Consistently use explicit float literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 60 +++++++++++++-------------- dlls/dwrite/font.c | 16 ++++---- dlls/dwrite/freetype.c | 4 +- dlls/dwrite/gdiinterop.c | 2 +- dlls/dwrite/layout.c | 104 +++++++++++++++++++++++------------------------ dlls/dwrite/main.c | 4 +- 6 files changed, 95 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74f00fa17d33c181a6720…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 3a653fb84a3b2f745d023fc83083e1137de90d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a653fb84a3b2f745d023fc83… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 11 12:42:06 2016 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index e5e2827..015c770 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-12-07 00:44+0100\n" +"PO-Revision-Date: 2016-01-11 12:42+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -1042,7 +1042,7 @@ msgstr "Ordner auswählen" #: comdlg32.rc:148 msgid "Font size has to be a number." -msgstr "" +msgstr "Die Schriftgröße muss eine Zahl sein." #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

1 0

Jacek Caban : mshtml: Expose IHTMLUniqueName for IDispatch of all element objects.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 0987f7fdea8190b2a9ec32327b543519362009f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0987f7fdea8190b2a9ec32327… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:02:11 2016 +0100 mshtml: Expose IHTMLUniqueName for IDispatch of all element objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/mshtml_private.h | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 684f3ae..6405f9f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -801,7 +801,6 @@ static const NodeImplVtbl HTMLAnchorElementImplVtbl = { static const tid_t HTMLAnchorElement_iface_tids[] = { IHTMLAnchorElement_tid, HTMLELEMENT_TIDS, - IHTMLUniqueName_tid, 0 }; diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e4b7990..39b1faf 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -871,7 +871,6 @@ static const tid_t HTMLBodyElement_iface_tids[] = { IHTMLBodyElement2_tid, HTMLELEMENT_TIDS, IHTMLTextContainer_tid, - IHTMLUniqueName_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 51adb38..2f03501 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -722,7 +722,8 @@ typedef struct { IHTMLElement_tid, \ IHTMLElement2_tid, \ IHTMLElement3_tid, \ - IHTMLElement4_tid + IHTMLElement4_tid, \ + IHTMLUniqueName_tid extern cp_static_data_t HTMLElementEvents2_data DECLSPEC_HIDDEN; #define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data}

1 0

Jacek Caban : mshtml/tests: Added IHTMLUniqueName tests.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: eb54df637470048212763e1e440b68e97c93cd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb54df637470048212763e1e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:02:02 2016 +0100 mshtml/tests: Added IHTMLUniqueName tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9a9cc85..2940cee 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6209,10 +6209,13 @@ static void test_default_selection(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); } -static void test_unique_id(IHTMLDocument2 *doc) +static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) { IHTMLDocument3 *doc3 = get_doc3_iface(doc); + IHTMLUniqueName *unique_name; + char buf[32]; BSTR id, id2; + LONG num; HRESULT hres; static const WCHAR prefixW[] = {'m','s','_','_','i','d',0}; @@ -6235,6 +6238,30 @@ static void test_unique_id(IHTMLDocument2 *doc) SysFreeString(id); SysFreeString(id2); + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLUniqueName, (void**)&unique_name); + ok(hres == S_OK, "Could not get IHTMLUniqueName iface: %08x\n", hres); + + hres = IHTMLUniqueName_get_uniqueID(unique_name, &id); + ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + trace("id %s\n", wine_dbgstr_w(id)); + + hres = IHTMLUniqueName_get_uniqueID(unique_name, &id2); + ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + ok(!lstrcmpW(id, id2), "unique names differ\n"); + trace("id %s\n", wine_dbgstr_w(id2)); + + hres = IHTMLUniqueName_get_uniqueNumber(unique_name, &num); + ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + ok(num, "num = 0\n"); + + sprintf(buf, "ms__id%u", num); + ok(!strcmp_wa(id, buf), "unexpected id %s\n", wine_dbgstr_w(id)); + trace("num %d\n", num); + + SysFreeString(id); + SysFreeString(id2); + + IHTMLUniqueName_Release(unique_name); IHTMLDocument3_Release(doc3); } @@ -6272,10 +6299,9 @@ static void test_doc_elem(IHTMLDocument2 *doc) IHTMLDocument2_Release(doc_node); test_elem_client_rect((IUnknown*)elem); + test_unique_id(doc, elem); IHTMLElement_Release(elem); - - test_unique_id(doc); } static void test_default_body(IHTMLBodyElement *body)

1 0

Jacek Caban : mshtml: Added IHTMLUniqueName::get_uniqueID implementation.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: a52cb2b87a8f74af7c7d40c413557f5f826cf690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52cb2b87a8f74af7c7d40c41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:01:57 2016 +0100 mshtml: Added IHTMLUniqueName::get_uniqueID implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 7 +------ dlls/mshtml/htmlelem.c | 18 ++++++++++++++++-- dlls/mshtml/mshtml_private.h | 3 +++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 30236aa..87be653 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2021,15 +2021,10 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I static HRESULT WINAPI HTMLDocument3_get_uniqueID(IHTMLDocument3 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - WCHAR buf[32]; - - static const WCHAR formatW[] = {'m','s','_','_','i','d','%','u',0}; TRACE("(%p)->(%p)\n", This, p); - sprintfW(buf, formatW, ++This->doc_node->unique_id); - *p = SysAllocString(buf); - return *p ? S_OK : E_OUTOFMEMORY; + return elem_unique_id(++This->doc_node->unique_id, p); } static HRESULT WINAPI HTMLDocument3_attachEvent(IHTMLDocument3 *iface, BSTR event, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 61110c5..cb0b864 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3843,6 +3843,17 @@ static HRESULT WINAPI HTMLUniqueName_Invoke(IHTMLUniqueName *iface, DISPID dispI wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } +HRESULT elem_unique_id(unsigned id, BSTR *p) +{ + WCHAR buf[32]; + + static const WCHAR formatW[] = {'m','s','_','_','i','d','%','u',0}; + + sprintfW(buf, formatW, id); + *p = SysAllocString(buf); + return *p ? S_OK : E_OUTOFMEMORY; +} + static void ensure_unique_id(HTMLElement *elem) { if(!elem->unique_id) @@ -3863,8 +3874,11 @@ static HRESULT WINAPI HTMLUniqueName_get_uniqueNumber(IHTMLUniqueName *iface, LO static HRESULT WINAPI HTMLUniqueName_get_uniqueID(IHTMLUniqueName *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLUniqueName(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + ensure_unique_id(This); + return elem_unique_id(This->unique_id, p); } static const IHTMLUniqueNameVtbl HTMLUniqueNameVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b613f70..51adb38 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -713,6 +713,7 @@ typedef struct { HTMLStyle *runtime_style; HTMLAttributeCollection *attrs; WCHAR *filter; + unsigned unique_id; } HTMLElement; #define HTMLELEMENT_TIDS \ @@ -1019,6 +1020,8 @@ nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PR HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BOOL,BSTR*) DECLSPEC_HIDDEN; HRESULT elem_string_attr_setter(HTMLElement*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT elem_unique_id(unsigned id, BSTR *p) DECLSPEC_HIDDEN; + /* commands */ typedef struct { DWORD id;

1 0

Jacek Caban : mshtml: Added IHTMLUniqueName:: get_uniqueNumber implementation.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 881b2f08d900c1a497dbd9006535ae4ba4401cec URL: http://source.winehq.org/git/wine.git/?a=commit;h=881b2f08d900c1a497dbd9006… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:01:38 2016 +0100 mshtml: Added IHTMLUniqueName::get_uniqueNumber implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index defa10a..61110c5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3843,11 +3843,21 @@ static HRESULT WINAPI HTMLUniqueName_Invoke(IHTMLUniqueName *iface, DISPID dispI wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } +static void ensure_unique_id(HTMLElement *elem) +{ + if(!elem->unique_id) + elem->unique_id = ++elem->node.doc->unique_id; +} + static HRESULT WINAPI HTMLUniqueName_get_uniqueNumber(IHTMLUniqueName *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLUniqueName(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + ensure_unique_id(This); + *p = This->unique_id; + return S_OK; } static HRESULT WINAPI HTMLUniqueName_get_uniqueID(IHTMLUniqueName *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added IHTMLUniqueName interface stub implementation.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 40b2deb843301987c89a912014226afcda280825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b2deb843301987c89a91201… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:01:24 2016 +0100 mshtml: Added IHTMLUniqueName interface stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 1 + 3 files changed, 83 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e5ae4e0..defa10a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3791,6 +3791,84 @@ static const IHTMLElement4Vtbl HTMLElement4Vtbl = { HTMLElement4_get_onfocusout }; +static inline HTMLElement *impl_from_IHTMLUniqueName(IHTMLUniqueName *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IHTMLUniqueName_iface); +} + +static HRESULT WINAPI HTMLUniqueName_QueryInterface(IHTMLUniqueName *iface, REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI HTMLUniqueName_AddRef(IHTMLUniqueName *iface) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI HTMLUniqueName_Release(IHTMLUniqueName *iface) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI HTMLUniqueName_GetTypeInfoCount(IHTMLUniqueName *iface, UINT *pctinfo) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLUniqueName_GetTypeInfo(IHTMLUniqueName *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLUniqueName_GetIDsOfNames(IHTMLUniqueName *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLUniqueName_Invoke(IHTMLUniqueName *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLUniqueName_get_uniqueNumber(IHTMLUniqueName *iface, LONG *p) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLUniqueName_get_uniqueID(IHTMLUniqueName *iface, BSTR *p) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLUniqueNameVtbl HTMLUniqueNameVtbl = { + HTMLUniqueName_QueryInterface, + HTMLUniqueName_AddRef, + HTMLUniqueName_Release, + HTMLUniqueName_GetTypeInfoCount, + HTMLUniqueName_GetTypeInfo, + HTMLUniqueName_GetIDsOfNames, + HTMLUniqueName_Invoke, + HTMLUniqueName_get_uniqueNumber, + HTMLUniqueName_get_uniqueID +}; + static inline HTMLElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLElement, node); @@ -3812,6 +3890,8 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IHTMLElement3_iface; }else if(IsEqualGUID(&IID_IHTMLElement4, riid)) { *ppv = &This->IHTMLElement4_iface; + }else if(IsEqualGUID(&IID_IHTMLUniqueName, riid)) { + *ppv = &This->IHTMLUniqueName_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { *ppv = &This->cp_container.IConnectionPointContainer_iface; }else { @@ -4072,6 +4152,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen This->IHTMLElement2_iface.lpVtbl = &HTMLElement2Vtbl; This->IHTMLElement3_iface.lpVtbl = &HTMLElement3Vtbl; This->IHTMLElement4_iface.lpVtbl = &HTMLElement4Vtbl; + This->IHTMLUniqueName_iface.lpVtbl = &HTMLUniqueNameVtbl; if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_dispex_vtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2b8fa82..b613f70 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -706,6 +706,7 @@ typedef struct { IHTMLElement2 IHTMLElement2_iface; IHTMLElement3 IHTMLElement3_iface; IHTMLElement4 IHTMLElement4_iface; + IHTMLUniqueName IHTMLUniqueName_iface; nsIDOMHTMLElement *nselem; HTMLStyle *style; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e90fc70..9a9cc85 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -179,6 +179,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLElement2, \ &IID_IHTMLElement3, \ &IID_IHTMLElement4, \ + &IID_IHTMLUniqueName, \ &IID_IDispatchEx static const IID * const elem_iids[] = {

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016