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

Alexandros Frantzis : winewayland.drv: Report basic monitor information.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 697b58f406cecd98539452239018a218943ccabb URL: https://gitlab.winehq.org/wine/wine/-/commit/697b58f406cecd98539452239018a2… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Mar 7 13:21:38 2023 +0200 winewayland.drv: Report basic monitor information. Whenever the Wayland output display state changes (including during initialization), update the monitor information on the Wine side to reflect these changes. For now all monitors are placed at 0,0 in the monitor space, and only the current mode is reported. These deficiencies will be addressed in upcoming commits. We currently support a single GPU, and a single monitor for each adapter. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/Makefile.in | 4 +- dlls/winewayland.drv/display.c | 155 +++++++++++++++++++++++++++++++++ dlls/winewayland.drv/wayland.c | 94 +++++++++++++++++++- dlls/winewayland.drv/wayland_output.c | 134 ++++++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 47 ++++++++++ dlls/winewayland.drv/waylanddrv_main.c | 15 +++- 6 files changed, 446 insertions(+), 3 deletions(-)

1 0

Alexandros Frantzis : winewayland.drv: Report all advertised monitor modes to Wine.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: b35f4424b239a82249bd048a8852749a08bb6c37 URL: https://gitlab.winehq.org/wine/wine/-/commit/b35f4424b239a82249bd048a885274… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Mar 10 17:57:38 2023 +0200 winewayland.drv: Report all advertised monitor modes to Wine. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/display.c | 23 ++++++---- dlls/winewayland.drv/wayland_output.c | 83 ++++++++++++++++++++++++++++++++--- dlls/winewayland.drv/waylanddrv.h | 5 ++- 3 files changed, 94 insertions(+), 17 deletions(-) diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index 9e75809fec9..e72b26a9da0 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -90,8 +90,8 @@ static void wayland_add_device_monitor(const struct gdi_device_manager *device_m struct gdi_monitor monitor = {0}; SetRect(&monitor.rc_monitor, 0, 0, - output->current_mode.width, - output->current_mode.height); + output->current_mode->width, + output->current_mode->height); /* We don't have a direct way to get the work area in Wayland. */ monitor.rc_work = monitor.rc_monitor; @@ -117,12 +117,17 @@ static void populate_devmode(struct wayland_output_mode *output_mode, DEVMODEW * mode->dmDisplayFrequency = output_mode->refresh / 1000; } -static void wayland_add_device_mode(const struct gdi_device_manager *device_manager, - void *param, struct wayland_output *output) +static void wayland_add_device_modes(const struct gdi_device_manager *device_manager, + void *param, struct wayland_output *output) { - DEVMODEW mode; - populate_devmode(&output->current_mode, &mode); - device_manager->add_mode(&mode, param); + struct wayland_output_mode *output_mode; + + RB_FOR_EACH_ENTRY(output_mode, &output->modes, struct wayland_output_mode, entry) + { + DEVMODEW mode; + populate_devmode(output_mode, &mode); + device_manager->add_mode(&mode, param); + } } /*********************************************************************** @@ -144,10 +149,10 @@ BOOL WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manage wl_list_for_each(output, &process_wayland->output_list, link) { - if (!output->current_mode.refresh) continue; + if (!output->current_mode) continue; wayland_add_device_adapter(device_manager, param, output_id); wayland_add_device_monitor(device_manager, param, output); - wayland_add_device_mode(device_manager, param, output); + wayland_add_device_modes(device_manager, param, output); output_id++; } diff --git a/dlls/winewayland.drv/wayland_output.c b/dlls/winewayland.drv/wayland_output.c index c8192f94fc7..be9ea32bd72 100644 --- a/dlls/winewayland.drv/wayland_output.c +++ b/dlls/winewayland.drv/wayland_output.c @@ -39,6 +39,64 @@ static uint32_t next_output_id = 0; * Output handling */ +/* Compare a mode rb_tree key with the provided mode rb_entry and return -1 if + * the key compares less than the entry, 0 if the key compares equal to the + * entry, and 1 if the key compares greater than the entry. + * + * The comparison is based on comparing the width, height and refresh in that + * order. */ +static int wayland_output_mode_cmp_rb(const void *key, + const struct rb_entry *entry) +{ + const struct wayland_output_mode *key_mode = key; + const struct wayland_output_mode *entry_mode = + RB_ENTRY_VALUE(entry, const struct wayland_output_mode, entry); + + if (key_mode->width < entry_mode->width) return -1; + if (key_mode->width > entry_mode->width) return 1; + if (key_mode->height < entry_mode->height) return -1; + if (key_mode->height > entry_mode->height) return 1; + if (key_mode->refresh < entry_mode->refresh) return -1; + if (key_mode->refresh > entry_mode->refresh) return 1; + + return 0; +} + +static void wayland_output_add_mode(struct wayland_output *output, + int32_t width, int32_t height, + int32_t refresh, BOOL current) +{ + struct rb_entry *mode_entry; + struct wayland_output_mode *mode; + struct wayland_output_mode key = + { + .width = width, + .height = height, + .refresh = refresh, + }; + + mode_entry = rb_get(&output->modes, &key); + if (mode_entry) + { + mode = RB_ENTRY_VALUE(mode_entry, struct wayland_output_mode, entry); + } + else + { + mode = calloc(1, sizeof(*mode)); + if (!mode) + { + ERR("Failed to allocate space for wayland_output_mode\n"); + return; + } + mode->width = width; + mode->height = height; + mode->refresh = refresh; + rb_put(&output->modes, mode, &mode->entry); + } + + if (current) output->current_mode = mode; +} + static void output_handle_geometry(void *data, struct wl_output *wl_output, int32_t x, int32_t y, int32_t physical_width, int32_t physical_height, @@ -54,22 +112,26 @@ static void output_handle_mode(void *data, struct wl_output *wl_output, { struct wayland_output *output = data; - if (!(flags & WL_OUTPUT_MODE_CURRENT)) return; - /* Windows apps don't expect a zero refresh rate, so use a default value. */ if (refresh == 0) refresh = default_refresh; - output->current_mode.width = width; - output->current_mode.height = width; - output->current_mode.refresh = refresh; + wayland_output_add_mode(output, width, height, refresh, + (flags & WL_OUTPUT_MODE_CURRENT)); } static void output_handle_done(void *data, struct wl_output *wl_output) { struct wayland_output *output = data; + struct wayland_output_mode *mode; + + TRACE("name=%s\n", output->name); - TRACE("name=%s mode=%dx%d\n", - output->name, output->current_mode.width, output->current_mode.height); + RB_FOR_EACH_ENTRY(mode, &output->modes, struct wayland_output_mode, entry) + { + TRACE("mode %dx%d @ %d %s\n", + mode->width, mode->height, mode->refresh, + output->current_mode == mode ? "*" : ""); + } wayland_init_display_devices(); } @@ -108,6 +170,7 @@ BOOL wayland_output_create(uint32_t id, uint32_t version) wl_output_add_listener(output->wl_output, &output_listener, output); wl_list_init(&output->link); + rb_init(&output->modes, wayland_output_mode_cmp_rb); snprintf(output->name, sizeof(output->name), "WaylandOutput%d", next_output_id++); @@ -121,6 +184,11 @@ err: return FALSE; } +static void wayland_output_mode_free_rb(struct rb_entry *entry, void *ctx) +{ + free(RB_ENTRY_VALUE(entry, struct wayland_output_mode, entry)); +} + /********************************************************************** * wayland_output_destroy * @@ -128,6 +196,7 @@ err: */ void wayland_output_destroy(struct wayland_output *output) { + rb_destroy(&output->modes, wayland_output_mode_free_rb, NULL); wl_list_remove(&output->link); wl_output_destroy(output->wl_output); free(output); diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 768e22f2caf..8458ed17df2 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -30,6 +30,7 @@ #include "windef.h" #include "winbase.h" #include "wine/gdi_driver.h" +#include "wine/rbtree.h" #include "unixlib.h" @@ -53,6 +54,7 @@ struct wayland struct wayland_output_mode { + struct rb_entry entry; int32_t width; int32_t height; int32_t refresh; @@ -62,7 +64,8 @@ struct wayland_output { struct wl_list link; struct wl_output *wl_output; - struct wayland_output_mode current_mode; + struct rb_tree modes; + struct wayland_output_mode *current_mode; char name[20]; uint32_t global_id; };

