October 2023 - Wine-Commits

Matteo Bruni : wined3d: Don't skip setting clip planes if the view transform state is dirty.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: f9c7fabed6b6950491cda400580bc40ce5291da9 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9c7fabed6b6950491cda400580bc4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 13 04:31:50 2023 +0200 wined3d: Don't skip setting clip planes if the view transform state is dirty. More fallout from 2ddb6b66a7cda0bf6aaddc0c6899e35cc92ceee9. --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6eaec9acb55..30b0adaa135 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3680,7 +3680,7 @@ void clipplane(struct wined3d_context *context, const struct wined3d_state *stat UINT index = state_id - STATE_CLIPPLANE(0); GLdouble plane[4]; - if (isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_VIEW)) || index >= gl_info->limits.user_clip_distances) + if (index >= gl_info->limits.user_clip_distances) return; gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW);

1 0

Connor McAdams : uiautomationcore/tests: Add tests for cached value helper functions in the COM API.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 6d0047ad66280f83458e4123d654f61ef7e77a25 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d0047ad66280f83458e4123d654f6… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 20 13:07:20 2023 -0400 uiautomationcore/tests: Add tests for cached value helper functions in the COM API. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 177 ++++++++++++++++++++++++++++- 1 file changed, 176 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index f34f020b814..1fd734bff65 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -13310,13 +13310,19 @@ static const struct prov_method_sequence get_cached_prop_val_seq3[] = { static void test_Element_cache_methods(IUIAutomation *uia_iface) { + static const int cache_test_props[] = { UIA_IsKeyboardFocusablePropertyId, UIA_NamePropertyId, UIA_ControlTypePropertyId, + UIA_BoundingRectanglePropertyId, UIA_HasKeyboardFocusPropertyId, }; HWND hwnd = create_test_hwnd("test_Element_cache_methods class"); IUIAutomationElement *element, *element2, *element3; + struct Provider_prop_override prop_override; IUIAutomationCacheRequest *cache_req; IUIAutomationElementArray *elem_arr; - int tmp_rt_id[2], i, len; + int tmp_rt_id[2], i, len, tmp_int; IUnknown *unk_ns; + BSTR tmp_bstr; + BOOL tmp_bool; HRESULT hr; + RECT rect; VARIANT v; element = create_test_element_from_hwnd(uia_iface, hwnd, TRUE); @@ -13534,6 +13540,175 @@ static void test_Element_cache_methods(IUIAutomation *uia_iface) ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); IUnknown_Release(unk_ns); + /* + * Windows 7 will call get_FragmentRoot in an endless loop until the fragment root returns an HWND. + * It's the only version with this behavior. + */ + if (!UiaLookupId(AutomationIdentifierType_Property, &OptimizeForVisualContent_Property_GUID)) + { + win_skip("Skipping cached UIA_BoundingRectanglePropertyId tests for Win7\n"); + goto exit; + } + + /* + * Cached property value helper function tests. + */ + element = create_test_element_from_hwnd(uia_iface, hwnd, TRUE); + method_sequences_enabled = FALSE; + + /* + * element has no cached values, element2 has cached values but they're + * all the equivalent of VT_EMPTY, element3 has valid cached values. + */ + cache_req = NULL; + hr = IUIAutomation_CreateCacheRequest(uia_iface, &cache_req); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!cache_req, "cache_req == NULL\n"); + + for (i = 0; i < ARRAY_SIZE(cache_test_props); i++) + { + hr = IUIAutomationCacheRequest_AddProperty(cache_req, cache_test_props[i]); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + } + + /* element2, invalid values for all cached properties. */ + element2 = NULL; + Provider.ret_invalid_prop_type = TRUE; + set_uia_rect(&Provider.bounds_rect, 0, 0, 0, 0); + hr = IUIAutomationElement_BuildUpdatedCache(element, cache_req, &element2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!element2, "element2 == NULL\n"); + Provider.ret_invalid_prop_type = FALSE; + + /* element3, valid values for all cached properties. */ + V_VT(&v) = VT_I4; + V_I4(&v) = UIA_HyperlinkControlTypeId; + set_property_override(&prop_override, UIA_ControlTypePropertyId, &v); + set_provider_prop_override(&Provider, &prop_override, 1); + set_uia_rect(&Provider.bounds_rect, 0, 0, 50, 50); + + element3 = NULL; + hr = IUIAutomationElement_BuildUpdatedCache(element, cache_req, &element3); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!element3, "element3 == NULL\n"); + set_provider_prop_override(&Provider, NULL, 0); + + IUIAutomationCacheRequest_Release(cache_req); + + /* Cached UIA_HasKeyboardFocusPropertyId helper. */ + hr = IUIAutomationElement_get_CachedHasKeyboardFocus(element, NULL); + todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + tmp_bool = 0xdeadbeef; + hr = IUIAutomationElement_get_CachedHasKeyboardFocus(element, &tmp_bool); + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(tmp_bool == 0xdeadbeef, "Unexpected tmp_bool %d\n", tmp_bool); + + tmp_bool = 0xdeadbeef; + hr = IUIAutomationElement_get_CachedHasKeyboardFocus(element2, &tmp_bool); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!tmp_bool, "tmp_bool != FALSE\n"); + + tmp_bool = FALSE; + hr = IUIAutomationElement_get_CachedHasKeyboardFocus(element3, &tmp_bool); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!!tmp_bool, "tmp_bool == FALSE\n"); + + /* Cached UIA_IsKeyboardFocusablePropertyId helper. */ + hr = IUIAutomationElement_get_CachedIsKeyboardFocusable(element, NULL); + todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + tmp_bool = 0xdeadbeef; + hr = IUIAutomationElement_get_CachedIsKeyboardFocusable(element, &tmp_bool); + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(tmp_bool == 0xdeadbeef, "Unexpected tmp_bool %d\n", tmp_bool); + + tmp_bool = 0xdeadbeef; + hr = IUIAutomationElement_get_CachedIsKeyboardFocusable(element2, &tmp_bool); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!tmp_bool, "tmp_bool != FALSE\n"); + + tmp_bool = FALSE; + hr = IUIAutomationElement_get_CachedIsKeyboardFocusable(element3, &tmp_bool); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!!tmp_bool, "tmp_bool == FALSE\n"); + + /* Cached UIA_NamePropertyId helper. */ + hr = IUIAutomationElement_get_CachedName(element, NULL); + todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + tmp_bstr = (void *)0xdeadbeef; + hr = IUIAutomationElement_get_CachedName(element, &tmp_bstr); + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(tmp_bstr == (void *)0xdeadbeef, "Unexpected BSTR ptr %p\n", tmp_bstr); + + tmp_bstr = NULL; + hr = IUIAutomationElement_get_CachedName(element2, &tmp_bstr); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ok(!lstrcmpW(tmp_bstr, L""), "Unexpected BSTR %s\n", wine_dbgstr_w(tmp_bstr)); + SysFreeString(tmp_bstr); + + tmp_bstr = NULL; + hr = IUIAutomationElement_get_CachedName(element3, &tmp_bstr); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ok(!lstrcmpW(tmp_bstr, uia_bstr_prop_str), "Unexpected BSTR %s\n", wine_dbgstr_w(tmp_bstr)); + SysFreeString(tmp_bstr); + + /* Cached UIA_ControlTypePropertyId. */ + hr = IUIAutomationElement_get_CachedControlType(element, NULL); + todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + tmp_int = 0xdeadbeef; + hr = IUIAutomationElement_get_CachedControlType(element, &tmp_int); + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(tmp_int == 0xdeadbeef, "Unexpected control type %#x\n", tmp_int); + + tmp_int = 0; + hr = IUIAutomationElement_get_CachedControlType(element2, &tmp_int); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(tmp_int == UIA_CustomControlTypeId, "Unexpected control type %#x\n", tmp_int); + + tmp_int = 0; + hr = IUIAutomationElement_get_CachedControlType(element3, &tmp_int); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(tmp_int == UIA_HyperlinkControlTypeId, "Unexpected control type %#x\n", tmp_int); + + /* Cached UIA_BoundingRectanglePropertyId helper. */ + hr = IUIAutomationElement_get_CachedBoundingRectangle(element, NULL); + todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + rect.left = rect.top = rect.bottom = rect.right = 1; + hr = IUIAutomationElement_get_CachedBoundingRectangle(element, &rect); + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(rect.left == 1, "Unexpected rect left %ld\n", rect.left); + ok(rect.top == 1, "Unexpected rect top %ld\n", rect.top); + ok(rect.right == 1, "Unexpected rect right %ld\n", rect.right); + ok(rect.bottom == 1, "Unexpected rect bottom %ld\n", rect.bottom); + + rect.left = rect.top = rect.bottom = rect.right = 1; + hr = IUIAutomationElement_get_CachedBoundingRectangle(element2, &rect); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!rect.left, "Unexpected rect left %ld\n", rect.left); + todo_wine ok(!rect.top, "Unexpected rect top %ld\n", rect.top); + todo_wine ok(!rect.right, "Unexpected rect right %ld\n", rect.right); + todo_wine ok(!rect.bottom, "Unexpected rect bottom %ld\n", rect.bottom); + + memset(&rect, 0, sizeof(rect)); + hr = IUIAutomationElement_get_CachedBoundingRectangle(element3, &rect); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + check_uia_rect_rect_val(&rect, &Provider.bounds_rect); + + IUIAutomationElement_Release(element3); + IUIAutomationElement_Release(element2); + IUIAutomationElement_Release(element); + + set_uia_rect(&Provider.bounds_rect, 0, 0, 0, 0); + method_sequences_enabled = TRUE; + +exit: DestroyWindow(hwnd); UnregisterClassA("test_Element_cache_methods class", NULL); }

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomationElement::get_CachedControlType.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 15f098c34e183d0e6e71187ef47972ceba79eb47 URL: https://gitlab.winehq.org/wine/wine/-/commit/15f098c34e183d0e6e71187ef47972… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 21 06:53:16 2023 -0400 uiautomationcore: Implement IUIAutomationElement::get_CachedControlType. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 12 ++++----- dlls/uiautomationcore/uia_com_client.c | 43 +++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 1fd734bff65..4a5bca74b6a 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -13658,22 +13658,22 @@ static void test_Element_cache_methods(IUIAutomation *uia_iface) /* Cached UIA_ControlTypePropertyId. */ hr = IUIAutomationElement_get_CachedControlType(element, NULL); - todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); tmp_int = 0xdeadbeef; hr = IUIAutomationElement_get_CachedControlType(element, &tmp_int); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); ok(tmp_int == 0xdeadbeef, "Unexpected control type %#x\n", tmp_int); tmp_int = 0; hr = IUIAutomationElement_get_CachedControlType(element2, &tmp_int); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(tmp_int == UIA_CustomControlTypeId, "Unexpected control type %#x\n", tmp_int); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(tmp_int == UIA_CustomControlTypeId, "Unexpected control type %#x\n", tmp_int); tmp_int = 0; hr = IUIAutomationElement_get_CachedControlType(element3, &tmp_int); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(tmp_int == UIA_HyperlinkControlTypeId, "Unexpected control type %#x\n", tmp_int); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(tmp_int == UIA_HyperlinkControlTypeId, "Unexpected control type %#x\n", tmp_int); /* Cached UIA_BoundingRectanglePropertyId helper. */ hr = IUIAutomationElement_get_CachedBoundingRectangle(element, NULL); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index d138d4ed919..e47c64c479b 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -2143,27 +2143,33 @@ static HRESULT WINAPI uia_element_get_CurrentProcessId(IUIAutomationElement9 *if return E_NOTIMPL; } +static void uia_elem_get_control_type(VARIANT *v, CONTROLTYPEID *ret_val) +{ + const struct uia_control_type_info *info = NULL; + + *ret_val = UIA_CustomControlTypeId; + if (V_VT(v) != VT_I4) + return; + + if ((info = uia_control_type_info_from_id(V_I4(v)))) + *ret_val = info->control_type_id; + else + WARN("Provider returned invalid control type ID %ld\n", V_I4(v)); +} + static HRESULT WINAPI uia_element_get_CurrentControlType(IUIAutomationElement9 *iface, CONTROLTYPEID *ret_val) { struct uia_element *element = impl_from_IUIAutomationElement9(iface); - const struct uia_control_type_info *control_type_info = NULL; HRESULT hr; VARIANT v; TRACE("%p, %p\n", iface, ret_val); VariantInit(&v); - *ret_val = UIA_CustomControlTypeId; hr = UiaGetPropertyValue(element->node, UIA_ControlTypePropertyId, &v); - if (SUCCEEDED(hr) && V_VT(&v) == VT_I4) - { - if ((control_type_info = uia_control_type_info_from_id(V_I4(&v)))) - *ret_val = control_type_info->control_type_id; - else - WARN("Provider returned invalid control type ID %ld\n", V_I4(&v)); - } - + uia_elem_get_control_type(&v, ret_val); VariantClear(&v); + return hr; } @@ -2393,8 +2399,21 @@ static HRESULT WINAPI uia_element_get_CachedProcessId(IUIAutomationElement9 *ifa static HRESULT WINAPI uia_element_get_CachedControlType(IUIAutomationElement9 *iface, CONTROLTYPEID *ret_val) { - FIXME("%p: stub\n", iface); - return E_NOTIMPL; + struct uia_element *element = impl_from_IUIAutomationElement9(iface); + const int prop_id = UIA_ControlTypePropertyId; + struct uia_cache_property *cache_prop = NULL; + + TRACE("%p, %p\n", iface, ret_val); + + if (!ret_val) + return E_POINTER; + + if (!(cache_prop = bsearch(&prop_id, element->cached_props, element->cached_props_count, sizeof(*cache_prop), + uia_cached_property_id_compare))) + return E_INVALIDARG; + + uia_elem_get_control_type(&cache_prop->prop_val, ret_val); + return S_OK; } static HRESULT WINAPI uia_element_get_CachedLocalizedControlType(IUIAutomationElement9 *iface, BSTR *ret_val)

