wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Henri Verbeet : wined3d: Also trace memory types in adapter_vk_init_driver_info().
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: fc50ea23511bacf2efbc60b164713692ecaea034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc50ea23511bacf2efbc60b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 18 15:38:50 2021 +0100 wined3d: Also trace memory types in adapter_vk_init_driver_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0404aa1877b..09180e7fdb6 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2025,6 +2025,7 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, const struct wined3d_gpu_description *gpu_description; struct wined3d_gpu_description description; UINT64 vram_bytes, sysmem_bytes; + const VkMemoryType *type; const VkMemoryHeap *heap; unsigned int i; @@ -2046,6 +2047,12 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, TRACE("Total device memory: 0x%s.\n", wine_dbgstr_longlong(vram_bytes)); TRACE("Total shared system memory: 0x%s.\n", wine_dbgstr_longlong(sysmem_bytes)); + for (i = 0; i < memory_properties->memoryTypeCount; ++i) + { + type = &memory_properties->memoryTypes[i]; + TRACE("Memory type [%u]: flags %#x, heap %u.\n", i, type->propertyFlags, type->heapIndex); + } + if (!(gpu_description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) gpu_description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID);

1 0

Henri Verbeet : wined3d: Handle UNORM/SNORM as FLOAT in shader_glsl_sprintf_cast().
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: 1efa4ec7fae94f20f0a4725d3dbc162787a7cbbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1efa4ec7fae94f20f0a4725d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 18 15:38:49 2021 +0100 wined3d: Handle UNORM/SNORM as FLOAT in shader_glsl_sprintf_cast(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 59c73ad4257..1fea6f92be0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3124,6 +3124,11 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, const char *src_param, enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type, unsigned int size) { + if (dst_data_type == WINED3D_DATA_UNORM || dst_data_type == WINED3D_DATA_SNORM) + dst_data_type = WINED3D_DATA_FLOAT; + if (src_data_type == WINED3D_DATA_UNORM || src_data_type == WINED3D_DATA_SNORM) + src_data_type = WINED3D_DATA_FLOAT; + if (dst_data_type == src_data_type) { string_buffer_sprintf(dst_param, "%s", src_param);

1 0

Henri Verbeet : wined3d: Handle UNORM/SNORM as FLOAT in shader_glsl_append_dst_ext().
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: 8ef6484deb803139e8321e00cae74454bdbab96b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ef6484deb803139e8321e00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 18 15:38:48 2021 +0100 wined3d: Handle UNORM/SNORM as FLOAT in shader_glsl_append_dst_ext(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7423b2003a6..59c73ad4257 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3271,6 +3271,8 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_string_buffer *buffer, switch (data_type) { case WINED3D_DATA_FLOAT: + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: shader_addline(buffer, "%s%s = %s(", glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); break;

1 0

Henri Verbeet : wined3d: Cleanup the staging bo on an error path in wined3d_texture_vk_upload_data().
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: d54576c89b4ef7b486435e24f37d4d570c206f5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d54576c89b4ef7b486435e24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 18 15:38:47 2021 +0100 wined3d: Cleanup the staging bo on an error path in wined3d_texture_vk_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3f106bb2d9d..f6037a47c1c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4678,6 +4678,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) { ERR("Failed to get command buffer.\n"); + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); return; }

1 0

Henri Verbeet : wined3d: Get rid of the destination offset in wined3d_texture_vk_upload_data().
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: 0d2b730f9ed4a6d6be578c00124628d29afcc913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d2b730f9ed4a6d6be578c00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 18 15:38:46 2021 +0100 wined3d: Get rid of the destination offset in wined3d_texture_vk_upload_data(). The idea was once to use permanent bo's for textures, similar to how texture PBOs work in the OpenGL backend. In that case we would have needed to copy to the correct position in the bo, in order not to modify other parts of the bo. With the current scheme, the destination offset serves no purpose. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b630f0dcfc5..3f106bb2d9d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4592,9 +4592,9 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, VkCommandBuffer vk_command_buffer; struct wined3d_bo_vk staging_bo; VkImageAspectFlags aspect_mask; - size_t src_offset, dst_offset; struct wined3d_range range; VkBufferImageCopy region; + size_t src_offset; void *map_ptr; TRACE("context %p, src_bo_addr %s, src_format %s, src_box %s, src_row_pitch %u, src_slice_pitch %u, " @@ -4649,9 +4649,6 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, src_offset = src_box->front * src_slice_pitch + (src_box->top / src_format->block_height) * src_row_pitch + (src_box->left / src_format->block_width) * src_format->block_byte_count; - dst_offset = dst_z * src_slice_pitch - + (dst_y / src_format->block_height) * src_row_pitch - + (dst_x / src_format->block_width) * src_format->block_byte_count; if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) @@ -4670,8 +4667,8 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, return; } - wined3d_format_copy_data(src_format, src_bo_addr->addr + src_offset, src_row_pitch, src_slice_pitch, - (uint8_t *)map_ptr + dst_offset, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, + wined3d_format_copy_data(src_format, src_bo_addr->addr + src_offset, src_row_pitch, + src_slice_pitch, map_ptr, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, src_box->bottom - src_box->top, src_box->back - src_box->front); range.offset = 0; @@ -4691,7 +4688,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, dst_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->vk_image, aspect_mask); - region.bufferOffset = staging_bo.buffer_offset + dst_offset; + region.bufferOffset = staging_bo.buffer_offset; region.bufferRowLength = (dst_row_pitch / src_format->block_byte_count) * src_format->block_width; if (dst_row_pitch) region.bufferImageHeight = (dst_slice_pitch / dst_row_pitch) * src_format->block_height;

1 0

Nikolay Sivov : dxva2: Add IDirectXVideoDecoderService stub.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: ef7e9d126fff00365fbea4538cd6f3cbeea0294b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7e9d126fff00365fbea453… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 18 15:42:11 2021 +0300 dxva2: Add IDirectXVideoDecoderService stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50349 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 106 insertions(+), 5 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 341ee33d44d..d784e1b46ab 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -50,6 +50,7 @@ struct device_manager { IDirect3DDeviceManager9 IDirect3DDeviceManager9_iface; IDirectXVideoProcessorService IDirectXVideoProcessorService_iface; + IDirectXVideoDecoderService IDirectXVideoDecoderService_iface; LONG refcount; IDirect3DDevice9 *device; @@ -114,6 +115,11 @@ static struct device_manager *impl_from_IDirectXVideoProcessorService(IDirectXVi return CONTAINING_RECORD(iface, struct device_manager, IDirectXVideoProcessorService_iface); } +static struct device_manager *impl_from_IDirectXVideoDecoderService(IDirectXVideoDecoderService *iface) +{ + return CONTAINING_RECORD(iface, struct device_manager, IDirectXVideoDecoderService_iface); +} + static struct video_processor *impl_from_IDirectXVideoProcessor(IDirectXVideoProcessor *iface) { return CONTAINING_RECORD(iface, struct video_processor, IDirectXVideoProcessor_iface); @@ -290,18 +296,27 @@ static const IDirectXVideoProcessorVtbl video_processor_vtbl = static HRESULT WINAPI device_manager_processor_service_QueryInterface(IDirectXVideoProcessorService *iface, REFIID riid, void **obj) { + struct device_manager *manager = impl_from_IDirectXVideoProcessorService(iface); + if (IsEqualIID(riid, &IID_IDirectXVideoProcessorService) || IsEqualIID(riid, &IID_IDirectXVideoAccelerationService) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; - IDirectXVideoProcessorService_AddRef(iface); - return S_OK; + } + else if (IsEqualIID(riid, &IID_IDirectXVideoDecoderService)) + { + *obj = &manager->IDirectXVideoDecoderService_iface; + } + else + { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; } - WARN("Unsupported interface %s.\n", debugstr_guid(riid)); - *obj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; } static ULONG WINAPI device_manager_processor_service_AddRef(IDirectXVideoProcessorService *iface) @@ -481,6 +496,91 @@ static const IDirectXVideoProcessorServiceVtbl device_manager_processor_service_ device_manager_processor_service_CreateVideoProcessor, }; +static HRESULT WINAPI device_manager_decoder_service_QueryInterface(IDirectXVideoDecoderService *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IDirectXVideoDecoderService) || + IsEqualIID(riid, &IID_IDirectXVideoAccelerationService) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IDirectXVideoDecoderService_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI device_manager_decoder_service_AddRef(IDirectXVideoDecoderService *iface) +{ + struct device_manager *manager = impl_from_IDirectXVideoDecoderService(iface); + return IDirect3DDeviceManager9_AddRef(&manager->IDirect3DDeviceManager9_iface); +} + +static ULONG WINAPI device_manager_decoder_service_Release(IDirectXVideoDecoderService *iface) +{ + struct device_manager *manager = impl_from_IDirectXVideoDecoderService(iface); + return IDirect3DDeviceManager9_Release(&manager->IDirect3DDeviceManager9_iface); +} + +static HRESULT WINAPI device_manager_decoder_service_CreateSurface(IDirectXVideoDecoderService *iface, + UINT width, UINT height, UINT backbuffers, D3DFORMAT format, D3DPOOL pool, DWORD usage, DWORD dxvaType, + IDirect3DSurface9 **surfaces, HANDLE *shared_handle) +{ + FIXME("%p, %u, %u, %u, %#x, %d, %d, %d, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, + dxvaType, surfaces, shared_handle); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_decoder_service_GetDecoderDeviceGuids(IDirectXVideoDecoderService *iface, + UINT *count, GUID **guids) +{ + FIXME("%p, %p, %p.\n", iface, count, guids); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_decoder_service_GetDecoderRenderTargets(IDirectXVideoDecoderService *iface, + REFGUID guid, UINT *count, D3DFORMAT **formats) +{ + FIXME("%p, %s, %p, %p.\n", iface, debugstr_guid(guid), count, formats); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(IDirectXVideoDecoderService *iface, + REFGUID guid, const DXVA2_VideoDesc *video_desc, IUnknown *reserved, UINT *count, DXVA2_ConfigPictureDecode **configs) +{ + FIXME("%p, %s, %p, %p, %p, %p.\n", iface, debugstr_guid(guid), video_desc, reserved, count, configs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_decoder_service_CreateVideoDecoder(IDirectXVideoDecoderService *iface, + REFGUID guid, const DXVA2_VideoDesc *video_desc, DXVA2_ConfigPictureDecode *config, IDirect3DSurface9 **rts, + UINT num_surfaces, IDirectXVideoDecoder **decoder) +{ + FIXME("%p, %s, %p, %p, %p, %u, %p.\n", iface, debugstr_guid(guid), video_desc, config, rts, num_surfaces, + decoder); + + return E_NOTIMPL; +} + +static const IDirectXVideoDecoderServiceVtbl device_manager_decoder_service_vtbl = +{ + device_manager_decoder_service_QueryInterface, + device_manager_decoder_service_AddRef, + device_manager_decoder_service_Release, + device_manager_decoder_service_CreateSurface, + device_manager_decoder_service_GetDecoderDeviceGuids, + device_manager_decoder_service_GetDecoderRenderTargets, + device_manager_decoder_service_GetDecoderConfigurations, + device_manager_decoder_service_CreateVideoDecoder, +}; + static HRESULT WINAPI device_manager_QueryInterface(IDirect3DDeviceManager9 *iface, REFIID riid, void **obj) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); @@ -806,6 +906,7 @@ HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceMan object->IDirect3DDeviceManager9_iface.lpVtbl = &device_manager_vtbl; object->IDirectXVideoProcessorService_iface.lpVtbl = &device_manager_processor_service_vtbl; + object->IDirectXVideoDecoderService_iface.lpVtbl = &device_manager_decoder_service_vtbl; object->refcount = 1; object->token = GetTickCount(); InitializeCriticalSection(&object->cs);

1 0

Haoyang Chen : dwrite/layout: Handle NULL format in CreateEllipsisTrimmingSign().
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: b5dbd180b49003adb6483084520f1e09c09c7de4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5dbd180b49003adb6483084… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Mon Jan 18 15:38:40 2021 +0300 dwrite/layout: Handle NULL format in CreateEllipsisTrimmingSign(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 +++ dlls/dwrite/tests/layout.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1f6201a6a93..58aa05abd44 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5361,6 +5361,9 @@ HRESULT create_trimmingsign(IDWriteFactory7 *factory, IDWriteTextFormat *format, *sign = NULL; + if (!format) + return E_INVALIDARG; + /* Validate reading/flow direction here, layout creation won't complain about invalid combinations. */ reading = IDWriteTextFormat_GetReadingDirection(format); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index beb09f400f9..7d950a0626c 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1321,6 +1321,11 @@ static void test_CreateEllipsisTrimmingSign(void) DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-GB", &format); ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + sign = (void *)0xdeadbeef; + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, NULL, &sign); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!sign, "Unexpected pointer %p.\n", sign); + EXPECT_REF(format, 1); hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &sign); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : dwrite: Use table access helpers for reading names.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: 6ebbf619cbca8bf6c235fbb9bb8000b8a780c8fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebbf619cbca8bf6c235fbb9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 18 15:05:42 2021 +0300 dwrite: Use table access helpers for reading names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 115 ++++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ebbf619cbca8bf6c235…

1 0

Nikolay Sivov : dwrite: Set joiners mode for gsub case.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: 590d5b535c4060ef4741cf4b096bb06e232d728e URL: https://source.winehq.org/git/wine.git/?a=commit;h=590d5b535c4060ef4741cf4b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 18 15:05:41 2021 +0300 dwrite: Set joiners mode for gsub case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 5698a83f3bf..ff341f03232 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5794,6 +5794,8 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, const struct lookup *lookup = &lookups.lookups[i]; context->lookup_mask = lookup->mask; + context->auto_zwnj = lookup->auto_zwnj; + context->auto_zwj = lookup->auto_zwj; if (!opentype_is_gsub_lookup_reversed(context, lookup)) {

1 0

Nikolay Sivov : dwrite: Use joiner modes for matching.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: db55f74b3ac4e847d76f6c59c6a3e9d26cde53f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db55f74b3ac4e847d76f6c59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 18 15:05:40 2021 +0300 dwrite: Use joiner modes for matching. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index aedbfe6dcab..5698a83f3bf 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -479,6 +479,8 @@ enum glyph_prop_flags GLYPH_PROP_BASE = LOOKUP_FLAG_IGNORE_BASE, GLYPH_PROP_LIGATURE = LOOKUP_FLAG_IGNORE_LIGATURES, GLYPH_PROP_MARK = LOOKUP_FLAG_IGNORE_MARKS, + GLYPH_PROP_ZWNJ = 0x10, + GLYPH_PROP_ZWJ = 0x20, }; enum gpos_lookup_type @@ -3683,6 +3685,10 @@ static enum iterator_match glyph_iterator_may_skip(const struct glyph_iterator * if (!lookup_is_glyph_match(iter->context, iter->pos, iter->flags)) return ITER_YES; + if ((iter->ignore_zwnj || !(iter->context->glyph_infos[iter->pos].props & GLYPH_PROP_ZWNJ)) && + (iter->ignore_zwj || !(iter->context->glyph_infos[iter->pos].props & GLYPH_PROP_ZWJ))) + return ITER_MAYBE; + return ITER_NO; } @@ -5723,6 +5729,10 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->u.buffer.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.buffer.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; opentype_set_subst_glyph_props(context, g); + if (codepoint == 0x200d) + context->glyph_infos[g].props |= GLYPH_PROP_ZWJ; + else if (codepoint == 0x200c) + context->glyph_infos[g].props |= GLYPH_PROP_ZWNJ; /* Group diacritics with preceding base. Glyph class is ignored here. */ if (!g || !opentype_is_diacritic(codepoint))

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
48
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 January 2021