wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

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: 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: 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

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

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: Inline the strmbase_qc structure into struct strmbase_renderer.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 1564d658681822c3f34adfd16e3124922393286a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1564d658681822c3f34adfd1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 16:19:55 2021 -0600 strmbase: Inline the strmbase_qc structure into struct strmbase_renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 152 ++++++++++++++++++++++------------------------- include/wine/strmbase.h | 19 ++---- 2 files changed, 78 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1564d658681822c3f34a…

1 0

Zebediah Figura : strmbase: Do not pretend to drop samples.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: b9393d08e1491d5fcd36ee926bb891a0326bf52c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9393d08e1491d5fcd36ee92… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 16:19:54 2021 -0600 strmbase: Do not pretend to drop samples. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 38 +++----------------------------------- include/wine/strmbase.h | 3 +-- 2 files changed, 4 insertions(+), 37 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index ec915a95ef8..ed815097a0f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -59,39 +59,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); static void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart) { - This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; + This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; - This->is_dropped = FALSE; -} - -static BOOL QualityControlRender_IsLate(struct strmbase_qc *This, REFERENCE_TIME jitter, - REFERENCE_TIME start, REFERENCE_TIME stop) -{ - REFERENCE_TIME max_lateness = 200000; - - TRACE("jitter %s, start %s, stop %s.\n", debugstr_time(jitter), - debugstr_time(start), debugstr_time(stop)); - - /* we can add a valid stop time */ - if (stop >= start) - max_lateness += stop; - else - max_lateness += start; - - /* if the jitter bigger than duration and lateness we are too late */ - if (start + jitter > max_lateness) { - WARN("buffer is too late %i > %i\n", (int)((start + jitter)/10000), (int)(max_lateness/10000)); - /* !!emergency!!, if we did not receive anything valid for more than a - * second, render it anyway so the user sees something */ - if (This->last_in_time < 0 || - start - This->last_in_time < 10000000) - return TRUE; - FIXME("A lot of buffers are being dropped.\n"); - FIXME("There may be a timestamping problem, or this computer is too slow.\n"); - } - This->last_in_time = start; - return FALSE; } static void QualityControlRender_DoQOS(struct strmbase_qc *priv) @@ -170,7 +140,7 @@ static void QualityControlRender_DoQOS(struct strmbase_qc *priv) if (priv->last_left >= 0) { - if (priv->is_dropped || priv->avg_rate < 0.0) + if (priv->avg_rate < 0.0) { priv->avg_rate = rate; } @@ -231,9 +201,7 @@ static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE This->current_jitter = 0; } - /* FIXME: This isn't correct; we don't drop samples, nor should. */ - This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); - TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, + TRACE("start %s, stop %s, jitter %s.\n", debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9df0437dd9a..c45e2a4513e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -279,10 +279,9 @@ struct strmbase_qc IQualityControl *tonotify; /* Render stuff */ - REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt; + REFERENCE_TIME last_left, avg_duration, avg_pt; REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; double avg_rate; - BOOL is_dropped; }; struct strmbase_renderer

1 0

