Skip to content

W
wine-winehq
Commit 07b12032 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Alexandre Julliard
Browse files
Options

quartz: Don't add MERIT_DO_NOT_USE filters automatically to create a connection.

NullRenderer might accidentally be rendered otherwise.
parent 950d3443
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dlls/quartz/filtergraph.c
View file @ 07b12032
...@@ -778,7 +778,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, ...@@ -778,7 +778,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface,
/* Try to find a suitable filter that can connect to the pin to render */ /* Try to find a suitable filter that can connect to the pin to render */
tab[0] = mt->majortype; tab[0] = mt->majortype;
tab[1] = mt->subtype; tab[1] = mt->subtype;
hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to enum filters (%x)\n", hr); ERR("Unable to enum filters (%x)\n", hr);
return hr; return hr;
...@@ -931,7 +931,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, ...@@ -931,7 +931,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface,
/* Try to find a suitable renderer with the same media type */ /* Try to find a suitable renderer with the same media type */
tab[0] = mt->majortype; tab[0] = mt->majortype;
tab[1] = GUID_NULL; tab[1] = GUID_NULL;
hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL); hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to enum filters (%x)\n", hr); ERR("Unable to enum filters (%x)\n", hr);
return hr; return hr;
...@@ -1057,7 +1057,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, ...@@ -1057,7 +1057,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface,
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
tab[0] = mt.majortype; tab[0] = mt.majortype;
tab[1] = mt.subtype; tab[1] = mt.subtype;
hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL);
} }
if (FAILED(hr)) if (FAILED(hr))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment