wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Louis Lenders : shcore: Return S_OK in SetCurrentProcessExplicitAppUserModelID.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: f8ca13d30ff85665644189ec3823b3f5d1f77dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8ca13d30ff85665644189ec… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed May 20 23:19:18 2020 +0200 shcore: Return S_OK in SetCurrentProcessExplicitAppUserModelID. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49189 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 3f95c1ffd8..e552ba277f 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -245,7 +245,7 @@ HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site) HRESULT WINAPI SetCurrentProcessExplicitAppUserModelID(const WCHAR *appid) { FIXME("%s: stub\n", debugstr_w(appid)); - return E_NOTIMPL; + return S_OK; } HRESULT WINAPI GetCurrentProcessExplicitAppUserModelID(const WCHAR **appid)

1 0

Markus Engel : user32/tests: Add more tests for GetKeyState().
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: ace37a68b75feccc9919471d2d4a5ba06b4c862e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace37a68b75feccc9919471d… Author: Markus Engel <markus_wine(a)familie-engel.online> Date: Mon May 18 18:35:59 2020 +0200 user32/tests: Add more tests for GetKeyState(). Signed-off-by: Markus Engel <markus_wine(a)familie-engel.online> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 43fdd34191..92b18becd2 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2759,6 +2759,9 @@ static DWORD WINAPI get_key_state_thread(void *arg) ok((result & 0x8000) || broken(!(result & 0x8000)), /* > Win 2003 */ "expected that highest bit is set, got %x\n", result); + ok((SHORT)(result & 0x007e) == 0, + "expected that undefined bits are unset, got %x\n", result); + ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); @@ -2766,6 +2769,9 @@ static DWORD WINAPI get_key_state_thread(void *arg) result = GetKeyState('X'); ok(!(result & 0x8000), "expected that highest bit is unset, got %x\n", result); + ok((SHORT)(result & 0x007e) == 0, + "expected that undefined bits are unset, got %x\n", result); + return 0; }

1 0

Markus Engel : user32: Force undefined bits in GetKeyState() and GetKeyboardState() to zero.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: d9855df17f905da97b4bd92227427c4f899babf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9855df17f905da97b4bd922… Author: Markus Engel <markus_wine(a)familie-engel.online> Date: Mon May 18 18:35:58 2020 +0200 user32: Force undefined bits in GetKeyState() and GetKeyboardState() to zero. Only the highest and lowest bits in the return values of these functions have a meaning, the others are undefined. While the other bits are always cleared in Windows, wine stores information there. Some programs expect these undefined bits to be zero, though, so make sure they are not set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30814 Signed-off-by: Markus Engel <markus_wine(a)familie-engel.online> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index b7cdbd84ef..2f8648f177 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -555,7 +555,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) { req->tid = GetCurrentThreadId(); req->key = vkey; - if (!wine_server_call( req )) retval = (signed char)reply->state; + if (!wine_server_call( req )) retval = (signed char)(reply->state & 0x81); } SERVER_END_REQ; TRACE("key (0x%x) -> %x\n", vkey, retval); @@ -569,6 +569,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) { BOOL ret; + UINT i; TRACE("(%p)\n", state); @@ -579,6 +580,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) req->key = -1; wine_server_set_reply( req, state, 256 ); ret = !wine_server_call_err( req ); + for (i = 0; i < 256; i++) state[i] &= 0x81; } SERVER_END_REQ; return ret;

1 0

