March 2021 - Wine-commits - list.winehq.org

Zebediah Figura : strmbase: Record jitter before waiting for presentation time.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: d99912aa65d63973af64f130659ecc36cce82e0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99912aa65d63973af64f130… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 16:19:56 2021 -0600 strmbase: Record jitter before waiting for presentation time. Otherwise we will consistently report that samples are late. In practice this can end up causing GStreamer to drop many video samples, which is one of the apparent causes of bug 50733. At the same time, don't record jitter *before* signalling preroll, as in that case stream_start will not yet be valid, and we'll end up recording something near the current tick count, and in this way also incorrectly report that samples are late. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 6a3164eee6a..b3641ddee6d 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -378,14 +378,9 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp strmbase_passthrough_update_time(&filter->passthrough, start); need_wait = TRUE; } - else - start = stop = -1; if (state == State_Paused) - { - begin_render(filter, start, stop); hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); - } if (need_wait) { @@ -394,6 +389,8 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp IReferenceClock_GetTime(filter->filter.clock, &now); + begin_render(filter, start, stop); + if (now - filter->stream_start - start <= -10000) { HANDLE handles[2] = {filter->advise_event, filter->flush_event}; @@ -411,16 +408,18 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp return S_OK; } } - } - if (state == State_Running) + if (state == State_Running) + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + + perform_qos(filter); + } + else { - begin_render(filter, start, stop); - hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + if (state == State_Running) + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); } - perform_qos(filter); - return hr; }

1 0