1 0

Connor McAdams : uiautomationcore: Add support for caching property values in UiaGetUpdatedCache.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: b9410e8c395a9c3a463a1ab0f0fb864fec1de5df URL: https://gitlab.winehq.org/wine/wine/-/commit/b9410e8c395a9c3a463a1ab0f0fb86… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Mar 3 16:20:59 2023 -0500 uiautomationcore: Add support for caching property values in UiaGetUpdatedCache. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 121 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_client.c | 38 ++++++++- 2 files changed, 156 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 95e4de1b106..715629cd8df 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -1140,6 +1140,8 @@ static struct Provider } Provider, Provider2, Provider_child, Provider_child2; static struct Provider Provider_hwnd, Provider_nc, Provider_proxy, Provider_proxy2, Provider_override; static void initialize_provider(struct Provider *prov, int prov_opts, HWND hwnd, BOOL initialize_nav_links); +static void set_provider_prop_override(struct Provider *prov, struct Provider_prop_override *override, int count); +static void set_property_override(struct Provider_prop_override *override, int prop_id, VARIANT *val); static const WCHAR *uia_bstr_prop_str = L"uia-string"; static const ULONG uia_i4_prop_val = 0xdeadbeef; @@ -7577,26 +7579,38 @@ static const struct prov_method_sequence cache_req_seq6[] = { { 0 } }; +static const struct prov_method_sequence cache_req_seq7[] = { + { &Provider, FRAG_GET_RUNTIME_ID }, + { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_IsControlElementPropertyId. */ + { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId. */ + { 0 } +}; + static const struct UiaCondition UiaTrueCondition = { ConditionType_True }; static const struct UiaCondition UiaFalseCondition = { ConditionType_False }; static void test_UiaGetUpdatedCache(void) { + LONG exp_lbound[2], exp_elems[2], idx[2], i; struct Provider_prop_override prop_override; struct node_provider_desc exp_node_desc[2]; struct UiaPropertyCondition prop_cond; struct UiaAndOrCondition and_or_cond; - LONG exp_lbound[2], exp_elems[2], i; struct UiaCacheRequest cache_req; struct UiaCondition *cond_arr[2]; struct UiaNotCondition not_cond; + VARIANT v, v_arr[2]; SAFEARRAY *out_req; + IUnknown *unk_ns; BSTR tree_struct; + int prop_ids[2]; HUIANODE node; HRESULT hr; - VARIANT v; CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = UiaGetReservedNotSupportedValue(&unk_ns); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + for (i = 0; i < ARRAY_SIZE(exp_node_desc); i++) init_node_provider_desc(&exp_node_desc[i], GetCurrentProcessId(), NULL); @@ -8018,9 +8032,112 @@ static void test_UiaGetUpdatedCache(void) Provider.prop_override = NULL; Provider.prop_override_count = 0; + /* + * Tests for property value caching. + */ + prop_ids[0] = UIA_RuntimeIdPropertyId; + /* Invalid property ID, no work will be done. */ + prop_ids[1] = 1; + tree_struct = NULL; out_req = NULL; + set_cache_request(&cache_req, NULL, TreeScope_Element, prop_ids, ARRAY_SIZE(prop_ids), NULL, 0, AutomationElementMode_Full); + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_None, NULL, &out_req, &tree_struct); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!out_req, "out_req != NULL\n"); + ok(!tree_struct, "tree_struct != NULL\n"); + + /* + * Retrieve values for UIA_RuntimeIdPropertyId and + * UIA_IsControlElementPropertyId in the returned cache. + */ + prop_ids[0] = UIA_RuntimeIdPropertyId; + prop_ids[1] = UIA_IsControlElementPropertyId; + initialize_provider(&Provider, ProviderOptions_ServerSideProvider, NULL, FALSE); + init_node_provider_desc(&exp_node_desc[0], GetCurrentProcessId(), NULL); + add_provider_desc(&exp_node_desc[0], L"Main", L"Provider", TRUE); + + tree_struct = NULL; out_req = NULL; + set_cache_request(&cache_req, NULL, TreeScope_Element, prop_ids, ARRAY_SIZE(prop_ids), NULL, 0, AutomationElementMode_Full); + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_None, NULL, &out_req, &tree_struct); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = 1; + exp_elems[1] = 3; + 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)); + + idx[0] = 0; + for (i = 0; i < ARRAY_SIZE(prop_ids); i++) + { + idx[1] = 1 + i; + VariantInit(&v_arr[i]); + hr = SafeArrayGetElement(out_req, idx, &v_arr[i]); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + } + + ok(V_VT(&v_arr[0]) == VT_UNKNOWN, "Unexpected vt %d\n", V_VT(&v)); + ok(V_UNKNOWN(&v_arr[0]) == unk_ns, "unexpected IUnknown %p\n", V_UNKNOWN(&v_arr[0])); + VariantClear(&v_arr[0]); + + ok(check_variant_bool(&v_arr[1], TRUE), "V_BOOL(&v) = %#x\n", V_BOOL(&v_arr[1])); + VariantClear(&v_arr[1]); + + ok_method_sequence(cache_req_seq7, "cache_req_seq7"); + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + + /* + * Again, but return a valid runtime ID and a different value for + * UIA_IsControlElementPropertyId. + */ + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = VARIANT_FALSE; + set_property_override(&prop_override, UIA_IsControlElementPropertyId, &v); + set_provider_prop_override(&Provider, &prop_override, 1); + Provider.runtime_id[0] = Provider.runtime_id[1] = 0xdeadbeef; + init_node_provider_desc(&exp_node_desc[0], GetCurrentProcessId(), NULL); + add_provider_desc(&exp_node_desc[0], L"Main", L"Provider", TRUE); + + tree_struct = NULL; out_req = NULL; + set_cache_request(&cache_req, NULL, TreeScope_Element, prop_ids, ARRAY_SIZE(prop_ids), NULL, 0, AutomationElementMode_Full); + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_None, NULL, &out_req, &tree_struct); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = 1; + exp_elems[1] = 3; + 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)); + + idx[0] = 0; + for (i = 0; i < ARRAY_SIZE(prop_ids); i++) + { + idx[1] = 1 + i; + VariantInit(&v_arr[i]); + hr = SafeArrayGetElement(out_req, idx, &v_arr[i]); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + } + + ok(V_VT(&v_arr[0]) == (VT_I4 | VT_ARRAY), "Unexpected vt %d\n", V_VT(&v_arr[0])); + check_runtime_id(Provider.runtime_id, ARRAY_SIZE(Provider.runtime_id), V_ARRAY(&v_arr[0])); + VariantClear(&v_arr[0]); + + ok(check_variant_bool(&v_arr[1], FALSE), "V_BOOL(&v) = %#x\n", V_BOOL(&v_arr[1])); + VariantClear(&v_arr[1]); + + ok_method_sequence(cache_req_seq7, "cache_req_seq7"); + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); + initialize_provider(&Provider, ProviderOptions_ServerSideProvider, NULL, FALSE); + IUnknown_Release(unk_ns); CoUninitialize(); } diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 8d543bd4dc7..4de9dc1919e 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -2787,6 +2787,7 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac LONG idx[2]; HRESULT hr; VARIANT v; + int i; TRACE("(%p, %p, %u, %p, %p, %p)\n", huianode, cache_req, normalize_state, normalize_cond, out_req, tree_struct); @@ -2802,6 +2803,18 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac return E_NOTIMPL; } + if (cache_req->cPatterns && cache_req->pPatterns) + FIXME("Pattern caching currently unimplemented\n"); + + if (cache_req->cProperties && cache_req->pProperties) + { + for (i = 0; i < cache_req->cProperties; i++) + { + if (!uia_prop_info_from_id(cache_req->pProperties[i])) + return E_INVALIDARG; + } + } + switch (normalize_state) { case NormalizeState_None: @@ -2834,7 +2847,8 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac } } - sabound[0].cElements = sabound[1].cElements = 1; + sabound[0].cElements = 1; + sabound[1].cElements = 1 + cache_req->cProperties; sabound[0].lLbound = sabound[1].lLbound = 0; if (!(sa = SafeArrayCreate(VT_VARIANT, 2, sabound))) { @@ -2852,6 +2866,28 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac return hr; } + idx[0] = 0; + VariantClear(&v); + for (i = 0; i < cache_req->cProperties; i++) + { + hr = UiaGetPropertyValue(huianode, cache_req->pProperties[i], &v); + /* Don't fail on unimplemented properties. */ + if (FAILED(hr) && hr != E_NOTIMPL) + { + SafeArrayDestroy(sa); + return hr; + } + + idx[1] = 1 + i; + hr = SafeArrayPutElement(sa, idx, &v); + VariantClear(&v); + if (FAILED(hr)) + { + SafeArrayDestroy(sa); + return hr; + } + } + /* * AddRef huianode since we're returning a reference to the same node we * passed in, rather than creating a new one.