1 0

Alexandre Julliard : zydis: Disable assertions.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 7ff690f4bd84517aa8020615174ba007eb110b07 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ff690f4bd84517aa8020615174ba0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 18 18:35:21 2023 +0200 zydis: Disable assertions. --- libs/zydis/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/zydis/Makefile.in b/libs/zydis/Makefile.in index eb545d678ac..b47f060ba2d 100644 --- a/libs/zydis/Makefile.in +++ b/libs/zydis/Makefile.in @@ -1,5 +1,6 @@ EXTLIB = libzydis.a EXTRAINCL = $(ZYDIS_PE_CFLAGS) -I$(srcdir)/src +EXTRADEFS = -DNDEBUG SOURCES = \ src/Decoder.c \

1 0

Alex Henrie : win32u: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 344eee2024979f0f5ae139dba696a09732750d1b URL: https://gitlab.winehq.org/wine/wine/-/commit/344eee2024979f0f5ae139dba696a0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:32:53 2023 -0600 win32u: Use debugstr_fourcc instead of debugstr_an. --- dlls/win32u/freetype.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index fd402758daa..6043c66bc53 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -2058,7 +2058,7 @@ static UINT freetype_get_font_data( struct gdi_font *font, UINT table, UINT offs err = pFT_Load_Sfnt_Table(ft_face, RtlUlongByteSwap(table), offset, buf, &len); if (err) { - TRACE("Can't find table %s\n", debugstr_an((char*)&table, 4)); + TRACE("Can't find table %s\n", debugstr_fourcc(table)); return GDI_ERROR; } return len; @@ -4010,7 +4010,7 @@ static UINT freetype_get_unicode_ranges( struct gdi_font *font, GLYPHSET *gs ) else { DWORD encoding = RtlUlongByteSwap(ft_face->charmap->encoding); - FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + FIXME("encoding %s not supported\n", debugstr_fourcc(encoding)); } return num_ranges; @@ -4175,7 +4175,7 @@ static UINT freetype_get_kerning_pairs( struct gdi_font *font, KERNINGPAIR **pai DWORD encoding = RtlUlongByteSwap(ft_face->charmap->encoding); ULONG n; - FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + FIXME("encoding %s not supported\n", debugstr_fourcc(encoding)); for (n = 0; n <= 65535; n++) glyph_to_char[n] = (USHORT)n; }

