wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Alexandre Julliard : ntdll: Move the virtual memory functions to the Unix library.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: c96ef78b6d6d9184d8ec4cd18924a3049d388583 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c96ef78b6d6d9184d8ec4cd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 17:08:59 2020 +0200 ntdll: Move the virtual memory functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 18 +- dlls/ntdll/loader.c | 12 +- dlls/ntdll/nt.c | 2 +- dlls/ntdll/signal_arm.c | 4 +- dlls/ntdll/signal_arm64.c | 4 +- dlls/ntdll/signal_i386.c | 22 +- dlls/ntdll/signal_powerpc.c | 4 +- dlls/ntdll/signal_x86_64.c | 10 +- dlls/ntdll/thread.c | 12 +- dlls/ntdll/unix/loader.c | 43 +- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/thread.c | 19 - dlls/ntdll/unix/unix_private.h | 28 +- dlls/ntdll/unix/virtual.c | 3897 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unixlib.h | 63 +- dlls/ntdll/virtual.c | 3801 ++------------------------------------- 16 files changed, 4134 insertions(+), 3807 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c96ef78b6d6d9184d8ec…

1 0

Alexandre Julliard : ntdll: Move NtGetContextThread() implementation to the Unix library.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 7c32b2dd9368137eca3cf0202360bbe0db62efbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c32b2dd9368137eca3cf020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 14:05:42 2020 +0200 ntdll: Move NtGetContextThread() implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/signal_arm.c | 142 ----------------------- dlls/ntdll/signal_arm64.c | 130 --------------------- dlls/ntdll/signal_i386.c | 171 ++------------------------- dlls/ntdll/signal_powerpc.c | 241 --------------------------------------- dlls/ntdll/signal_x86_64.c | 195 ------------------------------- dlls/ntdll/thread.c | 12 ++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/signal_arm.c | 88 ++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 86 ++++++++++++++ dlls/ntdll/unix/signal_i386.c | 150 ++++++++++++++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 141 +++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 128 +++++++++++++++++++++ dlls/ntdll/unix/thread.c | 40 +++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 3 +- 16 files changed, 660 insertions(+), 870 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c32b2dd9368137eca3c…

1 0

Alexandre Julliard : ntdll: Move NtSetContextThread() implementation to the Unix library.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: ac90898f72b02bbc226a95deb40555c1fb8ac3a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac90898f72b02bbc226a95de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 13:11:54 2020 +0200 ntdll: Move NtSetContextThread() implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/signal_arm.c | 72 --------------- dlls/ntdll/signal_arm64.c | 72 --------------- dlls/ntdll/signal_i386.c | 102 --------------------- dlls/ntdll/signal_powerpc.c | 130 -------------------------- dlls/ntdll/signal_x86_64.c | 96 -------------------- dlls/ntdll/thread.c | 10 ++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/signal_arm.c | 38 ++++++++ dlls/ntdll/unix/signal_arm64.c | 48 ++++++++++ dlls/ntdll/unix/signal_i386.c | 191 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 28 ++++++ dlls/ntdll/unix/signal_x86_64.c | 135 +++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 20 ++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 3 +- 16 files changed, 474 insertions(+), 474 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac90898f72b02bbc226a…

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.142.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: b4310a19e96283e114fad13f7565f912a39640de URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4310a19e96283e114fad13f… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Jun 1 12:19:58 2020 -0700 winevulkan: Update to VK spec version 1.2.142. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 16 ++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 6 ++++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 241686122c..1dee769836 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.140" +VK_XML_VERSION = "1.2.142" WINE_VK_VERSION = (1, 2) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index a7480bf2da..8811fbbb8a 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1569,6 +1569,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT: + { + const VkDevicePrivateDataCreateInfoEXT *in = (const VkDevicePrivateDataCreateInfoEXT *)in_header; + VkDevicePrivateDataCreateInfoEXT *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->privateDataSlotRequestCount = in->privateDataSlotRequestCount; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2: { const VkPhysicalDeviceFeatures2 *in = (const VkPhysicalDeviceFeatures2 *)in_header; diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 60f2a2fac9..84b47bb610 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.2.140" + "api_version": "1.2.142" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 513b5ffa85..d419d3f8e4 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -399,14 +399,14 @@ #define VK_QCOM_render_pass_store_ops_EXTENSION_NAME "VK_QCOM_render_pass_store_ops" #define VK_MAKE_VERSION(major, minor, patch) \ - (((major) << 22) | ((minor) << 12) | (patch)) + ((((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch))) #define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22) #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff) #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff) #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0) -#define VK_HEADER_VERSION 140 +#define VK_HEADER_VERSION 142 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; @@ -1135,6 +1135,7 @@ typedef enum VkDriverId VK_DRIVER_ID_GOOGLE_SWIFTSHADER = 10, VK_DRIVER_ID_GGP_PROPRIETARY = 11, VK_DRIVER_ID_BROADCOM_PROPRIETARY = 12, + VK_DRIVER_ID_MESA_LLVMPIPE = 13, VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY, VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE, VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV, @@ -3087,6 +3088,7 @@ typedef enum VkVendorId VK_VENDOR_ID_VSI = 0x00010002, VK_VENDOR_ID_KAZAN = 0x00010003, VK_VENDOR_ID_CODEPLAY = 0x00010004, + VK_VENDOR_ID_MESA = 0x00010005, VK_VENDOR_ID_MAX_ENUM = 0x7fffffff, } VkVendorId;

