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

Zebediah Figura : wined3d: Assert that the BO is mapped in unmap functions.
by Alexandre Julliard 22 Jul '22

22 Jul '22

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

Zebediah Figura : wined3d: Redirect vkd3d log output to the Unix stderr.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: c94be0460c87a12c8171b2932c5cdff6593c0b90 URL: https://gitlab.winehq.org/wine/wine/-/commit/c94be0460c87a12c8171b2932c5cdf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri May 27 12:13:47 2022 -0500 wined3d: Redirect vkd3d log output to the Unix stderr. --- configure | 10 +++++----- configure.ac | 4 ++-- dlls/wined3d/wined3d_main.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 73bfc9d6d98..8d36a4f7fa5 100755 --- a/configure +++ b/configure @@ -13004,8 +13004,8 @@ then : fi if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_serialize_versioned_root_signature in MinGW -lvkd3d" >&5 -printf %s "checking for vkd3d_serialize_versioned_root_signature in MinGW -lvkd3d... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_set_log_callback in MinGW -lvkd3d" >&5 +printf %s "checking for vkd3d_set_log_callback in MinGW -lvkd3d... " >&6; } if test ${ac_cv_mingw_lib_vkd3d+y} then : printf %s "(cached) " >&6 @@ -13022,11 +13022,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -char vkd3d_serialize_versioned_root_signature (); +char vkd3d_set_log_callback (); int main (void) { -return vkd3d_serialize_versioned_root_signature (); +return vkd3d_set_log_callback (); ; return 0; } @@ -13111,7 +13111,7 @@ CPPFLAGS=$ac_save_CPPFLAGS if test "x$VKD3D_PE_LIBS" = "x" then - as_fn_append wine_notices "|libvkd3d ${notice_platform}MinGW development files not found; using bundled version." + as_fn_append wine_notices "|libvkd3d ${notice_platform}MinGW development files not found (or too old); using bundled version." fi if ${ZLIB_PE_CFLAGS:+false} : diff --git a/configure.ac b/configure.ac index 5ea0d9120f0..dd4abd39e32 100644 --- a/configure.ac +++ b/configure.ac @@ -1107,7 +1107,7 @@ then WINE_CHECK_MINGW_HEADER(vkd3d_shader.h) if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" then - WINE_CHECK_MINGW_LIB(vkd3d,vkd3d_serialize_versioned_root_signature,[:],[:],[$VKD3D_PE_LIBS]) + WINE_CHECK_MINGW_LIB(vkd3d,vkd3d_set_log_callback,[:],[:],[$VKD3D_PE_LIBS]) WINE_CHECK_MINGW_LIB(vkd3d-shader,vkd3d_shader_compile,[:],[:],[$VKD3D_PE_LIBS]) if test "$ac_cv_mingw_lib_vkd3d" = "no" -o "$ac_cv_mingw_lib_vkd3d_shader" = "no" then @@ -1120,7 +1120,7 @@ then fi]) if test "x$VKD3D_PE_LIBS" = "x" then - WINE_NOTICE([libvkd3d ${notice_platform}MinGW development files not found; using bundled version.]) + WINE_NOTICE([libvkd3d ${notice_platform}MinGW development files not found (or too old); using bundled version.]) fi WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 35973e210b0..4b718746b6a 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -22,8 +22,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define VKD3D_NO_VULKAN_H +#define VKD3D_NO_WIN32_TYPES #include "initguid.h" #include "wined3d_private.h" +#include "d3d12.h" +#include <vkd3d.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -247,6 +251,14 @@ BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) return TRUE; } +static void vkd3d_log_callback(const char *fmt, va_list args) +{ + char buffer[1024]; + + vsnprintf(buffer, sizeof(buffer), fmt, args); + __wine_dbg_output(buffer); +} + static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx; @@ -459,6 +471,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (appkey) RegCloseKey( appkey ); if (hkey) RegCloseKey( hkey ); + vkd3d_set_log_callback(vkd3d_log_callback); + return TRUE; }

1 0

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

22 Jul '22

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

Nikolay Sivov : win32u: Remove some dead code from get_scroll_range() helper (Coverity).
by Alexandre Julliard 22 Jul '22

