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

Tim Clem : ntdll: Treat read faults on readable pages as write faults on macOS.
by Alexandre Julliard 22 Jun '23

22 Jun '23

Module: wine Branch: master Commit: 1b310a5aba1018bf671da4624daddc48bcfb8639 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b310a5aba1018bf671da4624daddc… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Feb 4 13:56:00 2022 -0800 ntdll: Treat read faults on readable pages as write faults on macOS. Working around a Rosetta bug on Apple Silicon - faults for certain instructions (e.g. lock cmpxchg8b) are misreported, which can break VPROT_WRITEWATCH handling. --- dlls/ntdll/unix/virtual.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 9a42db3c77a..8621b2ac6aa 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3692,6 +3692,16 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) mutex_lock( &virtual_mutex ); /* no need for signal masking inside signal handler */ vprot = get_page_vprot( page ); + +#ifdef __APPLE__ + /* Rosetta on Apple Silicon misreports certain write faults as read faults. */ + if (err == EXCEPTION_READ_FAULT && (get_unix_prot( vprot ) & PROT_READ)) + { + WARN( "treating read fault in a readable page as a write fault, addr %p\n", addr ); + err = EXCEPTION_WRITE_FAULT; + } +#endif + if (!is_inside_signal_stack( stack ) && (vprot & VPROT_GUARD)) { struct thread_stack_info stack_info;

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink AreaElements properly.
by Alexandre Julliard 22 Jun '23

22 Jun '23

Module: wine Branch: master Commit: 77fe549d3e5d448eafe28a7ec785a706cb63c271 URL: https://gitlab.winehq.org/wine/wine/-/commit/77fe549d3e5d448eafe28a7ec785a7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 21:12:50 2023 +0300 mshtml: Traverse and unlink AreaElements properly. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlarea.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index eb7ea383db9..c518432519d 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -461,6 +461,26 @@ fallback: return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } +static void HTMLAreaElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsarea) + note_cc_edge((nsISupports*)This->nsarea, "nsarea", cb); +} + +static void HTMLAreaElement_unlink(HTMLDOMNode *iface) +{ + HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsarea) { + nsIDOMHTMLAreaElement *nsarea = This->nsarea; + + This->nsarea = NULL; + nsIDOMHTMLAreaElement_Release(nsarea); + } +} + static const NodeImplVtbl HTMLAreaElementImplVtbl = { &CLSID_HTMLAreaElement, HTMLAreaElement_QI, @@ -468,7 +488,18 @@ static const NodeImplVtbl HTMLAreaElementImplVtbl = { HTMLElement_cpc, HTMLElement_clone, HTMLAreaElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLAreaElement_traverse, + HTMLAreaElement_unlink }; static const tid_t HTMLAreaElement_iface_tids[] = {

1 0

Gabriel Ivăncescu : mshtml: Fix style declaration leak in HTMLStyle_Create.
by Alexandre Julliard 22 Jun '23

22 Jun '23

Module: wine Branch: master Commit: f428c1feb5031b2c34cc48045d6c6592e4a7f09f URL: https://gitlab.winehq.org/wine/wine/-/commit/f428c1feb5031b2c34cc48045d6c65… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 21:12:50 2023 +0300 mshtml: Fix style declaration leak in HTMLStyle_Create. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstyle.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 703fbeeb942..c8dc69bb2af 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -10099,6 +10099,7 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) init_css_style(&style->css_style, nsstyle, HTMLStyle_QI, &HTMLStyle_dispex, dispex_compat_mode(&elem->node.event_target.dispex)); + nsIDOMCSSStyleDeclaration_Release(nsstyle); *ret = style; return S_OK;

1 0

Gabriel Ivăncescu : mshtml: Fix nsIDOMNode leak when retrieving an item in the node list.
by Alexandre Julliard 22 Jun '23

22 Jun '23

Module: wine Branch: master Commit: 21df8bd5aae1ece849d9cfae51f002af87c4a98a URL: https://gitlab.winehq.org/wine/wine/-/commit/21df8bd5aae1ece849d9cfae51f002… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 21:12:50 2023 +0300 mshtml: Fix nsIDOMNode leak when retrieving an item in the node list. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlnode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 02f3e2929b2..f15718f1b90 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -338,6 +338,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection } hres = get_node(nsnode, TRUE, &node); + nsIDOMNode_Release(nsnode); if(FAILED(hres)) return hres;