1 0

Zebediah Figura : wined3d: Use wined3d_array_reserve() to pre-allocate the buffer dirty ranges array.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 8378a786a6d3fada09e3907018d41e1e63d54743 URL: https://gitlab.winehq.org/wine/wine/-/commit/8378a786a6d3fada09e3907018d41e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 14 12:52:12 2023 -0500 wined3d: Use wined3d_array_reserve() to pre-allocate the buffer dirty ranges array. --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9f162a890e3..2d5bbcf4d79 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1399,7 +1399,8 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return E_OUTOFMEMORY; } - if (!(buffer->dirty_ranges = heap_alloc(sizeof(*buffer->dirty_ranges)))) + if (!wined3d_array_reserve((void **)&buffer->dirty_ranges, + &buffer->dirty_ranges_capacity, 1, sizeof(*buffer->dirty_ranges))) { ERR("Out of memory.\n"); buffer_resource_unload(resource); @@ -1407,7 +1408,6 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d wined3d_resource_wait_idle(resource); return E_OUTOFMEMORY; } - buffer->dirty_ranges_capacity = 1; if (buffer->locations & WINED3D_LOCATION_DISCARDED) buffer->resource.client.addr.buffer_object = CLIENT_BO_DISCARDED;

1 0

Zebediah Figura : wined3d: Rename buffer dirty ranges fields.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 352d04935ac891f414d11806c5e4fd369e49893d URL: https://gitlab.winehq.org/wine/wine/-/commit/352d04935ac891f414d11806c5e4fd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 14 12:51:15 2023 -0500 wined3d: Rename buffer dirty ranges fields. Make the fields names consistent with each other and with the usual scheme for field naming. --- dlls/wined3d/buffer.c | 52 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 7 ++++-- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 082d502ff98..9f162a890e3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -70,38 +70,38 @@ static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned i goto invalidate_all; } - if (!wined3d_array_reserve((void **)&buffer->maps, &buffer->maps_size, - buffer->modified_areas + 1, sizeof(*buffer->maps))) + if (!wined3d_array_reserve((void **)&buffer->dirty_ranges, &buffer->dirty_ranges_capacity, + buffer->dirty_range_count + 1, sizeof(*buffer->dirty_ranges))) { - ERR("Failed to allocate maps array, invalidating entire buffer.\n"); + ERR("Failed to allocate dirty ranges array, invalidating entire buffer.\n"); goto invalidate_all; } - buffer->maps[buffer->modified_areas].offset = offset; - buffer->maps[buffer->modified_areas].size = size; - ++buffer->modified_areas; + buffer->dirty_ranges[buffer->dirty_range_count].offset = offset; + buffer->dirty_ranges[buffer->dirty_range_count].size = size; + ++buffer->dirty_range_count; return; invalidate_all: - buffer->modified_areas = 1; - buffer->maps[0].offset = 0; - buffer->maps[0].size = buffer->resource.size; + buffer->dirty_range_count = 1; + buffer->dirty_ranges[0].offset = 0; + buffer->dirty_ranges[0].size = buffer->resource.size; } -static inline void buffer_clear_dirty_areas(struct wined3d_buffer *This) +static inline void buffer_clear_dirty_areas(struct wined3d_buffer *buffer) { - This->modified_areas = 0; + buffer->dirty_range_count = 0; } static BOOL buffer_is_dirty(const struct wined3d_buffer *buffer) { - return !!buffer->modified_areas; + return !!buffer->dirty_range_count; } static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) { - return buffer->modified_areas == 1 - && !buffer->maps->offset && buffer->maps->size == buffer->resource.size; + return buffer->dirty_range_count == 1 + && !buffer->dirty_ranges[0].offset && buffer->dirty_ranges[0].size == buffer->resource.size; } void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, uint32_t location) @@ -534,10 +534,10 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined return; } - for (range_idx = 0; range_idx < buffer->modified_areas; ++range_idx) + for (range_idx = 0; range_idx < buffer->dirty_range_count; ++range_idx) { - start = buffer->maps[range_idx].offset; - end = start + buffer->maps[range_idx].size; + start = buffer->dirty_ranges[range_idx].offset; + end = start + buffer->dirty_ranges[range_idx].size; memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) @@ -568,7 +568,8 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined dst.addr = NULL; src.buffer_object = NULL; src.addr = data; - wined3d_context_copy_bo_address(context, &dst, &src, buffer->modified_areas, buffer->maps, WINED3D_MAP_WRITE); + wined3d_context_copy_bo_address(context, &dst, &src, + buffer->dirty_range_count, buffer->dirty_ranges, WINED3D_MAP_WRITE); heap_free(data); } @@ -657,11 +658,11 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, { uint32_t map_flags = WINED3D_MAP_WRITE; - if (buffer->modified_areas == 1 && !buffer->maps[0].offset - && buffer->maps[0].size == buffer->resource.size) + if (buffer_is_fully_dirty(buffer)) map_flags |= WINED3D_MAP_DISCARD; - wined3d_context_copy_bo_address(context, &dst, &src, buffer->modified_areas, buffer->maps, map_flags); + wined3d_context_copy_bo_address(context, &dst, &src, + buffer->dirty_range_count, buffer->dirty_ranges, map_flags); } else { @@ -776,7 +777,7 @@ static void wined3d_buffer_destroy_object(void *object) context_release(context); } heap_free(buffer->conversion_map); - heap_free(buffer->maps); + heap_free(buffer->dirty_ranges); } void wined3d_buffer_cleanup(struct wined3d_buffer *buffer) @@ -1079,7 +1080,6 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - unsigned int range_count = buffer->modified_areas; struct wined3d_device *device = resource->device; struct wined3d_context *context; struct wined3d_bo_address addr; @@ -1112,7 +1112,7 @@ static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resou addr.buffer_object = buffer->buffer_object; addr.addr = 0; - wined3d_context_unmap_bo_address(context, &addr, range_count, buffer->maps); + wined3d_context_unmap_bo_address(context, &addr, buffer->dirty_range_count, buffer->dirty_ranges); context_release(context); @@ -1399,7 +1399,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return E_OUTOFMEMORY; } - if (!(buffer->maps = heap_alloc(sizeof(*buffer->maps)))) + if (!(buffer->dirty_ranges = heap_alloc(sizeof(*buffer->dirty_ranges)))) { ERR("Out of memory.\n"); buffer_resource_unload(resource); @@ -1407,7 +1407,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d wined3d_resource_wait_idle(resource); return E_OUTOFMEMORY; } - buffer->maps_size = 1; + buffer->dirty_ranges_capacity = 1; if (buffer->locations & WINED3D_LOCATION_DISCARDED) buffer->resource.client.addr.buffer_object = CLIENT_BO_DISCARDED; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0b72bf298e2..4506186229a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3832,8 +3832,11 @@ struct wined3d_buffer struct wined3d_bo *buffer_object; struct wined3d_bo_user bo_user; - struct wined3d_range *maps; - SIZE_T maps_size, modified_areas; + /* For buffers which are GPU accessible but for which BUFFER is not + * currently a valid location, this is a list of areas that need to be + * uploaded to BUFFER. */ + struct wined3d_range *dirty_ranges; + SIZE_T dirty_range_count, dirty_ranges_capacity; /* conversion stuff */ UINT decl_change_count, full_conversion_count;

