- Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in svg.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 2bc5a13209dfcda8bfe44bca68e51bf9d5c302c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2bc5a13209dfcda8bfe44bca68e51b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:15:12 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in svg.c. --- dlls/mshtml/svg.c | 219 ++---------------------------------------------------- 1 file changed, 8 insertions(+), 211 deletions(-)

1 0

Paul Gofman : wine.inf: Add Explorer\Advanced registry key.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 1bccb4cf9a5804fd1917b32827288a77276bb910 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bccb4cf9a5804fd1917b32827288a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 21 16:53:42 2024 -0600 wine.inf: Add Explorer\Advanced registry key. --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 256a24bc5a1..f952ef84f43 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -359,6 +359,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},"Class",,"HIDClass" [CurrentVersion] +HKCU,%CurrentVersion%\Explorer\Advanced,,16 HKCU,%CurrentVersion%\Run,,16 HKCU,%CurrentVersionNT%\Winlogon,,16 HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%" @@ -373,6 +374,7 @@ HKLM,%CurrentVersion%\Control Panel\Cursors\Schemes,,16 HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMax",,"3600" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMin",,"3" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" +HKLM,%CurrentVersion%\Explorer\Advanced,,16 HKLM,%CurrentVersion%\Explorer\AutoplayHandlers,,16 HKLM,%CurrentVersion%\Explorer\DriveIcons,,16 HKLM,%CurrentVersion%\Explorer\KindMap,,16

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in xmlhttprequest.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 3b0943e094c1b539fc2bb514e8107c6dad7d1211 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b0943e094c1b539fc2bb514e8107c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:18:16 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in xmlhttprequest.c. --- dlls/mshtml/xmlhttprequest.c | 198 ++----------------------------------------- 1 file changed, 8 insertions(+), 190 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in range.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 58ad3118b18b6dc218657a00745d314d318ae08b URL: https://gitlab.winehq.org/wine/wine/-/commit/58ad3118b18b6dc218657a00745d31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:09:52 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in range.c. --- dlls/mshtml/range.c | 106 +--------------------------------------------------- 1 file changed, 2 insertions(+), 104 deletions(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index e9b0b0edfef..e6d265bc2b0 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -810,58 +810,7 @@ static inline HTMLTxtRange *impl_from_IHTMLTxtRange(IHTMLTxtRange *iface) return CONTAINING_RECORD(iface, HTMLTxtRange, IHTMLTxtRange_iface); } -static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID riid, void **ppv) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLTxtRange_AddRef(IHTMLTxtRange *iface) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLTxtRange_Release(IHTMLTxtRange *iface) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLTxtRange_GetTypeInfoCount(IHTMLTxtRange *iface, UINT *pctinfo) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLTxtRange_GetTypeInfo(IHTMLTxtRange *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLTxtRange_GetIDsOfNames(IHTMLTxtRange *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLTxtRange_Invoke(IHTMLTxtRange *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLTxtRange, IHTMLTxtRange, impl_from_IHTMLTxtRange(iface)->dispex) static HRESULT WINAPI HTMLTxtRange_get_htmlText(IHTMLTxtRange *iface, BSTR *p) { @@ -1771,58 +1720,7 @@ static inline HTMLDOMRange *impl_from_IHTMLDOMRange(IHTMLDOMRange *iface) return CONTAINING_RECORD(iface, HTMLDOMRange, IHTMLDOMRange_iface); } -static HRESULT WINAPI HTMLDOMRange_QueryInterface(IHTMLDOMRange *iface, REFIID riid, void **ppv) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLDOMRange_AddRef(IHTMLDOMRange *iface) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLDOMRange_Release(IHTMLDOMRange *iface) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLDOMRange_GetTypeInfoCount(IHTMLDOMRange *iface, UINT *pctinfo) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLDOMRange_GetTypeInfo(IHTMLDOMRange *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLDOMRange_GetIDsOfNames(IHTMLDOMRange *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLDOMRange_Invoke(IHTMLDOMRange *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLDOMRange, IHTMLDOMRange, impl_from_IHTMLDOMRange(iface)->dispex) static HRESULT WINAPI HTMLDOMRange_get_startContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in selection.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 411ae17fe81282acfd688ff8e753bb5b96a440b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/411ae17fe81282acfd688ff8e753bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:11:02 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in selection.c. --- dlls/mshtml/selection.c | 112 ++---------------------------------------------- 1 file changed, 4 insertions(+), 108 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 0da2246a69e..fdf2be9acd5 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -47,60 +47,8 @@ static inline HTMLSelectionObject *impl_from_IHTMLSelectionObject(IHTMLSelection return CONTAINING_RECORD(iface, HTMLSelectionObject, IHTMLSelectionObject_iface); } -static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *iface, - REFIID riid, void **ppv) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLSelectionObject_GetTypeInfoCount(IHTMLSelectionObject *iface, UINT *pctinfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLSelectionObject_GetTypeInfo(IHTMLSelectionObject *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLSelectionObject_GetIDsOfNames(IHTMLSelectionObject *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLSelectionObject, IHTMLSelectionObject, + impl_from_IHTMLSelectionObject(iface)->dispex) static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *iface, IDispatch **range) { @@ -205,60 +153,8 @@ static inline HTMLSelectionObject *impl_from_IHTMLSelectionObject2(IHTMLSelectio return CONTAINING_RECORD(iface, HTMLSelectionObject, IHTMLSelectionObject2_iface); } -static HRESULT WINAPI HTMLSelectionObject2_QueryInterface(IHTMLSelectionObject2 *iface, REFIID riid, void **ppv) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IHTMLSelectionObject_QueryInterface(&This->IHTMLSelectionObject_iface, riid, ppv); -} - -static ULONG WINAPI HTMLSelectionObject2_AddRef(IHTMLSelectionObject2 *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IHTMLSelectionObject_AddRef(&This->IHTMLSelectionObject_iface); -} - -static ULONG WINAPI HTMLSelectionObject2_Release(IHTMLSelectionObject2 *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IHTMLSelectionObject_Release(&This->IHTMLSelectionObject_iface); -} - -static HRESULT WINAPI HTMLSelectionObject2_GetTypeInfoCount(IHTMLSelectionObject2 *iface, UINT *pctinfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLSelectionObject2_GetTypeInfo(IHTMLSelectionObject2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLSelectionObject2_GetIDsOfNames(IHTMLSelectionObject2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLSelectionObject2_Invoke(IHTMLSelectionObject2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLSelectionObject2, IHTMLSelectionObject2, + impl_from_IHTMLSelectionObject2(iface)->dispex) static HRESULT WINAPI HTMLSelectionObject2_createRangeCollection(IHTMLSelectionObject2 *iface, IDispatch **rangeCollection) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in mutation.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 3add3a2457a1c74b033e72633a9bb345863b3b7f URL: https://gitlab.winehq.org/wine/wine/-/commit/3add3a2457a1c74b033e72633a9bb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:01:55 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in mutation.c. --- dlls/mshtml/mutation.c | 55 ++------------------------------------------------ 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 845c189f98b..44cb2f491af 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -1089,59 +1089,8 @@ static inline struct mutation_observer *impl_from_IWineMSHTMLMutationObserver(IW return CONTAINING_RECORD(iface, struct mutation_observer, IWineMSHTMLMutationObserver_iface); } -static HRESULT WINAPI MutationObserver_QueryInterface(IWineMSHTMLMutationObserver *iface, REFIID riid, void **ppv) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI MutationObserver_AddRef(IWineMSHTMLMutationObserver *iface) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI MutationObserver_Release(IWineMSHTMLMutationObserver *iface) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI MutationObserver_GetTypeInfoCount(IWineMSHTMLMutationObserver *iface, UINT *pctinfo) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI MutationObserver_GetTypeInfo(IWineMSHTMLMutationObserver *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI MutationObserver_GetIDsOfNames(IWineMSHTMLMutationObserver *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, - DISPID *rgDispId) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, - rgDispId); -} - -static HRESULT WINAPI MutationObserver_Invoke(IWineMSHTMLMutationObserver *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(MutationObserver, IWineMSHTMLMutationObserver, + impl_from_IWineMSHTMLMutationObserver(iface)->dispex) static HRESULT WINAPI MutationObserver_disconnect(IWineMSHTMLMutationObserver *iface) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextnode.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: ff32b269b90af2a153b3ed62b7977c019750763d URL: https://gitlab.winehq.org/wine/wine/-/commit/ff32b269b90af2a153b3ed62b7977c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:59:52 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextnode.c. --- dlls/mshtml/htmltextnode.c | 106 ++------------------------------------------- 1 file changed, 4 insertions(+), 102 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 0d59204ad00..06dac8fff24 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -45,58 +45,8 @@ static inline HTMLDOMTextNode *impl_from_IHTMLDOMTextNode(IHTMLDOMTextNode *ifac return CONTAINING_RECORD(iface, HTMLDOMTextNode, IHTMLDOMTextNode_iface); } -static HRESULT WINAPI HTMLDOMTextNode_QueryInterface(IHTMLDOMTextNode *iface, - REFIID riid, void **ppv) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - - return IHTMLDOMNode_QueryInterface(&This->node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLDOMTextNode_AddRef(IHTMLDOMTextNode *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - - return IHTMLDOMNode_AddRef(&This->node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLDOMTextNode_Release(IHTMLDOMTextNode *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - - return IHTMLDOMNode_Release(&This->node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLDOMTextNode_GetTypeInfoCount(IHTMLDOMTextNode *iface, UINT *pctinfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLDOMTextNode_GetTypeInfo(IHTMLDOMTextNode *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLDOMTextNode_GetIDsOfNames(IHTMLDOMTextNode *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLDOMTextNode_Invoke(IHTMLDOMTextNode *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLDOMTextNode, IHTMLDOMTextNode, + impl_from_IHTMLDOMTextNode(iface)->node.event_target.dispex) static HRESULT WINAPI HTMLDOMTextNode_put_data(IHTMLDOMTextNode *iface, BSTR v) { @@ -206,56 +156,8 @@ static inline HTMLDOMTextNode *impl_from_IHTMLDOMTextNode2(IHTMLDOMTextNode2 *if return CONTAINING_RECORD(iface, HTMLDOMTextNode, IHTMLDOMTextNode2_iface); } -static HRESULT WINAPI HTMLDOMTextNode2_QueryInterface(IHTMLDOMTextNode2 *iface, REFIID riid, void **ppv) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - - return IHTMLDOMNode_QueryInterface(&This->node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLDOMTextNode2_AddRef(IHTMLDOMTextNode2 *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - - return IHTMLDOMNode_AddRef(&This->node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLDOMTextNode2_Release(IHTMLDOMTextNode2 *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - - return IHTMLDOMNode_Release(&This->node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLDOMTextNode2_GetTypeInfoCount(IHTMLDOMTextNode2 *iface, UINT *pctinfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLDOMTextNode2_GetTypeInfo(IHTMLDOMTextNode2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLDOMTextNode2_GetIDsOfNames(IHTMLDOMTextNode2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLDOMTextNode2_Invoke(IHTMLDOMTextNode2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLDOMTextNode2, IHTMLDOMTextNode2, + impl_from_IHTMLDOMTextNode2(iface)->node.event_target.dispex) static HRESULT WINAPI HTMLDOMTextNode2_substringData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR *string) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in omnavigator.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 9d4aa67cbbda20a94fe77728759f7501a3d13a06 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d4aa67cbbda20a94fe77728759f75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:08:41 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in omnavigator.c. --- dlls/mshtml/omnavigator.c | 674 ++-------------------------------------------- 1 file changed, 21 insertions(+), 653 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextarea.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 9f6d1da89d451d0cbddb3459f5c17ca15cf95063 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f6d1da89d451d0cbddb3459f5c17c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:57:23 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextarea.c. --- dlls/mshtml/htmltextarea.c | 55 ++-------------------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 6964c1c06a0..de0cd735e9e 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -45,59 +45,8 @@ static inline HTMLTextAreaElement *impl_from_IHTMLTextAreaElement(IHTMLTextAreaE return CONTAINING_RECORD(iface, HTMLTextAreaElement, IHTMLTextAreaElement_iface); } -static HRESULT WINAPI HTMLTextAreaElement_QueryInterface(IHTMLTextAreaElement *iface, - REFIID riid, void **ppv) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLTextAreaElement_AddRef(IHTMLTextAreaElement *iface) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLTextAreaElement_Release(IHTMLTextAreaElement *iface) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLTextAreaElement_GetTypeInfoCount(IHTMLTextAreaElement *iface, UINT *pctinfo) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLTextAreaElement_GetTypeInfo(IHTMLTextAreaElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLTextAreaElement_GetIDsOfNames(IHTMLTextAreaElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLTextAreaElement_Invoke(IHTMLTextAreaElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLTextAreaElement, IHTMLTextAreaElement, + impl_from_IHTMLTextAreaElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLTextAreaElement_get_type(IHTMLTextAreaElement *iface, BSTR *p) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltable.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 49f8b384500537c4d61c9dd04e0c5d7bacdf574b URL: https://gitlab.winehq.org/wine/wine/-/commit/49f8b384500537c4d61c9dd04e0c5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:55:42 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltable.c. --- dlls/mshtml/htmltable.c | 272 ++---------------------------------------------- 1 file changed, 7 insertions(+), 265 deletions(-)

1 0