- Wine-Commits - list.winehq.org

Giovanni Mascellani : vkd3d: Do not allow synchronization primitives to fail.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: vkd3d Branch: master Commit: 552926cfca64db45e9731f675c65a7214bfa6441 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/552926cfca64db45e9731f675c65a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 27 16:45:05 2023 +0100 vkd3d: Do not allow synchronization primitives to fail. In practice they never fail. If they fail, it means that there is some underlying platform problem and there is little we can do anyway. Under pthreads function prototypes allow returning failure, but that's only used for "error checking" mutexes, which we don't use. On the other hand, error handling in vkd3d is rather inconsistent: sometimes the errors are ignored, sometimes logged, sometimes passed to the caller. It's hard to handle failures appropriately if you can't even keep your state consistent, so I think it's better to avoid trying, assume that synchronization primitives do not fail and at least have consistent logging if something goes wrong. --- libs/vkd3d/command.c | 245 +++++++-------------------------------------- libs/vkd3d/device.c | 45 ++------- libs/vkd3d/resource.c | 23 +---- libs/vkd3d/state.c | 39 ++------ libs/vkd3d/utils.c | 21 +--- libs/vkd3d/vkd3d_private.h | 111 ++++++++++++-------- 6 files changed, 129 insertions(+), 355 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/spirv: Introduce an option to control whether point size is written.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: vkd3d Branch: master Commit: 8fc8d34ea006d298a29032b140a363b0a3faddbb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8fc8d34ea006d298a29032b140a36… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 26 14:28:18 2023 -0600 vkd3d-shader/spirv: Introduce an option to control whether point size is written. --- include/vkd3d_shader.h | 12 ++++++++++++ libs/vkd3d-shader/spirv.c | 22 ++++++++++++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7b9c0ff7..86ffb9d5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -150,6 +150,18 @@ enum vkd3d_shader_compile_option_name VKD3D_SHADER_COMPILE_OPTION_API_VERSION = 0x00000004, /** \a value is a member of enum vkd3d_shader_compile_option_typed_uav. \since 1.5 */ VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV = 0x00000005, + /** + * If \a value is nonzero, write the point size for Vulkan tessellation and + * geometry shaders. This option should be enabled if and only if the + * shaderTessellationAndGeometryPointSize feature is enabled. The default + * value is nonzero, i.e. write the point size. + * + * This option is supported by vkd3d_shader_compile() for the SPIR-V target + * type and Vulkan targets; it should not be enabled otherwise. + * + * \since 1.6 + */ + VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE = 0x00000006, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 417cdc92..f0cfee47 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2285,6 +2285,7 @@ struct spirv_compiler struct vkd3d_shader_spec_constant *spec_constants; size_t spec_constants_size; enum vkd3d_shader_compile_option_formatting_flags formatting; + bool write_tess_geom_point_size; struct vkd3d_string_buffer_cache string_buffers; }; @@ -2351,6 +2352,7 @@ struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version * compiler->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; + compiler->write_tess_geom_point_size = true; for (i = 0; i < compile_info->option_count; ++i) { @@ -2389,6 +2391,10 @@ struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version * else WARN("Ignoring unrecognised value %#x for option %#x.\n", option->value, option->name); break; + + case VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE: + compiler->write_tess_geom_point_size = option->value; + break; } } @@ -6348,10 +6354,18 @@ static void spirv_compiler_emit_point_size(struct spirv_compiler *compiler) /* Set the point size. Point sprites are not supported in d3d10+, but * point primitives can still be used with e.g. stream output. Vulkan * requires the point size to always be explicitly defined when outputting - * points. */ - vkd3d_spirv_build_op_store(&compiler->spirv_builder, - spirv_compiler_emit_builtin_variable(compiler, &point_size, SpvStorageClassOutput, 0), - spirv_compiler_get_constant_float(compiler, 1.0f), SpvMemoryAccessMaskNone); + * points. + * + * If shaderTessellationAndGeometryPointSize is disabled, we must not write + * PointSize for tessellation and geometry shaders. In that case the point + * size defaults to 1.0. */ + if (spirv_compiler_is_opengl_target(compiler) || compiler->shader_type == VKD3D_SHADER_TYPE_VERTEX + || compiler->write_tess_geom_point_size) + { + vkd3d_spirv_build_op_store(&compiler->spirv_builder, + spirv_compiler_emit_builtin_variable(compiler, &point_size, SpvStorageClassOutput, 0), + spirv_compiler_get_constant_float(compiler, 1.0f), SpvMemoryAccessMaskNone); + } } static void spirv_compiler_emit_dcl_output_topology(struct spirv_compiler *compiler,