1 0

Nikolay Sivov : dwrite: Partially implement GetBaseline().
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: c44a0e865b00110f0c490dabe26f2109ed787f47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c44a0e865b00110f0c490dab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:53 2020 +0300 dwrite: Partially implement GetBaseline(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 58 +++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/analyzer.c | 67 +++++++++++++++++++++++++------------------- 2 files changed, 92 insertions(+), 33 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index cb58f36299..a8a3e7c359 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1539,13 +1539,63 @@ static HRESULT WINAPI dwritetextanalyzer1_ApplyCharacterSpacing(IDWriteTextAnaly return S_OK; } -static HRESULT WINAPI dwritetextanalyzer1_GetBaseline(IDWriteTextAnalyzer2 *iface, IDWriteFontFace *face, +static HRESULT WINAPI dwritetextanalyzer1_GetBaseline(IDWriteTextAnalyzer2 *iface, IDWriteFontFace *fontface, DWRITE_BASELINE baseline, BOOL vertical, BOOL is_simulation_allowed, DWRITE_SCRIPT_ANALYSIS sa, const WCHAR *localeName, INT32 *baseline_coord, BOOL *exists) { - FIXME("(%p %d %d %u %s %p %p): stub\n", face, vertical, is_simulation_allowed, sa.script, debugstr_w(localeName), - baseline_coord, exists); - return E_NOTIMPL; + struct dwrite_fontface *font_obj; + const DWRITE_FONT_METRICS1 *metrics; + + TRACE("%p, %d, %d, %u, %s, %p, %p.\n", fontface, vertical, is_simulation_allowed, sa.script, debugstr_w(localeName), + baseline_coord, exists); + + *exists = FALSE; + *baseline_coord = 0; + + if (baseline == DWRITE_BASELINE_DEFAULT) + baseline = vertical ? DWRITE_BASELINE_CENTRAL : DWRITE_BASELINE_ROMAN; + + if ((unsigned int)baseline > DWRITE_BASELINE_MAXIMUM) + return E_INVALIDARG; + + /* TODO: fetch BASE table data if available. */ + + if (!*exists && is_simulation_allowed) + { + font_obj = unsafe_impl_from_IDWriteFontFace(fontface); + metrics = &font_obj->metrics; + + switch (baseline) + { + case DWRITE_BASELINE_ROMAN: + *baseline_coord = vertical ? metrics->descent : 0; + break; + case DWRITE_BASELINE_CENTRAL: + *baseline_coord = vertical ? (metrics->ascent + metrics->descent) / 2 : + -(metrics->ascent - metrics->descent) / 2; + break; + case DWRITE_BASELINE_MATH: + *baseline_coord = vertical ? (metrics->ascent + metrics->descent) / 2 : + -(metrics->ascent + metrics->descent) / 2; + break; + case DWRITE_BASELINE_HANGING: + /* FIXME: this one isn't accurate, but close. */ + *baseline_coord = vertical ? metrics->capHeight * 6 / 7 + metrics->descent : metrics->capHeight * 6 / 7; + break; + case DWRITE_BASELINE_IDEOGRAPHIC_BOTTOM: + case DWRITE_BASELINE_MINIMUM: + *baseline_coord = vertical ? 0 : metrics->descent; + break; + case DWRITE_BASELINE_IDEOGRAPHIC_TOP: + case DWRITE_BASELINE_MAXIMUM: + *baseline_coord = vertical ? metrics->ascent + metrics->descent : -metrics->ascent; + break; + default: + ; + } + } + + return S_OK; } static HRESULT WINAPI dwritetextanalyzer1_AnalyzeVerticalGlyphOrientation(IDWriteTextAnalyzer2 *iface, diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index c5cf0954fe..70becb55ee 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -2484,39 +2484,48 @@ static void test_GetBaseline(void) fontface = create_fontface(); - /* Tahoma doesn't have BASE table, it doesn't work even with simulation enabled */ + /* Tahoma does not have a BASE table. */ + exists = TRUE; baseline = 456; - hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, - fontface, - DWRITE_BASELINE_DEFAULT, - FALSE, - TRUE, - sa, - NULL, - &baseline, - &exists); -todo_wine { - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(baseline == 0, "got %d\n", baseline); - ok(exists == FALSE, "got %d\n", exists); -} + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_DEFAULT, FALSE, + TRUE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + exists = TRUE; baseline = 456; - hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, - fontface, - DWRITE_BASELINE_ROMAN, - FALSE, - TRUE, - sa, - NULL, - &baseline, - &exists); -todo_wine { - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(baseline == 0, "got %d\n", baseline); - ok(exists == FALSE, "got %d\n", exists); -} + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_DEFAULT, FALSE, + FALSE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + + exists = TRUE; + baseline = 0; + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_CENTRAL, FALSE, + TRUE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(baseline != 0, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + + exists = TRUE; + baseline = 0; + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_CENTRAL, FALSE, + FALSE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + + exists = TRUE; + baseline = 456; + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_DEFAULT + 100, FALSE, + TRUE, sa, NULL, &baseline, &exists); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + IDWriteFontFace_Release(fontface); IDWriteTextAnalyzer1_Release(analyzer1); }

1 0

Nikolay Sivov : dwrite: Enable lookups from non-global features too.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 4f7f3b7b8b007dd3e73b52b085109b223cbd5bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f7f3b7b8b007dd3e73b52b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:52 2020 +0300 dwrite: Enable lookups from non-global features too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 629bc7f407..64fba56202 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4369,10 +4369,6 @@ static void opentype_layout_add_lookups(const struct ot_feature_list *feature_li if (feature->index == 0xffff) return; - /* FIXME: skip non-global ones for now. */ - if (!(feature->flags & FEATURE_GLOBAL)) - return; - feature_offset = GET_BE_WORD(feature_list->features[feature->index].offset); lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset +

1 0

Nikolay Sivov : dwrite: Include required feature when collecting lookups.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 15baea930a3563bf66c688612e08b7f8925eda3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=15baea930a3563bf66c68861… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:51 2020 +0300 dwrite: Include required feature when collecting lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fd59f40dcb..629bc7f407 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4405,6 +4405,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex { unsigned int last_num_lookups = 0, stage, script_feature_count = 0; UINT16 total_feature_count, total_lookup_count; + struct shaping_feature required_feature = { 0 }; const struct ot_feature_list *feature_list; const struct ot_langsys *langsys = NULL; struct shaping_feature *feature; @@ -4455,6 +4456,12 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex if (!feature_list) return; + /* Required feature. */ + required_feature.index = langsys ? GET_BE_WORD(langsys->required_feature_index) : 0xffff; + if (required_feature.index < total_feature_count) + required_feature.tag = feature_list->features[required_feature.index].tag; + required_feature.mask = global_bit_mask; + context->global_mask = global_bit_mask; next_bit = global_bit_shift + 1; for (i = 0; i < features->count; ++i) @@ -4474,6 +4481,9 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex if (!feature->max_value || next_bit + bits_needed > 8 * sizeof (feature->mask)) continue; + if (required_feature.tag == feature->tag) + required_feature.stage = feature->stage; + for (j = 0; j < script_feature_count; ++j) { feature_index = GET_BE_WORD(langsys->feature_index[j]); @@ -4517,6 +4527,9 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex for (stage = 0; stage <= features->stage; ++stage) { + if (required_feature.index != 0xffff && required_feature.stage == stage) + opentype_layout_add_lookups(feature_list, total_lookup_count, table, &required_feature, lookups); + for (i = 0; i < features->count; ++i) { if (features->features[i].stage == stage)

1 0

Nikolay Sivov : dwrite: Use lookup fitering for context matching.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: aa222d7df87967b865a80c808b3714d6100ea542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa222d7df87967b865a80c80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:50 2020 +0300 dwrite: Use lookup fitering for context matching. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fe25c6b692..fd59f40dcb 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3496,7 +3496,7 @@ struct match_context unsigned int input_offset; unsigned int lookahead_offset; p_match_func match_func; - unsigned int mask; + const struct lookup *lookup; }; struct glyph_iterator @@ -5015,8 +5015,8 @@ static BOOL opentype_layout_context_match_input(const struct match_context *mc, match_positions[0] = context->cur; - glyph_iterator_init(context, 0, context->cur, count - 1, &iter); - iter.mask = mc->mask; + glyph_iterator_init(context, mc->lookup->flags, context->cur, count - 1, &iter); + iter.mask = mc->lookup->mask; iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = input; @@ -5042,7 +5042,7 @@ static BOOL opentype_layout_context_match_backtrack(const struct match_context * struct glyph_iterator iter; unsigned int i; - glyph_iterator_init(context, 0, context->cur, count, &iter); + glyph_iterator_init(context, mc->lookup->flags, context->cur, count, &iter); iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = backtrack; @@ -5066,7 +5066,7 @@ static BOOL opentype_layout_context_match_lookahead(const struct match_context * struct glyph_iterator iter; unsigned int i; - glyph_iterator_init(context, 0, context->cur + offset - 1, count, &iter); + glyph_iterator_init(context, mc->lookup->flags, context->cur + offset - 1, count, &iter); iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = lookahead; @@ -5262,7 +5262,7 @@ static BOOL opentype_layout_apply_rule_set(const struct match_context *mc, unsig static BOOL opentype_layout_apply_gsub_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - struct match_context mc = { .context = context, .mask = lookup->mask }; + struct match_context mc = { .context = context, .lookup = lookup }; const struct dwrite_fonttable *table = &context->table->table; unsigned int coverage_index = GLYPH_NOT_COVERED, count, offset; UINT16 glyph, format, coverage; @@ -5364,7 +5364,7 @@ static BOOL opentype_layout_apply_gsub_context_substitution(struct scriptshaping static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - struct match_context mc = { .context = context, .mask = lookup->mask }; + struct match_context mc = { .context = context, .lookup = lookup }; const struct dwrite_fonttable *table = &context->table->table; unsigned int coverage_index = GLYPH_NOT_COVERED, count, offset; UINT16 glyph, format, coverage; @@ -5493,7 +5493,7 @@ static BOOL opentype_layout_apply_gsub_reverse_chain_context_substitution(struct if (format == 1) { - struct match_context mc = { .context = context, .mask = lookup->mask }; + struct match_context mc = { .context = context, .lookup = lookup }; unsigned int start_index = 0, end_index = 0, backtrack_count, lookahead_count; unsigned int coverage, coverage_index; const UINT16 *backtrack, *lookahead;

1 0

Nikolay Sivov : dwrite: Implement reverse chain contextual substitution (GSUB lookup 8).
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: f2db3b58d6748c81dcbd24f96715b4efe2524dd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2db3b58d6748c81dcbd24f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:49 2020 +0300 dwrite: Implement reverse chain contextual substitution (GSUB lookup 8). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 58e1a3941c..fe25c6b692 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4661,7 +4661,6 @@ static void opentype_layout_replace_glyph(struct scriptshaping_context *context, context->u.subst.glyphs[context->cur] = glyph; opentype_set_subst_glyph_props(context, context->cur); } - context->cur++; } static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_context *context, const struct lookup *lookup, @@ -4707,6 +4706,7 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ } opentype_layout_replace_glyph(context, glyph); + context->cur++; return TRUE; } @@ -4801,6 +4801,7 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co { /* Equivalent of single substitution. */ opentype_layout_replace_glyph(context, GET_BE_WORD(glyphs[0])); + context->cur++; } else if (glyph_count == 0) { @@ -4915,6 +4916,7 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con } opentype_layout_replace_glyph(context, glyph); + context->cur++; return TRUE; } @@ -4937,6 +4939,7 @@ static BOOL opentype_layout_apply_ligature(struct scriptshaping_context *context if (comp_count == 1) { opentype_layout_replace_glyph(context, GET_BE_WORD(lig->lig_glyph)); + context->cur++; return TRUE; } @@ -5476,6 +5479,68 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts return ret; } +static BOOL opentype_layout_apply_gsub_reverse_chain_context_substitution(struct scriptshaping_context *context, + const struct lookup *lookup, unsigned int subtable_offset) +{ + const struct dwrite_fonttable *table = &context->table->table; + unsigned int offset = subtable_offset; + UINT16 glyph, format; + + glyph = context->u.subst.glyphs[context->cur]; + + format = table_read_be_word(table, offset); + offset += 2; + + if (format == 1) + { + struct match_context mc = { .context = context, .mask = lookup->mask }; + unsigned int start_index = 0, end_index = 0, backtrack_count, lookahead_count; + unsigned int coverage, coverage_index; + const UINT16 *backtrack, *lookahead; + + coverage = table_read_be_word(table, offset); + offset += 2; + + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + return FALSE; + + backtrack_count = table_read_be_word(table, offset); + offset += 2; + + backtrack = table_read_ensure(table, offset, sizeof(*backtrack) * backtrack_count); + offset += sizeof(*backtrack) * backtrack_count; + + lookahead_count = table_read_be_word(table, offset); + offset += 2; + + lookahead = table_read_ensure(table, offset, sizeof(*lookahead) * lookahead_count); + offset += sizeof(*lookahead) * lookahead_count; + + mc.match_func = opentype_match_coverage_func; + mc.backtrack_offset = subtable_offset; + mc.lookahead_offset = subtable_offset; + + if (opentype_layout_context_match_backtrack(&mc, backtrack_count, backtrack, &start_index) && + opentype_layout_context_match_lookahead(&mc, lookahead_count, lookahead, 1, &end_index)) + { + unsigned int glyph_count = table_read_be_word(table, offset); + if (coverage_index >= glyph_count) + return FALSE; + offset += 2; + + glyph = table_read_be_word(table, offset + coverage_index * sizeof(glyph)); + opentype_layout_replace_glyph(context, glyph); + + return TRUE; + } + } + else + WARN("Unknown reverse chaining contextual substitution format %u.\n", format); + + return FALSE; +} + static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, const struct lookup *lookup) { unsigned int i, lookup_type; @@ -5515,7 +5580,7 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: - WARN("Unimplemented lookup %d.\n", lookup->type); + ret = opentype_layout_apply_gsub_reverse_chain_context_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_EXTENSION_SUBST: WARN("Invalid lookup type for extension substitution %#x.\n", lookup_type);

1 0

Nikolay Sivov : mf/session: Handle source buffering events.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 68b5a0574c8ad6d1df27b3641f6be7ecbb6d4f4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b5a0574c8ad6d1df27b364… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:43:42 2020 +0300 mf/session: Handle source buffering events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index ba30733fe5..39b5e1a537 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2867,6 +2867,23 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM LeaveCriticalSection(&session->cs); break; + + case MEBufferingStarted: + case MEBufferingStopped: + + EnterCriticalSection(&session->cs); + if (session_get_media_source(session, (IMFMediaSource *)event_source)) + { + if (event_type == MEBufferingStarted) + IMFPresentationClock_Pause(session->clock); + else + IMFPresentationClock_Start(session->clock, PRESENTATION_CURRENT_POSITION); + + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + } + LeaveCriticalSection(&session->cs); + break; + case MENewStream: stream = (IMFMediaStream *)value.punkVal;

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
95
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 June 2020