August 2023 - Wine-commits - list.winehq.org

David Kahurani : gdiplus: Use get_log_fontW in GdipGetLogFontW.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 08d9f9b60b4787fd020c867c323d2c401b6e8e23 URL: https://gitlab.winehq.org/wine/wine/-/commit/08d9f9b60b4787fd020c867c323d2c… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Tue Aug 1 12:23:26 2023 +0300 gdiplus: Use get_log_fontW in GdipGetLogFontW. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/font.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 316f65d84cf..7bd60750e6d 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -480,24 +480,15 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW GdipMultiplyMatrix(&matrix, &graphics->gdi_transform, MatrixOrderAppend); transform_properties(graphics, &matrix, FALSE, NULL, &rel_height, &angle); + get_log_fontW(font, graphics, lf); + lf->lfHeight = -gdip_round(height * rel_height); - lf->lfWidth = 0; lf->lfEscapement = lf->lfOrientation = gdip_round((angle / M_PI) * 1800.0); if (lf->lfEscapement < 0) { lf->lfEscapement += 3600; lf->lfOrientation += 3600; } - lf->lfWeight = font->otm.otmTextMetrics.tmWeight; - lf->lfItalic = font->otm.otmTextMetrics.tmItalic ? 1 : 0; - lf->lfUnderline = font->otm.otmTextMetrics.tmUnderlined ? 1 : 0; - lf->lfStrikeOut = font->otm.otmTextMetrics.tmStruckOut ? 1 : 0; - lf->lfCharSet = font->otm.otmTextMetrics.tmCharSet; - lf->lfOutPrecision = OUT_DEFAULT_PRECIS; - lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; - lf->lfQuality = DEFAULT_QUALITY; - lf->lfPitchAndFamily = 0; - lstrcpyW(lf->lfFaceName, font->family->FamilyName); TRACE("=> %s,%ld\n", debugstr_w(lf->lfFaceName), lf->lfHeight);

1 0

Zebediah Figura : wined3d: Avoid uploading deferred context maps more than once.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 2f84616e02e876d71d3871dd17ef3d9db6c043bb URL: https://gitlab.winehq.org/wine/wine/-/commit/2f84616e02e876d71d3871dd17ef3d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 14 18:46:05 2023 -0500 wined3d: Avoid uploading deferred context maps more than once. --- dlls/wined3d/cs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 029ca5d884d..5fc2bf64074 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -4211,7 +4211,7 @@ static bool wined3d_deferred_context_unmap_upload_bo(struct wined3d_device_conte struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_box *box, struct upload_bo *bo) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - const struct wined3d_deferred_upload *upload; + struct wined3d_deferred_upload *upload; if ((upload = deferred_context_get_upload(deferred, resource, sub_resource_idx))) { @@ -4219,6 +4219,7 @@ static bool wined3d_deferred_context_unmap_upload_bo(struct wined3d_device_conte bo->addr.buffer_object = 0; bo->addr.addr = (uint8_t *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); bo->flags = upload->upload_flags; + upload->upload_flags = 0; return true; }

1 0

Zebediah Figura : wined3d: Pass map flags to wined3d_context_copy_bo_address().
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 9373cd5e3e1c5d4fd5e26783781ba5ea626b2094 URL: https://gitlab.winehq.org/wine/wine/-/commit/9373cd5e3e1c5d4fd5e26783781ba5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 17 12:48:15 2023 -0500 wined3d: Pass map flags to wined3d_context_copy_bo_address(). This is a step towards implementing D3D11_COPY_FLAGS. --- dlls/wined3d/adapter_gl.c | 4 ++-- dlls/wined3d/adapter_vk.c | 14 +++++--------- dlls/wined3d/buffer.c | 22 ++++++++++++++++++---- dlls/wined3d/context_gl.c | 6 +----- dlls/wined3d/directx.c | 2 +- dlls/wined3d/texture.c | 3 ++- dlls/wined3d/view.c | 5 +++-- dlls/wined3d/wined3d_private.h | 8 ++++---- dlls/wined3d/wined3d_vk.h | 2 +- 9 files changed, 37 insertions(+), 29 deletions(-)

