July 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Assert that the BO is mapped in unmap functions.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: b0a24c3cd7a10f41d3c0f45b813c17a999ae03aa URL: https://gitlab.winehq.org/wine/wine/-/commit/b0a24c3cd7a10f41d3c0f45b813c17… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 20 13:30:57 2022 -0500 wined3d: Assert that the BO is mapped in unmap functions. --- dlls/wined3d/adapter_vk.c | 2 ++ dlls/wined3d/context_gl.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 81248d40f46..58671cfb5f9 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1064,6 +1064,8 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, return; bo = wined3d_bo_vk(data->buffer_object); + assert(bo->b.map_ptr); + if (!bo->b.coherent) { for (i = 0; i < range_count; ++i) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 7679a0ffb20..7f7324c8b91 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3039,6 +3039,8 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, return; bo = wined3d_bo_gl(data->buffer_object); + assert(bo->b.map_ptr); + flush_bo_ranges(context_gl, wined3d_const_bo_address(data), range_count, ranges); wined3d_bo_gl_unmap(bo, context_gl); }

1 0

Nikolay Sivov : d2d1/tests: Add a missing return value test (Coverity).
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: ea82d4ee9842fbbad449e3e4280ae8fb82b53ba9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea82d4ee9842fbbad449e3e4280ae8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 22 21:46:29 2022 +0300 d2d1/tests: Add a missing return value test (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bbca9139711..22e020bebb9 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12008,7 +12008,8 @@ static void test_registered_effects(BOOL d3d11) free(effects); - ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count2 = 0; hr = ID2D1Factory1_GetRegisteredEffects(factory, NULL, 0, NULL, &count2);

1 0

Zebediah Figura : wined3d: Do not try to unmap already unmapped BOs in wined3d_texture_update_sub_resource().
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: 1733f86d4afef9449cab3499058be3f16eea27e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1733f86d4afef9449cab3499058be3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 20 13:30:30 2022 -0500 wined3d: Do not try to unmap already unmapped BOs in wined3d_texture_update_sub_resource(). --- dlls/wined3d/texture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 50049f96d71..39ef6376203 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4737,7 +4737,8 @@ void wined3d_texture_update_sub_resource(struct wined3d_texture *texture, unsign wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER); wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_BUFFER); /* Try to free address space if we are not mapping persistently. */ - wined3d_context_unmap_bo_address(context, (const struct wined3d_bo_address *)&upload_bo->addr, 0, NULL); + if (upload_bo->addr.buffer_object->map_ptr) + wined3d_context_unmap_bo_address(context, (const struct wined3d_bo_address *)&upload_bo->addr, 0, NULL); } /* Only load the sub-resource for partial updates. */

1 0

Nikolay Sivov : win32u: Remove some dead code from get_scroll_range() helper (Coverity).
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: 0cd65f0083c30a4058b8439a0d463518a57037a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0cd65f0083c30a4058b8439a0d4635… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 22 21:52:32 2022 +0300 win32u: Remove some dead code from get_scroll_range() helper (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/win32u/scroll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index cb6d4b7a7c9..c9734e3bfd1 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -1242,8 +1242,8 @@ static BOOL get_scroll_range( HWND hwnd, int nBar, int *min, int *max ) struct scroll_info *info; if (!(info = get_scroll_info_ptr( hwnd, nBar, FALSE ))) return FALSE; - if (min) *min = info ? info->minVal : 0; - if (max) *max = info ? info->maxVal : 0; + if (min) *min = info->minVal; + if (max) *max = info->maxVal; release_scroll_info_ptr( info ); return TRUE; }

1 0

