wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Alex Henrie : mmdevapi/tests: Fix capture test that consistently fails on Windows 10.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 473a4aaba2e7740c43ffca7843d90ee802a0da37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=473a4aaba2e7740c43ffca78… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 19 02:31:29 2018 -0700 mmdevapi/tests: Fix capture test that consistently fails on Windows 10. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 3cdfda1..27a5cdc 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -308,20 +308,17 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr==S_OK ? (UINT)pos : -1, pad, flags, frames); if(hr == S_OK){ - /* The discontinuity is reported here, but is this an old or new packet? */ - todo_wine_if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)) { - /* FIXME: Some drivers fail */ - ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY){ /* Native's position is one period further than what we read. * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: * signal when the position jump left a gap. */ - ok(pos == sum + frames, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); + ok(pos == sum + frames, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); + sum = pos; + }else{ /* win10 */ + ok(pos == sum, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); } ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next); - - if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) - sum = pos; } hr = IAudioCaptureClient_ReleaseBuffer(acc, frames);

1 0

Jacek Caban : mshtml: Use get_element helper in IHTMLElement:: get_offsetParent implementation.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: d5a190b052d4f9c33a2236e8482af73fe9ad1eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a190b052d4f9c33a2236e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:50:21 2018 +0100 mshtml: Use get_element helper in IHTMLElement::get_offsetParent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4789047..ca935d3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1408,6 +1408,7 @@ static HRESULT WINAPI HTMLElement_get_offsetParent(IHTMLElement *iface, IHTMLEle { HTMLElement *This = impl_from_IHTMLElement(iface); nsIDOMElement *nsparent; + HTMLElement *parent; nsresult nsres; HRESULT hres; @@ -1424,22 +1425,18 @@ static HRESULT WINAPI HTMLElement_get_offsetParent(IHTMLElement *iface, IHTMLEle return E_FAIL; } - if(nsparent) { - HTMLDOMNode *node; - - hres = get_node((nsIDOMNode*)nsparent, TRUE, &node); - nsIDOMElement_Release(nsparent); - if(FAILED(hres)) - return hres; - - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); - node_release(node); - }else { + if(!nsparent) { *p = NULL; hres = S_OK; } - return hres; + hres = get_element(nsparent, &parent); + nsIDOMElement_Release(nsparent); + if(FAILED(hres)) + return hres; + + *p = &parent->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLElement_put_innerHTML(IHTMLElement *iface, BSTR v)

1 0

Jacek Caban : mshtml: Get rid of no longer needed document argument from get_element.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: b304616f8ac725bcc663334256a29bfce4401c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b304616f8ac725bcc6633342… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:50:02 2018 +0100 mshtml: Get rid of no longer needed document argument from get_element. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 18 ++++++++++-------- dlls/mshtml/htmlelem.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5bd1da1..0fc96a5 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -112,7 +112,7 @@ HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement * return S_OK; } - hres = get_elem(doc, nselem, ret); + hres = get_element(nselem, ret); nsIDOMElement_Release(nselem); return hres; } @@ -281,7 +281,7 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement return S_OK; } - hres = get_elem(This->doc_node, (nsIDOMElement*)nsbody, &element); + hres = get_element((nsIDOMElement*)nsbody, &element); nsIDOMHTMLElement_Release(nsbody); if(FAILED(hres)) return hres; @@ -320,7 +320,7 @@ static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTM return S_OK; } - hres = get_elem(This->doc_node, nselem, &elem); + hres = get_element(nselem, &elem); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; @@ -3161,7 +3161,7 @@ static HRESULT WINAPI HTMLDocument6_getElementById(IHTMLDocument6 *iface, return S_OK; } - hres = get_elem(This->doc_node, nselem, &elem); + hres = get_element(nselem, &elem); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; @@ -4083,7 +4083,7 @@ static HRESULT WINAPI HTMLDocument7_get_head(IHTMLDocument7 *iface, IHTMLElement nsIDOMHTMLHeadElement_Release(nshead); assert(nsres == NS_OK); - hres = get_elem(This->doc_node, nselem, &elem); + hres = get_element(nselem, &elem); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; @@ -4282,10 +4282,12 @@ static HRESULT WINAPI DocumentSelector_querySelector(IDocumentSelector *iface, B return S_OK; } - hres = get_elem(This->doc_node, nselem, &elem); + hres = get_element(nselem, &elem); nsIDOMElement_Release(nselem); - if(SUCCEEDED(hres)) - *pel = &elem->IHTMLElement_iface; + if(FAILED(hres)) + return hres; + + *pel = &elem->IHTMLElement_iface; return S_OK; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f75a9ec..4789047 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5119,7 +5119,7 @@ static HRESULT WINAPI ElementTraversal_get_firstElementChild(IElementTraversal * return S_OK; } - hres = get_elem(This->node.doc, nselem, &elem); + hres = get_element(nselem, &elem); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; @@ -5623,7 +5623,7 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g return S_OK; } -HRESULT get_elem(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **ret) +HRESULT get_element(nsIDOMElement *nselem, HTMLElement **ret) { HTMLDOMNode *node; HRESULT hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0bb3a96..c9c6682 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1073,7 +1073,7 @@ HRESULT HTMLFrameBase_QI(HTMLFrameBase*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLFrameBase_destructor(HTMLFrameBase*) DECLSPEC_HIDDEN; HRESULT get_node(nsIDOMNode*,BOOL,HTMLDOMNode**) DECLSPEC_HIDDEN; -HRESULT get_elem(HTMLDocumentNode*,nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN; +HRESULT get_element(nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT get_document_node(nsIDOMDocument*,HTMLDocumentNode**) DECLSPEC_HIDDEN; HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Get rid of no longer needed document argument from create_all_list.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: ae4809c7d6a4daa86efdeac4b88afccfeb602ce6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae4809c7d6a4daa86efdeac4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:49:50 2018 +0100 mshtml: Get rid of no longer needed document argument from create_all_list. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelemcol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index d4a37a3..6671434 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -626,7 +626,7 @@ static dispex_static_data_t HTMLElementCollection_dispex = { HTMLElementCollection_iface_tids }; -static void create_all_list(HTMLDocumentNode *doc, HTMLDOMNode *elem, elem_vector_t *buf) +static void create_all_list(HTMLDOMNode *elem, elem_vector_t *buf) { nsIDOMNodeList *nsnode_list; nsIDOMNode *iter; @@ -661,7 +661,7 @@ static void create_all_list(HTMLDocumentNode *doc, HTMLDOMNode *elem, elem_vecto } elem_vector_add(buf, elem_from_HTMLDOMNode(node)); - create_all_list(doc, node, buf); + create_all_list(node, buf); } } } @@ -676,7 +676,7 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro node_addref(node); elem_vector_add(&buf, elem_from_HTMLDOMNode(node)); } - create_all_list(node->doc, node, &buf); + create_all_list(node, &buf); elem_vector_normalize(&buf); return HTMLElementCollection_Create(buf.buf, buf.len, @@ -805,7 +805,7 @@ HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) return E_OUTOFMEMORY; } - create_all_list(elem->node.doc, node, &buf); + create_all_list(node, &buf); for(i=0; i < buf.len; i++) { if(buf.buf[i] == elem)

1 0

Jacek Caban : mshtml: Get rid of no longer needed document argument from script_elem_from_nsscript.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: dfc13245f1384413b281e88d8c4faf524b55155d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfc13245f1384413b281e88d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:49:39 2018 +0100 mshtml: Get rid of no longer needed document argument from script_elem_from_nsscript. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlscript.h | 2 +- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/script.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 565ba37..18a652e 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -447,7 +447,7 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_unlink }; -HRESULT script_elem_from_nsscript(HTMLDocumentNode *doc, nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) +HRESULT script_elem_from_nsscript(nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) { nsIDOMNode *nsnode; HTMLDOMNode *node; diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index af9192f..e63e973 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -35,7 +35,7 @@ typedef struct { HTMLScriptElement *script; } script_queue_entry_t; -HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; +HRESULT script_elem_from_nsscript(nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; void bind_event_scripts(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT load_script(HTMLScriptElement*,const WCHAR*,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 8a36a75..189bf84 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -334,7 +334,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa } } - hres = script_elem_from_nsscript(doc, nsscript, &script_elem); + hres = script_elem_from_nsscript(nsscript, &script_elem); nsIDOMHTMLScriptElement_Release(nsscript); if(FAILED(hres)) return NS_ERROR_FAILURE; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 0cd3162..acc1b39 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1588,7 +1588,7 @@ void bind_event_scripts(HTMLDocumentNode *doc) assert(nsres == NS_OK); nsIDOMNode_Release(script_node); - hres = script_elem_from_nsscript(doc, nsscript, &script_elem); + hres = script_elem_from_nsscript(nsscript, &script_elem); if(FAILED(hres)) continue;

1 0

Jacek Caban : mshtml: Get rid of no loner needed document node reference in HTMLDOMChildrenCollection.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: a19caad9d08db947e9cd9290ed1d87da92e4e510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a19caad9d08db947e9cd9290… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:49:25 2018 +0100 mshtml: Get rid of no loner needed document node reference in HTMLDOMChildrenCollection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlnode.c | 11 ++--------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7f5f869..5bd1da1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4306,7 +4306,7 @@ static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface return E_FAIL; } - *pel = create_child_collection(This->doc_node, node_list); + *pel = create_child_collection(node_list); nsIDOMNodeList_Release(node_list); return *pel ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 964e85c..f75a9ec 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4964,7 +4964,7 @@ static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, return E_FAIL; } - *pel = create_child_collection(This->node.doc, node_list); + *pel = create_child_collection(node_list); nsIDOMNodeList_Release(node_list); return *pel ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 5557729..aec12fc 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -44,9 +44,6 @@ typedef struct { LONG ref; - /* FIXME: implement weak reference */ - HTMLDocumentNode *doc; - nsIDOMNodeList *nslist; } HTMLDOMChildrenCollection; @@ -244,7 +241,6 @@ static ULONG WINAPI HTMLDOMChildrenCollection_Release(IHTMLDOMChildrenCollection TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - htmldoc_release(&This->doc->basedoc); nsIDOMNodeList_Release(This->nslist); heap_free(This); } @@ -440,7 +436,7 @@ static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { HTMLDOMNode_init_dispex_info }; -IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) +IHTMLDOMChildrenCollection *create_child_collection(nsIDOMNodeList *nslist) { HTMLDOMChildrenCollection *ret; @@ -454,9 +450,6 @@ IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc, nsIDO nsIDOMNodeList_AddRef(nslist); ret->nslist = nslist; - htmldoc_addref(&doc->basedoc); - ret->doc = doc; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMChildrenCollection_iface, &HTMLDOMChildrenCollection_dispex); @@ -628,7 +621,7 @@ static HRESULT WINAPI HTMLDOMNode_get_childNodes(IHTMLDOMNode *iface, IDispatch return E_FAIL; } - *p = (IDispatch*)create_child_collection(This->doc, nslist); + *p = (IDispatch*)create_child_collection(nslist); nsIDOMNodeList_Release(nslist); return *p ? S_OK : E_OUTOFMEMORY; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 85671a3..0bb3a96 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1089,7 +1089,7 @@ HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; -IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; +IHTMLDOMChildrenCollection *create_child_collection(nsIDOMNodeList*) DECLSPEC_HIDDEN; HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,VARIANT*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Get rid of no longer needed document argument in get_node.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 69af9a4c9d82a4ea9ffe36ccc3ed10dcbda01138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69af9a4c9d82a4ea9ffe36cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:49:07 2018 +0100 mshtml: Get rid of no longer needed document argument in get_node. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 10 +++++----- dlls/mshtml/htmlelem.c | 8 ++++---- dlls/mshtml/htmlelemcol.c | 9 ++++----- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlnode.c | 24 ++++++++++++------------ dlls/mshtml/htmloption.c | 4 ++-- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/htmltextnode.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/npplugin.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/txtrange.c | 2 +- 18 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69af9a4c9d82a4ea9ffe…

