November 2023 - Wine-commits

Jacek Caban : gdiplus: Avoid implicit enum casts.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: 8577d7ec1e632ef0a9e6a3336cf5e8e3250a4e17 URL: https://gitlab.winehq.org/wine/wine/-/commit/8577d7ec1e632ef0a9e6a3336cf5e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:43:15 2023 +0200 gdiplus: Avoid implicit enum casts. --- dlls/gdiplus/image.c | 2 +- dlls/gdiplus/metafile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c6aa2ce5dd5..1fe259f6096 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -6066,7 +6066,7 @@ GpStatus WINGDIPAPI GdipInitializePalette(ColorPalette *palette, ColorPalette *wic_palette; GpStatus status = Ok; - wic_palette = get_palette(NULL, type); + wic_palette = get_palette(NULL, (WICBitmapPaletteType)type); if (!wic_palette) return OutOfMemory; if (palette->Count >= wic_palette->Count) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 0664aa5fc89..265aec65c1f 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4531,7 +4531,7 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR* fileName, (*metafile)->bounds.X = (*metafile)->bounds.Y = 0.0; (*metafile)->bounds.Width = (*metafile)->bounds.Height = 1.0; (*metafile)->unit = UnitPixel; - (*metafile)->metafile_type = type; + (*metafile)->metafile_type = (MetafileType)type; (*metafile)->record_dc = record_dc; (*metafile)->comment_data = NULL; (*metafile)->comment_data_size = 0;

1 0

Zebediah Figura : vkd3d-shader/spirv: No longer handle builtin array size mismatch in spirv_compiler_emit_input().
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: f05be8ff120bb334c8e0e9023828b904391a67b7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f05be8ff120bb334c8e0e9023828b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 19 23:35:04 2023 -0500 vkd3d-shader/spirv: No longer handle builtin array size mismatch in spirv_compiler_emit_input(). This is taken care of by prior I/O lowering. We no longer need to deal with this here. --- libs/vkd3d-shader/spirv.c | 53 ++++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d6cbab70..aa037b62 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4649,18 +4649,17 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, const struct shader_signature *shader_signature; enum vkd3d_shader_component_type component_type; enum vkd3d_shader_input_sysval_semantic sysval; - uint32_t type_id, ptr_type_id, float_type_id; const struct vkd3d_spirv_builtin *builtin; unsigned int write_mask, reg_write_mask; struct vkd3d_symbol *symbol = NULL; uint32_t val_id, input_id, var_id; + uint32_t type_id, float_type_id; struct vkd3d_symbol reg_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; bool use_private_var = false; unsigned int array_sizes[2]; unsigned int element_idx; - uint32_t i, index; assert(!reg->idx_count || !reg->idx[0].rel_addr); assert(reg->idx_count < 2 || !reg->idx[1].rel_addr); @@ -4765,47 +4764,27 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, if (use_private_var) { + struct vkd3d_shader_register dst_reg = *reg; + dst_reg.data_type = VKD3D_DATA_FLOAT; + type_id = vkd3d_spirv_get_type_id(builder, component_type, input_component_count); - for (i = 0; i < max(array_sizes[0], 1); ++i) - { - struct vkd3d_shader_register dst_reg = *reg; - dst_reg.data_type = VKD3D_DATA_FLOAT; - val_id = input_id; - if (array_sizes[0]) - { - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, type_id); - index = spirv_compiler_get_constant_uint(compiler, i); - val_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, input_id, index); - dst_reg.idx[0].offset = i; - } - else if (builtin && builtin->spirv_array_size) - { - /* The D3D builtin is not an array, but the SPIR-V builtin is, - * so we'll need to index into the SPIR-V builtin when loading - * it. This happens when reading TessLevel in domain shaders. */ - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, type_id); - index = spirv_compiler_get_constant_uint(compiler, builtin->member_idx); - val_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, input_id, index); - dst_reg.idx[0].offset = element_idx + i; - } - val_id = vkd3d_spirv_build_op_load(builder, type_id, val_id, SpvMemoryAccessMaskNone); + val_id = vkd3d_spirv_build_op_load(builder, type_id, input_id, SpvMemoryAccessMaskNone); - if (builtin && builtin->fixup_pfn) - val_id = builtin->fixup_pfn(compiler, val_id); + if (builtin && builtin->fixup_pfn) + val_id = builtin->fixup_pfn(compiler, val_id); - if (component_type != VKD3D_SHADER_COMPONENT_FLOAT) - { - float_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, input_component_count); - val_id = vkd3d_spirv_build_op_bitcast(builder, float_type_id, val_id); - } + if (component_type != VKD3D_SHADER_COMPONENT_FLOAT) + { + float_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, input_component_count); + val_id = vkd3d_spirv_build_op_bitcast(builder, float_type_id, val_id); + } - val_id = spirv_compiler_emit_swizzle(compiler, val_id, - vkd3d_write_mask_from_component_count(input_component_count), - VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_SHADER_NO_SWIZZLE, dst->write_mask >> component_idx); + val_id = spirv_compiler_emit_swizzle(compiler, val_id, + vkd3d_write_mask_from_component_count(input_component_count), + VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_SHADER_NO_SWIZZLE, dst->write_mask >> component_idx); - spirv_compiler_emit_store_reg(compiler, &dst_reg, dst->write_mask, val_id); - } + spirv_compiler_emit_store_reg(compiler, &dst_reg, dst->write_mask, val_id); } return input_id;

