September 2023 - Wine-commits

Gabriel Ivăncescu : mshtml: Move some ObjectElement methods up.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 7977a6bd59bf246f5b677aa07475fdfd58095136 URL: https://gitlab.winehq.org/wine/wine/-/commit/7977a6bd59bf246f5b677aa07475fd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some ObjectElement methods up. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlobject.c | 67 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index fbaa7d4c7d1..6c0fc014dad 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -637,6 +637,18 @@ static inline HTMLObjectElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLObjectElement, plugin_container.element.node); } +static HRESULT HTMLObjectElement_get_readystate(HTMLDOMNode *iface, BSTR *p) +{ + HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static inline HTMLObjectElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLObjectElement, plugin_container.element.node.event_target.dispex); +} + static void *HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); @@ -676,6 +688,22 @@ static void *HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid) return elem_iface; } +static void HTMLObjectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLObjectElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsobject) + note_cc_edge((nsISupports*)This->nsobject, "nsobject", cb); +} + +static void HTMLObjectElement_unlink(DispatchEx *dispex) +{ + HTMLObjectElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsobject); +} + static void HTMLObjectElement_destructor(HTMLDOMNode *iface) { HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); @@ -686,21 +714,13 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->plugin_container.element.node); } -static HRESULT HTMLObjectElement_get_readystate(HTMLDOMNode *iface, BSTR *p) -{ - HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; -} - -static HRESULT HTMLObjectElement_get_dispid(HTMLDOMNode *iface, BSTR name, - DWORD grfdex, DISPID *pid) +static HRESULT HTMLObjectElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid) { HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); - TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(name), grfdex, pid); + TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(name), grfdex, dispid); - return get_plugin_dispid(&This->plugin_container, name, pid); + return get_plugin_dispid(&This->plugin_container, name, dispid); } static HRESULT HTMLObjectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) @@ -712,8 +732,8 @@ static HRESULT HTMLObjectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, return E_NOTIMPL; } -static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, - WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); @@ -722,27 +742,6 @@ static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid return invoke_plugin_prop(&This->plugin_container, id, lcid, flags, params, res, ei); } -static inline HTMLObjectElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLObjectElement, plugin_container.element.node.event_target.dispex); -} - -static void HTMLObjectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) -{ - HTMLObjectElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_traverse(dispex, cb); - - if(This->nsobject) - note_cc_edge((nsISupports*)This->nsobject, "nsobject", cb); -} - -static void HTMLObjectElement_unlink(DispatchEx *dispex) -{ - HTMLObjectElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_unlink(dispex); - unlink_ref(&This->nsobject); -} - static const NodeImplVtbl HTMLObjectElementImplVtbl = { .clsid = &CLSID_HTMLObjectElement, .qi = HTMLObjectElement_QI,

1 0

Gabriel Ivăncescu : mshtml: Move some SelectElement methods up.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 6e6cc7e2862d6400174d6c633269ffc2b8f4040b URL: https://gitlab.winehq.org/wine/wine/-/commit/6e6cc7e2862d6400174d6c633269ff… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some SelectElement methods up. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlselect.c | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 5c020ffe089..13b8f14b807 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -1313,6 +1313,23 @@ static inline HTMLSelectElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLSelectElement, element.node); } +static HRESULT HTMLSelectElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) +{ + HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); + return IHTMLSelectElement_put_disabled(&This->IHTMLSelectElement_iface, v); +} + +static HRESULT HTMLSelectElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p) +{ + HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); + return IHTMLSelectElement_get_disabled(&This->IHTMLSelectElement_iface, p); +} + +static inline HTMLSelectElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLSelectElement, element.node.event_target.dispex); +} + static void *HTMLSelectElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); @@ -1327,16 +1344,20 @@ static void *HTMLSelectElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static HRESULT HTMLSelectElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) +static void HTMLSelectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { - HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); - return IHTMLSelectElement_put_disabled(&This->IHTMLSelectElement_iface, v); + HTMLSelectElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsselect) + note_cc_edge((nsISupports*)This->nsselect, "nsselect", cb); } -static HRESULT HTMLSelectElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p) +static void HTMLSelectElement_unlink(DispatchEx *dispex) { - HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); - return IHTMLSelectElement_get_disabled(&This->IHTMLSelectElement_iface, p); + HTMLSelectElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsselect); } #define DISPID_OPTIONCOL_0 MSHTML_DISPID_CUSTOM_MIN @@ -1406,27 +1427,6 @@ static HRESULT HTMLSelectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid return S_OK; } -static inline HTMLSelectElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLSelectElement, element.node.event_target.dispex); -} - -static void HTMLSelectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) -{ - HTMLSelectElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_traverse(dispex, cb); - - if(This->nsselect) - note_cc_edge((nsISupports*)This->nsselect, "nsselect", cb); -} - -static void HTMLSelectElement_unlink(DispatchEx *dispex) -{ - HTMLSelectElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_unlink(dispex); - unlink_ref(&This->nsselect); -} - static const NodeImplVtbl HTMLSelectElementImplVtbl = { .clsid = &CLSID_HTMLSelectElement, .qi = HTMLSelectElement_QI,

