January 2021 - Wine-commits

Hans Leidekker : wbemprox/tests: Add tests for Win32_NetworkAdapter/Configuration.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: e8aa254f3425a140a955f9d250987c88042bb747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8aa254f3425a140a955f9d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:40 2021 +0100 wbemprox/tests: Add tests for Win32_NetworkAdapter/Configuration. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 5a59f0a8f8f..572920c7702 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -248,6 +248,9 @@ static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *pro case VT_R4: trace( "%s: %f\n", wine_dbgstr_w(prop), V_R4(&val) ); break; + case VT_BOOL: + trace( "%s: %d\n", wine_dbgstr_w(prop), V_BOOL(&val) ); + break; default: break; } @@ -1162,6 +1165,34 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); check_property( obj, L"Index", VT_I4, CIM_UINT32 ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + +static void test_Win32_NetworkAdapterConfiguration( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapterConfiguration" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Description", VT_BSTR, CIM_STRING ); + check_property( obj, L"Index", VT_I4, CIM_UINT32 ); + check_property( obj, L"IPEnabled", VT_BOOL, CIM_BOOLEAN ); IWbemClassObject_Release( obj ); } @@ -1901,6 +1932,7 @@ START_TEST(query) test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_NetworkAdapter( services ); + test_Win32_NetworkAdapterConfiguration( services ); test_Win32_OperatingSystem( services ); test_Win32_PhysicalMemory( services ); test_Win32_PnPEntity( services );

1 0

Hans Leidekker : wbemprox: Handle escaped backslashes in LIKE queries.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: d4032d69f6fe4290217cb21a05dc33b9add868b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4032d69f6fe4290217cb21a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:41 2021 +0100 wbemprox: Handle escaped backslashes in LIKE queries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50256 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 1 + dlls/wbemprox/tests/query.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 3d60825f24e..ec2a43c3f5f 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -93,6 +93,7 @@ static BOOL eval_like( const WCHAR *lstr, const WCHAR *rstr ) while (*p && *q) { + if (q[0] == '\\' && q[1] == '\\') q++; if (*q == '%') { while (*q == '%') q++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 572920c7702..5d7559afe56 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1171,6 +1171,16 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) IEnumWbemClassObject_Release( result ); SysFreeString( query ); + + query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter WHERE PNPDeviceID LIKE \"PCI\\\\%\"" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( query ); + + query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter WHERE PNPDeviceID LIKE \"PCI\\%\"" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + todo_wine ok( hr == WBEM_E_INVALID_QUERY, "got %08x\n", hr ); + SysFreeString( query ); SysFreeString( wql ); }

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.ServiceName.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 4c5dee872be0c6a5d5df089bcf15e49edfd00d43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c5dee872be0c6a5d5df089b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:42 2021 +0100 wbemprox: Implement Win32_NetworkAdapter.ServiceName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50256 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d33cf1d03cc..9ae34a50c0d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -206,6 +206,7 @@ static const struct column col_networkadapter[] = { L"NetConnectionStatus", CIM_UINT16 }, { L"PhysicalAdapter", CIM_BOOLEAN }, { L"PNPDeviceID", CIM_STRING }, + { L"ServiceName", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Speed", CIM_UINT64 }, }; static const struct column col_networkadapterconfig[] = @@ -613,6 +614,7 @@ struct record_networkadapter UINT16 netconnection_status; int physicaladapter; const WCHAR *pnpdevice_id; + const WCHAR *servicename; UINT64 speed; }; struct record_networkadapterconfig @@ -2718,6 +2720,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec->netconnection_status = get_connection_status( aa->OperStatus ); rec->physicaladapter = physical; rec->pnpdevice_id = L"PCI\\VEN_8086&DEV_100E&SUBSYS_001E8086&REV_02\\3&267A616A&1&18"; + rec->servicename = heap_strdupW( aa->FriendlyName ); rec->speed = 1000000; if (!match_row( table, row, cond, &status )) { diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 5d7559afe56..a0488f40e52 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1160,12 +1160,26 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) for (;;) { + VARIANT val; + CIMTYPE type; + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"Description", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); check_property( obj, L"Index", VT_I4, CIM_UINT32 ); check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"ServiceName", 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get service name %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || broken(V_VT( &val ) == VT_NULL) /* win2k8 */, + "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); }

1 0