Hans Leidekker : wbemprox: Get the operating system serial number from the registry.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: f516a23041b3871625764611321250f977fe750a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f516a23041b3871625764611… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 18 09:49:40 2020 +0200 wbemprox: Get the operating system serial number from the registry. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5af47a0ddc..ddd12d6ebc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -243,7 +243,7 @@ static const struct column col_operatingsystem[] = { L"OSProductSuite", CIM_UINT32 }, { L"OSType", CIM_UINT16 }, { L"Primary", CIM_BOOLEAN }, - { L"SerialNumber", CIM_STRING }, + { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, { L"SuiteMask", CIM_UINT32 }, @@ -3360,6 +3360,27 @@ static WCHAR *get_osname( const WCHAR *caption ) memcpy( ret + len, partitionW, sizeof(partitionW) ); return ret; } +static WCHAR *get_osserialnumber(void) +{ + HKEY hkey = 0; + DWORD size, type; + WCHAR *ret = NULL; + + if (!RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hkey ) && + !RegQueryValueExW( hkey, L"ProductId", NULL, &type, NULL, &size ) && type == REG_SZ && + (ret = heap_alloc( size + sizeof(WCHAR) ))) + { + size += sizeof(WCHAR); + if (RegQueryValueExW( hkey, L"ProductId", NULL, NULL, (BYTE *)ret, &size )) + { + heap_free( ret ); + ret = NULL; + } + } + if (hkey) RegCloseKey( hkey ); + if (!ret) return heap_strdupW( L"12345-OEM-1234567-12345" ); + return ret; +} static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) { WCHAR *ret = heap_alloc( 33 * sizeof(WCHAR) ); @@ -3414,7 +3435,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->primary = -1; - rec->serialnumber = L"12345-OEM-1234567-12345"; + rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; rec->suitemask = 272; /* Single User + Terminal */

1 0

Jacek Caban : ucrtbase: Use MSVCRT prefix for __stdio_common_vsprintf implementation.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 37cb6cc75731cb1215a73bc8c406651244ef8ea4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37cb6cc75731cb1215a73bc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 21 16:36:31 2020 +0200 ucrtbase: Use MSVCRT prefix for __stdio_common_vsprintf implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f751d658ef..3aefaf4343 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -725,8 +725,8 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) /********************************************************************* * __stdio_common_vsprintf (UCRTBASE.@) */ -int CDECL __stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, - MSVCRT__locale_t locale, __ms_va_list valist ) +int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) { static const char nullbyte = '\0'; struct _str_ctx_a ctx = {len, str}; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index cc4bfc7768..a968cdaaa1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -156,7 +156,7 @@ @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s -@ cdecl -norelay __stdio_common_vsprintf(int64 ptr long str ptr ptr) +@ cdecl -norelay __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf @ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf @@ -820,7 +820,7 @@ @ cdecl _o___stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf @ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl _o___stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s -@ cdecl _o___stdio_common_vsprintf(int64 ptr long str ptr ptr) __stdio_common_vsprintf +@ cdecl _o___stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf @ cdecl _o___stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p @ cdecl _o___stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ cdecl _o___stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf

1 0

Nikolay Sivov : dwrite: Keep user features values.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: c8f409ed9311c6b84b2383ac5640ad39cfb1d5e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8f409ed9311c6b84b2383ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 15:28:49 2020 +0300 dwrite: Keep user features values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/opentype.c | 49 +++++++++++++++++++++++++------------------- dlls/dwrite/shape.c | 43 ++++++++++++++++++++++++++------------ 3 files changed, 60 insertions(+), 34 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cad74d9e94..8b5fefc66b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -523,6 +523,8 @@ struct shaping_feature unsigned int tag; unsigned int index; unsigned int flags; + unsigned int max_value; + unsigned int default_value; }; struct shaping_features diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 713a5002f3..8904dc546e 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4169,33 +4169,40 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex /* Collect lookups for all given features. */ for (i = 0; i < features->count; ++i) { + UINT16 feature_offset, lookup_count; + feature_index = features->features[i].index; - if (feature_index != 0xffff) - { - UINT16 feature_offset = GET_BE_WORD(feature_list->features[feature_index].offset); - UINT16 lookup_count; - lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + - FIELD_OFFSET(struct ot_feature, lookup_count)); - if (!lookup_count) - continue; + /* Feature wasn't found */ + if (feature_index == 0xffff) + continue; - if (!dwrite_array_reserve((void **)&lookups->indexes, &lookups->capacity, lookups->count + lookup_count, - sizeof(*lookups->indexes))) - { - return; - } + /* FIXME: skip non-global ones for now. */ + if (!(features->features[i].flags & FEATURE_GLOBAL)) + continue; - for (l = 0; l < lookup_count; ++l) - { - UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + - FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); + feature_offset = GET_BE_WORD(feature_list->features[feature_index].offset); - if (lookup_index >= total_lookup_count) - continue; + lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookup_count)); + if (!lookup_count) + continue; - lookups->indexes[lookups->count++] = lookup_index; - } + if (!dwrite_array_reserve((void **)&lookups->indexes, &lookups->capacity, lookups->count + lookup_count, + sizeof(*lookups->indexes))) + { + return; + } + + for (l = 0; l < lookup_count; ++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; } } diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 57c06f62e8..df680373a2 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -201,20 +201,24 @@ static DWORD shape_select_language(const struct scriptshaping_cache *cache, DWOR return 0; } -static void shape_add_feature_flags(struct shaping_features *features, unsigned int tag, unsigned int flags) +static void shape_add_feature_full(struct shaping_features *features, unsigned int tag, unsigned int flags, unsigned int value) { + unsigned int i = features->count; + if (!dwrite_array_reserve((void **)&features->features, &features->capacity, features->count + 1, sizeof(*features->features))) return; - features->features[features->count].tag = tag; - features->features[features->count].flags = flags; + features->features[i].tag = tag; + features->features[i].flags = flags; + features->features[i].max_value = value; + features->features[i].default_value = flags & FEATURE_GLOBAL ? value : 0; features->count++; } static void shape_add_feature(struct shaping_features *features, unsigned int tag) { - shape_add_feature_flags(features, tag, FEATURE_GLOBAL); + shape_add_feature_full(features, tag, FEATURE_GLOBAL, 1); } static int features_sorting_compare(const void *a, const void *b) @@ -229,18 +233,16 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s unsigned int j = 0, i; /* For now only consider global, enabled user features. */ - if (user_features && context->user_features.range_lengths && context->user_features.range_count == 1) + if (user_features && context->user_features.range_lengths) { + unsigned int flags = context->user_features.range_count == 1 && + context->user_features.range_lengths[0] == context->length ? FEATURE_GLOBAL : 0; + for (i = 0; i < context->user_features.range_count; ++i) { - if (context->user_features.range_lengths[i] != context->length) - break; - for (j = 0; j < user_features[i]->featureCount; ++j) - { - if (user_features[i]->features[j].parameter == 1) - shape_add_feature(features, user_features[i]->features[j].nameTag); - } + shape_add_feature_full(features, user_features[i]->features[j].nameTag, flags, + user_features[i]->features[j].parameter); } } @@ -251,6 +253,21 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s { if (features->features[i].tag != features->features[j].tag) features->features[++j] = features->features[i]; + else + { + if (features->features[i].flags & FEATURE_GLOBAL) + { + features->features[j].flags |= FEATURE_GLOBAL; + features->features[j].max_value = features->features[i].max_value; + features->features[j].default_value = features->features[i].default_value; + } + else + { + if (features->features[j].flags & FEATURE_GLOBAL) + features->features[j].flags ^= FEATURE_GLOBAL; + features->features[j].max_value = max(features->features[j].max_value, features->features[i].max_value); + } + } } features->count = j + 1; } @@ -369,7 +386,7 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i shape_add_feature(&features, horizontal_features[i]); } else - shape_add_feature_flags(&features, DWRITE_MAKE_OPENTYPE_TAG('v','e','r','t'), FEATURE_GLOBAL_SEARCH); + shape_add_feature_full(&features, DWRITE_MAKE_OPENTYPE_TAG('v','e','r','t'), FEATURE_GLOBAL | FEATURE_GLOBAL_SEARCH, 1); shape_merge_features(context, &features);