1 0

Zebediah Figura : vkd3d: Do not write the point size for SPIR-V shaders.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: vkd3d Branch: master Commit: a66fe31fe536a779eff019a2c6a616fdc54fb16d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a66fe31fe536a779eff019a2c6a61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 26 14:29:03 2023 -0600 vkd3d: Do not write the point size for SPIR-V shaders. We disable shaderTessellationAndGeometryPointSize. --- libs/vkd3d/state.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5ba5eb81..02f739d2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1966,6 +1966,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, { {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_6}, {VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV, typed_uav_compile_option(device)}, + {VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE, 0}, }; stage_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;

1 0

Brendan Shanks : taskmgr: Use exit code 1 when terminating processes.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: 2da1126021faf1a455d1e48f6828640bdd046136 URL: https://gitlab.winehq.org/wine/wine/-/commit/2da1126021faf1a455d1e48f682864… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Feb 1 13:34:38 2023 -0800 taskmgr: Use exit code 1 when terminating processes. --- programs/taskmgr/endproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c index 498186212b7..0d2752be9ac 100644 --- a/programs/taskmgr/endproc.c +++ b/programs/taskmgr/endproc.c @@ -83,7 +83,7 @@ void ProcessPage_OnEndProcess(void) return; } - if (!TerminateProcess(hProcess, 0)) + if (!TerminateProcess(hProcess, 1)) { GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); @@ -133,7 +133,7 @@ void ProcessPage_OnEndProcessTree(void) return; } - if (!TerminateProcess(hProcess, 0)) + if (!TerminateProcess(hProcess, 1)) { GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP);

1 0