Arkadiusz Hiler : hidclass.sys: Calculate correct bitCount for vendor-specific 1 bit repeated elements.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 5a32339dc858d898ac2fa1c948306a2ec271c68b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a32339dc858d898ac2fa1c9… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Thu Jan 21 18:11:13 2021 +0200 hidclass.sys: Calculate correct bitCount for vendor-specific 1 bit repeated elements. DualSense controller's report descriptor comes with a 1 bit vendor specific (Usage Page & Usage) element repeated through 'report count'. Those were correctly interpreted as non-ranged buttons (exposed as button caps with appropriate usage values) but their size was incorrectly assumed to be 1 ignoring the 'report count'. Because of that the InputReportByteLength is miscalculated as 63 instead of 64. If the buffer passed to HidD_GetInputReport() is allocated using that value the call will fail with ERROR_INSUFFICIENT_BUFFER. This change fixes the above and cleans up the code a bit so the size for each case is calculated directly from the count and size instead of using the values that were derived from them. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 56e4da4ad10..c02988494fd 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -698,6 +698,10 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems } wine_element->valueStartBit = wine_report->bitSize; + + wine_element->bitCount = (feature->caps.BitSize * feature->caps.ReportCount); + wine_report->bitSize += wine_element->bitCount; + if (feature->caps.BitSize == 1) { wine_element->ElementType = ButtonElement; @@ -713,8 +717,6 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems wine_element->caps.button.IsAbsolute = feature->IsAbsolute; if (wine_element->caps.button.IsRange) { - wine_element->bitCount = (feature->caps.u.Range.UsageMax - feature->caps.u.Range.UsageMin) + 1; - wine_report->bitSize += wine_element->bitCount; wine_element->caps.button.u.Range.UsageMin = feature->caps.u.Range.UsageMin; wine_element->caps.button.u.Range.UsageMax = feature->caps.u.Range.UsageMax; wine_element->caps.button.u.Range.StringMin = feature->caps.u.Range.StringMin; @@ -727,8 +729,6 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems } else { - wine_report->bitSize++; - wine_element->bitCount = 1; wine_element->caps.button.u.NotRange.Usage = feature->caps.u.NotRange.Usage; wine_element->caps.button.u.NotRange.Reserved1 = feature->caps.u.NotRange.Usage; wine_element->caps.button.u.NotRange.StringIndex = feature->caps.u.NotRange.StringIndex; @@ -756,8 +756,6 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems wine_element->caps.value.HasNull = feature->HasNull; wine_element->caps.value.BitSize = feature->caps.BitSize; wine_element->caps.value.ReportCount = feature->caps.ReportCount; - wine_element->bitCount = (feature->caps.BitSize * wine_element->caps.value.ReportCount); - wine_report->bitSize += wine_element->bitCount; wine_element->caps.value.UnitsExp = feature->caps.UnitsExp; wine_element->caps.value.Units = feature->caps.Units; wine_element->caps.value.LogicalMin = feature->caps.LogicalMin;

1 0

Nikolay Sivov : dwrite: Zero initialize font data structure.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 612652bb9ca93dbafefc2ff47714c1906cb59d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=612652bb9ca93dbafefc2ff4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 16:36:50 2021 +0300 dwrite: Zero initialize font data structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 74e6b929ecd..392c1dd0ee8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3932,9 +3932,6 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo data->file = desc->files[0]; data->face_index = desc->index; data->face_type = desc->face_type; - data->simulations = DWRITE_FONT_SIMULATIONS_NONE; - data->bold_sim_tested = 0; - data->oblique_sim_tested = 0; IDWriteFontFile_AddRef(data->file); stream_desc.stream = desc->stream;

1 0

