wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Piotr Caban : msvcrt: Fix 0 parsing in parse_double helper.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: ab5e48f4fc70debe2696b4047099e2cddd355954 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab5e48f4fc70debe2696b404… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 4 11:30:24 2020 +0200 msvcrt: Fix 0 parsing in parse_double helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 5 ++++- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 31ed4e2181..407f819884 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -744,7 +744,10 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), } #endif - while(nch == '0') nch = get(ctx); + while(nch == '0') { + found_digit = TRUE; + nch = get(ctx); + } b.data[0] = 0; b.b = 0; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 9b26484592..46eb0cc080 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1956,6 +1956,11 @@ static void test__strtod(void) { "0.1D-4736", 9, 0 }, { "3.4028234663852887e38", 21, FLT_MAX }, { "1.7976931348623158e+308", 23, DBL_MAX }, + { "00", 2, 0 }, + { "00.", 3, 0 }, + { ".00", 3, 0 }, + { "-0.", 3, 0 }, + { "0e13", 4, 0 }, }; const char overflow[] = "1d9999999999999999999";

1 0

Piotr Caban : msvcrt/tests: Cleanup strtod tests.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 19bff79da8d34739840c79bf80e23af5db30b6c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19bff79da8d34739840c79bf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 4 11:30:18 2020 +0200 msvcrt/tests: Cleanup strtod tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 92 +++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 59 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 05aa747f84..9b26484592 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1934,48 +1934,44 @@ static inline BOOL compare_double(double f, double g, unsigned int ulps) static void test__strtod(void) { - const char double1[] = "12.1"; - const char double2[] = "-13.721"; - const char double3[] = "INF"; - const char double4[] = ".21e12"; - const char double5[] = "214353e-3"; - const char double6[] = "NAN"; + static const struct { + const char *str; + int len; + double ret; + } tests[] = { + { "12.1", 4, 12.1 }, + { "-13.721", 7, -13.721 }, + { "INF", 0, 0 }, + { ".21e12", 6, 210000000000.0 }, + { "214353e-3", 9, 214.353 }, + { "NAN", 0, 0 }, + { "12.1d2", 6, 12.1e2 }, + { " d10", 0, 0 }, + { "0.1", 3, 0.1 }, + { "-0.1", 4, -0.1 }, + { "0.1281832188491894198128921", 27, 0.1281832188491894198128921 }, + { "0.82181281288121", 16, 0.82181281288121 }, + { "21921922352523587651128218821", 29, 21921922352523587651128218821.0 }, + { "0.1d238", 7, 0.1e238 }, + { "0.1D-4736", 9, 0 }, + { "3.4028234663852887e38", 21, FLT_MAX }, + { "1.7976931348623158e+308", 23, DBL_MAX }, + }; const char overflow[] = "1d9999999999999999999"; - const char white_chars[] = " d10"; char *end; double d; + int i; - d = strtod(double1, &end); - ok(d == 12.1, "d = %.16e\n", d); - ok(end == double1+4, "incorrect end (%d)\n", (int)(end-double1)); - - d = strtod(double2, &end); - ok(d == -13.721, "d = %.16e\n", d); - ok(end == double2+7, "incorrect end (%d)\n", (int)(end-double2)); - - d = strtod(double3, &end); - ok(d == 0, "d = %.16e\n", d); - ok(end == double3, "incorrect end (%d)\n", (int)(end-double3)); - - d = strtod(double4, &end); - ok(d == 210000000000.0, "d = %.16e\n", d); - ok(end == double4+6, "incorrect end (%d)\n", (int)(end-double4)); - - d = strtod(double5, &end); - ok(d == 214.353, "d = %.16e\n", d); - ok(end == double5+9, "incorrect end (%d)\n", (int)(end-double5)); - - d = strtod(double6, &end); - ok(d == 0, "d = %.16e\n", d); - ok(end == double6, "incorrect end (%d)\n", (int)(end-double6)); - - d = strtod("12.1d2", NULL); - ok(d == 12.1e2, "d = %.16e\n", d); - - d = strtod(white_chars, &end); - ok(d == 0, "d = %.16e\n", d); - ok(end == white_chars, "incorrect end (%d)\n", (int)(end-white_chars)); + for (i=0; i<ARRAY_SIZE(tests); i++) + { + errno = 0xdeadbeef; + d = strtod(tests[i].str, &end); + ok(d == tests[i].ret, "%d) d = %.16e\n", i, d); + ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", + i, (int)(end - tests[i].str)); + ok(errno = 0xdeadbeef, "%d) errno = %d\n", i, errno); + } if (!p__strtod_l) win_skip("_strtod_l not found\n"); @@ -2013,22 +2009,6 @@ static void test__strtod(void) setlocale(LC_ALL, "C"); - /* Precision tests */ - d = strtod("0.1", NULL); - ok(d == 0.1, "d = %.16e\n", d); - d = strtod("-0.1", NULL); - ok(d == -0.1, "d = %.16e\n", d); - d = strtod("0.1281832188491894198128921", NULL); - ok(d == 0.1281832188491894198128921, "d = %.16e\n", d); - d = strtod("0.82181281288121", NULL); - ok(d == 0.82181281288121, "d = %.16e\n", d); - d = strtod("21921922352523587651128218821", NULL); - ok(d == 21921922352523587651128218821.0, "d = %.16e\n", d); - d = strtod("0.1d238", NULL); - ok(d == 0.1e238, "d = %.16e\n", d); - d = strtod("0.1D-4736", NULL); - ok(d == 0.0, "d = %.16e\n", d); - errno = 0xdeadbeef; strtod(overflow, &end); ok(errno == ERANGE, "errno = %x\n", errno); @@ -2037,12 +2017,6 @@ static void test__strtod(void) errno = 0xdeadbeef; strtod("-1d309", NULL); ok(errno == ERANGE, "errno = %x\n", errno); - - d = strtod("3.4028234663852887e38", NULL); - ok(d <= FLT_MAX, "d = %e\n", d); - - d = strtod("1.7976931348623158e+308", NULL); - ok(d == DBL_MAX, "d = %le\n", d); } static void test_mbstowcs(void)

1 0

Nikolay Sivov : dwrite: Partially implement chaining contextual substitution (GSUB lookup 6).
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 075f5b73feb8609957dd6d00adc083825c1a5cd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=075f5b73feb8609957dd6d00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:35 2020 +0300 dwrite: Partially implement chaining contextual substitution (GSUB lookup 6). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 214 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 200 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=075f5b73feb8609957dd…

1 0

Nikolay Sivov : dwrite: Implement single substitution lookup (GSUB lookup 1).
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: a6be9579196f8c625017a73c536e73f426b0f93b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6be9579196f8c625017a73c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:34 2020 +0300 dwrite: Implement single substitution lookup (GSUB lookup 1). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 ++ dlls/dwrite/dwrite_private.h | 6 ++ dlls/dwrite/opentype.c | 165 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 164 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index bc5c54f21e..5ee057028f 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1252,6 +1252,10 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, context.length = length; context.is_rtl = is_rtl; context.is_sideways = is_sideways; + context.u.subst.glyphs = glyphs; + context.u.subst.glyph_props = glyph_props; + context.u.subst.max_glyph_count = max_glyph_count; + context.glyph_count = g; context.language_tag = get_opentype_language(locale); script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7a8ce1e499..28ac05a1c1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -478,6 +478,12 @@ struct scriptshaping_context const UINT16 *glyphs; const DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; } pos; + struct + { + UINT16 *glyphs; + DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; + unsigned int max_glyph_count; + } subst; } u; unsigned int glyph_count; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b5947a8960..e1bfee097b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -507,6 +507,18 @@ enum gpos_lookup_type GPOS_LOOKUP_EXTENSION_POSITION = 9, }; +enum gsub_lookup_type +{ + GSUB_LOOKUP_SINGLE_SUBST = 1, + GSUB_LOOKUP_MULTIPLE_SUBST = 2, + GSUB_LOOKUP_ALTERNATE_SUBST = 3, + GSUB_LOOKUP_LIGATURE_SUBST = 4, + GSUB_LOOKUP_CONTEXTUAL_SUBST = 5, + GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST = 6, + GSUB_LOOKUP_EXTENSION_SUBST = 7, + GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST = 8, +}; + enum gpos_value_format { GPOS_VALUE_X_PLACEMENT = 0x1, @@ -528,13 +540,28 @@ enum OPENTYPE_PLATFORM_ID OPENTYPE_PLATFORM_CUSTOM }; -struct ot_gpos_extensionpos_format1 +struct ot_gsubgpos_extensionpos_format1 { - WORD format; - WORD lookup_type; + UINT16 format; + UINT16 lookup_type; DWORD extension_offset; }; +struct ot_gsub_singlesubst_format1 +{ + UINT16 format; + UINT16 coverage; + short delta; +}; + +struct ot_gsub_singlesubst_format2 +{ + UINT16 format; + UINT16 coverage; + UINT16 count; + UINT16 substitutes[1]; +}; + struct ot_feature { WORD feature_params; @@ -740,12 +767,6 @@ typedef struct { #include "poppack.h" -enum gsub_lookup_type -{ - GSUB_LOOKUP_SINGLE_SUBST = 1, - GSUB_LOOKUP_EXTENSION_SUBST = 7, -}; - enum TT_NAME_WINDOWS_ENCODING_ID { TT_NAME_WINDOWS_ENCODING_SYMBOL = 0, @@ -3286,7 +3307,23 @@ static unsigned int opentype_layout_get_gpos_subtable(const struct scriptshaping FIELD_OFFSET(struct ot_lookup_table, subtable[subtable])); if (lookup_type == GPOS_LOOKUP_EXTENSION_POSITION) { - const struct ot_gpos_extensionpos_format1 *format1 = table_read_ensure(&cache->gpos.table, + const struct ot_gsubgpos_extensionpos_format1 *format1 = table_read_ensure(&cache->gpos.table, + lookup_offset + subtable_offset, sizeof(*format1)); + subtable_offset += GET_BE_DWORD(format1->extension_offset); + } + + return lookup_offset + subtable_offset; +} + +static unsigned int opentype_layout_get_gsub_subtable(const struct scriptshaping_cache *cache, + unsigned int lookup_offset, unsigned int subtable) +{ + UINT16 lookup_type = table_read_be_word(&cache->gsub.table, lookup_offset); + unsigned int subtable_offset = table_read_be_word(&cache->gsub.table, lookup_offset + + FIELD_OFFSET(struct ot_lookup_table, subtable[subtable])); + if (lookup_type == GSUB_LOOKUP_EXTENSION_SUBST) + { + const struct ot_gsubgpos_extensionpos_format1 *format1 = table_read_ensure(&cache->gsub.table, lookup_offset + subtable_offset, sizeof(*format1)); subtable_offset += GET_BE_DWORD(format1->extension_offset); } @@ -3971,7 +4008,7 @@ static void opentype_layout_apply_gpos_lookup(struct scriptshaping_context *cont lookup_type = GET_BE_WORD(lookup_table->lookup_type); if (lookup_type == GPOS_LOOKUP_EXTENSION_POSITION) { - const struct ot_gpos_extensionpos_format1 *extension = table_read_ensure(&cache->gpos.table, + const struct ot_gsubgpos_extensionpos_format1 *extension = table_read_ensure(&cache->gpos.table, lookup.offset + GET_BE_WORD(lookup_table->subtable[0]), sizeof(*extension)); WORD format; @@ -4157,9 +4194,115 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, heap_free(lookups.indexes); } +static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator *iter, const struct lookup *lookup) +{ + struct scriptshaping_cache *cache = iter->context->cache; + UINT16 format, coverage; + unsigned int i; + + for (i = 0; i < lookup->subtable_count; ++i) + { + unsigned int subtable_offset = opentype_layout_get_gsub_subtable(cache, lookup->offset, i); + UINT16 glyph = iter->context->u.subst.glyphs[iter->pos]; + unsigned int coverage_index; + + format = table_read_be_word(&cache->gsub.table, subtable_offset); + + coverage = table_read_be_word(&cache->gsub.table, subtable_offset + + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, coverage)); + + if (format == 1) + { + const struct ot_gsub_singlesubst_format1 *format1 = table_read_ensure(&cache->gsub.table, subtable_offset, + sizeof(*format1)); + + coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + continue; + + iter->context->u.subst.glyphs[iter->pos] = glyph + GET_BE_WORD(format1->delta); + break; + } + else if (format == 2) + { + UINT16 count = table_read_be_word(&cache->gsub.table, subtable_offset + + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count)); + const struct ot_gsub_singlesubst_format2 *format2 = table_read_ensure(&cache->gsub.table, subtable_offset, + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count) + count * sizeof(UINT16)); + + coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= count) + continue; + + iter->context->u.subst.glyphs[iter->pos] = GET_BE_WORD(format2->substitutes[coverage_index]); + break; + } + else + WARN("Unknown single substitution format %u.\n", format); + } + + return FALSE; +} + static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, unsigned int first_glyph, unsigned int glyph_count, int lookup_index) { + struct ot_gsubgpos_table *table = &context->cache->gsub; + const struct ot_lookup_table *lookup_table; + struct glyph_iterator iter; + struct lookup lookup; + WORD lookup_type; + + lookup.offset = table_read_be_word(&table->table, table->lookup_list + FIELD_OFFSET(struct ot_lookup_list, lookup[lookup_index])); + if (!lookup.offset) + return; + + lookup.offset += table->lookup_list; + + if (!(lookup_table = table_read_ensure(&table->table, lookup.offset, sizeof(*lookup_table)))) + return; + + lookup.subtable_count = GET_BE_WORD(lookup_table->subtable_count); + if (!lookup.subtable_count) + return; + + lookup_type = GET_BE_WORD(lookup_table->lookup_type); + lookup.flags = GET_BE_WORD(lookup_table->flags); + + glyph_iterator_init(context, lookup.flags, first_glyph, glyph_count, &iter); + + while (iter.pos < first_glyph + iter.len) + { + BOOL ret; + + if (!glyph_iterator_match(&iter)) + { + ++iter.pos; + continue; + } + + switch (lookup_type) + { + case GSUB_LOOKUP_SINGLE_SUBST: + ret = opentype_layout_apply_gsub_single_substitution(&iter, &lookup); + break; + case GSUB_LOOKUP_MULTIPLE_SUBST: + case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: + case GSUB_LOOKUP_ALTERNATE_SUBST: + case GSUB_LOOKUP_LIGATURE_SUBST: + case GSUB_LOOKUP_CONTEXTUAL_SUBST: + case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: + WARN("Unimplemented lookup %d.\n", lookup_type); + break; + default: + WARN("Unknown lookup type %u.\n", lookup_type); + return; + } + + /* Some lookups update position after making changes. */ + if (!ret) + ++iter.pos; + } } HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index,

1 0

Nikolay Sivov : dwrite: Add a helper to collect gsub/gpos lookups.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 5eb742687defb83d7a792f1e5088c4a0e91f3ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb742687defb83d7a792f1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:33 2020 +0300 dwrite: Add a helper to collect gsub/gpos lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 81 +++++++++++++++++++++++++++++++++----------------- dlls/dwrite/shape.c | 6 ++-- 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b9db82d661..b5947a8960 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4054,43 +4054,41 @@ static int lookups_sorting_compare(const void *left, const void *right) return *(int *)left - *(int *)right; }; -void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, - unsigned int script_index, unsigned int language_index, const struct shaping_features *features) +static void opentype_layout_collect_lookups(struct scriptshaping_context *context, unsigned int script_index, + unsigned int language_index, const struct shaping_features *features, struct ot_gsubgpos_table *table, + struct lookups *lookups) { - WORD table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; - struct scriptshaping_cache *cache = context->cache; + UINT16 table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; const struct ot_feature_list *feature_list; - struct lookups lookups = { 0 }; unsigned int i, j, l; /* ScriptTable offset. */ - table_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + script_index * sizeof(struct ot_script_record) + - FIELD_OFFSET(struct ot_script_record, script)); + table_offset = table_read_be_word(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + script_index * sizeof(struct ot_script_record) + FIELD_OFFSET(struct ot_script_record, script)); if (!table_offset) return; if (language_index == ~0u) - langsys_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset); + langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset); else - langsys_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + + langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys) + language_index * sizeof(struct ot_langsys_record) + FIELD_OFFSET(struct ot_langsys_record, langsys)); - script_feature_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + - langsys_offset + FIELD_OFFSET(struct ot_langsys, feature_count)); + script_feature_count = table_read_be_word(&table->table, table->script_list + table_offset + langsys_offset + + FIELD_OFFSET(struct ot_langsys, feature_count)); if (!script_feature_count) return; - total_feature_count = table_read_be_word(&cache->gpos.table, cache->gpos.feature_list); + total_feature_count = table_read_be_word(&table->table, table->feature_list); if (!total_feature_count) return; - total_lookup_count = table_read_be_word(&cache->gpos.table, cache->gpos.lookup_list); + total_lookup_count = table_read_be_word(&table->table, table->lookup_list); if (!total_lookup_count) return; - feature_list = table_read_ensure(&cache->gpos.table, cache->gpos.feature_list, + feature_list = table_read_ensure(&table->table, table->feature_list, FIELD_OFFSET(struct ot_feature_list, features[total_feature_count])); if (!feature_list) return; @@ -4100,7 +4098,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, { for (j = 0; j < script_feature_count; ++j) { - WORD feature_index = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + + UINT16 feature_index = table_read_be_word(&table->table, table->script_list + table_offset + langsys_offset + FIELD_OFFSET(struct ot_langsys, feature_index[j])); if (feature_index >= total_feature_count) continue; @@ -4110,49 +4108,78 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, WORD feature_offset = GET_BE_WORD(feature_list->features[feature_index].offset); WORD lookup_count; - lookup_count = table_read_be_word(&cache->gpos.table, cache->gpos.feature_list + feature_offset + + lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + FIELD_OFFSET(struct ot_feature, lookup_count)); if (!lookup_count) continue; - if (!dwrite_array_reserve((void **)&lookups.indexes, &lookups.capacity, lookups.count + lookup_count, - sizeof(*lookups.indexes))) + if (!dwrite_array_reserve((void **)&lookups->indexes, &lookups->capacity, lookups->count + lookup_count, + sizeof(*lookups->indexes))) { - heap_free(lookups.indexes); return; } for (l = 0; l < lookup_count; ++l) { - WORD lookup_index = table_read_be_word(&cache->gpos.table, cache->gpos.feature_list + - feature_offset + FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); + UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); if (lookup_index >= total_lookup_count) continue; - lookups.indexes[lookups.count++] = lookup_index; + lookups->indexes[lookups->count++] = lookup_index; } } } } /* Sort lookups. */ - qsort(lookups.indexes, lookups.count, sizeof(*lookups.indexes), lookups_sorting_compare); + qsort(lookups->indexes, lookups->count, sizeof(*lookups->indexes), lookups_sorting_compare); +} - for (l = 0; l < lookups.count; ++l) +void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, + unsigned int language_index, const struct shaping_features *features) +{ + struct lookups lookups = { 0 }; + unsigned int i; + + opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); + + for (i = 0; i < lookups.count; ++i) { /* Skip duplicates. */ - if (l && lookups.indexes[l] == lookups.indexes[l - 1]) + if (i && lookups.indexes[i] == lookups.indexes[i - 1]) continue; - opentype_layout_apply_gpos_lookup(context, lookups.indexes[l]); + opentype_layout_apply_gpos_lookup(context, lookups.indexes[i]); } heap_free(lookups.indexes); } +static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, unsigned int first_glyph, + unsigned int glyph_count, int lookup_index) +{ +} + HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) { + struct lookups lookups = { 0 }; + unsigned int i; + + opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gsub, &lookups); + + for (i = 0; i < lookups.count; ++i) + { + /* Skip duplicates. */ + if (i && lookups.indexes[i] == lookups.indexes[i - 1]) + continue; + + opentype_layout_apply_gsub_lookup(context, 0, context->glyph_count, lookups.indexes[i]); + } + + heap_free(lookups.indexes); + return S_OK; } diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index dd7c45e3e7..533efe6cc7 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -189,7 +189,7 @@ const struct scriptshaping_ops default_shaping_ops = default_set_text_glyphs_props }; -static DWORD shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, +static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, unsigned int *script_index) { static const DWORD fallback_scripts[] = @@ -199,10 +199,10 @@ static DWORD shape_select_script(const struct scriptshaping_cache *cache, DWORD DWRITE_MAKE_OPENTYPE_TAG('l','a','t','n'), 0, }; - DWORD script; + unsigned int script; /* Passed scripts in ascending priority. */ - while (*scripts) + while (scripts && *scripts) { if ((script = opentype_layout_find_script(cache, kind, *scripts, script_index))) return script;

1 0

Nikolay Sivov : dwrite: Add helper functions to collect default GSUB features.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: bd6a500ab095944a234cc93398d005569c5035a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd6a500ab095944a234cc933… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:32 2020 +0300 dwrite: Add helper functions to collect default GSUB features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 19 +++++++---- dlls/dwrite/dwrite_private.h | 17 ++++++++-- dlls/dwrite/opentype.c | 10 ++++-- dlls/dwrite/shape.c | 80 ++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 108 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd6a500ab095944a234c…

1 0

Nikolay Sivov : dwrite: Initialize GSUB offsets in shaping cache.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 7208bc40dcbea8638c4679b451f88ce06f8ab981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7208bc40dcbea8638c4679b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:31 2020 +0300 dwrite: Initialize GSUB offsets in shaping cache. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 10 ++++++++++ dlls/dwrite/shape.c | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d89dacb3a4..4516189445 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -448,6 +448,7 @@ struct scriptshaping_cache void *context; UINT16 upem; + struct ot_gsubgpos_table gsub; struct ot_gsubgpos_table gpos; struct diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 66c3398316..a2af5ce954 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2942,6 +2942,16 @@ DWRITE_CONTAINER_TYPE opentype_analyze_container_type(void const *data, UINT32 d void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) { + cache->font->grab_font_table(cache->context, MS_GSUB_TAG, &cache->gsub.table.data, &cache->gsub.table.size, + &cache->gsub.table.context); + + if (cache->gsub.table.data) + { + cache->gsub.script_list = table_read_be_word(&cache->gsub.table, FIELD_OFFSET(struct gpos_gsub_header, script_list)); + cache->gsub.feature_list = table_read_be_word(&cache->gsub.table, FIELD_OFFSET(struct gpos_gsub_header, feature_list)); + cache->gsub.lookup_list = table_read_be_word(&cache->gsub.table, FIELD_OFFSET(struct gpos_gsub_header, lookup_list)); + } + cache->font->grab_font_table(cache->context, MS_GPOS_TAG, &cache->gpos.table.data, &cache->gpos.table.size, &cache->gpos.table.context); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index d7d1261f35..bd53f03513 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -52,6 +52,7 @@ void release_scriptshaping_cache(struct scriptshaping_cache *cache) return; cache->font->release_font_table(cache->context, cache->gdef.table.context); + cache->font->release_font_table(cache->context, cache->gsub.table.context); cache->font->release_font_table(cache->context, cache->gpos.table.context); heap_free(cache); }

1 0

Nikolay Sivov : dwrite: Add separate structure for top level gsub/gpos offsets.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: b8f1aed6d91d174d29094a7e184d57e713041982 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f1aed6d91d174d29094a7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:30 2020 +0300 dwrite: Add separate structure for top level gsub/gpos offsets. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 16 +++++++++------- dlls/dwrite/opentype.c | 27 ++++++++++++++------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5755696875..d89dacb3a4 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -434,19 +434,21 @@ enum SCRIPT_JUSTIFY SCRIPT_JUSTIFY_ARABIC_SEEN_M }; +struct ot_gsubgpos_table +{ + struct dwrite_fonttable table; + unsigned int script_list; + unsigned int feature_list; + unsigned int lookup_list; +}; + struct scriptshaping_cache { const struct shaping_font_ops *font; void *context; UINT16 upem; - struct - { - struct dwrite_fonttable table; - unsigned int script_list; - unsigned int feature_list; - unsigned int lookup_list; - } gpos; + struct ot_gsubgpos_table gpos; struct { diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0307cd5981..66c3398316 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2962,10 +2962,11 @@ void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) cache->gdef.classdef = table_read_be_word(&cache->gdef.table, FIELD_OFFSET(struct gdef_header, classdef)); } -DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD kind, DWORD script, +unsigned int opentype_layout_find_script(const struct scriptshaping_cache *cache, unsigned int kind, DWORD script, unsigned int *script_index) { - WORD script_count; + const struct ot_gsubgpos_table *table = &cache->gpos; + UINT16 script_count; unsigned int i; *script_index = ~0u; @@ -2973,14 +2974,14 @@ DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD if (kind != MS_GPOS_TAG) return 0; - script_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list); + script_count = table_read_be_word(&table->table, table->script_list); if (!script_count) return 0; for (i = 0; i < script_count; i++) { - DWORD tag = table_read_dword(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + i * sizeof(struct ot_script_record)); + unsigned int tag = table_read_dword(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + i * sizeof(struct ot_script_record)); if (!tag) continue; @@ -2994,10 +2995,11 @@ DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD return 0; } -DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWORD kind, DWORD language, +unsigned int opentype_layout_find_language(const struct scriptshaping_cache *cache, unsigned int kind, DWORD language, unsigned int script_index, unsigned int *language_index) { - WORD table_offset, lang_count; + const struct ot_gsubgpos_table *table = &cache->gpos; + UINT16 table_offset, lang_count; unsigned int i; *language_index = ~0u; @@ -3005,17 +3007,16 @@ DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWO if (kind != MS_GPOS_TAG) return 0; - table_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + script_index * sizeof(struct ot_script_record) + - FIELD_OFFSET(struct ot_script_record, script)); + table_offset = table_read_be_word(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + script_index * sizeof(struct ot_script_record) + FIELD_OFFSET(struct ot_script_record, script)); if (!table_offset) return 0; - lang_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + + lang_count = table_read_be_word(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys_count)); for (i = 0; i < lang_count; i++) { - DWORD tag = table_read_dword(&cache->gpos.table, cache->gpos.script_list + table_offset + + unsigned int tag = table_read_dword(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys) + i * sizeof(struct ot_langsys_record)); if (tag == language) @@ -3026,7 +3027,7 @@ DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWO } /* Try 'defaultLangSys' if it's set. */ - if (table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset)) + if (table_read_be_word(&table->table, table->script_list + table_offset)) return ~0u; return 0;