1 0

Alex Henrie : wldap32: Handle null LDAPMessage in ldap_count_entries.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 65323a6b967b8e214aec8d97a88c7f1dbf17cbca URL: https://gitlab.winehq.org/wine/wine/-/commit/65323a6b967b8e214aec8d97a88c7f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 15 22:30:50 2023 -0600 wldap32: Handle null LDAPMessage in ldap_count_entries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54690 --- dlls/wldap32/misc.c | 1 + dlls/wldap32/tests/parse.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index 8c61d618bc9..05552bd6eed 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -98,6 +98,7 @@ ULONG CDECL WLDAP32_ldap_count_entries( LDAP *ld, WLDAP32_LDAPMessage *res ) { TRACE( "(%p, %p)\n", ld, res ); + if (!res) return 0; if (!ld) return ~0u; return ldap_count_entries( CTX(ld), MSG(res) ); } diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 8394d5eeeff..161a0672cdc 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -252,7 +252,13 @@ static void test_ldap_paged_search(void) ok( res != NULL, "expected res != NULL\n" ); ok( count == 0, "got %lu\n", count ); - count = ldap_count_entries( ld, res); + count = ldap_count_entries( NULL, NULL ); + ok( count == 0, "got %lu\n", count ); + count = ldap_count_entries( ld, NULL ); + ok( count == 0, "got %lu\n", count ); + count = ldap_count_entries( NULL, res ); + todo_wine ok( count == 1, "got %lu\n", count ); + count = ldap_count_entries( ld, res ); ok( count == 1, "got %lu\n", count ); entry = ldap_first_entry( ld, res);

