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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 07b12032d2e9bd24bdf952df875e82449898857a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=07b12032d2e9bd24bdf952df87...

Author: Maarten Lankhorst 
Date:   Thu Mar 13 21:42:22 2008 -0700

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

NullRenderer might accidentally be rendered otherwise.

---

dlls/quartz/filtergraph.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index c6e2c22..747f88d 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -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 */
     tab[0] = mt->majortype;
     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)) {
         ERR("Unable to enum filters (%x)\n", hr);
         return hr;
@@ -931,7 +931,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface,
         /* Try to find a suitable renderer with the same media type */
         tab[0] = mt->majortype;
         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)) {
             ERR("Unable to enum filters (%x)\n", hr);
             return hr;
@@ -1057,7 +1057,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface,
     if (SUCCEEDED(hr)) {
         tab[0] = mt.majortype;
         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))