1 0

Zebediah Figura : wined3d: Do not track dirty ranges for buffers without WINED3D_BUFFER_USE_BO.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 307b200363d78fbb00c3519a38b26a9f044e402e URL: https://gitlab.winehq.org/wine/wine/-/commit/307b200363d78fbb00c3519a38b26a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 14 12:57:11 2023 -0500 wined3d: Do not track dirty ranges for buffers without WINED3D_BUFFER_USE_BO. Since we never upload the buffer, and may very well never invalidate the whole thing, this just results in continually increasing memory consumption. This is especially a problem for our internal push constant buffers, which are sysmem buffers that usually are never wholly invalidated, but it could also potentially be a problem for other buffers. --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2d5bbcf4d79..57c6085c10a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -122,7 +122,7 @@ static void wined3d_buffer_invalidate_range(struct wined3d_buffer *buffer, DWORD TRACE("buffer %p, location %s, offset %u, size %u.\n", buffer, wined3d_debug_location(location), offset, size); - if (location & WINED3D_LOCATION_BUFFER) + if ((location & WINED3D_LOCATION_BUFFER) && (buffer->flags & WINED3D_BUFFER_USE_BO)) buffer_invalidate_bo_range(buffer, offset, size); buffer->locations &= ~location; @@ -1399,7 +1399,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return E_OUTOFMEMORY; } - if (!wined3d_array_reserve((void **)&buffer->dirty_ranges, + if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !wined3d_array_reserve((void **)&buffer->dirty_ranges, &buffer->dirty_ranges_capacity, 1, sizeof(*buffer->dirty_ranges))) { ERR("Out of memory.\n");