22 Jul '22

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 : dwrite: Use older interface version for fallback system collection.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: c4af69e0b764ed3a8351c48a751ccf7f9b13289b URL: https://gitlab.winehq.org/wine/wine/-/commit/c4af69e0b764ed3a8351c48a751ccf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 16 13:22:20 2022 +0300 dwrite: Use older interface version for fallback system collection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7ffcfa8070c..a8ab12b9430 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -245,7 +245,7 @@ struct dwrite_fontfallback IDWriteFontFallback1 IDWriteFontFallback1_iface; LONG refcount; IDWriteFactory7 *factory; - IDWriteFontCollection1 *systemcollection; + IDWriteFontCollection *systemcollection; struct fallback_mapping *mappings; UINT32 mappings_count; }; @@ -2228,7 +2228,7 @@ HRESULT create_system_fontfallback(IDWriteFactory7 *factory, IDWriteFontFallback fallback->factory = factory; fallback->mappings = (struct fallback_mapping *)fontfallback_neutral_data; fallback->mappings_count = ARRAY_SIZE(fontfallback_neutral_data); - IDWriteFactory5_GetSystemFontCollection((IDWriteFactory5 *)fallback->factory, FALSE, &fallback->systemcollection, FALSE); + IDWriteFactory_GetSystemFontCollection((IDWriteFactory *)fallback->factory, &fallback->systemcollection, FALSE); *ret = &fallback->IDWriteFontFallback1_iface; @@ -2238,7 +2238,7 @@ HRESULT create_system_fontfallback(IDWriteFactory7 *factory, IDWriteFontFallback void release_system_fontfallback(IDWriteFontFallback1 *iface) { struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback1(iface); - IDWriteFontCollection1_Release(fallback->systemcollection); + IDWriteFontCollection_Release(fallback->systemcollection); free(fallback); }

1 0

Nikolay Sivov : dwrite: Add additional structure for mappings array.
by Alexandre Julliard 22 Jul '22

22 Jul '22

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

Nikolay Sivov : dwrite: Filter out unusable ranges on AddMapping().
by Alexandre Julliard 22 Jul '22