Brendan Shanks : taskkill: Use exit code 1 when terminating processes.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: fe6294c74346e9956fb839d2a4ca078c624f6bbf URL: https://gitlab.winehq.org/wine/wine/-/commit/fe6294c74346e9956fb839d2a4ca07… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Feb 1 13:37:11 2023 -0800 taskkill: Use exit code 1 when terminating processes. --- programs/taskkill/taskkill.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 2904e64f40a..424e87b9a44 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -341,7 +341,7 @@ static int terminate_processes(void) continue; } - if (!TerminateProcess(process, 0)) + if (!TerminateProcess(process, 1)) { taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); status_code = 1; @@ -381,7 +381,7 @@ static int terminate_processes(void) continue; } - if (!TerminateProcess(process, 0)) + if (!TerminateProcess(process, 1)) { taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); status_code = 1;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support dot() for SM1.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: vkd3d Branch: master Commit: 06f300ec59a6e684b7d65014159e7bbd78269ae6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/06f300ec59a6e684b7d65014159e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 23:56:00 2023 +0300 vkd3d-shader/hlsl: Support dot() for SM1. --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 57 ++++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_sm1.c | 50 ++++++++++++++++++++++++++++++++++- 4 files changed, 108 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 256e466a..6b8e1b10 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1768,6 +1768,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP2_NEQUAL] = "!=", [HLSL_OP2_RSHIFT] = ">>", + [HLSL_OP3_DP2ADD] = "dp2add", [HLSL_OP3_LERP] = "lerp", }; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index bb63f827..2d0beb6c 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -497,6 +497,7 @@ enum hlsl_ir_expr_op HLSL_OP2_NEQUAL, HLSL_OP2_RSHIFT, + HLSL_OP3_DP2ADD, HLSL_OP3_LERP, }; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 4fa860a6..aa950e35 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1535,6 +1535,62 @@ static bool lower_sqrt(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *c return true; } +/* Lower DP2 to MUL + ADD */ +static bool lower_dot(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_node *arg1, *arg2, *mul, *replacement; + struct hlsl_ir_swizzle *add_x, *add_y; + struct hlsl_ir_constant *zero; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + arg1 = expr->operands[0].node; + arg2 = expr->operands[1].node; + if (expr->op != HLSL_OP2_DOT) + return false; + if (arg1->data_type->dimx != 2) + return false; + + if (ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) + { + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = { 0 }; + + if (!(zero = hlsl_new_float_constant(ctx, 0.0f, &expr->node.loc))) + return false; + list_add_before(&instr->entry, &zero->node.entry); + + operands[0] = arg1; + operands[1] = arg2; + operands[2] = &zero->node; + + if (!(replacement = hlsl_new_expr(ctx, HLSL_OP3_DP2ADD, operands, instr->data_type, &expr->node.loc))) + return false; + } + else + { + if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, expr->operands[0].node, expr->operands[1].node))) + return false; + list_add_before(&instr->entry, &mul->entry); + + if (!(add_x = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, X, X, X), instr->data_type->dimx, mul, &expr->node.loc))) + return false; + list_add_before(&instr->entry, &add_x->node.entry); + + if (!(add_y = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Y, Y, Y, Y), instr->data_type->dimx, mul, &expr->node.loc))) + return false; + list_add_before(&instr->entry, &add_y->node.entry); + + if (!(replacement = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, &add_x->node, &add_y->node))) + return false; + } + list_add_before(&instr->entry, &replacement->entry); + + hlsl_replace_node(instr, replacement); + return true; +} + static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_type *type = instr->data_type, *arg_type; @@ -2949,6 +3005,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry { transform_ir(ctx, lower_division, body, NULL); transform_ir(ctx, lower_sqrt, body, NULL); + transform_ir(ctx, lower_dot, body, NULL); } transform_ir(ctx, validate_static_object_references, body, NULL); diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index facf81b8..a09d7566 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -422,7 +422,7 @@ struct sm1_instruction D3DSHADER_PARAM_SRCMOD_TYPE mod; unsigned int swizzle; uint32_t reg; - } srcs[2]; + } srcs[3]; unsigned int src_count; unsigned int has_dst; @@ -459,6 +459,33 @@ static void write_sm1_instruction(struct hlsl_ctx *ctx, struct vkd3d_bytecode_bu write_sm1_src_register(buffer, &instr->srcs[i], instr->dst.writemask); }; +static void write_sm1_ternary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, + const struct hlsl_reg *src1, const struct hlsl_reg *src2, const struct hlsl_reg *src3) +{ + const struct sm1_instruction instr = + { + .opcode = opcode, + + .dst.type = D3DSPR_TEMP, + .dst.writemask = dst->writemask, + .dst.reg = dst->id, + .has_dst = 1, + + .srcs[0].type = D3DSPR_TEMP, + .srcs[0].swizzle = hlsl_swizzle_from_writemask(src1->writemask), + .srcs[0].reg = src1->id, + .srcs[1].type = D3DSPR_TEMP, + .srcs[1].swizzle = hlsl_swizzle_from_writemask(src2->writemask), + .srcs[1].reg = src2->id, + .srcs[2].type = D3DSPR_TEMP, + .srcs[2].swizzle = hlsl_swizzle_from_writemask(src3->writemask), + .srcs[2].reg = src3->id, + .src_count = 3, + }; + write_sm1_instruction(ctx, buffer, &instr); +} + static void write_sm1_binary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, const struct hlsl_reg *src1, const struct hlsl_reg *src2) @@ -631,6 +658,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); struct hlsl_ir_node *arg1 = expr->operands[0].node; struct hlsl_ir_node *arg2 = expr->operands[1].node; + struct hlsl_ir_node *arg3 = expr->operands[2].node; assert(instr->reg.allocated); @@ -679,6 +707,26 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm1_unary_op(ctx, buffer, D3DSIO_FRC, &instr->reg, &arg1->reg, D3DSPSM_NONE); break; + case HLSL_OP2_DOT: + switch (arg1->data_type->dimx) + { + case 4: + write_sm1_binary_op(ctx, buffer, D3DSIO_DP4, &instr->reg, &arg1->reg, &arg2->reg); + break; + + case 3: + write_sm1_binary_op(ctx, buffer, D3DSIO_DP3, &instr->reg, &arg1->reg, &arg2->reg); + break; + + default: + vkd3d_unreachable(); + } + break; + + case HLSL_OP3_DP2ADD: + write_sm1_ternary_op(ctx, buffer, D3DSIO_DP2ADD, &instr->reg, &arg1->reg, &arg2->reg, &arg3->reg); + break; + default: hlsl_fixme(ctx, &instr->loc, "SM1 \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Gabriel Ivăncescu : mshtml: Return undefined from window.XMLHttpRequest for uninitialized documents.
by Alexandre Julliard Feb. 1, 2023