1 0

Gabriel Ivăncescu : mshtml: Fix node leak when enumerating nodes.
by Alexandre Julliard 22 Jun '23

22 Jun '23

Module: wine Branch: master Commit: 1bce7be3e1c6504c30d1d7ca9281157fc0fe818d URL: https://gitlab.winehq.org/wine/wine/-/commit/1bce7be3e1c6504c30d1d7ca928115… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 21:12:50 2023 +0300 mshtml: Fix node leak when enumerating nodes. get_node already adds a ref. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlnode.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index f15718f1b90..c967f2f474b 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -140,7 +140,6 @@ static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Next(IEnumVARIANT *iface, UL } V_VT(rgVar+fetched) = VT_DISPATCH; - IHTMLDOMNode_AddRef(&node->IHTMLDOMNode_iface); V_DISPATCH(rgVar+fetched) = (IDispatch*)&node->IHTMLDOMNode_iface; fetched++; }

1 0

Gabriel Ivăncescu : mshtml: Handle failure and cleanup properly when enumerating nodes.
by Alexandre Julliard 22 Jun '23

22 Jun '23

Module: wine Branch: master Commit: 7d8fd7df8f13979e8f6838b577cc56c8ebe6cff3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d8fd7df8f13979e8f6838b577cc56… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 21:12:50 2023 +0300 mshtml: Handle failure and cleanup properly when enumerating nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlnode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index c967f2f474b..b29383ad9ff 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -135,8 +135,9 @@ static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Next(IEnumVARIANT *iface, UL hres = get_node(nsnode, TRUE, &node); nsIDOMNode_Release(nsnode); if(FAILED(hres)) { - ERR("get_node failed: %08lx\n", hres); - break; + while(fetched--) + VariantClear(rgVar+fetched); + return hres; } V_VT(rgVar+fetched) = VT_DISPATCH;

1 0

Gabriel Ivăncescu : mshtml: Fix leaks in create_all_list.
by Alexandre Julliard 22 Jun '23

22 Jun '23

Module: wine Branch: master Commit: ffb56bf700a234e3e36994fcea3d4380f74b6c3e URL: https://gitlab.winehq.org/wine/wine/-/commit/ffb56bf700a234e3e36994fcea3d43… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 21:12:50 2023 +0300 mshtml: Fix leaks in create_all_list. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelemcol.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 6172bc2d57e..75c86a8b4dd 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -656,8 +656,6 @@ static void create_all_list(HTMLDOMNode *elem, elem_vector_t *buf) } nsIDOMNodeList_GetLength(nsnode_list, &list_len); - if(!list_len) - return; for(i=0; i<list_len; i++) { nsres = nsIDOMNodeList_Item(nsnode_list, i, &iter); @@ -672,13 +670,18 @@ static void create_all_list(HTMLDOMNode *elem, elem_vector_t *buf) hres = get_node(iter, TRUE, &node); if(FAILED(hres)) { FIXME("get_node failed: %08lx\n", hres); + nsIDOMNode_Release(iter); continue; } elem_vector_add(buf, elem_from_HTMLDOMNode(node)); create_all_list(node, buf); } + + nsIDOMNode_Release(iter); } + + nsIDOMNodeList_Release(nsnode_list); } IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_root)

1 0

Tatsuyuki Ishi : win32u: Avoid SEGV in QueryDisplayConfig when run as service.
by Alexandre Julliard 22 Jun '23

22 Jun '23

Module: wine Branch: master Commit: 9d255d6d0c3264b733b813fd9defb1247b18ba39 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d255d6d0c3264b733b813fd9defb1… Author: Tatsuyuki Ishi <ishitatsuyuki(a)gmail.com> Date: Thu Jun 22 16:32:45 2023 +0900 win32u: Avoid SEGV in QueryDisplayConfig when run as service. The virtual_monitor used for non-interactive service executions do not have an adapter set. Avoid segfaulting and poisoning the mutex in such cases. --- dlls/win32u/sysparams.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 44ee33c80f0..acda600b43c 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2569,6 +2569,9 @@ LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *paths_count, DISPLAY if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + if (!monitor->adapter) + continue; + adapter_index = monitor->adapter->id; gpu_luid = &monitor->adapter->gpu_luid; output_id = monitor->output_id;

1 0

Tag vkd3d-1.8 : Alexandre Julliard : Release 1.8
by Alexandre Julliard 22 Jun '23

22 Jun '23

Module: vkd3d Branch: refs/tags/vkd3d-1.8 Tag: 8f40fd9e22fe38f2cf37609a1a4b3da8f2ca2f57 URL: https://gitlab.winehq.org/wine/vkd3d/-/tags/8f40fd9e22fe38f2cf37609a1a4b3da… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 22:05:16 2023 +0200 Release 1.8

1 0

Francisco Casas : vkd3d-shader/d3dbc: Avoid hlsl_type_get_regset() in d3dbc.c.
by Alexandre Julliard 22 Jun '23

22 Jun '23

Module: vkd3d Branch: master Commit: c1ca0dafe843b0ca7381876e1101fac1cdc7c747 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c1ca0dafe843b0ca7381876e1101f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jun 9 12:23:25 2023 -0400 vkd3d-shader/d3dbc: Avoid hlsl_type_get_regset() in d3dbc.c. In SM1 we can expect all variables to always belong to a single regset. structs in particular, should always be allocated to HLSL_REGSET_NUM, since they are only allowed if all their components are numeric. We are not covering the structs case because of the use of hlsl_type_get_regset(), which is currently not defined for structs. So the current shader struct { float4 a; float4 b; } apple; float4 main() : sv_target { return apple.a + apple.b; } fails with vkd3d/libs/vkd3d-shader/hlsl.c:224: Aborting, reached unreachable code. The solution is to iterate over all regsets to find the one where the variable is allocated (if any), and ignore all others. --- libs/vkd3d-shader/d3dbc.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index c35f8ca0..712613ac 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1281,10 +1281,13 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - enum hlsl_regset regset = hlsl_type_get_regset(var->data_type); + unsigned int r; - if (!var->semantic.name && var->regs[regset].allocated) + for (r = 0; r <= HLSL_REGSET_LAST; ++r) { + if (var->semantic.name || !var->regs[r].allocated) + continue; + ++uniform_count; if (var->is_param && var->is_uniform) @@ -1321,20 +1324,23 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - enum hlsl_regset regset = hlsl_type_get_regset(var->data_type); + unsigned int r; - if (!var->semantic.name && var->regs[regset].allocated) + for (r = 0; r <= HLSL_REGSET_LAST; ++r) { + if (var->semantic.name || !var->regs[r].allocated) + continue; + put_u32(buffer, 0); /* name */ - if (regset == HLSL_REGSET_NUMERIC) + if (r == HLSL_REGSET_NUMERIC) { - put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->regs[regset].id)); - put_u32(buffer, var->data_type->reg_size[regset] / 4); + put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->regs[r].id)); + put_u32(buffer, var->data_type->reg_size[r] / 4); } else { - put_u32(buffer, vkd3d_make_u32(D3DXRS_SAMPLER, var->regs[regset].id)); - put_u32(buffer, var->regs[regset].bind_count); + put_u32(buffer, vkd3d_make_u32(D3DXRS_SAMPLER, var->regs[r].id)); + put_u32(buffer, var->regs[r].bind_count); } put_u32(buffer, 0); /* type */ put_u32(buffer, 0); /* FIXME: default value */ @@ -1345,12 +1351,16 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - enum hlsl_regset regset = hlsl_type_get_regset(var->data_type); + unsigned int r; - if (!var->semantic.name && var->regs[regset].allocated) + for (r = 0; r <= HLSL_REGSET_LAST; ++r) { - size_t var_offset = vars_start + (uniform_count * 5 * sizeof(uint32_t)); - size_t name_offset; + size_t var_offset, name_offset; + + if (var->semantic.name || !var->regs[r].allocated) + continue; + + var_offset = vars_start + (uniform_count * 5 * sizeof(uint32_t)); name_offset = put_string(buffer, var->name); set_u32(buffer, var_offset, name_offset - ctab_start);

1 0