22 Jul '22

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: Keep locales separate for fallback data.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: 76e675a011dddcb141414c56d0da767aa3fd88e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/76e675a011dddcb141414c56d0da76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 17 17:42:59 2022 +0300 dwrite: Keep locales separate for fallback data. Each locale entry contains a "list" of its mappings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 1522d7638bc..c6c4fa2d654 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -220,16 +220,78 @@ static const DWRITE_UNICODE_RANGE cjk_ranges[] = { 0x4e00, 0x9fff }, /* CJK Unified Ideographs */ }; -struct fallback_mapping { +struct fallback_mapping +{ DWRITE_UNICODE_RANGE *ranges; UINT32 ranges_count; WCHAR **families; UINT32 families_count; IDWriteFontCollection *collection; - WCHAR *locale; - FLOAT scale; + float scale; +}; + +struct fallback_locale +{ + struct list entry; + WCHAR name[LOCALE_NAME_MAX_LENGTH]; + struct + { + size_t *data; + size_t count; + size_t size; + } ranges; }; +static void fallback_locale_list_destroy(struct list *locales) +{ + struct fallback_locale *cur, *cur2; + + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, locales, struct fallback_locale, entry) + { + list_remove(&cur->entry); + free(cur->ranges.data); + free(cur); + } +} + +static HRESULT fallback_locale_add_mapping(struct fallback_locale *locale, size_t index) +{ + size_t count = locale->ranges.count; + + /* Append to last range, or start a new one. */ + if (count && locale->ranges.data[count - 1] == (index - 1)) + { + locale->ranges.data[count - 1] = index; + return S_OK; + } + + if (!dwrite_array_reserve((void **)&locale->ranges.data, &locale->ranges.size, count + 2, + sizeof(*locale->ranges.data))) + { + return E_OUTOFMEMORY; + } + + locale->ranges.data[count] = locale->ranges.data[count + 1] = index; + locale->ranges.count += 2; + + return S_OK; +} + +/* TODO: potentially needs improvement to consider partially matching locale names. */ +static struct fallback_locale * font_fallback_get_locale(const struct list *locales, + const WCHAR *locale_name) +{ + struct fallback_locale *locale, *neutral = NULL; + + LIST_FOR_EACH_ENTRY(locale, locales, struct fallback_locale, entry) + { + if (!wcsicmp(locale->name, locale_name)) return locale; + if (!*locale->name) neutral = locale; + } + + return neutral; +} + static const struct fallback_mapping fontfallback_neutral_data[] = { #define MAPPING_RANGE(ranges, families) \ { (DWRITE_UNICODE_RANGE *)ranges, ARRAY_SIZE(ranges), \ @@ -244,6 +306,7 @@ struct fallback_data { struct fallback_mapping *mappings; size_t count; + struct list locales; }; struct dwrite_fontfallback @@ -284,6 +347,7 @@ static void release_fallback_data(struct fallback_data *data) for (i = 0; i < data->count; ++i) release_fallback_mapping(&data->mappings[i]); free(data->mappings); + fallback_locale_list_destroy(&data->locales); } struct dwrite_numbersubstitution @@ -2368,12 +2432,26 @@ static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *ifac return refcount; } +static struct fallback_locale * fallback_builder_add_locale(struct dwrite_fontfallback_builder *builder, + const WCHAR *locale_name) +{ + struct fallback_locale *locale; + + if (!locale_name) locale_name = L""; + if ((locale = font_fallback_get_locale(&builder->data.locales, locale_name))) return locale; + if (!(locale = calloc(1, sizeof(*locale)))) return NULL; + lstrcpynW(locale->name, locale_name, ARRAY_SIZE(locale->name)); + list_add_tail(&builder->data.locales, &locale->entry); + return locale; +} + static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder *iface, 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 *builder = impl_from_IDWriteFontFallbackBuilder(iface); struct fallback_mapping *mapping; + struct fallback_locale *locale; unsigned int i, count; TRACE("%p, %p, %u, %p, %u, %p, %s, %s, %f.\n", iface, ranges, ranges_count, families, families_count, @@ -2394,6 +2472,11 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder mapping = &builder->data.mappings[builder->data.count]; memset(mapping, 0, sizeof(*mapping)); + /* Append new mapping, link to its locale node. */ + + if (!(locale = fallback_builder_add_locale(builder, locale_name))) + return E_FAIL; + if (!(mapping->ranges = calloc(ranges_count, sizeof(*mapping->ranges)))) goto failed; @@ -2422,9 +2505,10 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder mapping->collection = collection; if (mapping->collection) IDWriteFontCollection_AddRef(mapping->collection); - mapping->locale = wcsdup(locale_name); mapping->scale = scale; + if (FAILED(fallback_locale_add_mapping(locale, builder->data.count))) goto failed; + builder->data.count++; return S_OK; @@ -2485,6 +2569,7 @@ HRESULT create_fontfallback_builder(IDWriteFactory7 *factory, IDWriteFontFallbac builder->refcount = 1; builder->factory = factory; IDWriteFactory7_AddRef(builder->factory); + list_init(&builder->data.locales); *ret = &builder->IDWriteFontFallbackBuilder_iface; return S_OK;

1 0

Nikolay Sivov : dwrite: Override existing ranges with AddMapping().
by Alexandre Julliard 22 Jul '22

22 Jul '22

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: Duplicate mapping data when creating fallback object.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: fcbb0f6c61829b7e65ef939d0034f76a81b5030e URL: https://gitlab.winehq.org/wine/wine/-/commit/fcbb0f6c61829b7e65ef939d0034f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 11:36:23 2022 +0300 dwrite: Duplicate mapping data when creating fallback object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 108 +++++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/tests/layout.c | 4 +- 2 files changed, 102 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index e4a52fa95a6..3d5aca98826 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -317,6 +317,8 @@ struct dwrite_fontfallback IDWriteFontCollection *systemcollection; struct fallback_mapping *mappings; UINT32 mappings_count; + struct fallback_data data; + size_t mappings_size; }; struct dwrite_fontfallback_builder @@ -2352,6 +2354,9 @@ static ULONG WINAPI customfontfallback_Release(IDWriteFontFallback1 *iface) if (!refcount) { IDWriteFactory7_Release(fallback->factory); + if (fallback->systemcollection) + IDWriteFontCollection_Release(fallback->systemcollection); + release_fallback_data(&fallback->data); free(fallback); } @@ -2559,26 +2564,113 @@ static HRESULT WINAPI fontfallbackbuilder_AddMappings(IDWriteFontFallbackBuilder return E_NOTIMPL; } -static HRESULT WINAPI fontfallbackbuilder_CreateFontFallback(IDWriteFontFallbackBuilder *iface, - IDWriteFontFallback **ret) +static HRESULT fallbackbuilder_init_fallback_data(const struct dwrite_fontfallback_builder *builder, + struct fallback_data *data) { - struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); - struct dwrite_fontfallback *fallback; + struct fallback_locale *iter, *locale; + size_t i, j; - TRACE("%p, %p.\n", iface, ret); + /* Duplicate locales list. */ + list_init(&data->locales); + LIST_FOR_EACH_ENTRY(iter, &builder->data.locales, struct fallback_locale, entry) + { + if (!(locale = calloc(1, sizeof(*locale)))) goto failed; + wcscpy(locale->name, iter->name); + locale->ranges.count = iter->ranges.count; + locale->ranges.size = iter->ranges.count; + if (!(locale->ranges.data = malloc(iter->ranges.count * sizeof(*iter->ranges.data)))) + { + free(locale); + goto failed; + } + memcpy(locale->ranges.data, iter->ranges.data, iter->ranges.count * sizeof(*iter->ranges.data)); + list_add_tail(&data->locales, &locale->entry); + } - *ret = NULL; + /* Duplicate mappings. */ + if (!(data->mappings = calloc(builder->data.count, sizeof(*data->mappings)))) + goto failed; + + data->count = builder->data.count; + for (i = 0; i < data->count; ++i) + { + struct fallback_mapping *src = &builder->data.mappings[i]; + struct fallback_mapping *dst = &data->mappings[i]; + + if (!(dst->ranges = calloc(src->ranges_count, sizeof(*src->ranges)))) goto failed; + memcpy(dst->ranges, src->ranges, src->ranges_count * sizeof(*src->ranges)); + dst->ranges_count = src->ranges_count; + + if (!(dst->families = calloc(src->families_count, sizeof(*src->families)))) goto failed; + dst->families_count = src->families_count; + for (j = 0; j < src->families_count; ++j) + { + if (!(dst->families[j] = wcsdup(src->families[j]))) goto failed; + } + + dst->collection = src->collection; + if (dst->collection) + IDWriteFontCollection_AddRef(dst->collection); + dst->scale = src->scale; + } + + return S_OK; + +failed: + + return E_OUTOFMEMORY; +} + +static HRESULT fallbackbuilder_create_fallback(struct dwrite_fontfallback_builder *builder, struct dwrite_fontfallback **ret) +{ + struct dwrite_fontfallback *fallback; + HRESULT hr; if (!(fallback = calloc(1, sizeof(*fallback)))) return E_OUTOFMEMORY; fallback->IDWriteFontFallback1_iface.lpVtbl = &customfontfallbackvtbl; fallback->refcount = 1; - fallback->factory = fallbackbuilder->factory; + fallback->factory = builder->factory; IDWriteFactory7_AddRef(fallback->factory); + if (FAILED(hr = IDWriteFactory_GetSystemFontCollection((IDWriteFactory *)fallback->factory, + &fallback->systemcollection, FALSE))) + { + goto done; + } + + if (FAILED(hr = fallbackbuilder_init_fallback_data(builder, &fallback->data))) + { + goto done; + } + + *ret = fallback; - *ret = (IDWriteFontFallback *)&fallback->IDWriteFontFallback1_iface; return S_OK; + +done: + + IDWriteFontFallback1_Release(&fallback->IDWriteFontFallback1_iface); + return hr; +} + +static HRESULT WINAPI fontfallbackbuilder_CreateFontFallback(IDWriteFontFallbackBuilder *iface, + IDWriteFontFallback **ret) +{ + struct dwrite_fontfallback_builder *builder = impl_from_IDWriteFontFallbackBuilder(iface); + struct dwrite_fontfallback *fallback; + HRESULT hr; + + TRACE("%p, %p.\n", iface, ret); + + *ret = NULL; + + if (SUCCEEDED(hr = fallbackbuilder_create_fallback(builder, &fallback))) + { + *ret = (IDWriteFontFallback *)&fallback->IDWriteFontFallback1_iface; + } + + return hr; } static const IDWriteFontFallbackBuilderVtbl fontfallbackbuildervtbl = diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 24ec3be7585..31bccfca3be 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4861,14 +4861,14 @@ static void test_FontFallbackBuilder(void) EXPECT_REF(builder, 1); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - EXPECT_REF(factory2, 3); + todo_wine EXPECT_REF(factory2, 3); EXPECT_REF(fallback, 1); EXPECT_REF(builder, 1); IDWriteFontFallback_AddRef(fallback); EXPECT_REF(builder, 1); EXPECT_REF(fallback, 2); - EXPECT_REF(factory2, 3); + todo_wine EXPECT_REF(factory2, 3); IDWriteFontFallback_Release(fallback); /* New instance is created every time, even if mappings have not changed. */

1 0