1 0

Zebediah Figura : wined3d: Do not load UAV locations when clearing if not necessary.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: d163ef089e8f68deef4b10a63b72003aaba0ec0b URL: https://gitlab.winehq.org/wine/wine/-/commit/d163ef089e8f68deef4b10a63b7200… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 17 13:18:07 2023 -0500 wined3d: Do not load UAV locations when clearing if not necessary. Don't load the buffer location if we are clearing the whole buffer, and never load the texture location (for Vulkan; GL already did this). Only prepare them instead. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/view.c | 57 +++++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2c99e5872ca..efbd3233428 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -103,7 +103,7 @@ static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) && !buffer->maps->offset && buffer->maps->size == buffer->resource.size; } -static void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, DWORD location) +void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, uint32_t location) { TRACE("buffer %p, location %s.\n", buffer, wined3d_debug_location(location)); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e862f54bc10..fb6f5d545ba 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1657,11 +1657,15 @@ void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view } buffer = buffer_from_resource(resource); - wined3d_buffer_load_location(buffer, &context_gl->c, WINED3D_LOCATION_BUFFER); + get_buffer_view_range(buffer, &view_gl->v.desc, &format_gl->f, &offset, &size); + + if (!offset && size == buffer->resource.size) + wined3d_buffer_prepare_location(buffer, &context_gl->c, WINED3D_LOCATION_BUFFER); + else + wined3d_buffer_load_location(buffer, &context_gl->c, WINED3D_LOCATION_BUFFER); wined3d_unordered_access_view_invalidate_location(&view_gl->v, ~WINED3D_LOCATION_BUFFER); bo_gl = wined3d_bo_gl(buffer->buffer_object); - get_buffer_view_range(buffer, &view_gl->v.desc, &format_gl->f, &offset, &size); wined3d_context_gl_bind_bo(context_gl, bo_gl->binding, bo_gl->id); GL_EXTCALL(glClearBufferSubData(bo_gl->binding, format_gl->internal, bo_gl->b.buffer_offset + offset, size, format_gl->format, format_gl->type, clear_value)); @@ -1979,8 +1983,6 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view struct wined3d_range range; VkMemoryBarrier vk_barrier; VkPipeline vk_pipeline; - DWORD uav_location; - unsigned int level; bool is_array; device_vk = wined3d_device_vk(device); @@ -2048,8 +2050,8 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int offset, size; - uav_location = WINED3D_LOCATION_BUFFER; layout = state->buffer_layout; vk_writes[0].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; @@ -2058,19 +2060,53 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view else constants.extent.width = view_desc->u.buffer.count; constants.extent.height = 1; + + get_buffer_view_range(buffer, view_desc, view_format, &offset, &size); + if (!offset && size == buffer->resource.size) + wined3d_buffer_prepare_location(buffer, &context_vk->c, WINED3D_LOCATION_BUFFER); + else + wined3d_buffer_load_location(buffer, &context_vk->c, WINED3D_LOCATION_BUFFER); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); } else { + unsigned int layer_count, level_count, base_level, base_layer, i, j; + texture_vk = wined3d_texture_vk(wined3d_texture_from_resource(resource)); - uav_location = WINED3D_LOCATION_TEXTURE_RGB; layout = state->image_layout; vk_writes[0].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - level = view_desc->u.texture.level_idx; - constants.extent.width = wined3d_texture_get_level_width(&texture_vk->t, level); - constants.extent.height = wined3d_texture_get_level_height(&texture_vk->t, level); + level_count = view_desc->u.texture.level_count; + base_level = view_desc->u.texture.level_idx; + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + layer_count = 1; + base_layer = 0; + } + else + { + layer_count = view_desc->u.texture.layer_count; + base_layer = view_desc->u.texture.layer_idx; + } + + constants.extent.width = wined3d_texture_get_level_width(&texture_vk->t, base_level); + constants.extent.height = wined3d_texture_get_level_height(&texture_vk->t, base_level); group_count.z = (view_desc->u.texture.layer_count + group_count.z - 1) / group_count.z; + + for (i = 0; i < layer_count; ++i) + { + for (j = 0; j < level_count; ++j) + { + unsigned int sub_resource_idx = (base_layer + i) * texture_vk->t.level_count + base_level + j; + + wined3d_texture_prepare_location(&texture_vk->t, sub_resource_idx, + &context_vk->c, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(&texture_vk->t, sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + } + } } group_count.x = (constants.extent.width + group_count.x - 1) / group_count.x; @@ -2108,9 +2144,6 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view return; } - wined3d_view_load_location(resource, view_desc, &context_vk->c, uav_location); - wined3d_unordered_access_view_invalidate_location(&view_vk->v, ~uav_location); - if (resource->type == WINED3D_RTYPE_BUFFER) { if (format_id == view_format->id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15a32529e84..c2c8f4035bd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4566,6 +4566,7 @@ BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct upload_bo *upload_bo, unsigned int offset, unsigned int size) DECLSPEC_HIDDEN; +void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, uint32_t location) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data,