1 0

Matteo Bruni : wined3d: Fix handling of system-memory GL vertex buffers.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 333a0be42d74269f0e17366532af04c688482af2 URL: https://gitlab.winehq.org/wine/wine/-/commit/333a0be42d74269f0e17366532af04… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 7 15:51:42 2023 +0200 wined3d: Fix handling of system-memory GL vertex buffers. Fixes: c065b4fe0b3622e0c737a4c7c1c514273ad2d8a7 --- dlls/wined3d/context_gl.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index a55365cdf12..b81f14a86ee 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5399,7 +5399,8 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context gl_info->gl_ops.gl.p_glTexCoordPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, get_vertex_attrib_pointer(e, state)); gl_info->gl_ops.gl.p_glEnableClientState(GL_TEXTURE_COORD_ARRAY); - wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); + if (bo) + wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); } else { @@ -5486,7 +5487,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte checkGLcall("glVertexPointer(...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_VERTEX_ARRAY); checkGLcall("glEnableClientState(GL_VERTEX_ARRAY)"); - wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); + if (bo) + wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); } /* Normals */ @@ -5509,7 +5511,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte checkGLcall("glNormalPointer(...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_NORMAL_ARRAY); checkGLcall("glEnableClientState(GL_NORMAL_ARRAY)"); - wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); + if (bo) + wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); } else { @@ -5538,7 +5541,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte checkGLcall("glColorPointer(4, GL_UNSIGNED_BYTE, ...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_COLOR_ARRAY); checkGLcall("glEnableClientState(GL_COLOR_ARRAY)"); - wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); + if (bo) + wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); } else { @@ -5602,7 +5606,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte } gl_info->gl_ops.gl.p_glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); checkGLcall("glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT)"); - wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); + if (bo) + wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); } else { @@ -5703,8 +5708,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c format_gl = wined3d_format_gl(element->format); stream = &state->streams[element->stream_idx]; - wined3d_buffer_validate_user(stream->buffer); - if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { @@ -5738,6 +5741,9 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c checkGLcall("glBindBuffer"); current_bo = bo; } + if (bo) + wined3d_buffer_validate_user(stream->buffer); + /* Use the VBO to find out if a vertex buffer exists, not the vb * pointer. vb can point to a user pointer data blob. In that case * current_bo will be 0. If there is a vertex buffer but no vbo we

