- Wine-Commits - list.winehq.org

Davide Beatrici : winecoreaudio: Add get_prop_value stub in unixlib.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 62b5ee8be1896b6cc33cd9bb269b99679f2dde5b URL: https://gitlab.winehq.org/wine/wine/-/commit/62b5ee8be1896b6cc33cd9bb269b99… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Aug 7 13:14:41 2023 +0200 winecoreaudio: Add get_prop_value stub in unixlib. --- dlls/winecoreaudio.drv/coreaudio.c | 69 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 18b70738215..e2bce64ea14 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1733,6 +1733,15 @@ static NTSTATUS unix_is_started(void *args) return STATUS_SUCCESS; } +static NTSTATUS unix_get_prop_value(void *args) +{ + struct get_prop_value_params *params = args; + + params->result = E_NOTIMPL; + + return STATUS_SUCCESS; +} + static NTSTATUS unix_set_volumes(void *args) { struct set_volumes_params *params = args; @@ -1816,7 +1825,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = unix_set_event_handle, unix_not_implemented, unix_is_started, - unix_not_implemented, + unix_get_prop_value, unix_midi_init, unix_midi_release, unix_midi_out_message, @@ -2184,6 +2193,62 @@ static NTSTATUS unix_wow64_set_event_handle(void *args) return STATUS_SUCCESS; } +static NTSTATUS unix_wow64_get_prop_value(void *args) +{ + struct propvariant32 + { + WORD vt; + WORD pad1, pad2, pad3; + union + { + ULONG ulVal; + PTR32 ptr; + ULARGE_INTEGER uhVal; + }; + } *value32; + struct + { + PTR32 device; + EDataFlow flow; + PTR32 guid; + PTR32 prop; + HRESULT result; + PTR32 value; + PTR32 buffer; /* caller allocated buffer to hold value's strings */ + PTR32 buffer_size; + } *params32 = args; + PROPVARIANT value; + struct get_prop_value_params params = + { + .device = ULongToPtr(params32->device), + .flow = params32->flow, + .guid = ULongToPtr(params32->guid), + .prop = ULongToPtr(params32->prop), + .value = &value, + .buffer = ULongToPtr(params32->buffer), + .buffer_size = ULongToPtr(params32->buffer_size) + }; + unix_get_prop_value(&params); + params32->result = params.result; + if (SUCCEEDED(params.result)) + { + value32 = UlongToPtr(params32->value); + value32->vt = value.vt; + switch (value.vt) + { + case VT_UI4: + value32->ulVal = value.ulVal; + break; + case VT_LPWSTR: + value32->ptr = params32->buffer; + break; + default: + FIXME("Unhandled vt %04x\n", value.vt); + } + } + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_wow64_funcs[] = { unix_process_attach, @@ -2213,7 +2278,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = unix_wow64_set_event_handle, unix_not_implemented, unix_is_started, - unix_not_implemented, + unix_wow64_get_prop_value, unix_wow64_midi_init, unix_midi_release, unix_wow64_midi_out_message,

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLAttributeCollection.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 6919d553aa67812537bbb648e5c1b6043bfeb8ec URL: https://gitlab.winehq.org/wine/wine/-/commit/6919d553aa67812537bbb648e5c1b6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 4 17:30:15 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLAttributeCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 2e1a26d058a..91316a8f237 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -8594,17 +8594,8 @@ static ULONG WINAPI HTMLAttributeCollection_Release(IHTMLAttributeCollection *if TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - while(!list_empty(&This->attrs)) { - HTMLDOMAttribute *attr = LIST_ENTRY(list_head(&This->attrs), HTMLDOMAttribute, entry); - - list_remove(&attr->entry); - attr->elem = NULL; - IHTMLDOMAttribute_Release(&attr->IHTMLDOMAttribute_iface); - } - - free(This); - } + if(!ref) + release_dispex(&This->dispex); return ref; } @@ -8953,6 +8944,24 @@ static inline HTMLAttributeCollection *HTMLAttributeCollection_from_DispatchEx(D return CONTAINING_RECORD(iface, HTMLAttributeCollection, dispex); } +static void HTMLAttributeCollection_unlink(DispatchEx *dispex) +{ + HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); + while(!list_empty(&This->attrs)) { + HTMLDOMAttribute *attr = LIST_ENTRY(list_head(&This->attrs), HTMLDOMAttribute, entry); + + list_remove(&attr->entry); + attr->elem = NULL; + IHTMLDOMAttribute_Release(&attr->IHTMLDOMAttribute_iface); + } +} + +static void HTMLAttributeCollection_destructor(DispatchEx *dispex) +{ + HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); + free(This); +} + static HRESULT HTMLAttributeCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); @@ -9019,8 +9028,8 @@ static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCI } static const dispex_static_data_vtbl_t HTMLAttributeCollection_dispex_vtbl = { - NULL, - NULL, + HTMLAttributeCollection_destructor, + HTMLAttributeCollection_unlink, NULL, HTMLAttributeCollection_get_dispid, HTMLAttributeCollection_get_name,