1 0

Zebediah Figura : vkd3d-shader/ir: Pass a vkd3d_shader_parser to instruction_array_normalise_io_registers().
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: 8b42f523f2beebe026b2cdbe19cd3445fa933c48 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8b42f523f2beebe026b2cdbe19cd3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 16 23:27:52 2023 -0500 vkd3d-shader/ir: Pass a vkd3d_shader_parser to instruction_array_normalise_io_registers(). --- libs/vkd3d-shader/ir.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 8cf92656..d9f92ff1 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1071,24 +1071,22 @@ static void shader_instruction_normalise_io_params(struct vkd3d_shader_instructi } } -static enum vkd3d_result instruction_array_normalise_io_registers(struct vkd3d_shader_instruction_array *instructions, - enum vkd3d_shader_type shader_type, struct shader_signature *input_signature, - struct shader_signature *output_signature, struct shader_signature *patch_constant_signature) +static enum vkd3d_result shader_normalise_io_registers(struct vkd3d_shader_parser *parser) { - struct io_normaliser normaliser = {*instructions}; + struct io_normaliser normaliser = {parser->instructions}; struct vkd3d_shader_instruction *ins; bool has_control_point_phase; unsigned int i, j; normaliser.phase = VKD3DSIH_INVALID; - normaliser.shader_type = shader_type; - normaliser.input_signature = input_signature; - normaliser.output_signature = output_signature; - normaliser.patch_constant_signature = patch_constant_signature; + normaliser.shader_type = parser->shader_version.type; + normaliser.input_signature = &parser->shader_desc.input_signature; + normaliser.output_signature = &parser->shader_desc.output_signature; + normaliser.patch_constant_signature = &parser->shader_desc.patch_constant_signature; - for (i = 0, has_control_point_phase = false; i < instructions->count; ++i) + for (i = 0, has_control_point_phase = false; i < parser->instructions.count; ++i) { - ins = &instructions->elements[i]; + ins = &parser->instructions.elements[i]; switch (ins->handler_idx) { @@ -1127,11 +1125,11 @@ static enum vkd3d_result instruction_array_normalise_io_registers(struct vkd3d_s } } - if (!shader_signature_merge(input_signature, normaliser.input_range_map, false) - || !shader_signature_merge(output_signature, normaliser.output_range_map, false) - || !shader_signature_merge(patch_constant_signature, normaliser.pc_range_map, true)) + if (!shader_signature_merge(&parser->shader_desc.input_signature, normaliser.input_range_map, false) + || !shader_signature_merge(&parser->shader_desc.output_signature, normaliser.output_range_map, false) + || !shader_signature_merge(&parser->shader_desc.patch_constant_signature, normaliser.pc_range_map, true)) { - *instructions = normaliser.instructions; + parser->instructions = normaliser.instructions; return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -1139,7 +1137,7 @@ static enum vkd3d_result instruction_array_normalise_io_registers(struct vkd3d_s for (i = 0; i < normaliser.instructions.count; ++i) shader_instruction_normalise_io_params(&normaliser.instructions.elements[i], &normaliser); - *instructions = normaliser.instructions; + parser->instructions = normaliser.instructions; return VKD3D_OK; } @@ -1444,9 +1442,7 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, &parser->shader_desc.input_signature); } if (result >= 0) - result = instruction_array_normalise_io_registers(instructions, parser->shader_version.type, - &parser->shader_desc.input_signature, &parser->shader_desc.output_signature, - &parser->shader_desc.patch_constant_signature); + result = shader_normalise_io_registers(parser); if (result >= 0) result = instruction_array_normalise_flat_constants(parser);

1 0

Zebediah Figura : vkd3d-shader/ir: Check for vocp usage during IR normalization.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: b73d2c978d35b8129593402675d86767f9787684 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b73d2c978d35b8129593402675d86… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 16 23:34:04 2023 -0500 vkd3d-shader/ir: Check for vocp usage during IR normalization. The hull shader barrier used for this was broken by I/O normalization, since vocp is no longer exposed to the spirv backend. Restore this barrier by checking for vocp during normalization instead. --- libs/vkd3d-shader/ir.c | 7 +++++++ libs/vkd3d-shader/spirv.c | 4 +--- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index d9f92ff1..758b594b 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -550,6 +550,8 @@ struct io_normaliser uint8_t input_range_map[MAX_REG_OUTPUT][VKD3D_VEC4_SIZE]; uint8_t output_range_map[MAX_REG_OUTPUT][VKD3D_VEC4_SIZE]; uint8_t pc_range_map[MAX_REG_OUTPUT][VKD3D_VEC4_SIZE]; + + bool use_vocp; }; static bool io_normaliser_is_in_fork_or_join_phase(const struct io_normaliser *normaliser) @@ -1031,6 +1033,10 @@ static void shader_instruction_normalise_io_params(struct vkd3d_shader_instructi if (normaliser->shader_type == VKD3D_SHADER_TYPE_HULL) { reg = &ins->declaration.dst.reg; + + if (reg->type == VKD3DSPR_OUTCONTROLPOINT) + normaliser->use_vocp = true; + /* We don't need to keep OUTCONTROLPOINT or PATCHCONST input declarations since their * equivalents were declared earlier, but INCONTROLPOINT may be the first occurrence. */ if (reg->type == VKD3DSPR_OUTCONTROLPOINT || reg->type == VKD3DSPR_PATCHCONST) @@ -1138,6 +1144,7 @@ static enum vkd3d_result shader_normalise_io_registers(struct vkd3d_shader_parse shader_instruction_normalise_io_params(&normaliser.instructions.elements[i], &normaliser); parser->instructions = normaliser.instructions; + parser->shader_desc.use_vocp = normaliser.use_vocp; return VKD3D_OK; } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6faac0cc..a43d1c00 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6146,9 +6146,6 @@ static void spirv_compiler_emit_dcl_input(struct spirv_compiler *compiler, spirv_compiler_emit_input(compiler, dst); else spirv_compiler_emit_input_register(compiler, dst); - - if (dst->reg.type == VKD3DSPR_OUTCONTROLPOINT) - compiler->use_vocp = true; } static void spirv_compiler_emit_dcl_input_sysval(struct spirv_compiler *compiler, @@ -9722,6 +9719,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, memset(&shader_desc->input_signature, 0, sizeof(shader_desc->input_signature)); memset(&shader_desc->output_signature, 0, sizeof(shader_desc->output_signature)); memset(&shader_desc->patch_constant_signature, 0, sizeof(shader_desc->patch_constant_signature)); + compiler->use_vocp = parser->shader_desc.use_vocp; if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) spirv_compiler_emit_shader_signature_outputs(compiler); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 912267e0..2b22e536 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -958,6 +958,8 @@ struct vkd3d_shader_desc { uint32_t used, external; } flat_constant_count[3]; + + bool use_vocp; }; struct vkd3d_shader_register_semantic

1 0

Zebediah Figura : vkd3d-shader/spirv: Remove handling of VKD3DSPR_OUTCONTROLPOINT.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: fa23165cc019a2f1cab53c1bc5ee0c482138bd20 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fa23165cc019a2f1cab53c1bc5ee0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 16 23:49:09 2023 -0500 vkd3d-shader/spirv: Remove handling of VKD3DSPR_OUTCONTROLPOINT. I/O normalization removes this register type. --- libs/vkd3d-shader/spirv.c | 1 - libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a43d1c00..d6cbab70 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4862,7 +4862,6 @@ static void spirv_compiler_emit_shader_phase_input(struct spirv_compiler *compil spirv_compiler_emit_input_register(compiler, dst); return; case VKD3DSPR_OUTPOINTID: /* Emitted in spirv_compiler_emit_initial_declarations(). */ - case VKD3DSPR_OUTCONTROLPOINT: /* See spirv_compiler_leave_shader_phase(). */ return; default: FIXME("Unhandled shader phase input register %#x.\n", reg->type); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 2b22e536..fd7f890b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1119,7 +1119,7 @@ static inline bool vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_ static inline bool vkd3d_shader_register_is_input(const struct vkd3d_shader_register *reg) { - return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT || reg->type == VKD3DSPR_OUTCONTROLPOINT; + return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT; } static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_register *reg)

1 0

Jacek Caban : shcore: Avoid implicit enum casts.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 5d7156f10b54a23670ba8c235bcd1512a7be1460 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d7156f10b54a23670ba8c235bcd15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:44:24 2023 +0200 shcore: Avoid implicit enum casts. --- dlls/shcore/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index a195d8f307a..67ee3b25171 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -67,7 +67,7 @@ HRESULT WINAPI GetProcessDpiAwareness(HANDLE process, PROCESS_DPI_AWARENESS *val HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS value) { - if (SetProcessDpiAwarenessInternal( value )) return S_OK; + if (SetProcessDpiAwarenessInternal( (DPI_AWARENESS)value )) return S_OK; return HRESULT_FROM_WIN32( GetLastError() ); }

1 0

Jacek Caban : webservices: Store xmlbuf encoding as unsigned int.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 88ec915034d2947088213e79de0b20ade85d372b URL: https://gitlab.winehq.org/wine/wine/-/commit/88ec915034d2947088213e79de0b20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:45:52 2023 +0200 webservices: Store xmlbuf encoding as unsigned int. Avoids enum casts when it's used for reader. --- dlls/webservices/heap.c | 2 +- dlls/webservices/webservices_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 93c57d523bd..b2ee514b970 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -320,7 +320,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void } #define XML_BUFFER_INITIAL_ALLOCATED_SIZE 256 -struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap, SIZE_T size, WS_XML_WRITER_ENCODING_TYPE encoding, WS_CHARSET charset, +struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap, SIZE_T size, unsigned int encoding, WS_CHARSET charset, const WS_XML_DICTIONARY *dict_static, WS_XML_DICTIONARY *dict ) { struct xmlbuf *ret; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 806d79ba4f2..e4a76afb7dd 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -27,7 +27,7 @@ struct xmlbuf WS_HEAP *heap; WS_BYTES bytes; SIZE_T size; - WS_XML_WRITER_ENCODING_TYPE encoding; + unsigned int encoding; WS_CHARSET charset; const WS_XML_DICTIONARY *dict_static; WS_XML_DICTIONARY *dict; @@ -38,7 +38,7 @@ void *ws_alloc_zero( WS_HEAP *, SIZE_T ); void *ws_realloc( WS_HEAP *, void *, SIZE_T, SIZE_T ); void *ws_realloc_zero( WS_HEAP *, void *, SIZE_T, SIZE_T ); void ws_free( WS_HEAP *, void *, SIZE_T ); -struct xmlbuf *alloc_xmlbuf( WS_HEAP *, SIZE_T, WS_XML_WRITER_ENCODING_TYPE, WS_CHARSET, +struct xmlbuf *alloc_xmlbuf( WS_HEAP *, SIZE_T, unsigned int, WS_CHARSET, const WS_XML_DICTIONARY *, WS_XML_DICTIONARY * ); void free_xmlbuf( struct xmlbuf * );

1 0

Gabriel Ivăncescu : mshtml: Release the returned lists from Gecko's QuerySelectorAll even on error.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 137a36529d5f9a1e1bdd20b7bed1ab40bc141ab6 URL: https://gitlab.winehq.org/wine/wine/-/commit/137a36529d5f9a1e1bdd20b7bed1ab… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:58 2023 +0200 mshtml: Release the returned lists from Gecko's QuerySelectorAll even on error. Gecko may return a pseudo-element-list even on error (such as with an invalid selector, for example), which holds refs to elements and leaks. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 18 ++++++++++++++---- dlls/mshtml/htmlelem.c | 4 +++- dlls/mshtml/script.c | 4 +++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4daf5ccc58d..540bbbd1626 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2685,7 +2685,7 @@ static HRESULT WINAPI HTMLDocument3_getElementsByName(IHTMLDocument3 *iface, BST IHTMLElementCollection **ppelColl) { HTMLDocumentNode *This = impl_from_IHTMLDocument3(iface); - nsIDOMNodeList *node_list; + nsIDOMNodeList *node_list = NULL; nsAString selector_str; WCHAR *selector; nsresult nsres; @@ -2715,6 +2715,8 @@ static HRESULT WINAPI HTMLDocument3_getElementsByName(IHTMLDocument3 *iface, BST free(selector); if(NS_FAILED(nsres)) { ERR("QuerySelectorAll failed: %08lx\n", nsres); + if(node_list) + nsIDOMNodeList_Release(node_list); return E_FAIL; } @@ -2781,12 +2783,15 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, return E_UNEXPECTED; } + nslist = NULL; nsAString_InitDepend(&nsstr, v); nsres = nsIDOMDocumentFragment_QuerySelectorAll(docfrag, &nsstr, &nslist); nsAString_Finish(&nsstr); nsIDOMDocumentFragment_Release(docfrag); if(NS_FAILED(nsres)) { ERR("QuerySelectorAll failed: %08lx\n", nsres); + if(nslist) + nsIDOMNodeList_Release(nslist); return E_FAIL; } } @@ -4751,7 +4756,7 @@ static HRESULT WINAPI DocumentSelector_querySelector(IDocumentSelector *iface, B static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) { HTMLDocumentNode *This = impl_from_IDocumentSelector(iface); - nsIDOMNodeList *node_list; + nsIDOMNodeList *node_list = NULL; nsAString nsstr; nsresult nsres; HRESULT hres; @@ -4773,6 +4778,8 @@ static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface if(NS_FAILED(nsres)) { WARN("QuerySelectorAll failed: %08lx\n", nsres); + if(node_list) + nsIDOMNodeList_Release(node_list); return map_nsresult(nsres); } @@ -5946,7 +5953,7 @@ static HRESULT HTMLDocumentNode_next_dispid(DispatchEx *dispex, DISPID id, DISPI { DWORD idx = (id == DISPID_STARTENUM) ? 0 : id - MSHTML_DISPID_CUSTOM_MIN + 1; HTMLDocumentNode *This = impl_from_DispatchEx(dispex); - nsIDOMNodeList *node_list; + nsIDOMNodeList *node_list = NULL; const PRUnichar *name; nsIDOMElement *nselem; nsIDOMNode *nsnode; @@ -5973,8 +5980,11 @@ static HRESULT HTMLDocumentNode_next_dispid(DispatchEx *dispex, DISPID id, DISPI nsAString_InitDepend(&nsstr, L":-moz-any(applet,embed,form,iframe,img,object)[name]"); nsres = nsIDOMHTMLDocument_QuerySelectorAll(This->html_document, &nsstr, &node_list); nsAString_Finish(&nsstr); - if(NS_FAILED(nsres)) + if(NS_FAILED(nsres)) { + if(node_list) + nsIDOMNodeList_Release(node_list); return map_nsresult(nsres); + } for(i = 0, hres = S_OK; SUCCEEDED(hres); i++) { nsres = nsIDOMNodeList_Item(node_list, i, &nsnode); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cfc84523436..687e62f1784 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6476,7 +6476,7 @@ static HRESULT WINAPI ElementSelector_querySelector(IElementSelector *iface, BST static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) { HTMLElement *This = impl_from_IElementSelector(iface); - nsIDOMNodeList *node_list; + nsIDOMNodeList *node_list = NULL; nsAString nsstr; nsresult nsres; HRESULT hres; @@ -6493,6 +6493,8 @@ static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, nsAString_Finish(&nsstr); if(NS_FAILED(nsres)) { WARN("QuerySelectorAll failed: %08lx\n", nsres); + if(node_list) + nsIDOMNodeList_Release(node_list); return map_nsresult(nsres); } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index ad44a1ace41..149abcf70e2 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1605,9 +1605,9 @@ void bind_event_scripts(HTMLDocumentNode *doc) { HTMLPluginContainer *plugin_container; nsIDOMHTMLScriptElement *nsscript; + nsIDOMNodeList *node_list = NULL; HTMLScriptElement *script_elem; EventTarget *event_target; - nsIDOMNodeList *node_list; nsIDOMNode *script_node; nsAString selector_str; IDispatch *event_disp; @@ -1626,6 +1626,8 @@ void bind_event_scripts(HTMLDocumentNode *doc) nsAString_Finish(&selector_str); if(NS_FAILED(nsres)) { ERR("QuerySelectorAll failed: %08lx\n", nsres); + if(node_list) + nsIDOMNodeList_Release(node_list); return; }

1 0

Gabriel Ivăncescu : mshtml: Fix window leak on error in async_stop_request.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 4b3cee0c5d6a93986f0bf3ed6b5aa9732ddb1f2f URL: https://gitlab.winehq.org/wine/wine/-/commit/4b3cee0c5d6a93986f0bf3ed6b5aa9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:58 2023 +0200 mshtml: Fix window leak on error in async_stop_request. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 373cfa03585..90ca22ea8b1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1415,16 +1415,16 @@ static HRESULT async_stop_request(nsChannelBSC *This) stop_request_task_t *task; HRESULT hres; + task = malloc(sizeof(*task)); + if(!task) + return E_OUTOFMEMORY; + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); if(!This->bsc.read) { TRACE("No data read, calling OnStartRequest\n"); on_start_nsrequest(This); } - task = malloc(sizeof(*task)); - if(!task) - return E_OUTOFMEMORY; - IBindStatusCallback_AddRef(&This->bsc.IBindStatusCallback_iface); task->bsc = This;

1 0

Gabriel Ivăncescu : jscript: Fix EnumVARIANT leak in enumerators.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 0a4b70a5f6a4bb5211c0dd5afd43e0f732645a42 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a4b70a5f6a4bb5211c0dd5afd43e0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript: Fix EnumVARIANT leak in enumerators. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/enumerator.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index d724d0685c9..d962c65d229 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -84,6 +84,8 @@ static void Enumerator_destructor(jsdisp_t *dispex) TRACE("\n"); + if(This->enumvar) + IEnumVARIANT_Release(This->enumvar); jsval_release(This->item); free(dispex); }

1 0