1 0

Gabriel Ivăncescu : mshtml: Move node vtbl QI methods around.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 6c1c1aaaa1874635b919ed2b4d8e2bae5ced9d66 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c1c1aaaa1874635b919ed2b4d8e2b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move node vtbl QI methods around. So they're in a consistent ordering for dispex conversion. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlbody.c | 32 ++++++++++++------------ dlls/mshtml/htmlcomment.c | 20 +++++++-------- dlls/mshtml/htmlhead.c | 20 +++++++-------- dlls/mshtml/htmlimg.c | 20 +++++++-------- dlls/mshtml/htmlinput.c | 60 ++++++++++++++++++++++----------------------- dlls/mshtml/htmllink.c | 20 +++++++-------- dlls/mshtml/htmlnode.c | 32 ++++++++++++------------ dlls/mshtml/htmlscript.c | 28 ++++++++++----------- dlls/mshtml/htmlselect.c | 10 ++++---- dlls/mshtml/htmlstyleelem.c | 26 ++++++++++---------- dlls/mshtml/htmltable.c | 44 ++++++++++++++++----------------- dlls/mshtml/htmltextarea.c | 28 ++++++++++----------- dlls/mshtml/htmltextnode.c | 14 +++++------ 13 files changed, 177 insertions(+), 177 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Move node vtbl destructor methods down.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 13842950241ff17b310309adab858fdb9b730b8a URL: https://gitlab.winehq.org/wine/wine/-/commit/13842950241ff17b310309adab858f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move node vtbl destructor methods down. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlscript.c | 14 +++++++------- dlls/mshtml/htmlstyleelem.c | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index dadd31d24a8..262002b07b5 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -354,13 +354,6 @@ static inline HTMLScriptElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLScriptElement, element.node); } -static void HTMLScriptElement_destructor(HTMLDOMNode *iface) -{ - HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); - free(This->src_text); - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); @@ -422,6 +415,13 @@ static void HTMLScriptElement_unlink(DispatchEx *dispex) unlink_ref(&This->nsscript); } +static void HTMLScriptElement_destructor(HTMLDOMNode *iface) +{ + HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + free(This->src_text); + HTMLElement_destructor(&This->element.node); +} + static const NodeImplVtbl HTMLScriptElementImplVtbl = { .clsid = &CLSID_HTMLScriptElement, .qi = HTMLScriptElement_QI, diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 8ad167a5fe3..f206537f59a 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -365,14 +365,6 @@ static inline HTMLStyleElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLStyleElement, element.node); } -static void HTMLStyleElement_destructor(HTMLDOMNode *iface) -{ - HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); - - unlink_ref(&This->style_sheet); - HTMLElement_destructor(iface); -} - static inline HTMLStyleElement *impl_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLStyleElement, element.node.event_target.dispex); @@ -410,6 +402,14 @@ static void HTMLStyleElement_unlink(DispatchEx *dispex) unlink_ref(&This->nsstyle); } +static void HTMLStyleElement_destructor(HTMLDOMNode *iface) +{ + HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); + + unlink_ref(&This->style_sheet); + HTMLElement_destructor(iface); +} + static void HTMLStyleElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { static const dispex_hook_t ie11_hooks[] = {