1 0

Davide Beatrici : wineoss: Add get_prop_value stub in unixlib.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: c03170a9b7cd1124f72a55aa0837ccce6bfbe1d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c03170a9b7cd1124f72a55aa0837cc… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Aug 7 13:16:19 2023 +0200 wineoss: Add get_prop_value stub in unixlib. --- dlls/wineoss.drv/oss.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 097e048d03b..1e839c57f5f 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1478,6 +1478,15 @@ static NTSTATUS oss_is_started(void *args) return oss_unlock_result(stream, &params->result, stream->playing ? S_OK : S_FALSE); } +static NTSTATUS oss_get_prop_value(void *args) +{ + struct get_prop_value_params *params = args; + + params->result = E_NOTIMPL; + + return STATUS_SUCCESS; +} + /* Aux driver */ static unsigned int num_aux; @@ -1724,7 +1733,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_set_event_handle, oss_test_connect, oss_is_started, - oss_not_implemented, + oss_get_prop_value, oss_not_implemented, oss_midi_release, oss_midi_out_message, @@ -2109,6 +2118,62 @@ static NTSTATUS oss_wow64_set_event_handle(void *args) return STATUS_SUCCESS; } +static NTSTATUS oss_wow64_get_prop_value(void *args) +{ + struct propvariant32 + { + WORD vt; + WORD pad1, pad2, pad3; + union + { + ULONG ulVal; + PTR32 ptr; + ULARGE_INTEGER uhVal; + }; + } *value32; + struct + { + PTR32 device; + EDataFlow flow; + PTR32 guid; + PTR32 prop; + HRESULT result; + PTR32 value; + PTR32 buffer; /* caller allocated buffer to hold value's strings */ + PTR32 buffer_size; + } *params32 = args; + PROPVARIANT value; + struct get_prop_value_params params = + { + .device = ULongToPtr(params32->device), + .flow = params32->flow, + .guid = ULongToPtr(params32->guid), + .prop = ULongToPtr(params32->prop), + .value = &value, + .buffer = ULongToPtr(params32->buffer), + .buffer_size = ULongToPtr(params32->buffer_size) + }; + oss_get_prop_value(&params); + params32->result = params.result; + if (SUCCEEDED(params.result)) + { + value32 = UlongToPtr(params32->value); + value32->vt = value.vt; + switch (value.vt) + { + case VT_UI4: + value32->ulVal = value.ulVal; + break; + case VT_LPWSTR: + value32->ptr = params32->buffer; + break; + default: + FIXME("Unhandled vt %04x\n", value.vt); + } + } + return STATUS_SUCCESS; +} + static NTSTATUS oss_wow64_aux_message(void *args) { struct @@ -2161,7 +2226,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_wow64_set_event_handle, oss_wow64_test_connect, oss_is_started, - oss_not_implemented, + oss_wow64_get_prop_value, oss_not_implemented, oss_midi_release, oss_wow64_midi_out_message,

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLDOMChildrenCollection.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 20b769dcb9ab751ac0f7a6098eab1f9cdfd6b07a URL: https://gitlab.winehq.org/wine/wine/-/commit/20b769dcb9ab751ac0f7a6098eab1f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 4 17:30:15 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLDOMChildrenCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlnode.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 0b509eca79a..d412b570aec 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -239,10 +239,8 @@ static ULONG WINAPI HTMLDOMChildrenCollection_Release(IHTMLDOMChildrenCollection TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - nsIDOMNodeList_Release(This->nslist); - free(This); - } + if(!ref) + release_dispex(&This->dispex); return ref; } @@ -364,6 +362,18 @@ static inline HTMLDOMChildrenCollection *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLDOMChildrenCollection, dispex); } +static void HTMLDOMChildrenCollection_unlink(DispatchEx *dispex) +{ + HTMLDOMChildrenCollection *This = impl_from_DispatchEx(dispex); + unlink_ref(&This->nslist); +} + +static void HTMLDOMChildrenCollection_destructor(DispatchEx *dispex) +{ + HTMLDOMChildrenCollection *This = impl_from_DispatchEx(dispex); + free(This); +} + #define DISPID_CHILDCOL_0 MSHTML_DISPID_CUSTOM_MIN static HRESULT HTMLDOMChildrenCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) @@ -433,8 +443,8 @@ static HRESULT HTMLDOMChildrenCollection_invoke(DispatchEx *dispex, DISPID id, L } static const dispex_static_data_vtbl_t HTMLDOMChildrenCollection_dispex_vtbl = { - NULL, - NULL, + HTMLDOMChildrenCollection_destructor, + HTMLDOMChildrenCollection_unlink, NULL, HTMLDOMChildrenCollection_get_dispid, HTMLDOMChildrenCollection_get_name,

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLElementCollection.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 0c99a89b15a888e930e964c41adf372b435293d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c99a89b15a888e930e964c41adf37… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 4 17:30:15 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLElementCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelemcol.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index afd7104c476..178ccde9b4d 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -252,16 +252,8 @@ static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - unsigned i; - - for(i=0; i < This->len; i++) - node_release(&This->elems[i]->node); - free(This->elems); - + if(!ref) release_dispex(&This->dispex); - free(This); - } return ref; } @@ -550,6 +542,25 @@ static inline HTMLElementCollection *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLElementCollection, dispex); } +static void HTMLElementCollection_unlink(DispatchEx *dispex) +{ + HTMLElementCollection *This = impl_from_DispatchEx(dispex); + unsigned i, len = This->len; + + if(len) { + This->len = 0; + for(i = 0; i < len; i++) + node_release(&This->elems[i]->node); + free(This->elems); + } +} + +static void HTMLElementCollection_destructor(DispatchEx *dispex) +{ + HTMLElementCollection *This = impl_from_DispatchEx(dispex); + free(This); +} + #define DISPID_ELEMCOL_0 MSHTML_DISPID_CUSTOM_MIN static HRESULT HTMLElementCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) @@ -622,8 +633,8 @@ static HRESULT HTMLElementCollection_invoke(DispatchEx *dispex, DISPID id, LCID } static const dispex_static_data_vtbl_t HTMLElementColection_dispex_vtbl = { - NULL, - NULL, + HTMLElementCollection_destructor, + HTMLElementCollection_unlink, NULL, HTMLElementCollection_get_dispid, HTMLElementCollection_get_name,

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for DOMTokenList.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: ee24cfe6beb2e98eb8dfee4329eecfb22813b5a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee24cfe6beb2e98eb8dfee4329eecf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 4 17:30:15 2023 +0300 mshtml: Use unlink and destructor in the vtbl for DOMTokenList. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 112057030d3..9542d43d5dc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7427,11 +7427,8 @@ static ULONG WINAPI token_list_Release(IWineDOMTokenList *iface) TRACE("(%p) ref=%ld\n", token_list, ref); - if(!ref) { - IHTMLElement_Release(token_list->element); + if(!ref) release_dispex(&token_list->dispex); - free(token_list); - } return ref; } @@ -7750,6 +7747,18 @@ static inline struct token_list *token_list_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, struct token_list, dispex); } +static void token_list_unlink(DispatchEx *dispex) +{ + struct token_list *token_list = token_list_from_DispatchEx(dispex); + unlink_ref(&token_list->element); +} + +static void token_list_destructor(DispatchEx *dispex) +{ + struct token_list *token_list = token_list_from_DispatchEx(dispex); + free(token_list); +} + static HRESULT token_list_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { @@ -7825,8 +7834,8 @@ static HRESULT token_list_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD } static const dispex_static_data_vtbl_t token_list_dispex_vtbl = { - NULL, - NULL, + token_list_destructor, + token_list_unlink, token_list_value, token_list_get_dispid, token_list_get_name,

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLFiltersCollection.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: d5e6c2a5819e3935c8e73e985354a6d7f9481b20 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5e6c2a5819e3935c8e73e985354a6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 4 17:30:15 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLFiltersCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9542d43d5dc..2e1a26d058a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -8135,9 +8135,7 @@ static ULONG WINAPI HTMLFiltersCollection_Release(IHTMLFiltersCollection *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) - { - free(This); - } + release_dispex(&This->dispex); return ref; } @@ -8213,6 +8211,17 @@ static const IHTMLFiltersCollectionVtbl HTMLFiltersCollectionVtbl = { HTMLFiltersCollection_item }; +static inline HTMLFiltersCollection *HTMLFiltersCollection_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLFiltersCollection, dispex); +} + +static void HTMLFiltersCollection_destructor(DispatchEx *dispex) +{ + HTMLFiltersCollection *This = HTMLFiltersCollection_from_DispatchEx(dispex); + free(This); +} + static HRESULT HTMLFiltersCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { WCHAR *ptr; @@ -8252,7 +8261,7 @@ static HRESULT HTMLFiltersCollection_invoke(DispatchEx *dispex, DISPID id, LCID } static const dispex_static_data_vtbl_t HTMLFiltersCollection_dispex_vtbl = { - NULL, + HTMLFiltersCollection_destructor, NULL, NULL, HTMLFiltersCollection_get_dispid,

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLRectCollection.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: ab784433bcf9844cbba85af59c1a4351fdacd949 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab784433bcf9844cbba85af59c1a43… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 4 17:30:14 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLRectCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 653bdd1e6b3..112057030d3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1084,12 +1084,8 @@ static ULONG WINAPI HTMLRectCollection_Release(IHTMLRectCollection *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - if(This->rect_list) - nsIDOMClientRectList_Release(This->rect_list); + if(!ref) release_dispex(&This->dispex); - free(This); - } return ref; } @@ -1212,6 +1208,18 @@ static inline HTMLRectCollection *HTMLRectCollection_from_DispatchEx(DispatchEx return CONTAINING_RECORD(iface, HTMLRectCollection, dispex); } +static void HTMLRectCollection_unlink(DispatchEx *dispex) +{ + HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex); + unlink_ref(&This->rect_list); +} + +static void HTMLRectCollection_destructor(DispatchEx *dispex) +{ + HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex); + free(This); +} + static HRESULT HTMLRectCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex); @@ -1287,8 +1295,8 @@ static HRESULT HTMLRectCollection_invoke(DispatchEx *dispex, DISPID id, LCID lci } static const dispex_static_data_vtbl_t HTMLRectCollection_dispex_vtbl = { - NULL, - NULL, + HTMLRectCollection_destructor, + HTMLRectCollection_unlink, NULL, HTMLRectCollection_get_dispid, HTMLRectCollection_get_name,

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for XMLHttpRequest.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 7913019fd0baadd921f8a88c3114a7ac7e3c7234 URL: https://gitlab.winehq.org/wine/wine/-/commit/7913019fd0baadd921f8a88c3114a7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 4 17:30:14 2023 +0300 mshtml: Use unlink and destructor in the vtbl for XMLHttpRequest. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/xmlhttprequest.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 73eea9d7f6d..75f52fb6c8e 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -550,17 +550,8 @@ static ULONG WINAPI HTMLXMLHttpRequest_Release(IHTMLXMLHttpRequest *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - remove_target_tasks(This->task_magic); - detach_xhr_event_listener(This->event_listener); - if(This->pending_progress_event) - IDOMEvent_Release(&This->pending_progress_event->IDOMEvent_iface); - IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); - release_event_target(&This->event_target); + if(!ref) release_dispex(&This->event_target.dispex); - nsIXMLHttpRequest_Release(This->nsxhr); - free(This); - } return ref; } @@ -1530,6 +1521,35 @@ static inline HTMLXMLHttpRequest *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, event_target.dispex); } +static void HTMLXMLHttpRequest_unlink(DispatchEx *dispex) +{ + HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); + remove_target_tasks(This->task_magic); + if(This->event_listener) { + XMLHttpReqEventListener *event_listener = This->event_listener; + This->event_listener = NULL; + detach_xhr_event_listener(event_listener); + } + if(This->window) { + HTMLInnerWindow *window = This->window; + This->window = NULL; + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + } + if(This->pending_progress_event) { + DOMEvent *pending_progress_event = This->pending_progress_event; + This->pending_progress_event = NULL; + IDOMEvent_Release(&pending_progress_event->IDOMEvent_iface); + } + unlink_ref(&This->nsxhr); + release_event_target(&This->event_target); +} + +static void HTMLXMLHttpRequest_destructor(DispatchEx *dispex) +{ + HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); + free(This); +} + static nsISupports *HTMLXMLHttpRequest_get_gecko_target(DispatchEx *dispex) { HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); @@ -1574,7 +1594,8 @@ static void HTMLXMLHttpRequest_init_dispex_info(dispex_data_t *info, compat_mode static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { { - NULL, + HTMLXMLHttpRequest_destructor, + HTMLXMLHttpRequest_unlink }, HTMLXMLHttpRequest_get_gecko_target, HTMLXMLHttpRequest_bind_event

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLRect.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: adefacfd12bc619266940575a81760087cc41aa2 URL: https://gitlab.winehq.org/wine/wine/-/commit/adefacfd12bc619266940575a81760… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 4 17:30:14 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLRect. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f9ab44ce5fc..653bdd1e6b3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -582,12 +582,8 @@ static ULONG WINAPI HTMLRect_Release(IHTMLRect *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - if(This->nsrect) - nsIDOMClientRect_Release(This->nsrect); + if(!ref) release_dispex(&This->dispex); - free(This); - } return ref; } @@ -841,19 +837,41 @@ static const IHTMLRect2Vtbl HTMLRect2Vtbl = { HTMLRect2_get_height, }; +static inline HTMLRect *HTMLRect_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLRect, dispex); +} + +static void HTMLRect_unlink(DispatchEx *dispex) +{ + HTMLRect *This = HTMLRect_from_DispatchEx(dispex); + unlink_ref(&This->nsrect); +} + +static void HTMLRect_destructor(DispatchEx *dispex) +{ + HTMLRect *This = HTMLRect_from_DispatchEx(dispex); + free(This); +} + void HTMLRect_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { if (mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLRect2_tid, NULL); } +static const dispex_static_data_vtbl_t HTMLRect_dispex_vtbl = { + HTMLRect_destructor, + HTMLRect_unlink +}; + static const tid_t HTMLRect_iface_tids[] = { IHTMLRect_tid, 0 }; static dispex_static_data_t HTMLRect_dispex = { L"ClientRect", - NULL, + &HTMLRect_dispex_vtbl, IHTMLRect_tid, HTMLRect_iface_tids, HTMLRect_init_dispex_info

1 0