Nikolay Sivov : dwrite/tests: Add some tests for text format properties.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 239530e8a8ecebfcf9a8d23f67ebec2b8522750e URL: https://source.winehq.org/git/wine.git/?a=commit;h=239530e8a8ecebfcf9a8d23f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 16:36:51 2021 +0300 dwrite/tests: Add some tests for text format properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 94 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 52f17820e5e..eb47997f22f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -190,11 +190,17 @@ static IDWriteTextAnalysisSourceVtbl analysissourcevtbl = { static IDWriteTextAnalysisSource analysissource = { &analysissourcevtbl }; +static void *create_factory_iid(REFIID riid) +{ + IUnknown *factory = NULL; + DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, riid, &factory); + return factory; +} + static IDWriteFactory *create_factory(void) { - IDWriteFactory *factory; - HRESULT hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IDWriteFactory, (IUnknown**)&factory); - ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFactory *factory = create_factory_iid(&IID_IDWriteFactory); + ok(factory != NULL, "Failed to create factory.\n"); return factory; } @@ -5860,6 +5866,87 @@ static void test_automatic_font_axes(void) IDWriteFactory_Release(factory); } +static void test_text_format_axes(void) +{ + IDWriteFontCollection *collection; + IDWriteFontCollection2 *collection2; + DWRITE_FONT_AXIS_VALUE axis; + IDWriteTextFormat3 *format3; + DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_WEIGHT weight; + IDWriteTextFormat *format; + IDWriteFactory6 *factory; + DWRITE_FONT_STYLE style; + DWRITE_FONT_FAMILY_MODEL model; + unsigned int count; + HRESULT hr; + + factory = create_factory_iid(&IID_IDWriteFactory6); + + if (!factory) + { + win_skip("Text format does not support variations.\n"); + return; + } + + hr = IDWriteFactory6_CreateTextFormat(factory, L"test_family", NULL, NULL, 0, 10.0f, L"en-us", &format3); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + hr = IDWriteTextFormat3_GetFontCollection(format3, &collection); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontCollection_QueryInterface(collection, &IID_IDWriteFontCollection2, (void **)&collection2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + model = IDWriteFontCollection2_GetFontFamilyModel(collection2); + ok(model == DWRITE_FONT_FAMILY_MODEL_TYPOGRAPHIC, "Unexpected model %d.\n", model); + + IDWriteFontCollection_Release(collection); + IDWriteFontCollection2_Release(collection2); + + count = IDWriteTextFormat3_GetFontAxisValueCount(format3); + ok(!count, "Unexpected axis count %u.\n", count); + + stretch = IDWriteTextFormat3_GetFontStretch(format3); + ok(stretch == DWRITE_FONT_STRETCH_NORMAL, "Unexpected font stretch %d.\n", stretch); + + style = IDWriteTextFormat3_GetFontStyle(format3); + ok(style == DWRITE_FONT_STYLE_NORMAL, "Unexpected font style %d.\n", style); + + weight = IDWriteTextFormat3_GetFontWeight(format3); + ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "Unexpected font weight %d.\n", weight); + + /* Regular properties are not set from axis values. */ + axis.axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis.value = 200.0f; + hr = IDWriteTextFormat3_SetFontAxisValues(format3, &axis, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + weight = IDWriteTextFormat3_GetFontWeight(format3); + ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "Unexpected font weight %d.\n", weight); + + IDWriteTextFormat3_Release(format3); +} + hr = IDWriteFactory_CreateTextFormat((IDWriteFactory *)factory, L"test_family", NULL, + DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_ITALIC, DWRITE_FONT_STRETCH_EXPANDED, + 10.0f, L"en-us", &format); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat3, (void **)&format3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteTextFormat3_GetFontAxisValueCount(format3); + ok(!count, "Unexpected axis count %u.\n", count); + + IDWriteTextFormat3_Release(format3); + IDWriteTextFormat_Release(format); + + IDWriteFactory6_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -5912,6 +5999,7 @@ START_TEST(layout) test_GetOverhangMetrics(); test_tab_stops(); test_automatic_font_axes(); + test_text_format_axes(); IDWriteFactory_Release(factory); }

1 0

