wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

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

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: Do not try to unmap already unmapped BOs in wined3d_texture_update_sub_resource().
by Alexandre Julliard 22 Jul '22

22 Jul '22

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

Zebediah Figura : wined3d: Do not try to unmap already unmapped BOs in wined3d_buffer_update_sub_resource().
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: f0706faae677b2fa5551a046606447d18144cfb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0706faae677b2fa5551a046606447… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 20 13:30:23 2022 -0500 wined3d: Do not try to unmap already unmapped BOs in wined3d_buffer_update_sub_resource(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53372 --- dlls/wined3d/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2131123bf44..a3c725136dd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1185,7 +1185,8 @@ void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wi */ range.offset = offset; range.size = size; - wined3d_context_unmap_bo_address(context, (const struct wined3d_bo_address *)&upload_bo->addr, 1, &range); + if (upload_bo->addr.buffer_object->map_ptr) + wined3d_context_unmap_bo_address(context, (const struct wined3d_bo_address *)&upload_bo->addr, 1, &range); } else {

1 0

Nikolay Sivov : d3d11: Use CRT allocation functions.
by Alexandre Julliard 22 Jul '22

22 Jul '22

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: Add some mappings for Tahoma in the system fallback.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: d8fa0ff14867174cde95829c3145be592d5ef2f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8fa0ff14867174cde95829c3145be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 22 12:54:16 2022 +0300 dwrite: Add some mappings for Tahoma in the system fallback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 4 ++++ dlls/dwrite/layout.c | 2 +- dlls/dwrite/tests/layout.c | 24 +++++++++--------------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index f0295eed48c..595d8806159 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -218,6 +218,10 @@ static const struct fallback_description } system_fallback_config[] = { + /* Latin, Combining Diacritical Marks */ + { "0000-007F, 0080-00FF, 0100-017F, 0180-024F, " + "0250-02AF, 02B0-02FF, 0300-036F", L"Tahoma" }, + { "3000-30FF, 31F0-31FF, 4E00-9FFF", L"Meiryo" }, }; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 447b3d5176b..2260e204c3f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -725,7 +725,7 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) goto fatal; } - if (!mapped_length) + if (!font) { if (FAILED(create_matching_font(range->collection, range->fontfamily, range->weight, range->style, range->stretch, &IID_IDWriteFont3, (void **)&font))) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 9d6dca91b39..5e7e1b16d27 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4640,14 +4640,12 @@ static void test_MapCharacters(void) hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); - todo_wine ok(font != NULL, "got %p\n", font); -if (font) { - IDWriteFont_Release(font); -} + if (font) + IDWriteFont_Release(font); + /* same Latin text, full length */ g_source = L"abc"; mappedlength = 0; @@ -4656,15 +4654,13 @@ if (font) { hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 3, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(mappedlength == 3, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); - todo_wine ok(font != NULL, "got %p\n", font); -if (font) { - IDWriteFont_Release(font); -} + if (font) + IDWriteFont_Release(font); + /* string 'a\x3058b' */ g_source = str2W; mappedlength = 0; @@ -4673,14 +4669,12 @@ if (font) { hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 3, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); - todo_wine ok(font != NULL, "got %p\n", font); -if (font) { - IDWriteFont_Release(font); -} + if (font) + IDWriteFont_Release(font); + g_source = str2W; mappedlength = 0; scale = 0.0f;

1 0

Nikolay Sivov : dwrite: Remove old system fallback logic.
by Alexandre Julliard 22 Jul '22

22 Jul '22

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 22 Jul '22

22 Jul '22

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: Extend matching font creation helper.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: d800cd7437b770f04dd4a0366e1017283272fbb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d800cd7437b770f04dd4a0366e1017… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 11:57:25 2022 +0300 dwrite: Extend matching font creation helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 20 ++++++++++++++------ dlls/dwrite/dwrite_private.h | 4 ++-- dlls/dwrite/layout.c | 14 ++++++-------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3d5aca98826..0769dada355 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2129,15 +2129,16 @@ static const struct fallback_mapping *find_fallback_mapping(struct dwrite_fontfa return NULL; } -HRESULT create_matching_font(IDWriteFontCollection *collection, const WCHAR *name, - DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, IDWriteFont **font) +HRESULT create_matching_font(IDWriteFontCollection *collection, const WCHAR *name, DWRITE_FONT_WEIGHT weight, + DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, REFIID riid, void **obj) { IDWriteFontFamily *family; BOOL exists = FALSE; + IDWriteFont *font; HRESULT hr; UINT32 i; - *font = NULL; + *obj = NULL; hr = IDWriteFontCollection_FindFamilyName(collection, name, &i, &exists); if (FAILED(hr)) @@ -2150,8 +2151,15 @@ HRESULT create_matching_font(IDWriteFontCollection *collection, const WCHAR *nam if (FAILED(hr)) return hr; - hr = IDWriteFontFamily_GetFirstMatchingFont(family, weight, stretch, style, font); + hr = IDWriteFontFamily_GetFirstMatchingFont(family, weight, stretch, style, &font); IDWriteFontFamily_Release(family); + + if (SUCCEEDED(hr)) + { + hr = IDWriteFont_QueryInterface(font, riid, obj); + IDWriteFont_Release(font); + } + return hr; } @@ -2200,7 +2208,7 @@ static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback, /* Now let's see what fallback can handle. Pick first font that could be created. */ for (i = 0; i < mapping->families_count; i++) { hr = create_matching_font((IDWriteFontCollection *)fallback->systemcollection, mapping->families[i], - weight, style, stretch, mapped_font); + weight, style, stretch, &IID_IDWriteFont, (void **)mapped_font); if (hr == S_OK) { TRACE("Created fallback font using family %s.\n", debugstr_w(mapping->families[i])); break; @@ -2255,7 +2263,7 @@ static HRESULT WINAPI fontfallback_MapCharacters(IDWriteFontFallback1 *iface, ID goto done; if (basefamily && *basefamily) { - hr = create_matching_font(basecollection, basefamily, weight, style, stretch, ret_font); + hr = create_matching_font(basecollection, basefamily, weight, style, stretch, &IID_IDWriteFont, (void **)ret_font); if (FAILED(hr)) goto done; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index edb005b8b58..a46d5fe7d96 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -324,8 +324,8 @@ extern BOOL lb_is_newline_char(WCHAR) DECLSPEC_HIDDEN; extern HRESULT create_system_fontfallback(IDWriteFactory7 *factory, IDWriteFontFallback1 **fallback) DECLSPEC_HIDDEN; extern void release_system_fontfallback(IDWriteFontFallback1 *fallback) DECLSPEC_HIDDEN; extern HRESULT create_fontfallback_builder(IDWriteFactory7 *factory, IDWriteFontFallbackBuilder **builder) DECLSPEC_HIDDEN; -extern HRESULT create_matching_font(IDWriteFontCollection*,const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, - IDWriteFont**) DECLSPEC_HIDDEN; +extern HRESULT create_matching_font(IDWriteFontCollection *collection, const WCHAR *family, DWRITE_FONT_WEIGHT weight, + DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, REFIID riid, void **obj) DECLSPEC_HIDDEN; extern HRESULT create_fontfacereference(IDWriteFactory7 *factory, IDWriteFontFile *file, UINT32 face_index, DWRITE_FONT_SIMULATIONS simulations, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 axis_values_count, IDWriteFontFaceReference1 **reference) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ba80c3f70e8..60fcb8cc71a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -682,7 +682,8 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) collection = range->collection ? range->collection : sys_collection; if (FAILED(hr = create_matching_font(collection, range->fontfamily, range->weight, range->style, - range->stretch, &font))) { + range->stretch, &IID_IDWriteFont, (void **)&font))) + { WARN("%s: failed to create matching font for non visual run, family %s, collection %p\n", debugstr_rundescr(&run->descr), debugstr_w(range->fontfamily), range->collection); break; @@ -1828,14 +1829,11 @@ static HRESULT layout_set_dummy_line_metrics(struct dwrite_textlayout *layout, U HRESULT hr; range = get_layout_range_by_pos(layout, pos); - hr = create_matching_font(range->collection, - range->fontfamily, - range->weight, - range->style, - range->stretch, - &font); - if (FAILED(hr)) + if (FAILED(hr = create_matching_font(range->collection, range->fontfamily, range->weight, range->style, + range->stretch, &IID_IDWriteFont, (void **)&font))) + { return hr; + } hr = IDWriteFont_CreateFontFace(font, &fontface); IDWriteFont_Release(font); if (FAILED(hr))

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

← Newer
1
...
14
15
16
17
18
19
20
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022