1 0

Nikolay Sivov : dwrite: Append enabled user features that apply to whole text.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: bd0abb596809cb0a1199f436d86215f8d2247c8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd0abb596809cb0a1199f436… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 15:28:48 2020 +0300 dwrite: Append enabled user features that apply to whole text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 9 +++++++++ dlls/dwrite/dwrite_private.h | 7 +++++++ dlls/dwrite/shape.c | 23 ++++++++++++++++++++--- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 2cbac7700c..98e1ef4a0d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1256,6 +1256,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, context.u.subst.max_glyph_count = max_glyph_count; context.glyph_count = g; context.language_tag = get_opentype_language(locale); + context.user_features.features = features; + context.user_features.range_lengths = feature_range_lengths; + context.user_features.range_count = feature_ranges; script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; scriptprops = &dwritescripts_properties[script]; @@ -1321,6 +1324,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.advances = advances; context.offsets = offsets; context.language_tag = get_opentype_language(locale); + context.user_features.features = features; + context.user_features.range_lengths = feature_range_lengths; + context.user_features.range_count = feature_ranges; return shape_get_positions(&context, scriptprops->scripttags); } @@ -1380,6 +1386,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.advances = advances; context.offsets = offsets; context.language_tag = get_opentype_language(locale); + context.user_features.features = features; + context.user_features.range_lengths = feature_range_lengths; + context.user_features.range_count = feature_ranges; return shape_get_positions(&context, scriptprops->scripttags); } diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 06fcf8d748..cad74d9e94 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -486,6 +486,13 @@ struct scriptshaping_context } subst; } u; + struct + { + const DWRITE_TYPOGRAPHIC_FEATURES **features; + const unsigned int *range_lengths; + unsigned int range_count; + } user_features; + unsigned int glyph_count; float emsize; DWRITE_MEASURING_MODE measuring_mode; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 4de73953d4..57c06f62e8 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -223,10 +223,27 @@ static int features_sorting_compare(const void *a, const void *b) return left->tag != right->tag ? (left->tag < right->tag ? -1 : 1) : 0; }; -static void shape_merge_features(struct shaping_features *features) +static void shape_merge_features(struct scriptshaping_context *context, struct shaping_features *features) { + const DWRITE_TYPOGRAPHIC_FEATURES **user_features = context->user_features.features; unsigned int j = 0, i; + /* For now only consider global, enabled user features. */ + if (user_features && context->user_features.range_lengths && context->user_features.range_count == 1) + { + for (i = 0; i < context->user_features.range_count; ++i) + { + if (context->user_features.range_lengths[i] != context->length) + break; + + for (j = 0; j < user_features[i]->featureCount; ++j) + { + if (user_features[i]->features[j].parameter == 1) + shape_add_feature(features, user_features[i]->features[j].nameTag); + } + } + } + /* Sort and merge duplicates. */ qsort(features->features, features->count, sizeof(*features->features), features_sorting_compare); @@ -267,7 +284,7 @@ HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigne shape_add_feature(&features, horizontal_features[i]); } - shape_merge_features(&features); + shape_merge_features(context, &features); /* Resolve script tag to actually supported script. */ if (cache->gpos.table.data) @@ -354,7 +371,7 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i else shape_add_feature_flags(&features, DWRITE_MAKE_OPENTYPE_TAG('v','e','r','t'), FEATURE_GLOBAL_SEARCH); - shape_merge_features(&features); + shape_merge_features(context, &features); /* Resolve script tag to actually supported script. */ if (cache->gsub.table.data)