Zebediah Figura : winegstreamer: Flush connected pins directly in SetPositions().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: ef79e902a61e25845b3fac16bc51294b370030d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef79e902a61e25845b3fac16… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:49 2021 -0600 winegstreamer: Flush connected pins directly in SetPositions(). Instead of propagating GStreamer flush events to corresponding DirectShow pins. This is mainly to avoid more callbacks from GStreamer and further separate the Win32 and Unix code. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 130 ++++++++++++++++++++++++++++-------------- 1 file changed, 86 insertions(+), 44 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 949acd012aa..9cf2379cb2c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -65,7 +65,7 @@ struct parser /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ - bool streaming; + bool streaming, flushing; BOOL initial, ignore_flush; GstElement *container; @@ -111,8 +111,9 @@ struct parser_source GstCaps *caps; SourceSeeking seek; - CONDITION_VARIABLE event_cv, event_empty_cv, flushing_cv, flush_stop_cv; - bool flushing, thread_blocked; + CRITICAL_SECTION flushing_cs; + CONDITION_VARIABLE event_cv, event_empty_cv; + bool flushing; struct parser_event event; HANDLE thread; }; @@ -630,8 +631,6 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) tevent = gst_event_new_flush_start(); gst_event_set_seqnum(tevent, seqnum); gst_pad_push_event(This->my_src, tevent); - if (This->reader) - IAsyncReader_BeginFlush(This->reader); if (thread) gst_pad_set_active(This->my_src, 1); } @@ -643,8 +642,6 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) tevent = gst_event_new_flush_stop(TRUE); gst_event_set_seqnum(tevent, seqnum); gst_pad_push_event(This->my_src, tevent); - if (This->reader) - IAsyncReader_EndFlush(This->reader); if (thread) gst_pad_set_active(This->my_src, 1); } @@ -659,25 +656,18 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) TRACE("filter %p, type \"%s\".\n", This, GST_EVENT_TYPE_NAME(event)); - switch (event->type) { + switch (event->type) + { case GST_EVENT_SEEK: ret = gst_base_src_perform_seek(This, event); break; + case GST_EVENT_FLUSH_START: - EnterCriticalSection(&This->filter.filter_cs); - if (This->reader) - IAsyncReader_BeginFlush(This->reader); - LeaveCriticalSection(&This->filter.filter_cs); - break; case GST_EVENT_FLUSH_STOP: - EnterCriticalSection(&This->filter.filter_cs); - if (This->reader) - IAsyncReader_EndFlush(This->reader); - LeaveCriticalSection(&This->filter.filter_cs); - break; case GST_EVENT_QOS: case GST_EVENT_RECONFIGURE: break; + default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); ret = FALSE; @@ -757,19 +747,11 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } if (pin->pin.pin.peer) { - IPin_BeginFlush(pin->pin.pin.peer); - EnterCriticalSection(&filter->cs); pin->flushing = true; - WakeConditionVariable(&pin->event_cv); WakeConditionVariable(&pin->event_empty_cv); - /* Wait for the thread to pause itself, to ensure that no stale - * samples are sent. */ - while (!pin->thread_blocked) - SleepConditionVariableCS(&pin->flushing_cv, &filter->cs, INFINITE); - /* And flush out any buffered event. */ switch (pin->event.type) { case PARSER_EVENT_NONE: @@ -797,9 +779,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) EnterCriticalSection(&filter->cs); pin->flushing = false; LeaveCriticalSection(&filter->cs); - WakeConditionVariable(&pin->flush_stop_cv); - - IPin_EndFlush(pin->pin.pin.peer); } break; @@ -1057,32 +1036,31 @@ static DWORD CALLBACK stream_thread(void *arg) { struct parser_event event; + EnterCriticalSection(&pin->flushing_cs); EnterCriticalSection(&filter->cs); - while (filter->streaming && !pin->flushing && pin->event.type == PARSER_EVENT_NONE) + while (filter->streaming && !filter->flushing && pin->event.type == PARSER_EVENT_NONE) SleepConditionVariableCS(&pin->event_cv, &filter->cs, INFINITE); - if (pin->flushing) + if (filter->flushing) { - TRACE("Filter is flushing; pausing thread.\n"); - pin->thread_blocked = true; - WakeConditionVariable(&pin->flushing_cv); - do - SleepConditionVariableCS(&pin->flush_stop_cv, &filter->cs, INFINITE); - while (pin->flushing); - pin->thread_blocked = false; - TRACE("Filter is no longer flushing; resuming thread.\n"); + LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); + TRACE("Filter is flushing.\n"); + continue; } if (!filter->streaming) { LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); break; } if (!pin->event.type) { LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); continue; } @@ -1127,6 +1105,8 @@ static DWORD CALLBACK stream_thread(void *arg) case PARSER_EVENT_NONE: assert(0); } + + LeaveCriticalSection(&pin->flushing_cs); } TRACE("Streaming stopped; exiting.\n"); @@ -2153,7 +2133,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, { GstSeekType current_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; struct parser_source *pin = impl_from_IMediaSeeking(iface); + struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); GstSeekFlags flags = 0; + HRESULT hr = S_OK; + int i; TRACE("pin %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", pin, current ? debugstr_time(*current) : "<null>", current_flags, @@ -2161,9 +2144,40 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, mark_wine_thread(); - SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); if (pin->pin.pin.filter->state == State_Stopped) + { + SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); return S_OK; + } + + if (!(current_flags & AM_SEEKING_NoFlush)) + { + EnterCriticalSection(&filter->cs); + filter->flushing = true; + LeaveCriticalSection(&filter->cs); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + { + WakeConditionVariable(&pin->event_cv); + IPin_BeginFlush(filter->sources[i]->pin.pin.peer); + } + } + + if (filter->reader) + IAsyncReader_BeginFlush(filter->reader); + } + + /* Acquire the flushing locks. This blocks the streaming threads, and + * ensures the seek is serialized between flushes. */ + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + EnterCriticalSection(&pin->flushing_cs); + } + + SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); if (current_flags & AM_SEEKING_SeekToKeyFrame) flags |= GST_SEEK_FLAG_KEY_UNIT; @@ -2182,9 +2196,33 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, { ERR("Failed to seek (current %s, stop %s).\n", debugstr_time(pin->seek.llCurrent), debugstr_time(pin->seek.llStop)); - return E_FAIL; + hr = E_FAIL; } - return S_OK; + + if (!(current_flags & AM_SEEKING_NoFlush)) + { + EnterCriticalSection(&filter->cs); + filter->flushing = false; + LeaveCriticalSection(&filter->cs); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + IPin_EndFlush(filter->sources[i]->pin.pin.peer); + } + + if (filter->reader) + IAsyncReader_EndFlush(filter->reader); + } + + /* Release the flushing locks. */ + for (i = filter->source_count - 1; i >= 0; --i) + { + if (filter->sources[i]->pin.pin.peer) + LeaveCriticalSection(&pin->flushing_cs); + } + + return hr; } static const IMediaSeekingVtbl GST_Seeking_Vtbl = @@ -2397,6 +2435,9 @@ static void free_source_pin(struct parser_source *pin) CloseHandle(pin->eos_event); gst_segment_free(pin->segment); + pin->flushing_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&pin->flushing_cs); + strmbase_seeking_cleanup(&pin->seek); strmbase_source_cleanup(&pin->pin); heap_free(pin); @@ -2434,10 +2475,11 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name GST_ChangeCurrent, GST_ChangeRate); InitializeConditionVariable(&pin->event_cv); InitializeConditionVariable(&pin->event_empty_cv); - InitializeConditionVariable(&pin->flushing_cv); - InitializeConditionVariable(&pin->flush_stop_cv); BaseFilterImpl_IncrementPinVersion(&filter->filter); + InitializeCriticalSection(&pin->flushing_cs); + pin->flushing_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": pin.flushing_cs"); + sprintf(pad_name, "qz_sink_%u", filter->source_count); pin->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); gst_pad_set_element_private(pin->my_sink, pin);