Feb. 1, 2023

Module: wine Branch: master Commit: fa63e870c56dbbcb9da991c949fd6a918ea76d16 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa63e870c56dbbcb9da991c949fd6a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 1 19:26:27 2023 +0200 mshtml: Return undefined from window.XMLHttpRequest for uninitialized documents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 5 ++ dlls/mshtml/tests/dom.c | 114 ++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/events.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 257 insertions(+), 1 deletion(-)

1 0

Gabriel Ivăncescu : mshtml: Simplify dynamic props unlinking.
by Alexandre Julliard Feb. 1, 2023

Feb. 1, 2023

Module: wine Branch: master Commit: e495c256bbe6f9119c74796cdd95ba8b1d0e05a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e495c256bbe6f9119c74796cdd95ba… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 1 19:26:27 2023 +0200 mshtml: Simplify dynamic props unlinking. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 5b72f712b92..2f9453918c1 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -2024,12 +2024,7 @@ void dispex_unlink(DispatchEx *This) return; for(prop = This->dynamic_data->props; prop < This->dynamic_data->props + This->dynamic_data->prop_cnt; prop++) { - if(V_VT(&prop->var) == VT_DISPATCH) { - V_VT(&prop->var) = VT_EMPTY; - IDispatch_Release(V_DISPATCH(&prop->var)); - }else { - VariantClear(&prop->var); - } + VariantClear(&prop->var); } if(This->dynamic_data->func_disps) {

1 0

Gabriel Ivăncescu : mshtml: Embed the HTMLLocation into the outer window.
by Alexandre Julliard Feb. 1, 2023

Feb. 1, 2023

Module: wine Branch: master Commit: 9a8e628d7057fd3ff1bc872a2ff4d326c31d3655 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a8e628d7057fd3ff1bc872a2ff4d3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 1 19:26:28 2023 +0200 mshtml: Embed the HTMLLocation into the outer window. Gets rid of the issues with the cyclic dependency or detached location. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmllocation.c | 80 +++++++------------------------------------- dlls/mshtml/htmlwindow.c | 36 ++++++-------------- dlls/mshtml/mshtml_private.h | 8 ++--- 3 files changed, 25 insertions(+), 99 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 5c31ee02e04..d9e458d9c5f 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -36,28 +36,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static HRESULT get_url(HTMLLocation *This, const WCHAR **ret) +static inline HTMLOuterWindow *get_window(HTMLLocation *This) { - if(!This->window || !This->window->url) - *ret = L"about:blank"; - else - *ret = This->window->url; - return S_OK; + return CONTAINING_RECORD(This, HTMLOuterWindow, location); } static IUri *get_uri(HTMLLocation *This) { - return This->window ? This->window->uri : NULL; + return get_window(This)->uri; } static HRESULT get_url_components(HTMLLocation *This, URL_COMPONENTSW *url) { - const WCHAR *doc_url; - HRESULT hres; - - hres = get_url(This, &doc_url); - if(FAILED(hres)) - return hres; + const WCHAR *doc_url = get_window(This)->url ? get_window(This)->url : L"about:blank"; if(!InternetCrackUrlW(doc_url, 0, 0, url)) { FIXME("InternetCrackUrlW failed: 0x%08lx\n", GetLastError()); @@ -102,28 +93,13 @@ static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID r static ULONG WINAPI HTMLLocation_AddRef(IHTMLLocation *iface) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%ld\n", This, ref); - - return ref; + return IHTMLWindow2_AddRef(&get_window(This)->base.IHTMLWindow2_iface); } static ULONG WINAPI HTMLLocation_Release(IHTMLLocation *iface) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%ld\n", This, ref); - - if(!ref) { - if(This->window) - This->window->location = NULL; - release_dispex(&This->dispex); - free(This); - } - - return ref; + return IHTMLWindow2_Release(&get_window(This)->base.IHTMLWindow2_iface); } static HRESULT WINAPI HTMLLocation_GetTypeInfoCount(IHTMLLocation *iface, UINT *pctinfo) @@ -163,12 +139,7 @@ static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->window) { - FIXME("No window available\n"); - return E_FAIL; - } - - return navigate_url(This->window, v, This->window->uri, BINDING_NAVIGATED); + return navigate_url(get_window(This), v, get_uri(This), BINDING_NAVIGATED); } static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) @@ -521,11 +492,6 @@ static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->window) { - FIXME("No window available\n"); - return E_FAIL; - } - if(hash[0] != '#') { unsigned size = (1 /* # */ + wcslen(v) + 1) * sizeof(WCHAR); if(!(hash = malloc(size))) @@ -534,7 +500,7 @@ static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v) memcpy(hash + 1, v, size - sizeof(WCHAR)); } - hres = navigate_url(This->window, hash, This->window->uri, BINDING_NAVIGATED); + hres = navigate_url(get_window(This), hash, get_uri(This), BINDING_NAVIGATED); if(hash != v) free(hash); @@ -577,18 +543,13 @@ static HRESULT WINAPI HTMLLocation_reload(IHTMLLocation *iface, VARIANT_BOOL fla TRACE("(%p)->(%x)\n", This, flag); - if(!This->window) { - FIXME("No window available\n"); - return E_FAIL; - } - /* reload is supposed to fail if called from a script with different origin, but IE doesn't care */ - if(!is_main_content_window(This->window)) { + if(!is_main_content_window(get_window(This))) { FIXME("Unsupported on iframe\n"); return E_NOTIMPL; } - return reload_page(This->window); + return reload_page(get_window(This)); } static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) @@ -597,12 +558,7 @@ static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) TRACE("(%p)->(%s)\n", This, debugstr_w(bstr)); - if(!This->window) { - FIXME("No window available\n"); - return E_FAIL; - } - - return navigate_url(This->window, bstr, This->window->uri, BINDING_NAVIGATED | BINDING_REPLACE); + return navigate_url(get_window(This), bstr, get_uri(This), BINDING_NAVIGATED | BINDING_REPLACE); } static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) @@ -662,22 +618,10 @@ static dispex_static_data_t HTMLLocation_dispex = { HTMLLocation_iface_tids }; - -HRESULT HTMLLocation_Create(HTMLOuterWindow *window, HTMLLocation **ret) +void HTMLLocation_Init(HTMLLocation *location) { - HTMLLocation *location; - - location = malloc(sizeof(*location)); - if(!location) - return E_OUTOFMEMORY; - location->IHTMLLocation_iface.lpVtbl = &HTMLLocationVtbl; - location->ref = 1; - location->window = window; init_dispatch(&location->dispex, (IUnknown*)&location->IHTMLLocation_iface, &HTMLLocation_dispex, COMPAT_MODE_QUIRKS); - - *ret = location; - return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e678c9f99e0..ed497eacf4e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -67,19 +67,13 @@ static inline BOOL is_outer_window(HTMLWindow *window) return &window->outer_window->base == window; } -static HRESULT get_location(HTMLOuterWindow *This, HTMLLocation **ret) +static void get_location(HTMLOuterWindow *This, HTMLLocation **ret) { - if(!This->location) { - HRESULT hres; + if(!This->location.dispex.outer) + HTMLLocation_Init(&This->location); - hres = HTMLLocation_Create(This, &This->location); - if(FAILED(hres)) - return hres; - } - - IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface); - *ret = This->location; - return S_OK; + IHTMLLocation_AddRef(&This->location.IHTMLLocation_iface); + *ret = &This->location; } void get_top_window(HTMLOuterWindow *window, HTMLOuterWindow **ret) @@ -133,8 +127,8 @@ static void detach_inner_window(HTMLInnerWindow *window) if(doc) detach_document_node(doc); - if(outer_window && outer_window->location) - dispex_unlink(&outer_window->location->dispex); + if(outer_window && outer_window->location.dispex.outer) + dispex_unlink(&outer_window->location.dispex); abort_window_bindings(window); remove_target_tasks(window->task_magic); @@ -240,10 +234,8 @@ static void release_outer_window(HTMLOuterWindow *This) if(This->base.inner_window) detach_inner_window(This->base.inner_window); - if(This->location) { - This->location->window = NULL; - IHTMLLocation_Release(&This->location->IHTMLLocation_iface); - } + if(This->location.dispex.outer) + release_dispex(&This->location.dispex); if(This->frame_element) This->frame_element->content_window = NULL; @@ -808,14 +800,10 @@ static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocatio { HTMLWindow *This = impl_from_IHTMLWindow2(iface); HTMLLocation *location; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - hres = get_location(This->outer_window, &location); - if(FAILED(hres)) - return hres; - + get_location(This->outer_window, &location); *p = &location->IHTMLLocation_iface; return S_OK; } @@ -3925,9 +3913,7 @@ static HRESULT IHTMLWindow2_location_hook(DispatchEx *dispex, WORD flags, DISPPA TRACE("forwarding to location.href\n"); - hres = get_location(This->base.outer_window, &location); - if(FAILED(hres)) - return hres; + get_location(This->base.outer_window, &location); hres = IDispatchEx_InvokeEx(&location->dispex.IDispatchEx_iface, DISPID_VALUE, 0, flags, dp, res, ei, caller); IHTMLLocation_Release(&location->IHTMLLocation_iface); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1ce25d5c862..bec982a75fc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -490,10 +490,6 @@ typedef struct { struct HTMLLocation { DispatchEx dispex; IHTMLLocation IHTMLLocation_iface; - - LONG ref; - - HTMLOuterWindow *window; }; typedef struct { @@ -576,7 +572,7 @@ struct HTMLOuterWindow { unsigned readystate_pending; HTMLInnerWindow *pending_window; - HTMLLocation *location; + HTMLLocation location; IMoniker *mon; IUri *uri; IUri *uri_nofrag; @@ -993,7 +989,7 @@ void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFactory**) DECLSPEC_HIDDEN; -HRESULT HTMLLocation_Create(HTMLOuterWindow*,HTMLLocation**) DECLSPEC_HIDDEN; +void HTMLLocation_Init(HTMLLocation*) DECLSPEC_HIDDEN; HRESULT create_navigator(compat_mode_t,IOmNavigator**) DECLSPEC_HIDDEN; HRESULT create_html_screen(compat_mode_t,IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_performance(HTMLInnerWindow*,IHTMLPerformance**) DECLSPEC_HIDDEN;

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink builtin func disps.
by Alexandre Julliard Feb. 1, 2023

Feb. 1, 2023

Module: wine Branch: master Commit: f43f96762ec71015b4eccfa4f430135e8701a305 URL: https://gitlab.winehq.org/wine/wine/-/commit/f43f96762ec71015b4eccfa4f43013… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 1 19:26:27 2023 +0200 mshtml: Traverse and unlink builtin func disps. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 1d00012572b..5b72f712b92 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -2003,7 +2003,17 @@ void dispex_traverse(DispatchEx *This, nsCycleCollectionTraversalCallback *cb) note_cc_edge((nsISupports*)V_DISPATCH(&prop->var), "dispex_data", cb); } - /* FIXME: Traverse func_disps */ + if(This->dynamic_data->func_disps) { + func_obj_entry_t *iter = This->dynamic_data->func_disps, *end = iter + This->info->func_disp_cnt; + + for(iter = This->dynamic_data->func_disps; iter < end; iter++) { + if(!iter->func_obj) + continue; + note_cc_edge((nsISupports*)&iter->func_obj->dispex.IDispatchEx_iface, "func_obj", cb); + if(V_VT(&iter->val) == VT_DISPATCH) + note_cc_edge((nsISupports*)V_DISPATCH(&iter->val), "func_val", cb); + } + } } void dispex_unlink(DispatchEx *This) @@ -2021,6 +2031,21 @@ void dispex_unlink(DispatchEx *This) VariantClear(&prop->var); } } + + if(This->dynamic_data->func_disps) { + func_obj_entry_t *iter = This->dynamic_data->func_disps, *end = iter + This->info->func_disp_cnt; + + for(iter = This->dynamic_data->func_disps; iter < end; iter++) { + if(!iter->func_obj) + continue; + iter->func_obj->obj = NULL; + IDispatchEx_Release(&iter->func_obj->dispex.IDispatchEx_iface); + VariantClear(&iter->val); + } + + free(This->dynamic_data->func_disps); + This->dynamic_data->func_disps = NULL; + } } const void *dispex_get_vtbl(DispatchEx *dispex)

1 0