1 0

Francois Gouget : webservices: Make alloc_float_text() static.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 5d377d8a5fe24052accc1f156c72b857fe415f6d URL: https://gitlab.winehq.org/wine/wine/-/commit/5d377d8a5fe24052accc1f156c72b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 17 09:20:42 2017 +0200 webservices: Make alloc_float_text() static. --- dlls/webservices/reader.c | 2 +- dlls/webservices/webservices_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 41b2adc8724..0c8ddcea035 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -914,7 +914,7 @@ WS_XML_UINT64_TEXT *alloc_uint64_text( UINT64 value ) return ret; } -WS_XML_FLOAT_TEXT *alloc_float_text( float value ) +static WS_XML_FLOAT_TEXT *alloc_float_text( float value ) { WS_XML_FLOAT_TEXT *ret; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index b754b36d02c..806d79ba4f2 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -83,7 +83,6 @@ WS_XML_BOOL_TEXT *alloc_bool_text( BOOL ); WS_XML_INT32_TEXT *alloc_int32_text( INT32 ); WS_XML_INT64_TEXT *alloc_int64_text( INT64 ); WS_XML_UINT64_TEXT *alloc_uint64_text( UINT64 ); -WS_XML_FLOAT_TEXT *alloc_float_text( float ); WS_XML_DOUBLE_TEXT *alloc_double_text( double ); WS_XML_GUID_TEXT *alloc_guid_text( const GUID * ); WS_XML_UNIQUE_ID_TEXT *alloc_unique_id_text( const GUID * );

1 0