1 0

Alex Henrie : wldap32: Handle null LDAPMessage in ldap_parse_result.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 0c1dcfd3548e29f4af9a8c7bbf02835955c90967 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c1dcfd3548e29f4af9a8c7bbf0283… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 15 22:30:50 2023 -0600 wldap32: Handle null LDAPMessage in ldap_parse_result. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54690 --- dlls/wldap32/parse.c | 2 ++ dlls/wldap32/tests/parse.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 436d38d5c42..26e8de14c85 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -148,6 +148,7 @@ ULONG CDECL ldap_parse_resultA( LDAP *ld, WLDAP32_LDAPMessage *result, ULONG *re free ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!result) return WLDAP32_LDAP_NO_RESULTS_RETURNED; ret = ldap_parse_resultW( ld, result, retcode, &matchedW, &errorW, &referralsW, &serverctrlsW, free ); @@ -177,6 +178,7 @@ ULONG CDECL ldap_parse_resultW( LDAP *ld, WLDAP32_LDAPMessage *result, ULONG *re free ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!result) return WLDAP32_LDAP_NO_RESULTS_RETURNED; ret = map_error( ldap_parse_result( CTX(ld), MSG(result), (int *)retcode, &matchedU, &errorU, &referralsU, &serverctrlsU, free ) ); diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 161a0672cdc..375acbbe776 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -68,6 +68,12 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ok( !ret, "ldap_search_ext_sA failed %#lx\n", ret ); ok( res != NULL, "expected res != NULL\n" ); + ret = ldap_parse_resultA( NULL, NULL, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA should fail, got %#lx\n", ret ); + ret = ldap_parse_resultA( NULL, res, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA should fail, got %#lx\n", ret ); + ret = ldap_parse_resultA( ld, NULL, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + ok( ret == LDAP_NO_RESULTS_RETURNED, "ldap_parse_resultA should fail, got %#lx\n", ret ); result = ~0u; ret = ldap_parse_resultA( ld, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); ok( !ret, "ldap_parse_resultA failed %#lx\n", ret );

1 0

Alex Henrie : wldap32: Replace bvfreeU with plain free.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 57828356f88f273a66b290ec64c948890fc0f30c URL: https://gitlab.winehq.org/wine/wine/-/commit/57828356f88f273a66b290ec64c948… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 15 22:21:53 2023 -0600 wldap32: Replace bvfreeU with plain free. --- dlls/wldap32/compare.c | 4 ++-- dlls/wldap32/extended.c | 4 ++-- dlls/wldap32/winldap_private.h | 5 ----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wldap32/compare.c b/dlls/wldap32/compare.c index c7fb83a3723..d23e52ef207 100644 --- a/dlls/wldap32/compare.c +++ b/dlls/wldap32/compare.c @@ -141,7 +141,7 @@ exit: free( dnU ); free( attrU ); free( valueU ); - bvfreeU( dataU ); + free( dataU ); controlarrayfreeU( serverctrlsU ); controlarrayfreeU( clientctrlsU ); return ret; @@ -218,7 +218,7 @@ exit: free( dnU ); free( attrU ); free( valueU ); - bvfreeU( dataU ); + free( dataU ); controlarrayfreeU( serverctrlsU ); controlarrayfreeU( clientctrlsU ); return ret; diff --git a/dlls/wldap32/extended.c b/dlls/wldap32/extended.c index fad2a3d42d4..b168615c0fc 100644 --- a/dlls/wldap32/extended.c +++ b/dlls/wldap32/extended.c @@ -92,7 +92,7 @@ ULONG CDECL ldap_extended_operationW( LDAP *ld, WCHAR *oid, struct WLDAP32_berva exit: free( oidU ); - bvfreeU( dataU ); + free( dataU ); controlarrayfreeU( serverctrlsU ); controlarrayfreeU( clientctrlsU ); return ret; @@ -174,7 +174,7 @@ ULONG CDECL ldap_extended_operation_sW( LDAP *ld, WCHAR *oid, struct WLDAP32_ber exit: free( oidU ); - bvfreeU( dataU ); + free( dataU ); controlarrayfreeU( serverctrlsU ); controlarrayfreeU( clientctrlsU ); return ret; diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 47a67968651..69dca519b0e 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -743,11 +743,6 @@ static inline struct WLDAP32_berval **bvarrayUtoW( struct berval **bv ) return ret; } -static inline void bvfreeU( struct berval *berval ) -{ - free( berval ); -} - static inline struct berval **bvarrayWtoU( struct WLDAP32_berval **bv ) { struct berval **ret = NULL;

1 0

Sven Baars : kernelbase: Pass the root key to create_key().
by Alexandre Julliard 15 Mar '23

15 Mar '23

Module: wine Branch: master Commit: 076fb381a97420d12a4b41158694789956376b8b URL: https://gitlab.winehq.org/wine/wine/-/commit/076fb381a97420d12a4b4115869478… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Mar 9 11:06:35 2023 +0100 kernelbase: Pass the root key to create_key(). --- dlls/kernelbase/registry.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 714f6a20227..de1410a2e95 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -140,12 +140,12 @@ static HKEY get_perflib_key( HANDLE key ) } /* wrapper for NtCreateKey that creates the key recursively if necessary */ -static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, +static NTSTATUS create_key( HKEY *retkey, HKEY root, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, const UNICODE_STRING *class, ULONG options, PULONG dispos ) { BOOL force_wow32 = is_win64 && (access & KEY_WOW64_32KEY); NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; - HANDLE subkey, root = attr->RootDirectory; + HANDLE subkey; if (!force_wow32) status = NtCreateKey( &subkey, access, attr, 0, class, options, dispos ); @@ -316,7 +316,7 @@ static HKEY create_special_root_hkey( HKEY hkey, DWORD access ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &name, root_key_names[idx] ); - if (create_key( &hkey, access, &attr, NULL, 0, NULL )) return 0; + if (create_key( &hkey, 0, access, &attr, NULL, 0, NULL )) return 0; TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey ); } @@ -444,7 +444,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD RtlInitUnicodeString( &nameW, name ); RtlInitUnicodeString( &classW, class ); - return RtlNtStatusToDosError( create_key( retkey, access, &attr, &classW, options, dispos ) ); + return RtlNtStatusToDosError( create_key( retkey, hkey, access, &attr, &classW, options, dispos ) ); } @@ -503,7 +503,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD { if (!(status = RtlAnsiStringToUnicodeString( &classW, &classA, TRUE ))) { - status = create_key( retkey, access, &attr, &classW, options, dispos ); + status = create_key( retkey, hkey, access, &attr, &classW, options, dispos ); RtlFreeUnicodeString( &classW ); } }

1 0

Sven Baars : kernelbase: Pass the key name to create_key().
by Alexandre Julliard 15 Mar '23

15 Mar '23

Module: wine Branch: master Commit: e146c3335164939186489ee68e44cfaa9a0214d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e146c3335164939186489ee68e44cf… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Mar 9 11:14:53 2023 +0100 kernelbase: Pass the key name to create_key(). --- dlls/kernelbase/registry.c | 92 +++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 54 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index de1410a2e95..7e4e93302e4 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -140,76 +140,83 @@ static HKEY get_perflib_key( HANDLE key ) } /* wrapper for NtCreateKey that creates the key recursively if necessary */ -static NTSTATUS create_key( HKEY *retkey, HKEY root, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - const UNICODE_STRING *class, ULONG options, PULONG dispos ) +static NTSTATUS create_key( HKEY *retkey, HKEY root, UNICODE_STRING name, ULONG options, ACCESS_MASK access, + const UNICODE_STRING *class, PULONG dispos ) { BOOL force_wow32 = is_win64 && (access & KEY_WOW64_32KEY); NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + OBJECT_ATTRIBUTES attr; HANDLE subkey; - if (!force_wow32) status = NtCreateKey( &subkey, access, attr, 0, class, options, dispos ); + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &name; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; + + if (!force_wow32) status = NtCreateKey( &subkey, access, &attr, 0, class, options, dispos ); if (status == STATUS_OBJECT_NAME_NOT_FOUND) { - WCHAR *buffer = attr->ObjectName->Buffer; - DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); - UNICODE_STRING str; + WCHAR *buffer = name.Buffer; + DWORD attrs, pos = 0, i = 0, len = name.Length / sizeof(WCHAR); /* don't try to create registry root */ - if (!attr->RootDirectory && len > 10 && !wcsnicmp( buffer, L"\\Registry\\", 10 )) i += 10; + if (!attr.RootDirectory && len > 10 && !wcsnicmp( buffer, L"\\Registry\\", 10 )) i += 10; while (i < len && buffer[i] != '\\') i++; if (i == len && !force_wow32) return status; - attrs = attr->Attributes; - attr->ObjectName = &str; + attrs = attr.Attributes; for (;;) { - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); + name.Buffer = buffer + pos; + name.Length = (i - pos) * sizeof(WCHAR); if (force_wow32 && pos) { - if (is_wow6432node( &str )) force_wow32 = FALSE; - else if ((subkey = open_wow6432node( attr->RootDirectory ))) + if (is_wow6432node( &name )) force_wow32 = FALSE; + else if ((subkey = open_wow6432node( attr.RootDirectory ))) { - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); - attr->RootDirectory = subkey; + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); + attr.RootDirectory = subkey; force_wow32 = FALSE; } } if (i == len) { - attr->Attributes = attrs; - status = NtCreateKey( &subkey, access, attr, 0, class, options, dispos ); + attr.Attributes = attrs; + status = NtCreateKey( &subkey, access, &attr, 0, class, options, dispos ); } else { - attr->Attributes = attrs & ~OBJ_OPENLINK; - status = NtCreateKey( &subkey, access, attr, 0, class, + attr.Attributes = attrs & ~OBJ_OPENLINK; + status = NtCreateKey( &subkey, access, &attr, 0, class, options & ~REG_OPTION_CREATE_LINK, dispos ); } - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); if (!NT_SUCCESS(status)) return status; if (i == len) break; - attr->RootDirectory = subkey; + attr.RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } } - attr->RootDirectory = subkey; - if (force_wow32 && (subkey = open_wow6432node( attr->RootDirectory ))) + attr.RootDirectory = subkey; + if (force_wow32 && (subkey = open_wow6432node( attr.RootDirectory ))) { - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); - attr->RootDirectory = subkey; + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); + attr.RootDirectory = subkey; } if (status == STATUS_PREDEFINED_HANDLE) { - attr->RootDirectory = get_perflib_key( attr->RootDirectory ); + attr.RootDirectory = get_perflib_key( attr.RootDirectory ); status = STATUS_SUCCESS; } - *retkey = attr->RootDirectory; + *retkey = attr.RootDirectory; return status; } @@ -306,18 +313,11 @@ static HKEY create_special_root_hkey( HKEY hkey, DWORD access ) } else { - OBJECT_ATTRIBUTES attr; UNICODE_STRING name; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &name; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &name, root_key_names[idx] ); - if (create_key( &hkey, 0, access, &attr, NULL, 0, NULL )) return 0; - TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey ); + if (create_key( &hkey, 0, name, 0, access, NULL, NULL )) return 0; + TRACE( "%s -> %p\n", debugstr_w(name.Buffer), hkey ); } if (!cache_disabled[idx] && !(access & (KEY_WOW64_64KEY | KEY_WOW64_32KEY))) @@ -428,23 +428,15 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, PHKEY retkey, LPDWORD dispos ) { - OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW, classW; if (reserved) return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey, access ))) return ERROR_INVALID_HANDLE; - attr.Length = sizeof(attr); - attr.RootDirectory = hkey; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; RtlInitUnicodeString( &nameW, name ); RtlInitUnicodeString( &classW, class ); - return RtlNtStatusToDosError( create_key( retkey, hkey, access, &attr, &classW, options, dispos ) ); + return RtlNtStatusToDosError( create_key( retkey, hkey, nameW, options, access, &classW, dispos ) ); } @@ -475,7 +467,6 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, PHKEY retkey, LPDWORD dispos ) { - OBJECT_ATTRIBUTES attr; UNICODE_STRING classW; ANSI_STRING nameA, classA; NTSTATUS status; @@ -488,13 +479,6 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD } if (!(hkey = get_special_root_hkey( hkey, access ))) return ERROR_INVALID_HANDLE; - attr.Length = sizeof(attr); - attr.RootDirectory = hkey; - attr.ObjectName = &NtCurrentTeb()->StaticUnicodeString; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; RtlInitAnsiString( &nameA, name ); RtlInitAnsiString( &classA, class ); @@ -503,7 +487,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD { if (!(status = RtlAnsiStringToUnicodeString( &classW, &classA, TRUE ))) { - status = create_key( retkey, hkey, access, &attr, &classW, options, dispos ); + status = create_key( retkey, hkey, NtCurrentTeb()->StaticUnicodeString, options, access, &classW, dispos ); RtlFreeUnicodeString( &classW ); } }