1 0

Nikolay Sivov : dwrite: Enable 'vert' feature.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: b9f580c9902ab1b52585358ed323b165e35c810d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9f580c9902ab1b52585358e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 15:28:47 2020 +0300 dwrite: Enable 'vert' feature. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 7 +++++++ dlls/dwrite/opentype.c | 15 +++++++++++++-- dlls/dwrite/shape.c | 13 +++++++++++-- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index db3543d79e..06fcf8d748 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -505,10 +505,17 @@ extern struct scriptshaping_cache *create_scriptshaping_cache(void *context, extern void release_scriptshaping_cache(struct scriptshaping_cache*) DECLSPEC_HIDDEN; extern struct scriptshaping_cache *fontface_get_shaping_cache(struct dwrite_fontface *fontface) DECLSPEC_HIDDEN; +enum shaping_feature_flags +{ + FEATURE_GLOBAL = 0x1, + FEATURE_GLOBAL_SEARCH = 0x2, +}; + struct shaping_feature { unsigned int tag; unsigned int index; + unsigned int flags; }; struct shaping_features diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 411b3df855..713a5002f3 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4143,14 +4143,25 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex langsys_offset + FIELD_OFFSET(struct ot_langsys, feature_index[j])); if (feature_index >= total_feature_count) continue; - if (feature_list->features[feature_index].tag == features->features[i].tag) + if ((found = feature_list->features[feature_index].tag == features->features[i].tag)) { - found = TRUE; features->features[i].index = feature_index; break; } } + if (!found && (features->features[i].flags & FEATURE_GLOBAL_SEARCH)) + { + for (j = 0; j < total_feature_count; ++j) + { + if ((found = (feature_list->features[j].tag == features->features[i].tag))) + { + features->features[i].index = j; + break; + } + } + } + if (!found) features->features[i].index = 0xffff; } diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 82ad3a2a1e..4de73953d4 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -201,13 +201,20 @@ static DWORD shape_select_language(const struct scriptshaping_cache *cache, DWOR return 0; } -static void shape_add_feature(struct shaping_features *features, unsigned int tag) +static void shape_add_feature_flags(struct shaping_features *features, unsigned int tag, unsigned int flags) { if (!dwrite_array_reserve((void **)&features->features, &features->capacity, features->count + 1, sizeof(*features->features))) return; - features->features[features->count++].tag = tag; + features->features[features->count].tag = tag; + features->features[features->count].flags = flags; + features->count++; +} + +static void shape_add_feature(struct shaping_features *features, unsigned int tag) +{ + shape_add_feature_flags(features, tag, FEATURE_GLOBAL); } static int features_sorting_compare(const void *a, const void *b) @@ -344,6 +351,8 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i for (i = 0; i < ARRAY_SIZE(horizontal_features); ++i) shape_add_feature(&features, horizontal_features[i]); } + else + shape_add_feature_flags(&features, DWRITE_MAKE_OPENTYPE_TAG('v','e','r','t'), FEATURE_GLOBAL_SEARCH); shape_merge_features(&features);