Nikolay Sivov : d3d11: Use CRT allocation functions.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: b951c37b8791ceb052c9e159ad7927f75a72d667 URL: https://gitlab.winehq.org/wine/wine/-/commit/b951c37b8791ceb052c9e159ad7927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 17:31:20 2022 +0300 d3d11: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/async.c | 6 +++--- dlls/d3d11/buffer.c | 6 +++--- dlls/d3d11/d3d11_private.h | 1 - dlls/d3d11/device.c | 30 +++++++++++++++--------------- dlls/d3d11/inputlayout.c | 14 +++++++------- dlls/d3d11/shader.c | 40 ++++++++++++++++++++-------------------- dlls/d3d11/state.c | 28 ++++++++++++++-------------- dlls/d3d11/texture.c | 18 +++++++++--------- dlls/d3d11/view.c | 24 ++++++++++++------------ 9 files changed, 83 insertions(+), 84 deletions(-)

1 0

Nikolay Sivov : dwrite: Remove old system fallback logic.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: 26e717c5653d2c6fcb29846e7d22aa97e37048e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/26e717c5653d2c6fcb29846e7d22aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 22:50:17 2022 +0300 dwrite: Remove old system fallback logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 402 ++++++++++++++++++------------------------- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/layout.c | 30 +++- dlls/dwrite/main.c | 1 + dlls/dwrite/tests/layout.c | 50 +++--- 5 files changed, 217 insertions(+), 267 deletions(-)

1 0

Nikolay Sivov : dwrite: Implement MapCharacters() for custom fallback.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: d37eb0f144f2f6d234da1dae36c8514148841c81 URL: https://gitlab.winehq.org/wine/wine/-/commit/d37eb0f144f2f6d234da1dae36c851… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 17:48:13 2022 +0300 dwrite: Implement MapCharacters() for custom fallback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 252 +++++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/layout.c | 33 +++--- 2 files changed, 255 insertions(+), 30 deletions(-)

1 0

Nikolay Sivov : dwrite: Filter out unusable ranges on AddMapping().
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: 78846236b938b1c5f2d2221ed0050656b54fb08e URL: https://gitlab.winehq.org/wine/wine/-/commit/78846236b938b1c5f2d2221ed00506… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 16 15:13:01 2022 +0300 dwrite: Filter out unusable ranges on AddMapping(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 2f5f1e1d7fe..1522d7638bc 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2374,7 +2374,7 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder { struct dwrite_fontfallback_builder *builder = impl_from_IDWriteFontFallbackBuilder(iface); struct fallback_mapping *mapping; - UINT32 i; + unsigned int i, count; TRACE("%p, %p, %u, %p, %u, %p, %s, %s, %f.\n", iface, ranges, ranges_count, families, families_count, collection, debugstr_w(locale_name), debugstr_w(base_family), scale); @@ -2397,8 +2397,22 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder if (!(mapping->ranges = calloc(ranges_count, sizeof(*mapping->ranges)))) goto failed; - mapping->ranges_count = ranges_count; - memcpy(mapping->ranges, ranges, sizeof(*mapping->ranges) * ranges_count); + /* Filter ranges that won't be usable. */ + for (i = 0, count = 0; i < ranges_count; ++i) + { + if (ranges[i].first > ranges[i].last) continue; + if (ranges[i].first > 0x10ffff) continue; + mapping->ranges[count].first = ranges[i].first; + mapping->ranges[count].last = min(ranges[i].last, 0x10ffff); + count++; + } + if (!count) + { + release_fallback_mapping(mapping); + return S_OK; + } + + mapping->ranges_count = count; if (!(mapping->families = calloc(families_count, sizeof(*mapping->families)))) goto failed;

1 0