1 0

Sven Baars : kernelbase: Restructure the open_key() loop.
by Alexandre Julliard 15 Mar '23

15 Mar '23

Module: wine Branch: master Commit: 0da843f082217289d89b3eb9562c351ca9cb721e URL: https://gitlab.winehq.org/wine/wine/-/commit/0da843f082217289d89b3eb9562c35… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Nov 30 11:42:39 2022 +0100 kernelbase: Restructure the open_key() loop. --- dlls/kernelbase/registry.c | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 7e4e93302e4..a6fec29bd08 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -100,7 +100,8 @@ static inline BOOL is_version_nt(void) static BOOL is_wow6432node( const UNICODE_STRING *name ) { - return (name->Length == 11 * sizeof(WCHAR) && !wcsnicmp( name->Buffer, L"Wow6432Node", 11 )); + DWORD len = name->Length / sizeof(WCHAR); + return (len >= 11 && !wcsnicmp( name->Buffer, L"Wow6432Node\\", min( len, 12 ) )); } /* open the Wow6432Node subkey of the specified key */ @@ -228,7 +229,7 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD op BOOL force_wow32 = is_win64 && (access & KEY_WOW64_32KEY); HANDLE subkey; WCHAR *buffer = name.Buffer; - DWORD pos = 0, i = 0, len = name.Length / sizeof(WCHAR); + DWORD i, len = name.Length / sizeof(WCHAR); *retkey = NULL; @@ -251,23 +252,15 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD op return status; } - if (len && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; - while (i < len && buffer[i] != '\\') i++; - - for (;;) + while (len) { - name.Buffer = buffer + pos; - name.Length = (i - pos) * sizeof(WCHAR); - if (force_wow32 && pos) - { - if (is_wow6432node( &name )) force_wow32 = FALSE; - else if ((subkey = open_wow6432node( attr.RootDirectory ))) - { - if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); - attr.RootDirectory = subkey; - force_wow32 = FALSE; - } - } + i = 0; + if (buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; + while (i < len && buffer[i] != '\\') i++; + + name.Buffer = buffer; + name.Length = i * sizeof(WCHAR); + if (i == len) { if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; @@ -281,15 +274,22 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD op if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); if (status) return status; attr.RootDirectory = subkey; - if (i == len) break; while (i < len && buffer[i] == '\\') i++; - pos = i; - while (i < len && buffer[i] != '\\') i++; - } - if (force_wow32 && (subkey = open_wow6432node( attr.RootDirectory ))) - { - if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); - attr.RootDirectory = subkey; + buffer += i; + len -= i; + + if (force_wow32) + { + name.Buffer = buffer; + name.Length = len * sizeof(WCHAR); + if (is_wow6432node( &name )) force_wow32 = FALSE; + else if ((subkey = open_wow6432node( attr.RootDirectory ))) + { + NtClose( attr.RootDirectory ); + attr.RootDirectory = subkey; + force_wow32 = FALSE; + } + } } if (status == STATUS_PREDEFINED_HANDLE) {