1 0

Gabriel Ivăncescu : mshtml: Get rid of useless element destructors.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 912f1a43ded779645e15e4172f972158e8c1e124 URL: https://gitlab.winehq.org/wine/wine/-/commit/912f1a43ded779645e15e4172f9721… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Get rid of useless element destructors. Just use the HTMLElement_destructor directly. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlcomment.c | 9 +-------- dlls/mshtml/htmlgeneric.c | 9 +-------- dlls/mshtml/htmlhead.c | 36 ++++-------------------------------- dlls/mshtml/htmlobject.c | 9 +-------- dlls/mshtml/htmltable.c | 9 +-------- 5 files changed, 8 insertions(+), 64 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 1f08e2ffa5e..9c720d9468e 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -146,13 +146,6 @@ static inline HTMLCommentElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLCommentElement, element.node); } -static void HTMLCommentElement_destructor(HTMLDOMNode *iface) -{ - HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); @@ -180,7 +173,7 @@ static void *HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid) static const NodeImplVtbl HTMLCommentElementImplVtbl = { .clsid = &CLSID_HTMLCommentElement, .qi = HTMLCommentElement_QI, - .destructor = HTMLCommentElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLCommentElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 7cae4026c47..5f069e05f67 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -138,17 +138,10 @@ static void *HTMLGenericElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLGenericElement_destructor(HTMLDOMNode *iface) -{ - HTMLGenericElement *This = impl_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLGenericElementImplVtbl = { .clsid = &CLSID_HTMLGenericElement, .qi = HTMLGenericElement_QI, - .destructor = HTMLGenericElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 3449b27e050..af17a35dbb7 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -156,17 +156,10 @@ static void *HTMLTitleElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLTitleElement_destructor(HTMLDOMNode *iface) -{ - HTMLTitleElement *This = HTMLTitleElement_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLTitleElementImplVtbl = { .clsid = &CLSID_HTMLTitleElement, .qi = HTMLTitleElement_QI, - .destructor = HTMLTitleElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, @@ -303,13 +296,6 @@ static inline HTMLHtmlElement *HTMLHtmlElement_from_HTMLDOMNode(HTMLDOMNode *ifa return CONTAINING_RECORD(iface, HTMLHtmlElement, element.node); } -static void HTMLHtmlElement_destructor(HTMLDOMNode *iface) -{ - HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static BOOL HTMLHtmlElement_is_settable(HTMLDOMNode *iface, DISPID dispid) { switch(dispid) { @@ -333,7 +319,7 @@ static void *HTMLHtmlElement_QI(HTMLDOMNode *iface, REFIID riid) static const NodeImplVtbl HTMLHtmlElementImplVtbl = { .clsid = &CLSID_HTMLHtmlElement, .qi = HTMLHtmlElement_QI, - .destructor = HTMLHtmlElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, @@ -553,17 +539,10 @@ static void *HTMLMetaElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLMetaElement_destructor(HTMLDOMNode *iface) -{ - HTMLMetaElement *This = HTMLMetaElement_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLMetaElementImplVtbl = { .clsid = &CLSID_HTMLMetaElement, .qi = HTMLMetaElement_QI, - .destructor = HTMLMetaElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, @@ -713,17 +692,10 @@ static void *HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLHeadElement_destructor(HTMLDOMNode *iface) -{ - HTMLHeadElement *This = impl_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLHeadElementImplVtbl = { .clsid = &CLSID_HTMLHeadElement, .qi = HTMLHeadElement_QI, - .destructor = HTMLHeadElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6c0fc014dad..6e903a0e97e 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -1006,17 +1006,10 @@ static void *HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLEmbedElement_destructor(HTMLDOMNode *iface) -{ - HTMLEmbed *This = embed_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLEmbedElementImplVtbl = { .clsid = &CLSID_HTMLEmbed, .qi = HTMLEmbedElement_QI, - .destructor = HTMLEmbedElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 4d5438d165b..aa4e16037e3 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -446,13 +446,6 @@ static inline HTMLTableCell *HTMLTableCell_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLTableCell, element.node); } -static void HTMLTableCell_destructor(HTMLDOMNode *iface) -{ - HTMLTableCell *This = HTMLTableCell_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static inline HTMLTableCell *HTMLTableCell_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLTableCell, element.node.event_target.dispex); @@ -491,7 +484,7 @@ static void HTMLTableCell_unlink(DispatchEx *dispex) static const NodeImplVtbl HTMLTableCellImplVtbl = { .clsid = &CLSID_HTMLTableCell, .qi = HTMLTableCell_QI, - .destructor = HTMLTableCell_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event,