1 0

Jacek Caban : mshtml/tests: Added more ownerDocument property tests.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 7586334008364935ac3c8cc2699474cf7e859ccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7586334008364935ac3c8cc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:48:54 2018 +0100 mshtml/tests: Added more ownerDocument property tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/elements.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index a16194f..089d356 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -187,6 +187,27 @@ function test_compare_position() { next_test(); } +function test_document_owner() { + var node; + + ok(document.ownerDocument === null, "ownerDocument = " + document.ownerDocument); + ok(document.body.ownerDocument === document, + "body.ownerDocument = " + document.body.ownerDocument); + ok(document.documentElement.ownerDocument === document, + "documentElement.ownerDocument = " + document.documentElement.ownerDocument); + + node = document.createElement("test"); + ok(node.ownerDocument === document, "element.ownerDocument = " + node.ownerDocument); + + node = document.createDocumentFragment("test"); + ok(node.ownerDocument === document, "fragment.ownerDocument = " + node.ownerDocument); + + node = document.createTextNode("test"); + ok(node.ownerDocument === document, "text.ownerDocument = " + node.ownerDocument); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, @@ -195,5 +216,6 @@ var tests = [ test_head, test_iframe, test_query_selector, - test_compare_position + test_compare_position, + test_document_owner ];

1 0

Jacek Caban : mshtml: Get owner document from Gecko node in get_node.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 23b1d3a79df224f14f39278731477ff3ee86f194 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23b1d3a79df224f14f392787… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:48:44 2018 +0100 mshtml: Get owner document from Gecko node in get_node. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 19 +++++++++++++++++++ dlls/mshtml/htmlnode.c | 18 +++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 174ef20..a4e281b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5205,6 +5205,25 @@ static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *do return S_OK; } +HRESULT get_document_node(nsIDOMDocument *dom_document, HTMLDocumentNode **ret) +{ + HTMLDOMNode *node; + HRESULT hres; + + hres = get_node(NULL, (nsIDOMNode*)dom_document, FALSE, &node); + if(FAILED(hres)) + return hres; + + if(!node) { + ERR("document not initialized\n"); + return E_FAIL; + } + + assert(node->vtbl == &HTMLDocumentNodeImplVtbl); + *ret = impl_from_HTMLDOMNode(node); + return S_OK; +} + static inline HTMLDocumentObj *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, HTMLDocumentObj, IUnknown_outer); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 0aad491..44983bc 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1616,8 +1616,11 @@ void init_node_cc(void) HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDOMNode **ret) { + nsIDOMDocument *dom_document; + HTMLDocumentNode *document; nsISupports *unk = NULL; nsresult nsres; + HRESULT hres; nsres = nsIDOMNode_GetMshtmlNode(nsnode, &unk); assert(nsres == NS_OK); @@ -1633,5 +1636,18 @@ HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDO return S_OK; } - return create_node(This, nsnode, ret); + nsres = nsIDOMNode_GetOwnerDocument(nsnode, &dom_document); + if(NS_FAILED(nsres) || !dom_document) { + ERR("GetOwnerDocument failed: %08x\n", nsres); + return E_FAIL; + } + + hres = get_document_node(dom_document, &document); + nsIDOMDocument_Release(dom_document); + if(!document) + return E_FAIL; + + hres = create_node(document, nsnode, ret); + htmldoc_release(&document->basedoc); + return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index de200cf..cd5b9c3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1074,6 +1074,7 @@ void HTMLFrameBase_destructor(HTMLFrameBase*) DECLSPEC_HIDDEN; HRESULT get_node(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLDOMNode**) DECLSPEC_HIDDEN; HRESULT get_elem(HTMLDocumentNode*,nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN; +HRESULT get_document_node(nsIDOMDocument*,HTMLDocumentNode**) DECLSPEC_HIDDEN; HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN;

1 0

Anton Romanov : wmp: Add IWMPControls stub implementation.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: b5aff992338215ab1b71460a7e994830886d51dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5aff992338215ab1b71460a… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Sun Feb 18 23:31:25 2018 -0800 wmp: Add IWMPControls stub implementation. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/oleobj.c | 13 +++ dlls/wmp/wmp_private.h | 1 + 3 files changed, 225 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index accf540..e40422d 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -32,6 +32,11 @@ static inline WindowsMediaPlayer *impl_from_IWMPPlayer(IWMPPlayer *iface) return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPPlayer_iface); } +static inline WindowsMediaPlayer *impl_from_IWMPControls(IWMPControls *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPControls_iface); +} + static HRESULT WINAPI WMPPlayer4_QueryInterface(IWMPPlayer4 *iface, REFIID riid, void **ppv) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); @@ -121,8 +126,12 @@ static HRESULT WINAPI WMPPlayer4_get_playState(IWMPPlayer4 *iface, WMPPlayState static HRESULT WINAPI WMPPlayer4_get_controls(IWMPPlayer4 *iface, IWMPControls **ppControl) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, ppControl); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppControl); + + IWMPControls_AddRef(&This->IWMPControls_iface); + *ppControl = &This->IWMPControls_iface; + return S_OK; } static HRESULT WINAPI WMPPlayer4_get_settings(IWMPPlayer4 *iface, IWMPSettings **ppSettings) @@ -931,9 +940,209 @@ static const IWMPSettingsVtbl WMPSettingsVtbl = { WMPSettings_put_enableErrorDialogs }; +HRESULT WINAPI WMPControls_QueryInterface(IWMPControls *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWMPControls)) { + *ppv = iface; + }else { + WARN("Unsupported interface (%s)\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMPControls_AddRef(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI WMPControls_Release(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI WMPControls_GetTypeInfoCount(IWMPControls *iface, UINT *pctinfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_GetTypeInfo(IWMPControls *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_GetIDsOfNames(IWMPControls *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_play(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_stop(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_pause(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_fastForward(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pdCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%f)\n", This, dCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pbstrCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_next(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_previous(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentItem(IWMPControls *iface, IWMPMedia **ppIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, ppIWMPMedia); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pIWMPMedia); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentMarker(IWMPControls *iface, LONG *plMarker) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, plMarker); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentMarker(IWMPControls *iface, LONG lMarker) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%d)\n", This, lMarker); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_playItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pIWMPMedia); + return E_NOTIMPL; +} + +static const IWMPControlsVtbl WMPControlsVtbl = { + WMPControls_QueryInterface, + WMPControls_AddRef, + WMPControls_Release, + WMPControls_GetTypeInfoCount, + WMPControls_GetTypeInfo, + WMPControls_GetIDsOfNames, + WMPControls_Invoke, + WMPControls_get_isAvailable, + WMPControls_play, + WMPControls_stop, + WMPControls_pause, + WMPControls_fastForward, + WMPControls_fastReverse, + WMPControls_get_currentPosition, + WMPControls_put_currentPosition, + WMPControls_get_currentPositionString, + WMPControls_next, + WMPControls_previous, + WMPControls_get_currentItem, + WMPControls_put_currentItem, + WMPControls_get_currentMarker, + WMPControls_put_currentMarker, + WMPControls_playItem, +}; + void init_player_ifaces(WindowsMediaPlayer *wmp) { wmp->IWMPPlayer4_iface.lpVtbl = &WMPPlayer4Vtbl; wmp->IWMPPlayer_iface.lpVtbl = &WMPPlayerVtbl; wmp->IWMPSettings_iface.lpVtbl = &WMPSettingsVtbl; + wmp->IWMPControls_iface.lpVtbl = &WMPControlsVtbl; } diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 46b0b72..a004337 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -859,11 +859,24 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings *settings, *settings_qi; IWMPPlayer4 *player4; IWMPPlayer *player; + IWMPControls *controls; HRESULT hres; hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + controls = NULL; + hres = IWMPPlayer4_get_controls(player4, &controls); + ok(hres == S_OK, "get_controls failed: %08x\n", hres); + ok(controls != NULL, "controls = NULL\n"); + + player = NULL; + hres = IWMPControls_QueryInterface(controls, &IID_IWMPPlayer, (void**)&player); + ok(hres != S_OK, "Getting IWMPPlayer from IWMPControls SUCCEEDED\n"); + ok(player == NULL, "player != NULL\n"); + + IWMPControls_Release(controls); + settings = NULL; hres = IWMPPlayer4_get_settings(player4, &settings); ok(hres == S_OK, "get_settings failed: %08x\n", hres); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 710793c..65de6bb 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -44,6 +44,7 @@ struct WindowsMediaPlayer { IWMPPlayer4 IWMPPlayer4_iface; IWMPPlayer IWMPPlayer_iface; IWMPSettings IWMPSettings_iface; + IWMPControls IWMPControls_iface; LONG ref;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
81
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 February 2018