Maarten Lankhorst : Revert "quartz: Reaching a renderer in the filtergraph is not an error."

Alexandre Julliard julliard at winehq.org
Mon Nov 17 09:14:09 CST 2008


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

Author: Maarten Lankhorst <maarten at codeweavers.com>
Date:   Fri Nov 14 22:50:34 2008 +0100

Revert "quartz: Reaching a renderer in the filtergraph is not an error."

This is plain wrong, input pin and output pin are supposed to be 
connected to each other, not the input pin being connected to a renderer 
pin and NOT reaching output pin

---

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

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 8b68d2f..7b773ef 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -1030,8 +1030,9 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut,
         if (SUCCEEDED(hr)) {
             unsigned int i;
             if (nb == 0) {
-                TRACE("Reached a renderer\n");
-                break;
+                IPin_Disconnect(ppinfilter);
+                IPin_Disconnect(ppinOut);
+                goto error;
             }
             TRACE("pins to consider: %d\n", nb);
             for(i = 0; i < nb; i++)




More information about the wine-cvs mailing list