1 0

Piotr Caban : msvcp110: Add _Winerror_map implementation.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 5833732b9ad66c70b586c8b5f83a90c85cc8782b URL: https://gitlab.winehq.org/wine/wine/-/commit/5833732b9ad66c70b586c8b5f83a90… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 18 10:44:19 2023 +0200 msvcp110: Add _Winerror_map implementation. Based on patch by Myah Caron. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/misc.c | 11 +++++++++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 1a100676743..9c61f57a4de 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1827,8 +1827,8 @@ @ stub -arch=arm ?_W_Gettnames(a)_Locinfo@std@@QBA?AV_Timevec(a)2@XZ @ stub -arch=i386 ?_W_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ -@ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z -@ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z +@ cdecl -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z(long) _Winerror_map_str +@ cdecl -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z(long) _Winerror_map_str @ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index b95330179e5..835d37d3bf4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1788,8 +1788,8 @@ @ stub -arch=arm ?_W_Gettnames(a)_Locinfo@std@@QBA?AV_Timevec(a)2@XZ @ stub -arch=i386 ?_W_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ -@ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z -@ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z +@ cdecl -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z(long) _Winerror_map_str +@ cdecl -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z(long) _Winerror_map_str @ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 9155a90e554..c6778841ffb 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1788,8 +1788,8 @@ @ stub -arch=arm ?_W_Gettnames(a)_Locinfo@std@@QBA?AV_Timevec(a)2@XZ @ stub -arch=i386 ?_W_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ -@ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z -@ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z +@ cdecl -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z(long) msvcp120.?_Winerror_map(a)std@@YAPBDH(a)Z +@ cdecl -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z(long) msvcp120.?_Winerror_map(a)std@@YAPEBDH(a)Z @ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) msvcp120.?_XLgamma(a)std@@YAMM(a)Z @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) msvcp120.?_XLgamma(a)std@@YANN(a)Z @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) msvcp120.?_XLgamma(a)std@@YAOO(a)Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ada8ee967d8..f82456cbf4b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -191,9 +191,7 @@ static const struct { {ETXTBSY, str_ETXTBSY}, {EWOULDBLOCK, str_EWOULDBLOCK}, }; -#endif -#if _MSVCP_VER >= 140 static const struct { int winerr; int doserr; @@ -1691,7 +1689,9 @@ ULONG __cdecl _Winerror_message(ULONG err, char *buf, ULONG size) return FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, 0, buf, size, NULL); } +#endif +#if _MSVCP_VER >= 110 /* ?_Winerror_map(a)std@@YAHH(a)Z */ int __cdecl _Winerror_map(int err) { @@ -1711,6 +1711,13 @@ int __cdecl _Winerror_map(int err) return 0; } + +/* ?_Winerror_map(a)std@@YAPBDH(a)Z */ +/* ?_Winerror_map(a)std@@YAPEBDH(a)Z */ +const char *_Winerror_map_str(int err) +{ + return _Syserror_map(_Winerror_map(err)); +} #endif #if _MSVCP_VER >= 100

1 0