Alexandre Julliard : ntdll: Explicitly reset the PATH variable before reloading the environment.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 9107f591d3d73a3b4040db2e13ef51d9846591c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9107f591d3d73a3b4040db2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 9 15:06:58 2021 +0100 ntdll: Explicitly reset the PATH variable before reloading the environment. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50786 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 004e76b789f..2051ad33888 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1306,7 +1306,7 @@ static WCHAR *expand_value( WCHAR *env, SIZE_T size, const WCHAR *src, SIZE_T sr * helper for add_registry_environment(). * Note that Windows happily truncates the value if it's too big. */ -static void add_registry_variables( WCHAR **env, SIZE_T *pos, SIZE_T *size, HANDLE key, BOOL append ) +static void add_registry_variables( WCHAR **env, SIZE_T *pos, SIZE_T *size, HANDLE key ) { static const WCHAR pathW[] = {'P','A','T','H'}; NTSTATUS status; @@ -1331,13 +1331,13 @@ static void add_registry_variables( WCHAR **env, SIZE_T *pos, SIZE_T *size, HAND if (info->Type == REG_EXPAND_SZ) value = expand_value( *env, *pos, data, datalen ); /* PATH is magic */ - if (append && namelen == 4 && !wcsnicmp( info->Name, pathW, 4 ) && (p = find_env_var( *env, *pos, pathW, 4 ))) + if (namelen == 4 && !wcsnicmp( info->Name, pathW, 4 ) && (p = find_env_var( *env, *pos, pathW, 4 ))) { static const WCHAR sepW[] = {';',0}; - WCHAR *newpath = malloc( (wcslen(p) - 4 + datalen) * sizeof(WCHAR) ); + WCHAR *newpath = malloc( (wcslen(p) - 3 + wcslen(value)) * sizeof(WCHAR) ); wcscpy( newpath, p + 5 ); wcscat( newpath, sepW ); - wcscat( newpath, data ); + wcscat( newpath, value ); if (value != data) free( value ); value = newpath; } @@ -1370,17 +1370,17 @@ static void add_registry_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) init_unicode_string( &nameW, syskeyW ); if (!NtOpenKey( &key, KEY_READ, &attr )) { - add_registry_variables( env, pos, size, key, FALSE ); + add_registry_variables( env, pos, size, key ); NtClose( key ); } if (!open_hkcu_key( "Environment", &key )) { - add_registry_variables( env, pos, size, key, TRUE ); + add_registry_variables( env, pos, size, key ); NtClose( key ); } if (!open_hkcu_key( "Volatile Environment", &key )) { - add_registry_variables( env, pos, size, key, TRUE ); + add_registry_variables( env, pos, size, key ); NtClose( key ); } } @@ -1708,18 +1708,28 @@ static inline void put_unicode_string( WCHAR *src, WCHAR **dst, UNICODE_STRING * */ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) { + static const WCHAR pathW[] = {'P','A','T','H'}; RTL_USER_PROCESS_PARAMETERS *params = NULL; SIZE_T size, env_pos, env_size; - WCHAR *dst; + WCHAR *dst, *p, *path = NULL; WCHAR *cmdline = build_command_line( main_wargv + 1 ); WCHAR *env = get_initial_environment( &env_pos, &env_size ); NTSTATUS status; + /* store the initial PATH value */ + if ((p = find_env_var( env, env_pos, pathW, 4 ))) + { + path = malloc( (wcslen(p + 5) + 1) * sizeof(WCHAR) ); + wcscpy( path, p + 5 ); + } add_dynamic_environment( &env, &env_pos, &env_size ); add_registry_environment( &env, &env_pos, &env_size ); env[env_pos] = 0; run_wineboot( env, env_pos ); + /* reload environment now that wineboot has run */ + set_env_var( &env, &env_pos, &env_size, pathW, 4, path ); /* reset PATH */ + free( path ); add_registry_environment( &env, &env_pos, &env_size ); env[env_pos++] = 0;

1 0

Rafał Harabień : kernel32: Add Wow64GetThreadSelectorEntry stub.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 45cd7ff4879d17c3730bb2228e047af7f8e334e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45cd7ff4879d17c3730bb222… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Fri Mar 5 22:30:42 2021 +0100 kernel32: Add Wow64GetThreadSelectorEntry stub. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/thread.c | 12 ++++++++++++ include/winbase.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0eb66a0e3b0..d14bf010383 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1617,7 +1617,7 @@ @ stdcall Wow64EnableWow64FsRedirection(long) KERNEL32_Wow64EnableWow64FsRedirection @ stdcall -import Wow64DisableWow64FsRedirection(ptr) @ stdcall Wow64GetThreadContext(long ptr) -# @ stub Wow64GetThreadSelectorEntry +@ stdcall Wow64GetThreadSelectorEntry(long long ptr) @ stdcall -import Wow64RevertWow64FsRedirection(ptr) @ stdcall Wow64SetThreadContext(long ptr) # @ stub Wow64SuspendThread diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 1f4f938af51..050bd416553 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -30,8 +30,10 @@ #include "winternl.h" #include "wine/asm.h" +#include "wine/debug.h" #include "kernel_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(thread); /*********************************************************************** * BaseThreadInitThunk (KERNEL32.@) @@ -99,6 +101,16 @@ BOOL WINAPI Wow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context) } +/*********************************************************************** + * Wow64GetThreadSelectorEntry [KERNEL32.@] + */ +BOOL WINAPI Wow64GetThreadSelectorEntry( HANDLE thread, DWORD selector, WOW64_LDT_ENTRY *selector_entry) +{ + FIXME("(%p %u %p): stub\n", thread, selector, selector_entry); + return set_ntstatus( STATUS_NOT_IMPLEMENTED ); +} + + /********************************************************************** * SetThreadAffinityMask (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 0262e50d980..651da6d6906 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2771,6 +2771,7 @@ WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT); WINBASEAPI BOOL WINAPI Wow64DisableWow64FsRedirection(PVOID*); WINBASEAPI BOOLEAN WINAPI Wow64EnableWow64FsRedirection(BOOLEAN); WINBASEAPI BOOL WINAPI Wow64GetThreadContext(HANDLE, WOW64_CONTEXT *); +WINBASEAPI BOOL WINAPI Wow64GetThreadSelectorEntry(HANDLE,DWORD,WOW64_LDT_ENTRY*); WINBASEAPI BOOL WINAPI Wow64RevertWow64FsRedirection(PVOID); WINBASEAPI BOOL WINAPI Wow64SetThreadContext(HANDLE, const WOW64_CONTEXT *); WINADVAPI DWORD WINAPI WriteEncryptedFileRaw(PFE_IMPORT_FUNC,PVOID,PVOID);

1 0

Rafał Harabień : ntdll: Allow getting/setting x86_64 context of x86 processes in wine64.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 77481d36d3a9ce87a213424aef65ad094b42b022 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77481d36d3a9ce87a213424a… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Mon Mar 1 00:42:28 2021 +0100 ntdll: Allow getting/setting x86_64 context of x86 processes in wine64. WoW64 process has two separate contexts: - x86 context used most of the time (e.g. by application code) - x86_64 context used by system when it quits x86 emulation and jumps to the kernel code A notable exception are debug registers - their state is shared. Some debuggers make use of that fact and sets/gets debug registers of x86 processes using x86_64 thread context. Add support for setting and getting debug registers using x86_64 thread context. Getting other registers is allowed too and will return values from x86 thread context. Fixes hardware breakpoints in IDA 7.0 disassembler (x86_64 app) when debugging x86 (32 bit) applications. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 9 ------- dlls/ntdll/unix/signal_x86_64.c | 59 +++++++++++++++++++++++++++++++++++++++++ server/thread.c | 22 +++++++++++++-- 3 files changed, 79 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 75765bee5a0..da88ca449fb 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5841,7 +5841,6 @@ static void test_debug_registers_wow64(void) ZeroMemory(&ctx, sizeof(ctx)); ctx.ContextFlags = CONTEXT_ALL; bret = GetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "GetThreadContext failed\n"); ctx.Dr0 = 0x12340000; @@ -5850,14 +5849,12 @@ static void test_debug_registers_wow64(void) ctx.Dr3 = 0x12340003; ctx.Dr7 = 0x155; /* enable all breakpoints (local) */ bret = SetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "SetThreadContext failed\n"); if (bret) { ZeroMemory(&ctx, sizeof(ctx)); ctx.ContextFlags = CONTEXT_ALL; bret = GetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "GetThreadContext failed\n"); if (bret) { @@ -5896,22 +5893,16 @@ static void test_debug_registers_wow64(void) ok(ret == STATUS_SUCCESS, "Wow64GetThreadContext failed with %lx\n", ret); if (ret == STATUS_SUCCESS) { - todo_wine ok(wow64_ctx.Dr0 == 0x56780000, "expected 0x56780000, got %lx\n", wow64_ctx.Dr0); - todo_wine ok(wow64_ctx.Dr1 == 0x56780001, "expected 0x56780001, got %lx\n", wow64_ctx.Dr1); - todo_wine ok(wow64_ctx.Dr2 == 0x56780002, "expected 0x56780002, got %lx\n", wow64_ctx.Dr2); - todo_wine ok(wow64_ctx.Dr3 == 0x56780003, "expected 0x56780003, got %lx\n", wow64_ctx.Dr3); - todo_wine ok(wow64_ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", wow64_ctx.Dr7); } ZeroMemory(&ctx, sizeof(ctx)); ctx.ContextFlags = CONTEXT_ALL; bret = GetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "GetThreadContext failed\n"); if (bret) { diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 2a030372fb7..7dab5fbf4ed 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1707,6 +1707,65 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) */ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { + if (from->cpu == CPU_x86) + { + /* convert the WoW64 context */ + to->ContextFlags = CONTEXT_AMD64; + if (from->flags & SERVER_CTX_CONTROL) + { + to->ContextFlags |= CONTEXT_CONTROL; + to->Rbp = from->ctl.i386_regs.ebp; + to->Rip = from->ctl.i386_regs.eip; + to->Rsp = from->ctl.i386_regs.esp; + to->SegCs = from->ctl.i386_regs.cs; + to->SegSs = from->ctl.i386_regs.ss; + to->EFlags = from->ctl.i386_regs.eflags; + } + + if (from->flags & SERVER_CTX_INTEGER) + { + to->ContextFlags |= CONTEXT_INTEGER; + to->Rax = from->integer.i386_regs.eax; + to->Rcx = from->integer.i386_regs.ecx; + to->Rdx = from->integer.i386_regs.edx; + to->Rbx = from->integer.i386_regs.ebx; + to->Rsi = from->integer.i386_regs.esi; + to->Rdi = from->integer.i386_regs.edi; + to->R8 = 0; + to->R9 = 0; + to->R10 = 0; + to->R11 = 0; + to->R12 = 0; + to->R13 = 0; + to->R14 = 0; + to->R15 = 0; + } + if (from->flags & SERVER_CTX_SEGMENTS) + { + to->ContextFlags |= CONTEXT_SEGMENTS; + to->SegDs = from->seg.i386_regs.ds; + to->SegEs = from->seg.i386_regs.es; + to->SegFs = from->seg.i386_regs.fs; + to->SegGs = from->seg.i386_regs.gs; + } + if (from->flags & SERVER_CTX_FLOATING_POINT) + { + to->ContextFlags |= CONTEXT_FLOATING_POINT; + memset(&to->u.FltSave, 0, sizeof(to->u.FltSave)); + } + if (from->flags & SERVER_CTX_DEBUG_REGISTERS) + { + to->ContextFlags |= CONTEXT_DEBUG_REGISTERS; + to->Dr0 = from->debug.i386_regs.dr0; + to->Dr1 = from->debug.i386_regs.dr1; + to->Dr2 = from->debug.i386_regs.dr2; + to->Dr3 = from->debug.i386_regs.dr3; + to->Dr6 = from->debug.i386_regs.dr6; + to->Dr7 = from->debug.i386_regs.dr7; + } + return STATUS_SUCCESS; + } + if (from->cpu != CPU_x86_64) return STATUS_INVALID_PARAMETER; to->ContextFlags = CONTEXT_AMD64 | (to->ContextFlags & 0x40); diff --git a/server/thread.c b/server/thread.c index dc02a1a9de3..e4abe4fab94 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1890,8 +1890,7 @@ DECL_HANDLER(set_thread_context) reply->self = (thread == current); if (thread->state == TERMINATED) set_error( STATUS_UNSUCCESSFUL ); - else if (context->cpu != thread->process->cpu) set_error( STATUS_INVALID_PARAMETER ); - else + else if (context->cpu == thread->process->cpu) { unsigned int system_flags = get_context_system_regs(context->cpu) & context->flags; @@ -1903,6 +1902,25 @@ DECL_HANDLER(set_thread_context) thread->context->regs.flags |= context->flags; } } + else if (context->cpu == CPU_x86_64 && thread->process->cpu == CPU_x86) + { + /* convert the WoW64 context */ + unsigned int system_flags = get_context_system_regs( context->cpu ) & context->flags; + if (system_flags) + { + set_thread_context( thread, context, system_flags ); + if (thread->context && !get_error()) + { + thread->context->regs.debug.i386_regs.dr0 = context->debug.x86_64_regs.dr0; + thread->context->regs.debug.i386_regs.dr1 = context->debug.x86_64_regs.dr1; + thread->context->regs.debug.i386_regs.dr2 = context->debug.x86_64_regs.dr2; + thread->context->regs.debug.i386_regs.dr3 = context->debug.x86_64_regs.dr3; + thread->context->regs.debug.i386_regs.dr6 = context->debug.x86_64_regs.dr6; + thread->context->regs.debug.i386_regs.dr7 = context->debug.x86_64_regs.dr7; + } + } + } + else set_error( STATUS_INVALID_PARAMETER ); release_object( thread ); }

1 0

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 March 2021