Gabriel Ivăncescu : mshtml: Use the common HTMLElement dispex vtbl in the dispex definitions.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 7b30e3d34e069708f9c9322d244d50dc9f23d187 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b30e3d34e069708f9c9322d244d50… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 1 19:45:24 2023 +0300 mshtml: Use the common HTMLElement dispex vtbl in the dispex definitions. Rather than filling it during initialization, which was a bit confusing, even more later on when dispex will handle Cycle Collection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlarea.c | 2 +- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmlcomment.c | 3 ++- dlls/mshtml/htmlelem.c | 5 +---- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlframe.c | 4 ++-- dlls/mshtml/htmlgeneric.c | 3 ++- dlls/mshtml/htmlhead.c | 9 +++++---- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 6 +++--- dlls/mshtml/htmllink.c | 2 +- dlls/mshtml/htmlobject.c | 5 +++-- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmlstyleelem.c | 3 ++- dlls/mshtml/htmltable.c | 7 ++++--- dlls/mshtml/htmltextarea.c | 3 ++- 19 files changed, 36 insertions(+), 31 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Introduce unlink_ref helper.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 3c92edfdf2fd9d47fd5e9fd2aa65eb8a55787a01 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c92edfdf2fd9d47fd5e9fd2aa65eb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 1 19:45:24 2023 +0300 mshtml: Introduce unlink_ref helper. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 8 +----- dlls/mshtml/htmlarea.c | 8 +----- dlls/mshtml/htmlbody.c | 7 +---- dlls/mshtml/htmldoc.c | 18 +++--------- dlls/mshtml/htmlform.c | 8 +----- dlls/mshtml/htmlframe.c | 16 ++--------- dlls/mshtml/htmlimg.c | 8 +----- dlls/mshtml/htmlinput.c | 16 ++--------- dlls/mshtml/htmllink.c | 8 +----- dlls/mshtml/htmlnode.c | 7 +---- dlls/mshtml/htmlobject.c | 8 +----- dlls/mshtml/htmlscript.c | 8 +----- dlls/mshtml/htmlselect.c | 16 ++--------- dlls/mshtml/htmlstyleelem.c | 14 ++-------- dlls/mshtml/htmltable.c | 24 ++-------------- dlls/mshtml/htmltextarea.c | 8 +----- dlls/mshtml/mshtml_private.h | 10 +++++++ dlls/mshtml/navigate.c | 16 ++--------- dlls/mshtml/nsembed.c | 11 ++------ dlls/mshtml/nsevents.c | 5 +--- dlls/mshtml/nsio.c | 65 ++++++++------------------------------------ dlls/mshtml/oleobj.c | 48 +++++++------------------------- dlls/mshtml/persist.c | 12 ++------ dlls/mshtml/pluginhost.c | 17 ++---------- dlls/mshtml/script.c | 11 ++------ dlls/mshtml/view.c | 5 +--- 26 files changed, 70 insertions(+), 312 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for function disps.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 6a2ca11c654352dd169c331b4a140c30ae3e45b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a2ca11c654352dd169c331b4a140c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 1 19:45:24 2023 +0300 mshtml: Use unlink and destructor in the vtbl for function disps. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 23 ++++++++++++++++++----- dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlelem.c | 10 ++++++++++ dlls/mshtml/htmlelemcol.c | 2 ++ dlls/mshtml/htmlimg.c | 2 ++ dlls/mshtml/htmlnode.c | 2 ++ dlls/mshtml/htmlselect.c | 2 ++ dlls/mshtml/htmlstorage.c | 2 ++ dlls/mshtml/htmlstyle.c | 2 ++ dlls/mshtml/htmlstylesheet.c | 4 ++++ dlls/mshtml/htmlwindow.c | 2 ++ dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/xmlhttprequest.c | 2 ++ 13 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index fecc7f6690c..09782fb83c9 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -826,11 +826,8 @@ static ULONG WINAPI Function_Release(IUnknown *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - assert(!This->obj); + if(!ref) release_dispex(&This->dispex); - free(This); - } return ref; } @@ -846,6 +843,13 @@ static inline func_disp_t *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, func_disp_t, dispex); } +static void function_destructor(DispatchEx *dispex) +{ + func_disp_t *This = impl_from_DispatchEx(dispex); + assert(!This->obj); + free(This); +} + static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { @@ -902,6 +906,8 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR } static const dispex_static_data_vtbl_t function_dispex_vtbl = { + function_destructor, + NULL, function_value, NULL, NULL, @@ -2053,8 +2059,11 @@ void release_dispex(DispatchEx *This) { dynamic_prop_t *prop; + if(This->info->desc->vtbl && This->info->desc->vtbl->unlink) + This->info->desc->vtbl->unlink(This); + if(!This->dynamic_data) - return; + goto destructor; for(prop = This->dynamic_data->props; prop < This->dynamic_data->props + This->dynamic_data->prop_cnt; prop++) { VariantClear(&prop->var); @@ -2078,6 +2087,10 @@ void release_dispex(DispatchEx *This) } free(This->dynamic_data); + +destructor: + if(This->info->desc->vtbl && This->info->desc->vtbl->destructor) + This->info->desc->vtbl->destructor(This); } void init_dispatch(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data, compat_mode_t compat_mode) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6777debecd0..23b0064c9a6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -6086,6 +6086,8 @@ static HRESULT HTMLDocumentNode_location_hook(DispatchEx *dispex, WORD flags, DI static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { { + NULL, + NULL, NULL, NULL, HTMLDocumentNode_get_name, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 53c418ab333..f9ab44ce5fc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1269,6 +1269,8 @@ static HRESULT HTMLRectCollection_invoke(DispatchEx *dispex, DISPID id, LCID lci } static const dispex_static_data_vtbl_t HTMLRectCollection_dispex_vtbl = { + NULL, + NULL, NULL, HTMLRectCollection_get_dispid, HTMLRectCollection_get_name, @@ -7328,6 +7330,8 @@ static const tid_t HTMLElement_iface_tids[] = { const event_target_vtbl_t HTMLElement_event_target_vtbl = { { + NULL, + NULL, NULL, HTMLElement_get_dispid, HTMLElement_get_name, @@ -7795,6 +7799,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_value, token_list_get_dispid, token_list_get_name, @@ -8211,6 +8217,8 @@ static HRESULT HTMLFiltersCollection_invoke(DispatchEx *dispex, DISPID id, LCID } static const dispex_static_data_vtbl_t HTMLFiltersCollection_dispex_vtbl = { + NULL, + NULL, NULL, HTMLFiltersCollection_get_dispid, HTMLFiltersCollection_get_name, @@ -8967,6 +8975,8 @@ static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCI } static const dispex_static_data_vtbl_t HTMLAttributeCollection_dispex_vtbl = { + NULL, + NULL, NULL, HTMLAttributeCollection_get_dispid, HTMLAttributeCollection_get_name, diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 75ee079e3c7..afd7104c476 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -622,6 +622,8 @@ static HRESULT HTMLElementCollection_invoke(DispatchEx *dispex, DISPID id, LCID } static const dispex_static_data_vtbl_t HTMLElementColection_dispex_vtbl = { + NULL, + NULL, NULL, HTMLElementCollection_get_dispid, HTMLElementCollection_get_name, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index d624c0e9df6..e0ade235c01 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -975,6 +975,8 @@ static const tid_t HTMLImageElementFactory_iface_tids[] = { }; static const dispex_static_data_vtbl_t HTMLImageElementFactory_dispex_vtbl = { + NULL, + NULL, HTMLImageElementFactory_value, NULL, NULL, diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index b20c1decddb..0b509eca79a 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -433,6 +433,8 @@ static HRESULT HTMLDOMChildrenCollection_invoke(DispatchEx *dispex, DISPID id, L } static const dispex_static_data_vtbl_t HTMLDOMChildrenCollection_dispex_vtbl = { + NULL, + NULL, NULL, HTMLDOMChildrenCollection_get_dispid, HTMLDOMChildrenCollection_get_name, diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 31410e9f0f0..cbbd9ebcc69 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -629,6 +629,8 @@ static const tid_t HTMLOptionElementFactory_iface_tids[] = { }; static const dispex_static_data_vtbl_t HTMLOptionElementFactory_dispex_vtbl = { + NULL, + NULL, HTMLOptionElementFactory_value, NULL, NULL, diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 24eec4ba078..da97809177b 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -1308,6 +1308,8 @@ static HRESULT HTMLStorage_next_dispid(DispatchEx *dispex, DISPID id, DISPID *pi } static const dispex_static_data_vtbl_t HTMLStorage_dispex_vtbl = { + NULL, + NULL, NULL, HTMLStorage_get_dispid, HTMLStorage_get_name, diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c8dc69bb2af..766a9306b05 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -9997,6 +9997,8 @@ void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) } const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl = { + NULL, + NULL, NULL, CSSStyle_get_dispid, NULL, diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 59680d720e2..73d94d1f2c0 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -466,6 +466,8 @@ static HRESULT HTMLStyleSheetRulesCollection_invoke(DispatchEx *dispex, DISPID i } static const dispex_static_data_vtbl_t HTMLStyleSheetRulesCollection_dispex_vtbl = { + NULL, + NULL, NULL, HTMLStyleSheetRulesCollection_get_dispid, HTMLStyleSheetRulesCollection_get_name, @@ -893,6 +895,8 @@ static HRESULT HTMLStyleSheetsCollection_invoke(DispatchEx *dispex, DISPID id, L } static const dispex_static_data_vtbl_t HTMLStyleSheetsCollection_dispex_vtbl = { + NULL, + NULL, NULL, HTMLStyleSheetsCollection_get_dispid, HTMLStyleSheetsCollection_get_name, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5abe13c96e6..f603a33016c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -4028,6 +4028,8 @@ static IHTMLEventObj *HTMLWindow_set_current_event(DispatchEx *dispex, IHTMLEven static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { { + NULL, + NULL, NULL, NULL, HTMLWindow_get_name, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c0274bd8aac..ff6294749cd 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -347,6 +347,10 @@ typedef struct DispatchEx DispatchEx; - dynamic props: These props are generally allocated by external code (e.g. 'document.wine = 42' creates 'wine' dynamic prop on document) */ typedef struct { + /* Unlike delete_cycle_collectable, unlink is called before the destructor (if available). */ + void (*destructor)(DispatchEx*); + void (*unlink)(DispatchEx*); + /* Called when the object wants to handle DISPID_VALUE invocations */ HRESULT (*value)(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 17f29396b8f..4803b5c55a1 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -1790,6 +1790,8 @@ static HRESULT HTMLXMLHttpRequestFactory_value(DispatchEx *iface, LCID lcid, WOR } static const dispex_static_data_vtbl_t HTMLXMLHttpRequestFactory_dispex_vtbl = { + NULL, + NULL, HTMLXMLHttpRequestFactory_value };

1 0

Gabriel Ivăncescu : mshtml: Use separate dispex destructors for different event types.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 548b6811855b5f65602246e9fd8d905d457029a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/548b6811855b5f65602246e9fd8d90… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 1 19:45:24 2023 +0300 mshtml: Use separate dispex destructors for different event types. And get rid of the destroy method. This especially simplifies it when traversal and unlinking is implemented. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 165 ++++++++++++++++++++++++++++++++---------------- dlls/mshtml/htmlevent.h | 1 - 2 files changed, 112 insertions(+), 54 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLEventObj.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 9bad7be301f3bfcdb7b597f12a56efc0fbead23e URL: https://gitlab.winehq.org/wine/wine/-/commit/9bad7be301f3bfcdb7b597f12a56ef… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 1 19:45:25 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLEventObj. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ea1b11fbd38..2c518464246 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -385,12 +385,8 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - if(This->event) - IDOMEvent_Release(&This->event->IDOMEvent_iface); + if(!ref) release_dispex(&This->dispex); - free(This); - } return ref; } @@ -872,6 +868,32 @@ static inline HTMLEventObj *unsafe_impl_from_IHTMLEventObj(IHTMLEventObj *iface) return iface->lpVtbl == &HTMLEventObjVtbl ? impl_from_IHTMLEventObj(iface) : NULL; } +static inline HTMLEventObj *HTMLEventObj_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLEventObj, dispex); +} + +static void HTMLEventObj_unlink(DispatchEx *dispex) +{ + HTMLEventObj *This = HTMLEventObj_from_DispatchEx(dispex); + if(This->event) { + DOMEvent *event = This->event; + This->event = NULL; + IDOMEvent_Release(&event->IDOMEvent_iface); + } +} + +static void HTMLEventObj_destructor(DispatchEx *dispex) +{ + HTMLEventObj *This = HTMLEventObj_from_DispatchEx(dispex); + free(This); +} + +static const dispex_static_data_vtbl_t HTMLEventObj_dispex_vtbl = { + HTMLEventObj_destructor, + HTMLEventObj_unlink +}; + static const tid_t HTMLEventObj_iface_tids[] = { IHTMLEventObj_tid, 0 @@ -879,7 +901,7 @@ static const tid_t HTMLEventObj_iface_tids[] = { static dispex_static_data_t HTMLEventObj_dispex = { L"MSEventObj", - NULL, + &HTMLEventObj_dispex_vtbl, DispCEventObj_tid, HTMLEventObj_iface_tids };

1 0