1 0

Eric Pouech : dbghelp: Set the machine type for mach-O modules.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: e1064850ffd4024758530268ec8032bdaf7aa6ab URL: https://gitlab.winehq.org/wine/wine/-/commit/e1064850ffd4024758530268ec8032… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Oct 9 09:39:41 2023 +0200 dbghelp: Set the machine type for mach-O modules. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/macho_module.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index d5f7df9001f..b0569593fba 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -206,6 +206,18 @@ static char* format_uuid(const UINT8 uuid[16], char out[UUID_STRING_LEN]) return out; } +static USHORT macho_cpu_to_machine(unsigned cpu) +{ + switch (cpu) + { + case MACHO_CPU_TYPE_X86: return IMAGE_FILE_MACHINE_I386; + case MACHO_CPU_TYPE_X86_64: return IMAGE_FILE_MACHINE_AMD64; + default: + FIXME("Untranslated Mach-O CPU %x\n", cpu); + return IMAGE_FILE_MACHINE_UNKNOWN; + } +} + /****************************************************************** * macho_calc_range * @@ -1354,6 +1366,26 @@ static BOOL image_uses_split_segs(struct process* process, ULONG_PTR load_addr) return split_segs; } +/****************************************************************** + * image_get_machine + * + * For a module identified by its load address, return the machine field + * of the (loaded) Macho header. + */ +static USHORT image_get_machine(struct process *process, ULONG_PTR load_addr) +{ + if (load_addr) + { + struct macho_header header; + UINT32 target_magic = (process->is_host_64bit) ? MACHO_MH_MAGIC_64 : MACHO_MH_MAGIC_32; + + if (read_process_memory(process, load_addr, &header, FIELD_OFFSET(struct macho_header, reserved)) && + header.magic == target_magic) + return macho_cpu_to_machine(header.cputype); + } + return IMAGE_FILE_MACHINE_UNKNOWN; +} + /****************************************************************** * macho_load_debug_info * @@ -1479,7 +1511,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, load_addr = fmap.u.macho.segs_start; macho_info->module = module_new(pcs, filename, DMT_MACHO, FALSE, load_addr, fmap.u.macho.segs_size, 0, calc_crc32(fmap.u.macho.handle), - IMAGE_FILE_MACHINE_UNKNOWN); + image_get_machine(pcs, load_addr)); if (!macho_info->module) { HeapFree(GetProcessHeap(), 0, modfmt);

1 0