February 2018 - Wine-Commits

Alex Henrie : shlwapi/tests: Drop ordinal test workarounds for Windows <= 2000.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: a5c66523891d8a2a87a369fa14d80a3edb11de6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5c66523891d8a2a87a369fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Feb 18 21:05:44 2018 -0700 shlwapi/tests: Drop ordinal test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/Makefile.in | 2 +- dlls/shlwapi/tests/ordinal.c | 205 +++-------------------------------------- 2 files changed, 16 insertions(+), 191 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a5c66523891d8a2a87a3…

1 0

Huw Davies : winedbg: Add cvtdq2ps and cvtps2pd opcodes.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: ca9f7cc5eb9f312ffcae9cabf32a96e233258e16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca9f7cc5eb9f312ffcae9cab… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 11:52:06 2018 +0000 winedbg: Add cvtdq2ps and cvtps2pd opcodes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/db_disasm.c | 4 ++-- programs/winedbg/db_disasm64.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index b8a2152..fc25e1c 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -312,8 +312,8 @@ static const struct inst db_inst_0f5x[] = { /*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, -/*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5a*/ { "cvtps2pd",TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5b*/ { "cvtdq2ps",TRUE, NONE, op2(EXMM, XMM), 0 }, /*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index b1556ad..4d9aca9 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -362,8 +362,8 @@ static const struct inst db_inst_0f5x[] = { /*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, -/*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5a*/ { "cvtps2pd",TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5b*/ { "cvtdq2ps",TRUE, NONE, op2(EXMM, XMM), 0 }, /*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 },

1 0

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

Feb. 19, 2018

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

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

Feb. 19, 2018

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 rid of no loner needed document node reference in HTMLDOMChildrenCollection.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

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

Huw Davies : riched20: Underline links.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: ec2bcdf279116fdff38f11eb1326116898b21d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2bcdf279116fdff38f11eb… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 09:36:02 2018 +0000 riched20: Underline links. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d3b908a..fcc4e10 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -218,6 +218,9 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) static HPEN get_underline_pen( ME_Style *style, COLORREF color ) { + if (style->fmt.dwEffects & CFE_LINK) + return CreatePen( PS_SOLID, 1, color ); + /* Choose the pen type for underlining the text. */ if (style->fmt.dwEffects & CFE_UNDERLINE) {

1 0

Huw Davies : riched20: Don't use logfont-style underlining for links.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: ff8fba389dc2e69cac1dd6d18b73065eb1477e10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff8fba389dc2e69cac1dd6d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 09:36:00 2018 +0000 riched20: Don't use logfont-style underlining for links. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/style.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 48d57e8..0b85d69 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -306,7 +306,8 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s) lf->lfWeight = s->fmt.wWeight; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_ITALIC) lf->lfItalic = 1; - if ((s->fmt.dwEffects & s->fmt.dwMask & (CFM_UNDERLINE | CFE_LINK)) && + if ((s->fmt.dwEffects & s->fmt.dwMask & CFM_UNDERLINE) && + !(s->fmt.dwEffects & CFE_LINK) && s->fmt.bUnderlineType == CFU_CF1UNDERLINE) lf->lfUnderline = 1; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_STRIKEOUT)

1 0

Alex Henrie : mmdevapi/tests: Relax capture test that sometimes fails on Windows 8.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 5fcfff6e641af9a1733ff9253ceddc04a3dee692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fcfff6e641af9a1733ff925… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 19 02:31:30 2018 -0700 mmdevapi/tests: Relax capture test that sometimes fails on Windows 8. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 27a5cdc..0fa9f0c 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -413,9 +413,9 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); trace("Running position %d pad %u flags %x, amount of frames locked: %u\n", - hr==S_OK ? (UINT)pos : -1, pad, flags, frames); + SUCCEEDED(hr) ? (UINT)pos : -1, pad, flags, frames); - if(hr == S_OK){ + if(SUCCEEDED(hr)){ /* Some w7 machines signal DATA_DISCONTINUITY here following the * previous AUDCLNT_S_BUFFER_EMPTY, others not. What logic? */ ok(pos >= sum, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum);

1 0

Anton Romanov : wmp: Add IWMPControls stub implementation.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

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

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

Feb. 19, 2018

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