1 0

Nikolay Sivov : dwrite: Set feature indices before collecting lookups.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 093d6966be963fea9a9ca090ac6714e3f74458d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=093d6966be963fea9a9ca090… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 15:28:46 2020 +0300 dwrite: Set feature indices before collecting lookups. 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 | 60 ++++++++++++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0b863147af..db3543d79e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -508,6 +508,7 @@ extern struct scriptshaping_cache *fontface_get_shaping_cache(struct dwrite_font struct shaping_feature { unsigned int tag; + unsigned int index; }; struct shaping_features diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f22cd7469b..411b3df855 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4099,6 +4099,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex { UINT16 table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; const struct ot_feature_list *feature_list; + UINT16 feature_index; unsigned int i, j, l; /* ScriptTable offset. */ @@ -4132,42 +4133,57 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex if (!feature_list) return; - /* Collect lookups for all given features. */ for (i = 0; i < features->count; ++i) { + BOOL found = FALSE; + for (j = 0; j < script_feature_count; ++j) { - UINT16 feature_index = table_read_be_word(&table->table, table->script_list + table_offset + + 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; - if (feature_list->features[feature_index].tag == features->features[i].tag) { - WORD feature_offset = GET_BE_WORD(feature_list->features[feature_index].offset); - WORD lookup_count; + found = TRUE; + features->features[i].index = feature_index; + break; + } + } - 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 (!found) + features->features[i].index = 0xffff; + } - if (!dwrite_array_reserve((void **)&lookups->indexes, &lookups->capacity, lookups->count + lookup_count, - sizeof(*lookups->indexes))) - { - return; - } + /* Collect lookups for all given features. */ + for (i = 0; i < features->count; ++i) + { + feature_index = features->features[i].index; + if (feature_index != 0xffff) + { + UINT16 feature_offset = GET_BE_WORD(feature_list->features[feature_index].offset); + UINT16 lookup_count; - for (l = 0; l < lookup_count; ++l) - { - UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + - FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); + 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))) + { + return; + } + + for (l = 0; l < lookup_count; ++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; + if (lookup_index >= total_lookup_count) + continue; - lookups->indexes[lookups->count++] = lookup_index; - } + lookups->indexes[lookups->count++] = lookup_index; } } }

1 0

Nikolay Sivov : dwrite: Remove feature duplicates before applying them.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 2aaa6d1af98cd3b1f50339a17a0b7fff82334770 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aaa6d1af98cd3b1f50339a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 15:28:45 2020 +0300 dwrite: Remove feature duplicates before applying them. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 0372d739b5..82ad3a2a1e 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -210,6 +210,27 @@ static void shape_add_feature(struct shaping_features *features, unsigned int ta features->features[features->count++].tag = tag; } +static int features_sorting_compare(const void *a, const void *b) +{ + const struct shaping_feature *left = a, *right = b; + return left->tag != right->tag ? (left->tag < right->tag ? -1 : 1) : 0; +}; + +static void shape_merge_features(struct shaping_features *features) +{ + unsigned int j = 0, i; + + /* Sort and merge duplicates. */ + qsort(features->features, features->count, sizeof(*features->features), features_sorting_compare); + + for (i = 1; i < features->count; ++i) + { + if (features->features[i].tag != features->features[j].tag) + features->features[++j] = features->features[i]; + } + features->count = j + 1; +} + HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) { static const unsigned int common_features[] = @@ -239,6 +260,8 @@ HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigne shape_add_feature(&features, horizontal_features[i]); } + shape_merge_features(&features); + /* Resolve script tag to actually supported script. */ if (cache->gpos.table.data) { @@ -322,6 +345,8 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i shape_add_feature(&features, horizontal_features[i]); } + shape_merge_features(&features); + /* Resolve script tag to actually supported script. */ if (cache->gsub.table.data) {

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
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