November 2022 - Wine-commits

Connor McAdams : uiautomationcore: Implement ConditionType_True parent navigation for HUIANODEs.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: c375765e63041905967848c10c25d544ca0fdb9c URL: https://gitlab.winehq.org/wine/wine/-/commit/c375765e63041905967848c10c25d5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 17 12:06:02 2022 -0400 uiautomationcore: Implement ConditionType_True parent navigation for HUIANODEs. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 27 +++--- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 142 ++++++++++++++++++++++++++++- 3 files changed, 153 insertions(+), 17 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 15368a7fd03..d5c186e7ee6 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -8205,24 +8205,21 @@ static void test_UiaNavigate(void) tree_struct = NULL; out_req = NULL; hr = UiaNavigate(node, NavigateDirection_Parent, (struct UiaCondition *)&UiaTrueCondition, &cache_req, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx\n", hr); - todo_wine ok(!!out_req, "out_req == NULL\n"); - todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); - todo_wine ok(Provider2.ref == 2, "Unexpected refcnt %ld\n", Provider2.ref); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + ok(Provider2.ref == 2, "Unexpected refcnt %ld\n", Provider2.ref); - if (SUCCEEDED(hr)) - { - exp_lbound[0] = exp_lbound[1] = 0; - exp_elems[0] = exp_elems[1] = 1; - test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); - ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); - SafeArrayDestroy(out_req); - SysFreeString(tree_struct); - ok(Provider2.ref == 1, "Unexpected refcnt %ld\n", Provider2.ref); - ok_method_sequence(nav_seq14, "nav_seq14"); - } + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + ok(Provider2.ref == 1, "Unexpected refcnt %ld\n", Provider2.ref); + ok_method_sequence(nav_seq14, "nav_seq14"); ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); diff --git a/dlls/uiautomationcore/uia_classes.idl b/dlls/uiautomationcore/uia_classes.idl index d8982259050..2dc7981b702 100644 --- a/dlls/uiautomationcore/uia_classes.idl +++ b/dlls/uiautomationcore/uia_classes.idl @@ -46,6 +46,7 @@ library UIA_wine_private HRESULT get_prop_val([in]const struct uia_prop_info *prop_info, [out, retval]VARIANT *ret_val); HRESULT get_prov_opts([out, retval]int *out_opts); HRESULT has_parent([out, retval]BOOL *out_val); + HRESULT navigate([in]int nav_dir, [out, retval]VARIANT *ret_val); } [ diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 8f9ac813a8d..23a0dc3d3c4 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -371,6 +371,22 @@ static HRESULT get_has_parent_from_node_provider(IWineUiaNode *node, int idx, BO return hr; } +static HRESULT get_navigate_from_node_provider(IWineUiaNode *node, int idx, int nav_dir, VARIANT *ret_val) +{ + IWineUiaProvider *prov; + HRESULT hr; + + VariantInit(ret_val); + hr = IWineUiaNode_get_provider(node, idx, &prov); + if (FAILED(hr)) + return hr; + + hr = IWineUiaProvider_navigate(prov, nav_dir, ret_val); + IWineUiaProvider_Release(prov); + + return hr; +} + /* * IWineUiaNode interface. */ @@ -643,6 +659,41 @@ static HRESULT prepare_uia_node(struct uia_node *node) return S_OK; } +static HRESULT navigate_uia_node(struct uia_node *node, int nav_dir, HUIANODE *out_node) +{ + HRESULT hr; + VARIANT v; + + *out_node = NULL; + + VariantInit(&v); + switch (nav_dir) + { + case NavigateDirection_FirstChild: + case NavigateDirection_LastChild: + case NavigateDirection_NextSibling: + case NavigateDirection_PreviousSibling: + FIXME("Unimplemented NavigateDirection %d\n", nav_dir); + return E_NOTIMPL; + + case NavigateDirection_Parent: + hr = get_navigate_from_node_provider(&node->IWineUiaNode_iface, node->parent_link_idx, nav_dir, &v); + if (FAILED(hr)) + WARN("Parent navigation failed with hr %#lx\n", hr); + + hr = UiaHUiaNodeFromVariant(&v, out_node); + if (FAILED(hr)) + *out_node = NULL; + break; + + default: + WARN("Invalid NavigateDirection %d\n", nav_dir); + return E_INVALIDARG; + } + + return S_OK; +} + /* * IWineUiaProvider interface. */ @@ -977,6 +1028,38 @@ static HRESULT WINAPI uia_provider_has_parent(IWineUiaProvider *iface, BOOL *out return S_OK; } +static HRESULT WINAPI uia_provider_navigate(IWineUiaProvider *iface, int nav_dir, VARIANT *out_val) +{ + struct uia_provider *prov = impl_from_IWineUiaProvider(iface); + IRawElementProviderFragment *elfrag, *elfrag2; + HRESULT hr; + + TRACE("%p, %d, %p\n", iface, nav_dir, out_val); + + VariantInit(out_val); + hr = IRawElementProviderSimple_QueryInterface(prov->elprov, &IID_IRawElementProviderFragment, (void **)&elfrag); + if (FAILED(hr) || !elfrag) + return S_OK; + + hr = IRawElementProviderFragment_Navigate(elfrag, nav_dir, &elfrag2); + IRawElementProviderFragment_Release(elfrag); + if (SUCCEEDED(hr) && elfrag2) + { + IRawElementProviderSimple *elprov; + + hr = IRawElementProviderFragment_QueryInterface(elfrag2, &IID_IRawElementProviderSimple, (void **)&elprov); + IRawElementProviderFragment_Release(elfrag2); + if (FAILED(hr) || !elprov) + return hr; + + hr = get_variant_for_elprov_node(elprov, prov->return_nested_node, out_val); + if (FAILED(hr)) + return hr; + } + + return S_OK; +} + static const IWineUiaProviderVtbl uia_provider_vtbl = { uia_provider_QueryInterface, uia_provider_AddRef, @@ -984,6 +1067,7 @@ static const IWineUiaProviderVtbl uia_provider_vtbl = { uia_provider_get_prop_val, uia_provider_get_prov_opts, uia_provider_has_parent, + uia_provider_navigate, }; static HRESULT create_wine_uia_provider(struct uia_node *node, IRawElementProviderSimple *elprov, @@ -1358,6 +1442,30 @@ static HRESULT WINAPI uia_nested_node_provider_has_parent(IWineUiaProvider *ifac return get_has_parent_from_node_provider(prov->nested_node, 0, out_val); } +static HRESULT WINAPI uia_nested_node_provider_navigate(IWineUiaProvider *iface, int nav_dir, VARIANT *out_val) +{ + struct uia_nested_node_provider *prov = impl_from_nested_node_IWineUiaProvider(iface); + HUIANODE node; + HRESULT hr; + VARIANT v; + + TRACE("%p, %d, %p\n", iface, nav_dir, out_val); + + VariantInit(out_val); + hr = get_navigate_from_node_provider(prov->nested_node, 0, nav_dir, &v); + if (FAILED(hr) || V_VT(&v) == VT_EMPTY) + return hr; + + hr = uia_node_from_lresult((LRESULT)V_I4(&v), &node); + if (FAILED(hr)) + return hr; + + get_variant_for_node(node, out_val); + VariantClear(&v); + + return S_OK; +} + static const IWineUiaProviderVtbl uia_nested_node_provider_vtbl = { uia_nested_node_provider_QueryInterface, uia_nested_node_provider_AddRef, @@ -1365,6 +1473,7 @@ static const IWineUiaProviderVtbl uia_nested_node_provider_vtbl = { uia_nested_node_provider_get_prop_val, uia_nested_node_provider_get_prov_opts, uia_nested_node_provider_has_parent, + uia_nested_node_provider_navigate, }; static BOOL is_nested_node_provider(IWineUiaProvider *iface) @@ -2234,7 +2343,36 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac HRESULT WINAPI UiaNavigate(HUIANODE huianode, enum NavigateDirection dir, struct UiaCondition *nav_condition, struct UiaCacheRequest *cache_req, SAFEARRAY **out_req, BSTR *tree_struct) { - FIXME("(%p, %u, %p, %p, %p, %p): stub\n", huianode, dir, nav_condition, cache_req, out_req, + struct uia_node *node = unsafe_impl_from_IWineUiaNode((IWineUiaNode *)huianode); + HUIANODE node2; + HRESULT hr; + + TRACE("(%p, %u, %p, %p, %p, %p)\n", huianode, dir, nav_condition, cache_req, out_req, tree_struct); - return E_NOTIMPL; + + if (!node || !nav_condition || !cache_req || !out_req || !tree_struct) + return E_INVALIDARG; + + *out_req = NULL; + *tree_struct = NULL; + + if (nav_condition->ConditionType != ConditionType_True) + { + FIXME("ConditionType %d based navigation is not implemented.\n", nav_condition->ConditionType); + return E_NOTIMPL; + } + + hr = navigate_uia_node(node, dir, &node2); + if (FAILED(hr)) + return hr; + + if (node2) + { + hr = UiaGetUpdatedCache(node2, cache_req, NormalizeState_None, NULL, out_req, tree_struct); + if (FAILED(hr)) + WARN("UiaGetUpdatedCache failed with hr %#lx\n", hr); + UiaNodeRelease(node2); + } + + return hr; }

1 0

Connor McAdams : uiautomationcore: Partially implement ConditionType_True sibling navigation for HUIANODEs.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: ef7e88ea5202bdbb211a2b314768877f07c82938 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef7e88ea5202bdbb211a2b31476887… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 17 12:21:51 2022 -0400 uiautomationcore: Partially implement ConditionType_True sibling navigation for HUIANODEs. Add support for navigating between siblings of an individual IWineUiaProvider for an HUIANODE. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 92 ++++++++++++++++++++++++++++++++++--- dlls/uiautomationcore/uia_private.h | 2 + 2 files changed, 88 insertions(+), 6 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 23a0dc3d3c4..4d13262e292 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -596,6 +596,18 @@ static HRESULT prepare_uia_node(struct uia_node *node) int i, prov_idx; HRESULT hr; + /* Get the provider index for the provider that created the node. */ + for (i = prov_idx = 0; i < PROV_TYPE_COUNT; i++) + { + if (i == node->creator_prov_type) + { + node->creator_prov_idx = prov_idx; + break; + } + else if (node->prov[i]) + prov_idx++; + } + /* * HUIANODEs can only have one 'parent link' provider, which handles * parent and sibling navigation for the entire HUIANODE. Each provider is @@ -659,6 +671,62 @@ static HRESULT prepare_uia_node(struct uia_node *node) return S_OK; } +static BOOL node_creator_is_parent_link(struct uia_node *node) +{ + if (node->creator_prov_idx == node->parent_link_idx) + return TRUE; + else + return FALSE; +} + +static HRESULT get_sibling_from_node_provider(struct uia_node *node, int prov_idx, int nav_dir, + VARIANT *out_node) +{ + HUIANODE tmp_node; + HRESULT hr; + VARIANT v; + + hr = get_navigate_from_node_provider(&node->IWineUiaNode_iface, prov_idx, nav_dir, &v); + if (FAILED(hr)) + return hr; + + hr = UiaHUiaNodeFromVariant(&v, &tmp_node); + if (FAILED(hr)) + goto exit; + + while (1) + { + struct uia_node *node_data = impl_from_IWineUiaNode((IWineUiaNode *)tmp_node); + + /* + * If our sibling provider is the parent link of it's HUIANODE, then + * it is a valid sibling of this node. + */ + if (node_creator_is_parent_link(node_data)) + break; + + /* + * If our sibling provider is not the parent link of it's HUIANODE, we + * need to try the next sibling. + */ + hr = get_navigate_from_node_provider((IWineUiaNode *)tmp_node, node_data->creator_prov_idx, nav_dir, &v); + UiaNodeRelease(tmp_node); + if (FAILED(hr)) + return hr; + + tmp_node = NULL; + hr = UiaHUiaNodeFromVariant(&v, &tmp_node); + if (FAILED(hr)) + break; + } + +exit: + if (tmp_node) + *out_node = v; + + return S_OK; +} + static HRESULT navigate_uia_node(struct uia_node *node, int nav_dir, HUIANODE *out_node) { HRESULT hr; @@ -671,19 +739,20 @@ static HRESULT navigate_uia_node(struct uia_node *node, int nav_dir, HUIANODE *o { case NavigateDirection_FirstChild: case NavigateDirection_LastChild: - case NavigateDirection_NextSibling: - case NavigateDirection_PreviousSibling: FIXME("Unimplemented NavigateDirection %d\n", nav_dir); return E_NOTIMPL; + case NavigateDirection_NextSibling: + case NavigateDirection_PreviousSibling: + hr = get_sibling_from_node_provider(node, node->parent_link_idx, nav_dir, &v); + if (FAILED(hr)) + WARN("Sibling navigation failed with hr %#lx\n", hr); + break; + case NavigateDirection_Parent: hr = get_navigate_from_node_provider(&node->IWineUiaNode_iface, node->parent_link_idx, nav_dir, &v); if (FAILED(hr)) WARN("Parent navigation failed with hr %#lx\n", hr); - - hr = UiaHUiaNodeFromVariant(&v, out_node); - if (FAILED(hr)) - *out_node = NULL; break; default: @@ -691,6 +760,13 @@ static HRESULT navigate_uia_node(struct uia_node *node, int nav_dir, HUIANODE *o return E_INVALIDARG; } + if (V_VT(&v) != VT_EMPTY) + { + hr = UiaHUiaNodeFromVariant(&v, (HUIANODE *)out_node); + if (FAILED(hr)) + WARN("UiaHUiaNodeFromVariant failed with hr %#lx\n", hr); + } + return S_OK; } @@ -1082,6 +1158,8 @@ static HRESULT create_wine_uia_provider(struct uia_node *node, IRawElementProvid prov->elprov = elprov; prov->ref = 1; node->prov[prov_type] = &prov->IWineUiaProvider_iface; + if (!node->prov_count) + node->creator_prov_type = prov_type; node->prov_count++; IRawElementProviderSimple_AddRef(elprov); @@ -1595,6 +1673,8 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU node->prov[prov_type] = provider_iface; node->git_cookie[prov_type] = git_cookie; + if (!node->prov_count) + node->creator_prov_type = prov_type; node->prov_count++; return S_OK; diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index cb4ce8b0acf..63820d0b937 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -60,10 +60,12 @@ struct uia_node { DWORD git_cookie[PROV_TYPE_COUNT]; int prov_count; int parent_link_idx; + int creator_prov_idx; HWND hwnd; BOOL nested_node; BOOL disconnected; + int creator_prov_type; struct list prov_thread_list_entry; struct list node_map_list_entry; struct uia_provider_thread_map_entry *map;

1 0

Connor McAdams : uiautomationcore: Implement ConditionType_True child navigation for HUIANODEs.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 7602ad014f697ac7bdd46304ffd708738efff51e URL: https://gitlab.winehq.org/wine/wine/-/commit/7602ad014f697ac7bdd46304ffd708… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 17 12:46:35 2022 -0400 uiautomationcore: Implement ConditionType_True child navigation for HUIANODEs. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 187 ++++++++++++++--------------- dlls/uiautomationcore/uia_client.c | 68 ++++++++++- 2 files changed, 153 insertions(+), 102 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add support for navigating between sibling node providers of a parent HUIANODE.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 389df55dfbcb513d2163cfa7a61e671209c0a75d URL: https://gitlab.winehq.org/wine/wine/-/commit/389df55dfbcb513d2163cfa7a61e67… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 17 13:18:43 2022 -0400 uiautomationcore: Add support for navigating between sibling node providers of a parent HUIANODE. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 250 +++++++++++++---------------- dlls/uiautomationcore/uia_client.c | 39 +++++ 2 files changed, 153 insertions(+), 136 deletions(-)

1 0

Eric Pouech : dbghelp: No longer pass inline site's address upon creation.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: a6f1f7be7e11192557acc4d960e39e6992640cf1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6f1f7be7e11192557acc4d960e39e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 1 10:39:57 2022 +0100 dbghelp: No longer pass inline site's address upon creation. Instead use the first address of the first defined range of address. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/dwarf.c | 4 +++- dlls/dbghelp/msc.c | 33 +++++---------------------------- dlls/dbghelp/symbol.c | 5 ++--- 4 files changed, 10 insertions(+), 33 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index daf15732877..d1ca5d38868 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -850,7 +850,6 @@ extern struct symt_inlinesite* struct symt_function* func, struct symt* parent, const char* name, - ULONG_PTR addr, struct symt* type) DECLSPEC_HIDDEN; extern void symt_add_func_line(struct module* module, struct symt_function* func, diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f9ffa374dbc..cc31cc7912c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2141,13 +2141,15 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, subpgm->top_func, subpgm->current_block ? &subpgm->current_block->symt : &subpgm->current_func->symt, dwarf2_get_cpp_name(di, name.u.string), - adranges[0].low, &sig_type->symt); + &sig_type->symt); subpgm->current_func = (struct symt_function*)inlined; subpgm->current_block = NULL; for (i = 0; i < num_adranges; ++i) symt_add_inlinesite_range(subpgm->ctx->module_ctx->module, inlined, adranges[i].low, adranges[i].high); + /* temporary: update address field */ + inlined->func.address = adranges[0].low; free(adranges); children = dwarf2_get_di_children(di); diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 872b0e70b58..39beaf80c12 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2101,7 +2101,7 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu const union codeview_type* cvt; struct symt_inlinesite* inlined; struct cv_binannot cvba; - BOOL srcok, found = FALSE; + BOOL srcok; unsigned offset, line, srcfile; const struct CV_Checksum_t* chksms; @@ -2111,42 +2111,17 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu return NULL; } - /* grasp first code offset in binary annotation to compute inline site start address */ - cvba.annot = annot; - cvba.last_annot = last_annot; - while (codeview_advance_binannot(&cvba)) - if (cvba.opcode == BA_OP_CodeOffset || - cvba.opcode == BA_OP_ChangeCodeOffset || - cvba.opcode == BA_OP_ChangeCodeOffsetAndLineOffset) - { - offset = cvba.arg1; - found = TRUE; - break; - } - else if (cvba.opcode == BA_OP_ChangeCodeLengthAndCodeOffset) - { - offset = cvba.arg2; - found = TRUE; - break; - } - - if (!found) - { - WARN("Couldn't find start address of inlined\n"); - return NULL; - } - switch (cvt->generic.id) { case LF_FUNC_ID: inlined = symt_new_inlinesite(msc_dbg->module, top_func, container, - cvt->func_id_v3.name, top_func->address + offset, + cvt->func_id_v3.name, codeview_get_type(cvt->func_id_v3.type, FALSE)); break; case LF_MFUNC_ID: /* FIXME we just declare a function, not a method */ inlined = symt_new_inlinesite(msc_dbg->module, top_func, container, - cvt->mfunc_id_v3.name, top_func->address + offset, + cvt->mfunc_id_v3.name, codeview_get_type(cvt->mfunc_id_v3.type, FALSE)); break; default: @@ -2228,6 +2203,8 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu if (range->low == range->high) WARN("pending empty range at end of %s inside %s\n", inlined->func.hash_elt.name, top_func->hash_elt.name); + /* temporary: update address field */ + inlined->func.address = ((struct addr_range*)vector_at(&inlined->vranges, 0))->low; } return inlined; } diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 6e6c35e9b98..082eec2a555 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -362,17 +362,16 @@ struct symt_inlinesite* symt_new_inlinesite(struct module* module, struct symt_function* func, struct symt* container, const char* name, - ULONG_PTR addr, struct symt* sig_type) { struct symt_inlinesite* sym; - TRACE_(dbghelp_symt)("Adding inline site %s @%Ix\n", name, addr); + TRACE_(dbghelp_symt)("Adding inline site %s\n", name); if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) { struct symt** p; assert(container); - init_function_or_inlinesite(&sym->func, module, SymTagInlineSite, container, name, addr, 0, sig_type); + init_function_or_inlinesite(&sym->func, module, SymTagInlineSite, container, name, 0, 0, sig_type); vector_init(&sym->vranges, sizeof(struct addr_range), 2); /* FIXME: number of elts => to be set on input */ /* chain inline sites */ sym->func.next_inlinesite = func->next_inlinesite;

1 0

Eric Pouech : dbghelp: Store address range as FAM in symt_inlinesite.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: c576b0c73f0f35a4803b2e315902402ecf95278b URL: https://gitlab.winehq.org/wine/wine/-/commit/c576b0c73f0f35a4803b2e31590240… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 1 10:39:59 2022 +0100 dbghelp: Store address range as FAM in symt_inlinesite. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 11 +++--- dlls/dbghelp/dwarf.c | 23 ++++++------ dlls/dbghelp/msc.c | 79 +++++++++++++++++++++++++++++++----------- dlls/dbghelp/symbol.c | 50 ++++---------------------- 4 files changed, 81 insertions(+), 82 deletions(-)

1 0

Eric Pouech : dbghelp: Use addr_range for storing symt_function address and size.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 790a2852aa8753f329d1b6caac2307f66fc0079a URL: https://gitlab.winehq.org/wine/wine/-/commit/790a2852aa8753f329d1b6caac2307… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 1 10:40:00 2022 +0100 dbghelp: Use addr_range for storing symt_function address and size. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp.c | 2 +- dlls/dbghelp/dbghelp_private.h | 8 ++++++-- dlls/dbghelp/dwarf.c | 4 ++-- dlls/dbghelp/elf_module.c | 27 ++++++++++++++------------- dlls/dbghelp/macho_module.c | 11 ++++++----- dlls/dbghelp/msc.c | 40 ++++++++++++++++++++-------------------- dlls/dbghelp/stabs.c | 20 ++++++++++---------- dlls/dbghelp/symbol.c | 6 +++--- dlls/dbghelp/type.c | 6 +++--- 9 files changed, 65 insertions(+), 59 deletions(-)

1 0

Eric Pouech : dbghelp: Get rid of symt_inlinesite by merging it inside symt_function.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: c4f1f5b18509b99f61d2fe43f56fac356030af47 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4f1f5b18509b99f61d2fe43f56fac… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 1 10:40:02 2022 +0100 dbghelp: Get rid of symt_inlinesite by merging it inside symt_function. Basically: - extending symt_function to enable storage of multiple address ranges - symt_function and sym_inlinesite now share the same fields, so get rid to the later. Note that only the first range of a top level function is actually stored and used (even if the structure allows for more). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp.c | 4 +- dlls/dbghelp/dbghelp_private.h | 31 ++++++-------- dlls/dbghelp/dwarf.c | 14 +++---- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/msc.c | 50 +++++++++++------------ dlls/dbghelp/symbol.c | 92 ++++++++++++++++++++++-------------------- dlls/dbghelp/type.c | 24 ++++------- 7 files changed, 101 insertions(+), 116 deletions(-)

1 0

Piotr Caban : wineps.drv: Add DrvDocumentPropertySheets implementation.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 1f89a88660bb148a1af09187963ae4782dcad9f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f89a88660bb148a1af09187963ae4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 29 21:57:01 2022 +0200 wineps.drv: Add DrvDocumentPropertySheets implementation. --- dlls/wineps.drv/driver.c | 101 ++++++++++++++++++++++++++++++++++++++++ dlls/wineps.drv/wineps.drv.spec | 1 + 2 files changed, 102 insertions(+) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 3b0300f3fd2..592d1b33599 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -23,6 +23,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -39,6 +40,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); +typedef struct +{ + WORD cbSize; + WORD Reserved; + HANDLE hPrinter; + LPCWSTR pszPrinterName; + PDEVMODEW pdmIn; + PDEVMODEW pdmOut; + DWORD cbOut; + DWORD fMode; +} DOCUMENTPROPERTYHEADERW; + /* convert points to paper size units (10th of a millimeter) */ static inline int paper_size_from_points( float size ) { @@ -521,6 +534,94 @@ INT WINAPI DrvDocumentProperties(HWND hwnd, const WCHAR *device, DEVMODEW *outpu return IDOK; } +/****************************************************************************** + * DrvDocumentPropertySheets (wineps.drv.@) + */ +LONG WINAPI DrvDocumentPropertySheets(PROPSHEETUI_INFO *info, LPARAM lparam) +{ + DOCUMENTPROPERTYHEADERW *dph; + PRINTERINFO *pi; + + TRACE("(info=%p, lparam=%Id)\n", info, lparam); + + dph = (DOCUMENTPROPERTYHEADERW *)(info ? info->lParamInit : lparam); + + if (!(pi = PSDRV_FindPrinterInfo(dph->pszPrinterName))) return ERR_CPSUI_GETLASTERROR; + + if (!info || info->Reason == PROPSHEETUI_REASON_INIT) + { + /* If dph->fMode == 0, return size of DEVMODE structure */ + if (!dph->fMode || !dph->pdmOut) + { + dph->cbOut = pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra; + return dph->cbOut; + } + + /* If DM_MODIFY is set, change settings in accordance with pdmIn */ + if ((dph->fMode & DM_MODIFY) && dph->pdmIn) + { + TRACE("DM_MODIFY set. devIn->dmFields = %08lx\n", dph->pdmIn->dmFields); + PSDRV_MergeDevmodes(pi->Devmode, (PSDRV_DEVMODE *)dph->pdmIn, pi); + } + + /* If DM_PROMPT is set, present modal dialog box */ + if (dph->fMode & DM_PROMPT) + { + PROPSHEETPAGEW psp; + PSDRV_DLGINFO *di; + + if (!info) + { + ERR("DM_PROMPT passed with NULL PROPSHEETUI_INFO\n"); + return ERR_CPSUI_GETLASTERROR; + } + + di = malloc(sizeof(*di)); + if (!di) + return ERR_CPSUI_ALLOCMEM_FAILED; + info->UserData = (ULONG_PTR)di; + + di->dlgdm = malloc(sizeof(*di->dlgdm)); + if (!di->dlgdm) + return ERR_CPSUI_ALLOCMEM_FAILED; + + memset(&psp, 0, sizeof(psp)); + di->pi = pi; + *di->dlgdm = *pi->Devmode; + psp.dwSize = sizeof(psp); + psp.hInstance = PSDRV_hInstance; + psp.pszTemplate = L"PAPER"; + psp.pszIcon = NULL; + psp.pfnDlgProc = PSDRV_PaperDlgProc; + psp.lParam = (LPARAM)di; + + if (!info->pfnComPropSheet(info->hComPropSheet, CPSFUNC_ADD_PROPSHEETPAGEW, (LPARAM)&psp, 0)) + return ERR_CPSUI_GETLASTERROR; + } + } + + if (info && info->Reason == PROPSHEETUI_REASON_DESTROY) + { + if (info->UserData) + free(((PSDRV_DLGINFO *)info->UserData)->dlgdm); + free((void *)info->UserData); + } + + if (!info || (info->Reason == PROPSHEETUI_REASON_DESTROY && lparam)) + { + /* If DM_UPDATE is set, should write settings to environment and initialization file */ + if (dph->fMode & DM_UPDATE) + FIXME("Mode DM_UPDATE. Just do the same as DM_COPY\n"); + + /* If DM_COPY is set, should write settings to pdmOut */ + if (dph->pdmOut && (dph->fMode & (DM_COPY | DM_UPDATE))) + memcpy(dph->pdmOut, &pi->Devmode->dmPublic, + pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra); + } + + return CPSUI_OK; +} + /****************************************************************************** * DrvDeviceCapabilities (wineps.drv.@) */ diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 470bbd8e5c6..c5775b0328b 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -3,3 +3,4 @@ # Printer driver config exports @ stdcall DrvDeviceCapabilities(ptr wstr long ptr ptr) @ stdcall DrvDocumentProperties(long wstr ptr ptr long) +@ stdcall DrvDocumentPropertySheets(ptr long)

1 0

Piotr Caban : winspool.drv: Use DrvDocumentPropertySheets driver entry in DocumentProperties.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: d005d1ee60f3ab795a9ab82aafcb088cf1181ee9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d005d1ee60f3ab795a9ab82aafcb08… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 29 21:47:18 2022 +0200 winspool.drv: Use DrvDocumentPropertySheets driver entry in DocumentProperties. --- dlls/winspool.drv/Makefile.in | 2 +- dlls/winspool.drv/info.c | 64 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 54 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index b4948ccb5e8..3f6d32cb44d 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = winspool.drv UNIXLIB = winspool.so IMPORTLIB = winspool -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 compstui UNIX_CFLAGS = $(CUPS_CFLAGS) UNIX_LIBS = $(APPLICATIONSERVICES_LIBS) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3806384ee08..22422f7e966 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -51,6 +51,7 @@ #include "wine/heap.h" #include <wine/unixlib.h> +#include "ddk/compstui.h" #include "ddk/winsplp.h" #include "wspool.h" @@ -115,11 +116,27 @@ typedef struct /* entry points */ DWORD (WINAPI *pDrvDeviceCapabilities)(HANDLE, const WCHAR *, WORD, void *, const DEVMODEW *); - INT (WINAPI *pDrvDocumentProperties)(HWND, const WCHAR *, DEVMODEW *, DEVMODEW *, DWORD); + LONG (WINAPI *pDrvDocumentPropertySheets)(PROPSHEETUI_INFO*, LPARAM); WCHAR name[1]; } config_module_t; +typedef struct { + WORD cbSize; + WORD Reserved; + HANDLE hPrinter; + LPCWSTR pszPrinterName; + PDEVMODEW pdmIn; + PDEVMODEW pdmOut; + DWORD cbOut; + DWORD fMode; +} DOCUMENTPROPERTYHEADERW; + +typedef struct { + DOCUMENTPROPERTYHEADERW dph; + config_module_t *config; +} document_property_t; + /* ############################### */ static opened_printer_t **printer_handles; @@ -502,7 +519,7 @@ static config_module_t *get_config_module(const WCHAR *device, BOOL grab) ret->ref = 2; /* one for config_module and one for the caller */ ret->module = driver_module; ret->pDrvDeviceCapabilities = (void *)GetProcAddress(driver_module, "DrvDeviceCapabilities"); - ret->pDrvDocumentProperties = (void *)GetProcAddress(driver_module, "DrvDocumentProperties"); + ret->pDrvDocumentPropertySheets = (void *)GetProcAddress(driver_module, "DrvDocumentPropertySheets"); wcscpy( ret->name, device ); wine_rb_put(&config_modules, ret->name, &ret->entry); @@ -1896,6 +1913,18 @@ LONG WINAPI DocumentPropertiesA(HWND hwnd, HANDLE printer, char *device_name, DE return ret; } +static LONG WINAPI document_callback(PROPSHEETUI_INFO *info, LPARAM lparam) +{ + if (info->Reason == PROPSHEETUI_REASON_INIT) + { + document_property_t *dp = (document_property_t *)info->lParamInit; + + if (!info->pfnComPropSheet(info->hComPropSheet, CPSFUNC_ADD_PFNPROPSHEETUIW, + (LPARAM)dp->config->pDrvDocumentPropertySheets, (LPARAM)&dp->dph)) + return ERR_CPSUI_GETLASTERROR; + } + return CPSUI_OK; +} /***************************************************************************** * DocumentPropertiesW (WINSPOOL.@) @@ -1905,8 +1934,8 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, LPDEVMODEW pDevModeOutput, LPDEVMODEW pDevModeInput, DWORD fMode) { - config_module_t *config = NULL; - const WCHAR *device = NULL; + document_property_t dp; + const WCHAR *device; LONG ret; TRACE("(%p,%p,%s,%p,%p,%ld)\n", @@ -1918,17 +1947,30 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, return -1; } - config = get_config_module(device, TRUE); - if (!config) { + dp.dph.cbSize = sizeof(dp.dph); + dp.dph.Reserved = 0; + dp.dph.hPrinter = hPrinter; + dp.dph.pszPrinterName = device; + dp.dph.pdmIn = pDevModeInput; + dp.dph.pdmOut = pDevModeOutput; + dp.dph.cbOut = dp.dph.pdmOut ? dp.dph.pdmOut->dmSize : 0; + dp.dph.fMode = fMode; + dp.config = get_config_module(device, TRUE); + if (!dp.config) { ERR("Could not load config module for %s\n", debugstr_w(device)); return -1; } - /* FIXME: This uses Wine-specific config file entry point. - * We should use DrvDevicePropertySheets instead (requires CPSUI support first). - */ - ret = config->pDrvDocumentProperties(hWnd, device, pDevModeOutput, pDevModeInput, fMode); - release_config_module(config); + if (!(fMode & ~(DM_IN_BUFFER | DM_OUT_BUFFER | DM_OUT_DEFAULT))) { + ret = dp.config->pDrvDocumentPropertySheets(NULL, (LPARAM)&dp.dph); + + if ((!fMode || !pDevModeOutput) && dp.dph.cbOut != ret) + FIXME("size mismatch: ret = %ld cbOut = %ld\n", ret, dp.dph.cbOut); + } else { + ret = CommonPropertySheetUIW(hWnd, document_callback, (LPARAM)&dp, NULL); + } + + release_config_module(dp.config); return ret; }

1 0