1 0

Sven Baars : kernelbase: Always try to open the Wow6432Node in open_key().
by Alexandre Julliard 15 Mar '23

15 Mar '23

Module: wine Branch: master Commit: 31ee0b309bf704f6b7eab79aace901d5df1f2bc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/31ee0b309bf704f6b7eab79aace901… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Nov 30 11:44:42 2022 +0100 kernelbase: Always try to open the Wow6432Node in open_key(). --- dlls/kernelbase/registry.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index a6fec29bd08..a78aea82fc1 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -226,7 +226,6 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD op { OBJECT_ATTRIBUTES attr; NTSTATUS status; - BOOL force_wow32 = is_win64 && (access & KEY_WOW64_32KEY); HANDLE subkey; WCHAR *buffer = name.Buffer; DWORD i, len = name.Length / sizeof(WCHAR); @@ -240,7 +239,7 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD op attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (!force_wow32) + if (!(is_win64 && (access & KEY_WOW64_32KEY))) { if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; status = NtOpenKeyEx( (HANDLE *)retkey, access, &attr, options ); @@ -278,16 +277,14 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD op buffer += i; len -= i; - if (force_wow32) + name.Buffer = buffer; + name.Length = len * sizeof(WCHAR); + if (!is_wow6432node( &name )) { - name.Buffer = buffer; - name.Length = len * sizeof(WCHAR); - if (is_wow6432node( &name )) force_wow32 = FALSE; - else if ((subkey = open_wow6432node( attr.RootDirectory ))) + if ((subkey = open_wow6432node( attr.RootDirectory ))) { NtClose( attr.RootDirectory ); attr.RootDirectory = subkey; - force_wow32 = FALSE; } } }

1 0