Zebediah Figura : strmbase: Make the "current_*" fields of struct strmbase_renderer into local variables.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 0d07d1ec6128c4f3b7613e4dd71032080c843047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d07d1ec6128c4f3b7613e4d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 16:19:57 2021 -0600 strmbase: Make the "current_*" fields of struct strmbase_renderer into local variables. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 57 +++++++++++++----------------------------------- include/wine/strmbase.h | 1 - 2 files changed, 15 insertions(+), 43 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b3641ddee6d..47017f5ced5 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -63,18 +63,12 @@ static void reset_qos(struct strmbase_renderer *filter) filter->avg_rate = -1.0; } -static void perform_qos(struct strmbase_renderer *filter) +static void perform_qos(struct strmbase_renderer *filter, + const REFERENCE_TIME start, const REFERENCE_TIME stop, REFERENCE_TIME jitter) { - REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; + REFERENCE_TIME pt, entered, left, duration; double rate; - if (!filter->filter.clock || filter->current_rstart < 0) - return; - - start = filter->current_rstart; - stop = filter->current_rstop; - jitter = filter->current_jitter; - if (jitter < 0) { /* This is the time the buffer entered the sink. */ @@ -155,16 +149,16 @@ static void perform_qos(struct strmbase_renderer *filter) Quality q; /* If we have a valid rate, start sending QoS messages. */ - if (filter->current_jitter < 0) + if (jitter < 0) { /* Make sure we never go below 0 when adding the jitter to the * timestamp. */ - if (filter->current_rstart < -filter->current_jitter) - filter->current_jitter = -filter->current_rstart; + if (start < -jitter) + jitter = -start; } else { - filter->current_jitter += (filter->current_rstop - filter->current_rstart); + jitter += stop - start; } q.Type = (jitter > 0 ? Famine : Flood); @@ -173,8 +167,8 @@ static void perform_qos(struct strmbase_renderer *filter) q.Proportion = 200; else if (q.Proportion > 5000) q.Proportion = 5000; - q.Late = filter->current_jitter; - q.TimeStamp = filter->current_rstart; + q.Late = jitter; + q.TimeStamp = start; IQualityControl_Notify(&filter->IQualityControl_iface, &filter->filter.IBaseFilter_iface, q); } @@ -182,27 +176,6 @@ static void perform_qos(struct strmbase_renderer *filter) filter->last_left = left; } -static void begin_render(struct strmbase_renderer *filter, - REFERENCE_TIME start, REFERENCE_TIME stop) -{ - filter->current_rstart = start; - filter->current_rstop = max(stop, start); - - if (start >= 0) - { - REFERENCE_TIME now; - IReferenceClock_GetTime(filter->filter.clock, &now); - filter->current_jitter = (now - filter->stream_start) - start; - } - else - { - filter->current_jitter = 0; - } - - TRACE("start %s, stop %s, jitter %s.\n", - debugstr_time(start), debugstr_time(stop), debugstr_time(filter->current_jitter)); -} - static inline struct strmbase_renderer *impl_from_strmbase_filter(struct strmbase_filter *iface) { return CONTAINING_RECORD(iface, struct strmbase_renderer, filter); @@ -384,14 +357,16 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp if (need_wait) { - REFERENCE_TIME now; + REFERENCE_TIME now, jitter; DWORD_PTR cookie; IReferenceClock_GetTime(filter->filter.clock, &now); - begin_render(filter, start, stop); + /* "jitter" describes how early (negative) or late (positive) this + * buffer arrived, relative to its PTS. */ + jitter = (now - filter->stream_start) - start; - if (now - filter->stream_start - start <= -10000) + if (jitter <= -10000) /* if we are early by at least 1 ms */ { HANDLE handles[2] = {filter->advise_event, filter->flush_event}; DWORD ret; @@ -412,7 +387,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp if (state == State_Running) hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); - perform_qos(filter); + perform_qos(filter, start, stop, jitter); } else { @@ -588,8 +563,6 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, ISeekingPassThru_Init(&filter->passthrough.ISeekingPassThru_iface, TRUE, &filter->sink.pin.IPin_iface); filter->IQualityControl_iface.lpVtbl = &quality_control_vtbl; - filter->current_rstart = filter->current_rstop = -1; - filter->pFuncsTable = ops; strmbase_sink_init(&filter->sink, &filter->filter, sink_name, &sink_ops, NULL); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cad5ebe0a42..4b5ecc86721 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -293,7 +293,6 @@ struct strmbase_renderer IQualityControl *qc_sink; REFERENCE_TIME last_left, avg_duration, avg_pt; - REFERENCE_TIME current_jitter, current_rstart, current_rstop; double avg_rate; const struct strmbase_renderer_ops *pFuncsTable;

1 0

Nikolay Sivov : dwrite: Look for English name strings in mac platform records.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 2d8f32be7d3a4ee072fa60a0226a8c88424f0521 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d8f32be7d3a4ee072fa60a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 10 12:30:25 2021 +0300 dwrite: Look for English name strings in mac platform records. 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/main.c | 10 ++++++--- dlls/dwrite/opentype.c | 51 +++++++++++++++++++++++++++----------------- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a91b8f99d70..7f7c933e7e2 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -298,6 +298,7 @@ extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const W extern HRESULT clone_localizedstrings(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; extern void sort_localizedstrings(IDWriteLocalizedStrings*) DECLSPEC_HIDDEN; +extern unsigned int get_localizedstrings_count(IDWriteLocalizedStrings *strings) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection1 **collection) DECLSPEC_HIDDEN; extern HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 **collection) DECLSPEC_HIDDEN; extern IDWriteTextAnalyzer2 *get_text_analyzer(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index d66a27d7f68..4e308485a01 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -323,11 +323,9 @@ static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) static UINT32 WINAPI localizedstrings_GetCount(IDWriteLocalizedStrings *iface) { - struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); - TRACE("%p.\n", iface); - return strings->count; + return get_localizedstrings_count(iface); } static HRESULT WINAPI localizedstrings_FindLocaleName(IDWriteLocalizedStrings *iface, @@ -559,6 +557,12 @@ void sort_localizedstrings(IDWriteLocalizedStrings *iface) qsort(strings->data, strings->count, sizeof(*strings->data), localizedstrings_sorting_compare); } +unsigned int get_localizedstrings_count(IDWriteLocalizedStrings *iface) +{ + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); + return strings->count; +} + struct collectionloader { struct list entry; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 717b1ea0351..a74c9712b6a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2288,9 +2288,21 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la } } +static BOOL opentype_is_english_namerecord(const struct dwrite_fonttable *table, unsigned int idx) +{ + const struct name_header *header = (const struct name_header *)table->data; + const struct name_record *record; + + record = &header->records[idx]; + + return GET_BE_WORD(record->platformID) == OPENTYPE_PLATFORM_MAC && + GET_BE_WORD(record->languageID) == TT_NAME_MAC_LANGID_ENGLISH; +} + static BOOL opentype_decode_namerecord(const struct dwrite_fonttable *table, unsigned int idx, IDWriteLocalizedStrings *strings) { + static const WCHAR enusW[] = {'e','n','-','U','S',0}; USHORT lang_id, length, offset, encoding, platform; const struct name_header *header = (const struct name_header *)table->data; const struct name_record *record; @@ -2338,7 +2350,8 @@ static BOOL opentype_decode_namerecord(const struct dwrite_fonttable *table, uns TRACE("string %s for locale %s found\n", debugstr_w(name_string), debugstr_w(locale)); add_localizedstring(strings, locale, name_string); heap_free(name_string); - ret = TRUE; + + ret = !lstrcmpW(locale, enusW); } else FIXME("handle NAME format 1\n"); @@ -2349,10 +2362,10 @@ static BOOL opentype_decode_namerecord(const struct dwrite_fonttable *table, uns static HRESULT opentype_get_font_strings_from_id(const struct dwrite_fonttable *table, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { - int i, count, candidate_mac, candidate_unicode; + int i, count, candidate_mac, candidate_mac_en, candidate_unicode; const struct name_record *records; + BOOL has_english; WORD format; - BOOL exists; HRESULT hr; if (!table->data) @@ -2374,8 +2387,8 @@ static HRESULT opentype_get_font_strings_from_id(const struct dwrite_fonttable * count = 0; } - exists = FALSE; - candidate_unicode = candidate_mac = -1; + has_english = FALSE; + candidate_unicode = candidate_mac = candidate_mac_en = -1; for (i = 0; i < count; i++) { @@ -2398,10 +2411,11 @@ static HRESULT opentype_get_font_strings_from_id(const struct dwrite_fonttable * case OPENTYPE_PLATFORM_MAC: if (candidate_mac == -1) candidate_mac = i; + if (candidate_mac_en == -1 && opentype_is_english_namerecord(table, i)) + candidate_mac_en = i; break; case OPENTYPE_PLATFORM_WIN: - if (opentype_decode_namerecord(table, i, *strings)) - exists = TRUE; + has_english |= opentype_decode_namerecord(table, i, *strings); break; default: FIXME("platform %i not supported\n", platform); @@ -2409,24 +2423,23 @@ static HRESULT opentype_get_font_strings_from_id(const struct dwrite_fonttable * } } - if (!exists) - { - if (candidate_mac != -1) - exists = opentype_decode_namerecord(table, candidate_mac, *strings); - if (!exists && candidate_unicode != -1) - exists = opentype_decode_namerecord(table, candidate_unicode, *strings); + if (!get_localizedstrings_count(*strings) && candidate_mac != -1) + has_english |= opentype_decode_namerecord(table, candidate_mac, *strings); + if (!get_localizedstrings_count(*strings) && candidate_unicode != -1) + has_english |= opentype_decode_namerecord(table, candidate_unicode, *strings); + if (!has_english && candidate_mac_en != -1) + opentype_decode_namerecord(table, candidate_mac_en, *strings); - if (!exists) - { - IDWriteLocalizedStrings_Release(*strings); - *strings = NULL; - } + if (!get_localizedstrings_count(*strings)) + { + IDWriteLocalizedStrings_Release(*strings); + *strings = NULL; } if (*strings) sort_localizedstrings(*strings); - return exists ? S_OK : E_FAIL; + return *strings ? S_OK : E_FAIL; } static WCHAR *meta_get_lng_name(WCHAR *str, WCHAR **ctx)

1 0

Nikolay Sivov : dwrite: Lowercase locale names in localized strings pairs.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 98608f20999da7432000e4a4f0ca5a2838e0b0de URL: https://source.winehq.org/git/wine.git/?a=commit;h=98608f20999da7432000e4a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 10 12:30:26 2021 +0300 dwrite: Lowercase locale names in localized strings pairs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 4e308485a01..ea5a8e018cc 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -468,7 +468,7 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, if (*locale) { for (i = 0; i < count; i++) - if (!strcmpW(strings->data[i].locale, locale)) + if (!lstrcmpiW(strings->data[i].locale, locale)) return S_OK; } @@ -483,6 +483,7 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, heap_free(strings->data[count].string); return E_OUTOFMEMORY; } + strlwrW(strings->data[count].locale); strings->count++;

1 0

Nikolay Sivov : dwrite: Make font set entries refcounted.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: dc37782f663497413f27309e10cf7a1584bac33c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc37782f663497413f27309e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 10 12:30:27 2021 +0300 dwrite: Make font set entries refcounted. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 105 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 64 insertions(+), 41 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 1afc72e22c5..07d96dfe107 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -252,6 +252,7 @@ struct dwrite_fontresource struct dwrite_fontset_entry { + LONG refcount; IDWriteFontFile *file; unsigned int face_index; unsigned int simulations; @@ -263,7 +264,7 @@ struct dwrite_fontset LONG refcount; IDWriteFactory7 *factory; - struct dwrite_fontset_entry *entries; + struct dwrite_fontset_entry **entries; unsigned int count; }; @@ -273,7 +274,7 @@ struct dwrite_fontset_builder LONG refcount; IDWriteFactory7 *factory; - struct dwrite_fontset_entry *entries; + struct dwrite_fontset_entry **entries; size_t count; size_t capacity; }; @@ -7103,25 +7104,27 @@ static ULONG WINAPI dwritefontset_AddRef(IDWriteFontSet3 *iface) return refcount; } -static void fontset_release_entries(struct dwrite_fontset_entry *entries, unsigned int count) +static void release_fontset_entry(struct dwrite_fontset_entry *entry) { - unsigned int i; - - for (i = 0; i < count; ++i) - IDWriteFontFile_Release(entries[i].file); + if (InterlockedDecrement(&entry->refcount) > 0) + return; + IDWriteFontFile_Release(entry->file); + heap_free(entry); } static ULONG WINAPI dwritefontset_Release(IDWriteFontSet3 *iface) { struct dwrite_fontset *set = impl_from_IDWriteFontSet3(iface); ULONG refcount = InterlockedDecrement(&set->refcount); + unsigned int i; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { IDWriteFactory7_Release(set->factory); - fontset_release_entries(set->entries, set->count); + for (i = 0; i < set->count; ++i) + release_fontset_entry(set->entries[i]); heap_free(set->entries); heap_free(set); } @@ -7142,7 +7145,6 @@ static HRESULT WINAPI dwritefontset_GetFontFaceReference(IDWriteFontSet3 *iface, IDWriteFontFaceReference **reference) { struct dwrite_fontset *set = impl_from_IDWriteFontSet3(iface); - struct dwrite_fontset_entry *entry; TRACE("%p, %u, %p.\n", iface, index, reference); @@ -7151,9 +7153,8 @@ static HRESULT WINAPI dwritefontset_GetFontFaceReference(IDWriteFontSet3 *iface, if (index >= set->count) return E_INVALIDARG; - entry = &set->entries[index]; - return IDWriteFactory7_CreateFontFaceReference_(set->factory, entry->file, entry->face_index, - entry->simulations, reference); + return IDWriteFactory7_CreateFontFaceReference_(set->factory, set->entries[index]->file, + set->entries[index]->face_index, set->entries[index]->simulations, reference); } static HRESULT WINAPI dwritefontset_FindFontFaceReference(IDWriteFontSet3 *iface, @@ -7386,65 +7387,85 @@ static const IDWriteFontSet3Vtbl fontsetvtbl = dwritefontset3_GetFontSourceName, }; -static HRESULT fontset_create_from_font_data(IDWriteFactory7 *factory, struct dwrite_font_data **fonts, - unsigned int count, IDWriteFontSet1 **ret) +static HRESULT fontset_create_entry(IDWriteFontFile *file, unsigned int face_index, + unsigned int simulations, struct dwrite_fontset_entry **ret) { - struct dwrite_fontset *object; - unsigned int i; + struct dwrite_fontset_entry *entry; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(entry = heap_alloc_zero(sizeof(*entry)))) return E_OUTOFMEMORY; + entry->refcount = 1; + entry->file = file; + IDWriteFontFile_AddRef(entry->file); + entry->face_index = face_index; + entry->simulations = simulations; + + *ret = entry; + + return S_OK; +} + +static void init_fontset(struct dwrite_fontset *object, IDWriteFactory7 *factory, + struct dwrite_fontset_entry **entries, unsigned int count) +{ object->IDWriteFontSet3_iface.lpVtbl = &fontsetvtbl; object->refcount = 1; object->factory = factory; IDWriteFactory7_AddRef(object->factory); + object->entries = entries; + object->count = count; +} + +static HRESULT fontset_create_from_font_data(IDWriteFactory7 *factory, struct dwrite_font_data **fonts, + unsigned int count, IDWriteFontSet1 **ret) +{ + struct dwrite_fontset_entry **entries = NULL; + struct dwrite_fontset *object; + unsigned int i; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; if (count) { - object->entries = heap_calloc(count, sizeof(*object->entries)); - object->count = count; + entries = heap_calloc(count, sizeof(*entries)); /* FIXME: set available properties too */ - for (i = 0; i < object->count; ++i) + + for (i = 0; i < count; ++i) { - object->entries[i].file = fonts[i]->file; - object->entries[i].face_index = fonts[i]->face_index; - object->entries[i].simulations = fonts[i]->simulations; - IDWriteFontFile_AddRef(object->entries[i].file); + fontset_create_entry(fonts[i]->file, fonts[i]->face_index, fonts[i]->simulations, &entries[i]); } } + init_fontset(object, factory, entries, count); *ret = (IDWriteFontSet1 *)&object->IDWriteFontSet3_iface; return S_OK; } -static HRESULT fontset_builder_create_fontset(IDWriteFactory7 *factory, struct dwrite_fontset_entry *entries, +static HRESULT fontset_builder_create_fontset(IDWriteFactory7 *factory, struct dwrite_fontset_entry **src_entries, unsigned int count, IDWriteFontSet **ret) { + struct dwrite_fontset_entry **entries = NULL; struct dwrite_fontset *object; unsigned int i; if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - object->IDWriteFontSet3_iface.lpVtbl = &fontsetvtbl; - object->refcount = 1; - object->factory = factory; - IDWriteFactory7_AddRef(object->factory); - if (count) { - object->entries = heap_calloc(count, sizeof(*object->entries)); - object->count = count; + entries = heap_calloc(count, sizeof(*entries)); - for (i = 0; i < object->count; ++i) + for (i = 0; i < count; ++i) { - object->entries[i] = entries[i]; - IDWriteFontFile_AddRef(object->entries[i].file); + entries[i] = src_entries[i]; + InterlockedIncrement(&entries[i]->refcount); } } + init_fontset(object, factory, entries, count); *ret = (IDWriteFontSet *)&object->IDWriteFontSet3_iface; @@ -7485,13 +7506,15 @@ static ULONG WINAPI dwritefontsetbuilder_Release(IDWriteFontSetBuilder2 *iface) { struct dwrite_fontset_builder *builder = impl_from_IDWriteFontSetBuilder2(iface); ULONG refcount = InterlockedDecrement(&builder->refcount); + unsigned int i; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { IDWriteFactory7_Release(builder->factory); - fontset_release_entries(builder->entries, builder->count); + for (i = 0; i < builder->count; ++i) + release_fontset_entry(builder->entries[i]); heap_free(builder->entries); heap_free(builder); } @@ -7503,6 +7526,7 @@ static HRESULT fontset_builder_add_entry(struct dwrite_fontset_builder *builder, unsigned int face_index, unsigned int simulations) { struct dwrite_fontset_entry *entry; + HRESULT hr; if (!dwrite_array_reserve((void **)&builder->entries, &builder->capacity, builder->count + 1, sizeof(*builder->entries))) @@ -7510,11 +7534,10 @@ static HRESULT fontset_builder_add_entry(struct dwrite_fontset_builder *builder, return E_OUTOFMEMORY; } - entry = &builder->entries[builder->count++]; - entry->file = file; - IDWriteFontFile_AddRef(entry->file); - entry->face_index = face_index; - entry->simulations = simulations; + if (FAILED(hr = fontset_create_entry(file, face_index, simulations, &entry))) + return hr; + + builder->entries[builder->count++] = entry; return S_OK; }

1 0

Nikolay Sivov : dwrite: Partially implement GetPropertyValues().
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 0ce34328bdf8fdd2b241e69bc6a1e246be309855 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ce34328bdf8fdd2b241e69b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 10 12:30:28 2021 +0300 dwrite: Partially implement GetPropertyValues(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 116 ++++++++++++++++++++++++++++++++++++++++------- dlls/dwrite/tests/font.c | 39 +++++++++++++++- 2 files changed, 137 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0ce34328bdf8fdd2b241…

1 0

Nikolay Sivov : dwrite: Initial implementation of fontset filtering.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: b6ffd6cb789a398dd9a96d1beb7868d2e7852c82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ffd6cb789a398dd9a96d1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 10 12:30:29 2021 +0300 dwrite: Initial implementation of fontset filtering. 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/font.c | 82 ++++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/main.c | 13 +++++++ 3 files changed, 93 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7f7c933e7e2..8c09a315f54 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -299,6 +299,7 @@ extern HRESULT clone_localizedstrings(IDWriteLocalizedStrings *iface, IDWriteLoc extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; extern void sort_localizedstrings(IDWriteLocalizedStrings*) DECLSPEC_HIDDEN; extern unsigned int get_localizedstrings_count(IDWriteLocalizedStrings *strings) DECLSPEC_HIDDEN; +extern BOOL localizedstrings_contains(IDWriteLocalizedStrings *strings, const WCHAR *str) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection1 **collection) DECLSPEC_HIDDEN; extern HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 **collection) DECLSPEC_HIDDEN; extern IDWriteTextAnalyzer2 *get_text_analyzer(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c0642b5bbe4..3da6b555c02 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7280,6 +7280,47 @@ static HRESULT WINAPI dwritefontset_GetPropertyOccurrenceCount(IDWriteFontSet3 * return E_NOTIMPL; } +static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE_FONT_PROPERTY const *props, + unsigned int count) +{ + IDWriteLocalizedStrings *value; + unsigned int i; + BOOL ret; + + for (i = 0; i < count; ++i) + { + switch (props[i].propertyId) + { + case DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME: + case DWRITE_FONT_PROPERTY_ID_FULL_NAME: + if (!(value = fontset_entry_get_property(entry, props[i].propertyId))) + return FALSE; + + ret = localizedstrings_contains(value, props[i].propertyValue); + IDWriteLocalizedStrings_Release(value); + if (!ret) return FALSE; + break; + case DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME: + case DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME: + case DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME: + case DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME: + case DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG: + case DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG: + case DWRITE_FONT_PROPERTY_ID_SEMANTIC_TAG: + case DWRITE_FONT_PROPERTY_ID_WEIGHT: + case DWRITE_FONT_PROPERTY_ID_STRETCH: + case DWRITE_FONT_PROPERTY_ID_STYLE: + case DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME: + FIXME("Unsupported property %d.\n", props[i].propertyId); + /* fallthrough */ + default: + return FALSE; + } + } + + return TRUE; +} + static HRESULT WINAPI dwritefontset_GetMatchingFonts_(IDWriteFontSet3 *iface, WCHAR const *family, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFontSet **fontset) { @@ -7289,11 +7330,46 @@ static HRESULT WINAPI dwritefontset_GetMatchingFonts_(IDWriteFontSet3 *iface, WC } static HRESULT WINAPI dwritefontset_GetMatchingFonts(IDWriteFontSet3 *iface, DWRITE_FONT_PROPERTY const *props, UINT32 count, - IDWriteFontSet **fontset) + IDWriteFontSet **filtered_set) { - FIXME("%p, %p, %u, %p.\n", iface, props, count, fontset); + struct dwrite_fontset *set = impl_from_IDWriteFontSet3(iface); + struct dwrite_fontset_entry **entries; + unsigned int i, matched_count = 0; + struct dwrite_fontset *object; - return E_NOTIMPL; + TRACE("%p, %p, %u, %p.\n", iface, props, count, filtered_set); + + if (!props && count) + return E_INVALIDARG; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (!(entries = heap_calloc(set->count, sizeof(*entries)))) + { + heap_free(object); + return E_OUTOFMEMORY; + } + + for (i = 0; i < set->count; ++i) + { + if (fontset_entry_is_matching(set->entries[i], props, count)) + { + entries[matched_count++] = addref_fontset_entry(set->entries[i]); + } + } + + if (!matched_count) + { + heap_free(entries); + entries = NULL; + } + + init_fontset(object, set->factory, entries, matched_count); + + *filtered_set = (IDWriteFontSet *)&object->IDWriteFontSet3_iface; + + return S_OK; } static HRESULT WINAPI dwritefontset1_GetMatchingFonts(IDWriteFontSet3 *iface, DWRITE_FONT_PROPERTY const *property, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index ea5a8e018cc..51020d6f586 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -564,6 +564,19 @@ unsigned int get_localizedstrings_count(IDWriteLocalizedStrings *iface) return strings->count; } +BOOL localizedstrings_contains(IDWriteLocalizedStrings *iface, const WCHAR *str) +{ + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); + unsigned int i; + + for (i = 0; i < strings->count; ++i) + { + if (!lstrcmpiW(strings->data[i].string, str)) return TRUE; + } + + return FALSE; +} + struct collectionloader { struct list entry;

1 0

Rémi Bernon : winex11.drv: Fix invalid range when reading GTK_WORKAREAS_D0 (valgrind).
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 99088fe17b4ea6c627a8c3d377c39bd48c68ccef URL: https://source.winehq.org/git/wine.git/?a=commit;h=99088fe17b4ea6c627a8c3d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 8 09:14:22 2021 +0100 winex11.drv: Fix invalid range when reading GTK_WORKAREAS_D0 (valgrind). Invalid read of size 8 at 0x559B816: get_work_area (display.c:296) by 0x55DC8C1: query_screens (xinerama.c:103) by 0x55DC8C1: xinerama_init (xinerama.c:275) by 0x55D6F47: process_attach (x11drv_main.c:602) by 0x55D6F47: DllMain (x11drv_main.c:721) by 0x7BC35819: call_dll_entry_point (loader.c:285) by 0x7BC35819: MODULE_InitDLL (loader.c:1317) by 0x7BC362ED: process_attach.part.0 (loader.c:1411) by 0x7BC3B843: process_attach (loader.c:1382) by 0x7BC3B843: LdrLoadDll (loader.c:2765) by 0x7B025C85: load_library (loader.c:172) by 0x7B026B72: LoadLibraryExW (loader.c:522) by 0x7B026BE5: LoadLibraryW (loader.c:492) by 0x40990D: load_graphics_driver (desktop.c:844) by 0x40990D: manage_desktop (desktop.c:1010) by 0x40C6B3: parse_command_line (explorer.c:836) by 0x40C6B3: wWinMain (explorer.c:865) by 0x4103F2: wmain (crt_wwinmain.c:55) Address 0x5272370 is 16 bytes before an unallocated block of size 3,132,512 in arena "client" Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 0f61f9f7b2e..b647455a01f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -289,9 +289,9 @@ RECT get_work_area(const RECT *monitor_rect) x11drv_atom(_GTK_WORKAREAS_D0), 0, ~0, False, XA_CARDINAL, &type, &format, &count, &remaining, (unsigned char **)&work_area)) { - if (type == XA_CARDINAL && format == 32 && count >= 4) + if (type == XA_CARDINAL && format == 32) { - for (i = 0; i + 3 < count; i += 4) + for (i = 0; i < count / 4; ++i) { work_rect.left = work_area[i * 4]; work_rect.top = work_area[i * 4 + 1];

1 0

Rémi Bernon : ntdll: Initialize dbg_offset and dbg_size (valgrind).
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: c3c4d0c37e41fef27ae06cf6784c873d6f9b68d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c4d0c37e41fef27ae06cf6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 8 09:14:18 2021 +0100 ntdll: Initialize dbg_offset and dbg_size (valgrind). Syscall param writev(vector[...]) points to uninitialised byte(s) at 0x4189DA3: writev (writev.c:26) by 0x46A5A0B: send_request (server.c:213) by 0x46A5A0B: server_call_unlocked (server.c:273) by 0x46A5B4F: wine_server_call (server.c:289) by 0x46C996A: virtual_create_builtin_view (virtual.c:2524) by 0x4692CB4: dlopen_dll (loader.c:1133) by 0x46931CA: open_builtin_file (loader.c:1373) by 0x46931CA: open_builtin_file (loader.c:1354) by 0x4694559: load_builtin_dll (loader.c:1457) by 0x7BC375F2: load_builtin_dll (loader.c:2348) by 0x7BC38369: load_dll (loader.c:2705) by 0x7BC39E46: import_dll (loader.c:782) by 0x7BC36CEC: fixup_imports (loader.c:1138) by 0x7BC3BE4B: LdrInitializeThunk (loader.c:3454) Address 0x32e390 is on thread 1's stack in frame #5, created by open_builtin_file (loader.c:1357) Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6adf4bb5b00..1c26d1322f8 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1068,6 +1068,8 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) info->header_size = nt->OptionalHeader.SizeOfHeaders; info->file_size = nt->OptionalHeader.SizeOfImage; info->checksum = nt->OptionalHeader.CheckSum; + info->dbg_offset = 0; + info->dbg_size = 0; info->cpu = client_cpu; info->__pad = 0; }

1 0

Rémi Bernon : ntdll: Fix environment memcpy read overflow (valgrind).
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: f69e5478d5f5ca2201fd9115b34afc95c3f00187 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f69e5478d5f5ca2201fd9115… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 8 09:14:19 2021 +0100 ntdll: Fix environment memcpy read overflow (valgrind). Invalid read of size 1 at 0x7BC5C5E3: memcpy (string.c:109) by 0x7BC267F7: RtlCreateProcessParametersEx (env.c:785) by 0x7B04EB57: create_process_params (process.c:183) by 0x7B04EB57: CreateProcessInternalW (process.c:544) by 0x7B0508E3: CreateProcessW (process.c:668) by 0x403B1E: runCmd (wineboot.c:1055) by 0x403B1E: process_run_key (wineboot.c:1126) by 0x404228: ProcessRunKeys (wineboot.c:1159) by 0x406DB1: main (wineboot.c:1707) Address 0x7ffffe00331a is 0 bytes after a recently re-allocated block of size 12,074 alloc'd at 0x7BC2D209: notify_alloc (heap.c:260) by 0x7BC2D209: RtlAllocateHeap (heap.c:1713) by 0x7BC25BAC: RtlSetEnvironmentVariable (env.c:515) by 0x7BC25EE0: set_env_var (env.c:61) by 0x7BC26C37: set_wow64_environment (env.c:228) by 0x7BC26C37: init_user_process_params (env.c:891) by 0x7BC3B01B: process_init (loader.c:3991) by 0x7BC3CD24: __wine_set_unix_funcs (loader.c:4095) by 0x469604E: start_main_thread (loader.c:1752) by 0x469604E: __wine_main (loader.c:2083) by 0x7D001231: main (main.c:157) Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index a18d1446db4..75ea2ebbb45 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -762,14 +762,13 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu + ROUND_SIZE( ShellInfo->MaximumLength ) + ROUND_SIZE( RuntimeInfo->MaximumLength )); - env_size = ROUND_SIZE( env_size ); - if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + env_size ))) + if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + ROUND_SIZE( env_size ) ))) { RTL_USER_PROCESS_PARAMETERS *params = ptr; params->AllocationSize = size; params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; - params->EnvironmentSize = env_size; + params->EnvironmentSize = ROUND_SIZE( env_size ); if (cur_params) params->ConsoleFlags = cur_params->ConsoleFlags; /* all other fields are zero */

1 0