1 0

Jacek Caban : riched20: Include wine/asm.h in editstr.h.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 9763f5189f1312c82c98b3ce25cb8100ae4cb420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9763f5189f1312c82c98b3ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 3 14:09:42 2020 +0200 riched20: Include wine/asm.h in editstr.h. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49068 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 1 + dlls/riched20/txthost.c | 1 - dlls/riched20/txtsrv.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index a65169056e..2c5737f3e9 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -43,6 +43,7 @@ #include <textserv.h> #include "usp10.h" +#include "wine/asm.h" #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 5992fc0b06..99f446e581 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -25,7 +25,6 @@ #include "richole.h" #include "imm.h" #include "textserv.h" -#include "wine/asm.h" #include "wine/debug.h" #include "editstr.h" diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 12761621c4..622d851928 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -27,7 +27,6 @@ #include "tom.h" #include "imm.h" #include "textserv.h" -#include "wine/asm.h" #include "wine/debug.h" #include "editstr.h"

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoIs32bitProcess().
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 0e09d5ea74d1c4a2b780c27a66b227e7a406d9d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e09d5ea74d1c4a2b780c27a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 3 11:22:02 2020 -0500 ntoskrnl.exe: Implement IoIs32bitProcess(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49088 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + include/ddk/wdm.h | 3 +++ 4 files changed, 17 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d1bdc33653..3013fe7eb9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2196,6 +2196,7 @@ static void *create_process_object( HANDLE handle ) process->header.Type = 3; process->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ NtQueryInformationProcess( handle, ProcessBasicInformation, &process->info, sizeof(process->info), NULL ); + IsWow64Process( handle, &process->wow64 ); return process; } @@ -3935,6 +3936,17 @@ PEPROCESS WINAPI IoGetRequestorProcess(IRP *irp) return irp->Tail.Overlay.Thread->kthread.process; } +#ifdef _WIN64 +/*********************************************************************** + * IoIs32bitProcess (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI IoIs32bitProcess(IRP *irp) +{ + TRACE("irp %p.\n", irp); + return irp->Tail.Overlay.Thread->kthread.process->wow64; +} +#endif + /*********************************************************************** * RtlIsNtDdiVersionAvailable (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 14d95a47f8..8e3b127b16 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -416,6 +416,7 @@ @ stdcall IoInitializeTimer(ptr ptr ptr) @ stdcall IoInvalidateDeviceRelations(ptr long) @ stub IoInvalidateDeviceState +@ stdcall -arch=win64 IoIs32bitProcess(ptr) @ stub IoIsFileOriginRemote @ stub IoIsOperationSynchronous @ stub IoIsSystemThread diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 256e945e6f..23f03c336d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -40,6 +40,7 @@ struct _EPROCESS { DISPATCHER_HEADER header; PROCESS_BASIC_INFORMATION info; + BOOL wow64; }; struct _KTHREAD diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 60396779fc..db8073ebe3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1608,6 +1608,9 @@ void WINAPI IoGetStackLimits(ULONG_PTR*,ULONG_PTR*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +#ifdef _WIN64 +BOOLEAN WINAPI IoIs32bitProcess(IRP*); +#endif NTSTATUS WINAPI IoOpenDeviceRegistryKey(DEVICE_OBJECT*,ULONG,ACCESS_MASK,HANDLE*); void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING);

1 0

← Newer
1
...
67
68
69
70
71
72
73
74
75
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 May 2020