1 0

Zebediah Figura : winegstreamer: Consistently use GST_STATE_PAUSED for test-play.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: b3e2009b5edfa653f7629901c2658b70f65538b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3e2009b5edfa653f7629901… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:50 2021 -0600 winegstreamer: Consistently use GST_STATE_PAUSED for test-play. It does not matter whether we use PAUSED or PLAYING, but we should at least be consistent. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9cf2379cb2c..90ba02bba5d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1875,7 +1875,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) return FALSE; } - gst_element_set_state(filter->container, GST_STATE_PLAYING); + gst_element_set_state(filter->container, GST_STATE_PAUSED); ret = gst_element_get_state(filter->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { @@ -2776,7 +2776,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter) return FALSE; } - gst_element_set_state(filter->container, GST_STATE_PLAYING); + gst_element_set_state(filter->container, GST_STATE_PAUSED); ret = gst_element_get_state(filter->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) {

1 0

Zebediah Figura : winegstreamer: Do not return GST_FLOW_NOT_LINKED if the DirectShow pin is not connected.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 36a7dd93d713ff16b0df6ef3cdb836d6614ec0f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36a7dd93d713ff16b0df6ef3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:51 2021 -0600 winegstreamer: Do not return GST_FLOW_NOT_LINKED if the DirectShow pin is not connected. This is a fatal error condition for GStreamer, but should not cause errors for DirectShow. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 90ba02bba5d..da0121e089e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -878,18 +878,12 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu TRACE("pad %p, pin %p, buffer %p.\n", pad, pin, buffer); - if (filter->initial) + if (filter->initial || !pin->pin.pin.peer) { gst_buffer_unref(buffer); return GST_FLOW_OK; } - if (!pin->pin.pin.peer) - { - gst_buffer_unref(buffer); - return GST_FLOW_NOT_LINKED; - } - stream_event.type = PARSER_EVENT_BUFFER; stream_event.u.buffer = buffer; /* Transfer our reference to the buffer to the thread. */

1 0

Zebediah Figura : winegstreamer: Keep the stream in paused state for its entire lifetime.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 90107bba944a1da286e9ebd246ab3fd5dd7cb115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90107bba944a1da286e9ebd2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:52 2021 -0600 winegstreamer: Keep the stream in paused state for its entire lifetime. This noticeably improves stream startup time. The process of typefinding and negotiation takes about 70 ms for a simple test file on one machine, and this is currently done twice. This patch replaces the second instance with a simple seek, which takes less than 10 ms. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 194 +++++++----------------------------------- 1 file changed, 32 insertions(+), 162 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90107bba944a1da286e9…

1 0