Nikolay Sivov : dwrite: Override existing ranges with AddMapping().
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: f2ad1d8b93f36a05b05b6b206767d916fc616576 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2ad1d8b93f36a05b05b6b206767d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 17 18:32:34 2022 +0300 dwrite: Override existing ranges with AddMapping(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index c6c4fa2d654..e4a52fa95a6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2452,7 +2452,7 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder struct dwrite_fontfallback_builder *builder = impl_from_IDWriteFontFallbackBuilder(iface); struct fallback_mapping *mapping; struct fallback_locale *locale; - unsigned int i, count; + unsigned int i, j, m, count; TRACE("%p, %p, %u, %p, %u, %p, %s, %s, %f.\n", iface, ranges, ranges_count, families, families_count, collection, debugstr_w(locale_name), debugstr_w(base_family), scale); @@ -2502,12 +2502,47 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder mapping->families_count = families_count; for (i = 0; i < families_count; i++) if (!(mapping->families[i] = wcsdup(families[i]))) goto failed; + mapping->scale = scale; + + if (FAILED(fallback_locale_add_mapping(locale, builder->data.count))) goto failed; + + /* Mappings with explicit collections take priority, for that reduce existing mappings ranges + by newly added ranges. */ + mapping->collection = collection; if (mapping->collection) + { IDWriteFontCollection_AddRef(mapping->collection); - mapping->scale = scale; - if (FAILED(fallback_locale_add_mapping(locale, builder->data.count))) goto failed; + for (m = 0; m < builder->data.count; ++m) + { + struct fallback_mapping *c = &builder->data.mappings[m]; + if (c->collection) continue; + for (i = 0; i < count; ++i) + { + const DWRITE_UNICODE_RANGE *new_range = &mapping->ranges[i]; + + for (j = 0; j < c->ranges_count; ++j) + { + DWRITE_UNICODE_RANGE *range = &c->ranges[j]; + + /* In case existing ranges intersect, disable or reduce them */ + if (range->first >= new_range->first && range->last <= new_range->last) + { + range->first = range->last = ~0u; + } + else if (range->first >= new_range->first && range->first <= new_range->last) + { + range->first = new_range->last; + } + else if (range->last >= new_range->first && range->last <= new_range->last) + { + range->last = new_range->first; + } + } + } + } + } builder->data.count++; return S_OK;

1 0

Nikolay Sivov : dwrite: Add additional structure for mappings array.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: 1cf2ac20c8587504c32d85854737d103bc9c624a URL: https://gitlab.winehq.org/wine/wine/-/commit/1cf2ac20c8587504c32d85854737d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 16 15:01:20 2022 +0300 dwrite: Add additional structure for mappings array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 96 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a8ab12b9430..2f5f1e1d7fe 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -240,6 +240,12 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { #undef MAPPING_RANGE }; +struct fallback_data +{ + struct fallback_mapping *mappings; + size_t count; +}; + struct dwrite_fontfallback { IDWriteFontFallback1 IDWriteFontFallback1_iface; @@ -255,11 +261,31 @@ struct dwrite_fontfallback_builder IDWriteFontFallbackBuilder IDWriteFontFallbackBuilder_iface; LONG refcount; IDWriteFactory7 *factory; - struct fallback_mapping *mappings; - size_t size; - size_t count; + struct fallback_data data; + size_t mappings_size; }; +static void release_fallback_mapping(struct fallback_mapping *mapping) +{ + unsigned int i; + + free(mapping->ranges); + for (i = 0; i < mapping->families_count; ++i) + free(mapping->families[i]); + free(mapping->families); + if (mapping->collection) + IDWriteFontCollection_Release(mapping->collection); +} + +static void release_fallback_data(struct fallback_data *data) +{ + size_t i; + + for (i = 0; i < data->count; ++i) + release_fallback_mapping(&data->mappings[i]); + free(data->mappings); +} + struct dwrite_numbersubstitution { IDWriteNumberSubstitution IDWriteNumberSubstitution_iface; @@ -2327,76 +2353,70 @@ static ULONG WINAPI fontfallbackbuilder_AddRef(IDWriteFontFallbackBuilder *iface static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *iface) { - struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); - ULONG refcount = InterlockedDecrement(&fallbackbuilder->refcount); - size_t i; + struct dwrite_fontfallback_builder *builder = impl_from_IDWriteFontFallbackBuilder(iface); + ULONG refcount = InterlockedDecrement(&builder->refcount); TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { - for (i = 0; i < fallbackbuilder->count; ++i) - { - struct fallback_mapping *mapping = &fallbackbuilder->mappings[i]; - UINT32 j; - - for (j = 0; j < mapping->families_count; j++) - free(mapping->families[j]); - free(mapping->families); - - if (mapping->collection) - IDWriteFontCollection_Release(mapping->collection); - free(mapping->ranges); - free(mapping->locale); - } - - IDWriteFactory7_Release(fallbackbuilder->factory); - free(fallbackbuilder->mappings); - free(fallbackbuilder); + IDWriteFactory7_Release(builder->factory); + release_fallback_data(&builder->data); + free(builder); } return refcount; } static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder *iface, - const DWRITE_UNICODE_RANGE *ranges, UINT32 ranges_count, WCHAR const **target_families, UINT32 families_count, - IDWriteFontCollection *collection, WCHAR const *locale, WCHAR const *base_family, FLOAT scale) + const DWRITE_UNICODE_RANGE *ranges, UINT32 ranges_count, WCHAR const **families, UINT32 families_count, + IDWriteFontCollection *collection, WCHAR const *locale_name, WCHAR const *base_family, float scale) { - struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); + struct dwrite_fontfallback_builder *builder = impl_from_IDWriteFontFallbackBuilder(iface); struct fallback_mapping *mapping; UINT32 i; - TRACE("%p, %p, %u, %p, %u, %p, %s, %s, %f.\n", iface, ranges, ranges_count, target_families, families_count, - collection, debugstr_w(locale), debugstr_w(base_family), scale); + TRACE("%p, %p, %u, %p, %u, %p, %s, %s, %f.\n", iface, ranges, ranges_count, families, families_count, + collection, debugstr_w(locale_name), debugstr_w(base_family), scale); - if (!ranges || ranges_count == 0 || !target_families || families_count == 0 || scale < 0.0f) + if (!ranges || !ranges_count || !families || !families_count || scale < 0.0f) return E_INVALIDARG; if (base_family) FIXME("base family ignored.\n"); - if (!dwrite_array_reserve((void **)&fallbackbuilder->mappings, &fallbackbuilder->size, fallbackbuilder->count + 1, - sizeof(*fallbackbuilder->mappings))) + if (!dwrite_array_reserve((void **)&builder->data.mappings, &builder->mappings_size, + builder->data.count + 1, sizeof(*builder->data.mappings))) { return E_OUTOFMEMORY; } - mapping = &fallbackbuilder->mappings[fallbackbuilder->count++]; + mapping = &builder->data.mappings[builder->data.count]; + memset(mapping, 0, sizeof(*mapping)); + + if (!(mapping->ranges = calloc(ranges_count, sizeof(*mapping->ranges)))) + goto failed; - mapping->ranges = calloc(ranges_count, sizeof(*mapping->ranges)); - memcpy(mapping->ranges, ranges, sizeof(*mapping->ranges) * ranges_count); mapping->ranges_count = ranges_count; - mapping->families = calloc(families_count, sizeof(*mapping->families)); + memcpy(mapping->ranges, ranges, sizeof(*mapping->ranges) * ranges_count); + + if (!(mapping->families = calloc(families_count, sizeof(*mapping->families)))) + goto failed; mapping->families_count = families_count; for (i = 0; i < families_count; i++) - mapping->families[i] = wcsdup(target_families[i]); + if (!(mapping->families[i] = wcsdup(families[i]))) goto failed; mapping->collection = collection; if (mapping->collection) IDWriteFontCollection_AddRef(mapping->collection); - mapping->locale = wcsdup(locale); + mapping->locale = wcsdup(locale_name); mapping->scale = scale; + builder->data.count++; return S_OK; + +failed: + release_fallback_mapping(mapping); + return E_OUTOFMEMORY; } static HRESULT WINAPI fontfallbackbuilder_AddMappings(IDWriteFontFallbackBuilder *iface, IDWriteFontFallback *fallback)

1 0