Ally Sommers : server: Return WSAEOPNOTSUPP on listen() if the socket's type is SOCK_DGRAM.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 998febf7cf33cbd37ce3c3d031d2cf8578bfb207 URL: https://gitlab.winehq.org/wine/wine/-/commit/998febf7cf33cbd37ce3c3d031d2cf… Author: Ally Sommers <dropbear.sh(a)gmail.com> Date: Mon Sep 18 03:21:16 2023 -0700 server: Return WSAEOPNOTSUPP on listen() if the socket's type is SOCK_DGRAM. --- dlls/ws2_32/tests/sock.c | 12 ++++++++++++ server/sock.c | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 31dff1a11c7..5ab21060a62 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3945,6 +3945,18 @@ static void test_listen(void) ret = WSAGetLastError(); ok (ret == WSAENOTSOCK, "expected 10038, received %d\n", ret); + /* udp test */ + SetLastError(0xdeadbeef); + fdA = socket(AF_INET, SOCK_DGRAM, 0); + ok ((fdA != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + + ok ((listen(fdA, 1) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEOPNOTSUPP, "expected 10045, received %d\n", ret); + + ret = closesocket(fdA); + ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); + /* tcp tests */ fdA = socket(AF_INET, SOCK_STREAM, 0); ok ((fdA != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); diff --git a/server/sock.c b/server/sock.c index ac55a5448f7..52175b08987 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2533,6 +2533,12 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } + if (sock->type == WS_SOCK_DGRAM) + { + set_error( STATUS_NOT_SUPPORTED ); + return; + } + if (!sock->bound) { set_error( STATUS_INVALID_PARAMETER );

1 0

Connor McAdams : include: Add missing WinEvent definitions.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 80a9c0efa80434afbd16949a3f42f05121bb5180 URL: https://gitlab.winehq.org/wine/wine/-/commit/80a9c0efa80434afbd16949a3f42f0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jul 26 12:48:42 2023 -0400 include: Add missing WinEvent definitions. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/winuser.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index 453f561e62f..4ed29e86616 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3235,6 +3235,17 @@ typedef struct /* User event Id limits */ #define EVENT_MIN 0x00000001 #define EVENT_MAX 0x7FFFFFFF +#define EVENT_SYSTEM_END 0x000000FF +#define EVENT_OEM_DEFINED_START 0x00000101 +#define EVENT_OEM_DEFINED_END 0x000001FF +#define EVENT_CONSOLE_END 0x000040FF +#define EVENT_UIA_EVENTID_START 0x00004E00 +#define EVENT_UIA_EVENTID_END 0x00004EFF +#define EVENT_UIA_PROPID_START 0x00007500 +#define EVENT_UIA_PROPID_END 0x000075FF +#define EVENT_OBJECT_END 0x000080FF +#define EVENT_AIA_START 0x0000A000 +#define EVENT_AIA_END 0x0000AFFF /* System events */ #define EVENT_SYSTEM_SOUND 0x01 @@ -3260,6 +3271,13 @@ typedef struct #define EVENT_SYSTEM_SWITCHEND 0x15 #define EVENT_SYSTEM_MINIMIZESTART 0x16 #define EVENT_SYSTEM_MINIMIZEEND 0x17 +#define EVENT_SYSTEM_DESKTOPSWITCH 0x20 +#define EVENT_SYSTEM_SWITCHER_APPGRABBED 0x24 +#define EVENT_SYSTEM_SWITCHER_APPOVERTARGET 0x25 +#define EVENT_SYSTEM_SWITCHER_APPDROPPED 0x26 +#define EVENT_SYSTEM_SWITCHER_CANCELLED 0x27 +#define EVENT_SYSTEM_IME_KEY_NOTIFICATION 0x29 + /* Console events */ #define EVENT_CONSOLE_CARET 0x4001 @@ -3295,6 +3313,24 @@ typedef struct #define EVENT_OBJECT_DEFACTIONCHANGE 0x8011 #define EVENT_OBJECT_ACCELERATORCHANGE 0x8012 #define EVENT_OBJECT_INVOKED 0x8013 +#define EVENT_OBJECT_TEXTSELECTIONCHANGED 0x8014 +#define EVENT_OBJECT_CONTENTSCROLLED 0x8015 +/* Typo matches Window's headers, ARRANGMENT should be ARRANGEMENT presumably. */ +#define EVENT_SYSTEM_ARRANGMENTPREVIEW 0x8016 +#define EVENT_OBJECT_CLOAKED 0x8017 +#define EVENT_OBJECT_UNCLOAKED 0x8018 +#define EVENT_OBJECT_LIVEREGIONCHANGED 0x8019 +#define EVENT_OBJECT_HOSTEDOBJECTSINVALIDATED 0x8020 +#define EVENT_OBJECT_DRAGSTART 0x8021 +#define EVENT_OBJECT_DRAGCANCEL 0x8022 +#define EVENT_OBJECT_DRAGCOMPLETE 0x8023 +#define EVENT_OBJECT_DRAGENTER 0x8024 +#define EVENT_OBJECT_DRAGLEAVE 0x8025 +#define EVENT_OBJECT_DRAGDROPPED 0x8026 +#define EVENT_OBJECT_IME_SHOW 0x8027 +#define EVENT_OBJECT_IME_HIDE 0x8028 +#define EVENT_OBJECT_IME_CHANGE 0x8029 +#define EVENT_OBJECT_TEXTEDIT_CONVERSIONTARGETCHANGED 0x8030 /* Sound events */ #define SOUND_SYSTEM_STARTUP 1

1 0

Eric Pouech : dbghelp: Check that dwarf unwinder did actually unwind.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 9a28dbfb272491d584d5485c5eae44746b36c7bd URL: https://gitlab.winehq.org/wine/wine/-/commit/9a28dbfb272491d584d5485c5eae44… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Sep 18 10:00:08 2023 +0200 dbghelp: Check that dwarf unwinder did actually unwind. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55560 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/cpu_x86_64.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c653c5fa9dd..957ce36cc5d 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -611,7 +611,8 @@ static BOOL fetch_next_frame(struct cpu_stack_walk *csw, union ctx *pcontext, DWORD64 cfa; RUNTIME_FUNCTION* rtf; DWORD64 base; - CONTEXT *context = &pcontext->ctx; + CONTEXT *context = &pcontext->ctx; + DWORD64 input_Rip = context->Rip; if (!curr_pc || !(base = sw_module_base(csw, curr_pc))) return FALSE; rtf = sw_table_access(csw, curr_pc); @@ -620,7 +621,7 @@ static BOOL fetch_next_frame(struct cpu_stack_walk *csw, union ctx *pcontext, { return interpret_function_table_entry(csw, context, rtf, base); } - else if (dwarf2_virtual_unwind(csw, curr_pc, pcontext, &cfa)) + else if (dwarf2_virtual_unwind(csw, curr_pc, pcontext, &cfa) && input_Rip != context->Rip) { context->Rsp = cfa; TRACE("next function rip=%016Ix\n", context->Rip);

1 0

Rémi Bernon : dmime/tests: Test that SendPMsg also converts reference time.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: eedde528096aca8aa69b8c0c3b27084df79551f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/eedde528096aca8aa69b8c0c3b2708… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 13 08:56:13 2023 +0200 dmime/tests: Test that SendPMsg also converts reference time. And avoid checking a possibly freed message. --- dlls/dmime/tests/dmime.c | 109 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 32 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 26efdd4c72f..00cbd045bd8 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1730,9 +1730,10 @@ static void test_performance_pmsg(void) static const DWORD delivery_flags[] = {DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGF_TOOL_QUEUE, DMUS_PMSGF_TOOL_ATTIME}; static const DWORD message_types[] = {DMUS_PMSGT_MIDI, DMUS_PMSGT_USER}; IDirectMusicPerformance *performance; - IDirectMusicGraph *graph; + IDirectMusicGraph *graph, *performance_graph; IDirectMusicTool *tool; DMUS_PMSG *msg, *clone; + MUSIC_TIME music_time; REFERENCE_TIME time; HRESULT hr; DWORD ret; @@ -1744,6 +1745,8 @@ static void test_performance_pmsg(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance, (void **)&performance); ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&performance_graph); + ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_AllocPMsg(performance, 0, NULL); @@ -1826,6 +1829,40 @@ static void test_performance_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); + /* SendPMsg skips all the tools unless messages are stamped beforehand */ + + hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(DMUS_PMSG), &msg); + ok(hr == S_OK, "got %#lx\n", hr); + ok(msg->dwSize == sizeof(DMUS_PMSG), "got %ld\n", msg->dwSize); + msg->mtTime = 0; + msg->dwFlags = DMUS_PMSGF_MUSICTIME; + msg->dwType = DMUS_PMSGT_USER; + hr = IDirectMusicPerformance_SendPMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 10, &msg); + ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); + ok(!msg, "got %p\n", msg); + + + /* SendPMsg converts music time to reference time if it is missing */ + + hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(DMUS_PMSG), &msg); + ok(hr == S_OK, "got %#lx\n", hr); + ok(msg->dwSize == sizeof(DMUS_PMSG), "got %ld\n", msg->dwSize); + msg->mtTime = 500; + msg->dwFlags = DMUS_PMSGF_MUSICTIME; + msg->dwType = DMUS_PMSGT_USER; + hr = IDirectMusicGraph_StampPMsg(performance_graph, msg); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_SendPMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 50, &msg); + todo_wine ok(!ret, "got %#lx\n", ret); + todo_wine ok(msg != NULL, "got %p\n", msg); + if (!msg) goto skip_rtime; + time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, msg->mtTime, &time); ok(hr == S_OK, "got %#lx\n", hr); @@ -1833,32 +1870,26 @@ static void test_performance_pmsg(void) todo_wine ok(msg->rtTime == time, "got %I64d\n", msg->rtTime); ok(msg->mtTime == 500, "got %ld\n", msg->mtTime); todo_wine ok(msg->dwFlags & DMUS_PMSGF_REFTIME, "got %#lx\n", msg->dwFlags); + todo_wine ok(msg->dwFlags & DMUS_PMSGF_MUSICTIME, "got %#lx\n", msg->dwFlags); todo_wine ok(msg->dwFlags & (DMUS_PMSGF_TOOL_QUEUE | DMUS_PMSGF_TOOL_IMMEDIATE), "got %#lx\n", msg->dwFlags); ok(!msg->dwPChannel, "got %ld\n", msg->dwPChannel); ok(!msg->dwVirtualTrackID, "got %ld\n", msg->dwVirtualTrackID); - ok(!msg->pTool, "got %p\n", msg->pTool); - ok(!msg->pGraph, "got %p\n", msg->pGraph); - ok(!msg->dwType, "got %#lx\n", msg->dwType); + ok(msg->pTool == tool, "got %p\n", msg->pTool); + ok(msg->pGraph == performance_graph, "got %p\n", msg->pGraph); + ok(msg->dwType == DMUS_PMSGT_USER, "got %#lx\n", msg->dwType); ok(!msg->dwVoiceID, "got %ld\n", msg->dwVoiceID); ok(!msg->dwGroupID, "got %ld\n", msg->dwGroupID); ok(!msg->punkUser, "got %p\n", msg->punkUser); - - /* SendPMsg skips all the tools unless messages are stamped beforehand */ - - hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(DMUS_PMSG), &msg); - ok(hr == S_OK, "got %#lx\n", hr); - ok(msg->dwSize == sizeof(DMUS_PMSG), "got %ld\n", msg->dwSize); - msg->rtTime = time; - msg->dwFlags = DMUS_PMSGF_REFTIME; - msg->dwType = DMUS_PMSGT_USER; - hr = IDirectMusicPerformance_SendPMsg(performance, msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - ret = test_tool_wait_message(tool, 10, &msg); - ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); - ok(!msg, "got %p\n", msg); +skip_rtime: + /* SendPMsg converts reference time to music time if it is missing */ + + hr = IDirectMusicPerformance_GetTime(performance, &time, &music_time); + ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(DMUS_PMSG), &msg); ok(hr == S_OK, "got %#lx\n", hr); @@ -1866,24 +1897,39 @@ static void test_performance_pmsg(void) msg->rtTime = time; msg->dwFlags = DMUS_PMSGF_REFTIME; msg->dwType = DMUS_PMSGT_USER; - - hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph); + hr = IDirectMusicGraph_StampPMsg(performance_graph, msg); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_StampPMsg(graph, msg); - ok(hr == S_OK, "got %#lx\n", hr); - IDirectMusicGraph_Release(graph); - hr = IDirectMusicPerformance_SendPMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 50, &msg); todo_wine ok(!ret, "got %#lx\n", ret); todo_wine ok(msg != NULL, "got %p\n", msg); - if (!msg) hr = S_OK; - else hr = IDirectMusicPerformance_FreePMsg(performance, msg); + if (!msg) goto skip_mtime; + + music_time = 0xdeadbeef; + hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, msg->rtTime, &music_time); + ok(hr == S_OK, "got %#lx\n", hr); + ok(msg->dwSize == sizeof(DMUS_PMSG), "got %ld\n", msg->dwSize); + todo_wine ok(msg->rtTime == time, "got %I64d\n", msg->rtTime); + todo_wine ok(msg->mtTime == music_time, "got %ld\n", msg->mtTime); + todo_wine ok(msg->dwFlags & DMUS_PMSGF_REFTIME, "got %#lx\n", msg->dwFlags); + todo_wine ok(msg->dwFlags & DMUS_PMSGF_MUSICTIME, "got %#lx\n", msg->dwFlags); + todo_wine ok(msg->dwFlags & (DMUS_PMSGF_TOOL_QUEUE | DMUS_PMSGF_TOOL_IMMEDIATE), "got %#lx\n", msg->dwFlags); + ok(!msg->dwPChannel, "got %ld\n", msg->dwPChannel); + ok(!msg->dwVirtualTrackID, "got %ld\n", msg->dwVirtualTrackID); + ok(msg->pTool == tool, "got %p\n", msg->pTool); + ok(msg->pGraph == performance_graph, "got %p\n", msg->pGraph); + ok(msg->dwType == DMUS_PMSGT_USER, "got %#lx\n", msg->dwType); + ok(!msg->dwVoiceID, "got %ld\n", msg->dwVoiceID); + ok(!msg->dwGroupID, "got %ld\n", msg->dwGroupID); + ok(!msg->punkUser, "got %p\n", msg->punkUser); + + hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); +skip_mtime: for (i = 0; i < ARRAY_SIZE(delivery_flags); i++) { DWORD duration = 0; @@ -1896,12 +1942,8 @@ static void test_performance_pmsg(void) msg->rtTime = time + 150 * 10000; msg->dwFlags = DMUS_PMSGF_REFTIME; msg->dwType = DMUS_PMSGT_USER; - - hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph); - ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_StampPMsg(graph, msg); + hr = IDirectMusicGraph_StampPMsg(performance_graph, msg); ok(hr == S_OK, "got %#lx\n", hr); - IDirectMusicGraph_Release(graph); msg->dwFlags &= ~(DMUS_PMSGF_TOOL_IMMEDIATE | DMUS_PMSGF_TOOL_QUEUE | DMUS_PMSGF_TOOL_ATTIME); msg->dwFlags |= delivery_flags[i]; @@ -1921,8 +1963,8 @@ static void test_performance_pmsg(void) switch (delivery_flags[i]) { case DMUS_PMSGF_TOOL_IMMEDIATE: todo_wine ok(duration <= 50, "got %lu\n", duration); break; - case DMUS_PMSGF_TOOL_QUEUE: todo_wine ok(duration >= 50 && duration <= 100, "got %lu\n", duration); break; - case DMUS_PMSGF_TOOL_ATTIME: todo_wine ok(duration >= 150 && duration <= 500, "got %lu\n", duration); break; + case DMUS_PMSGF_TOOL_QUEUE: todo_wine ok(duration >= 50 && duration <= 125, "got %lu\n", duration); break; + case DMUS_PMSGF_TOOL_ATTIME: todo_wine ok(duration >= 125 && duration <= 500, "got %lu\n", duration); break; } } @@ -1931,7 +1973,10 @@ static void test_performance_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); + IDirectMusicGraph_Release(performance_graph); + IDirectMusicPerformance_Release(performance); + IDirectMusicTool_Release(tool); } START_TEST(dmime)

1 0