Changeset 6578 for trunk/src/quartz/fgraph.c

Timestamp:

Aug 23, 2001, 8:34:51 PM (24 years ago)

Author:

sandervl

Message:

wine updates

File:

• trunk/src/quartz/fgraph.c (modified) (3 diffs)

trunk/src/quartz/fgraph.c

@@ -14 +14 @@
 #include "winerror.h"
 #include "wine/obj_base.h"
+#include "wine/obj_oleaut.h"
 #include "strmif.h"
+#include "control.h"
 #include "uuids.h"
 
@@ -29 +31 @@
   { &IID_IGraphBuilder, offsetof(CFilterGraph,fgraph)-offsetof(CFilterGraph,unk) },
   { &IID_IFilterGraph2, offsetof(CFilterGraph,fgraph)-offsetof(CFilterGraph,unk) },
+  { &IID_IMediaControl, offsetof(CFilterGraph,mediacontrol)-offsetof(CFilterGraph,unk) },
+  { &IID_IMediaEvent, offsetof(CFilterGraph,mediaevent)-offsetof(CFilterGraph,unk) },
+  { &IID_IMediaEventEx, offsetof(CFilterGraph,mediaevent)-offsetof(CFilterGraph,unk) },
+  { &IID_IMediaPosition, offsetof(CFilterGraph,mediaposition)-offsetof(CFilterGraph,unk) },
+  { &IID_IMediaSeeking, offsetof(CFilterGraph,mediaseeking)-offsetof(CFilterGraph,unk) },
+  { &IID_IBasicVideo, offsetof(CFilterGraph,basvid)-offsetof(CFilterGraph,unk) },
+  { &IID_IBasicAudio, offsetof(CFilterGraph,basaud)-offsetof(CFilterGraph,unk) },
+  { &IID_IVideoWindow, offsetof(CFilterGraph,vidwin)-offsetof(CFilterGraph,unk) },
 };
 
@@ -41 +51 @@
                 return E_OUTOFMEMORY;
 
-        QUARTZ_IUnkInit( &pfg->unk );
+        QUARTZ_IUnkInit( &pfg->unk, punkOuter );
         CFilterGraph_InitIFilterGraph2( pfg );
+        CFilterGraph_InitIMediaControl( pfg );
+        CFilterGraph_InitIMediaEventEx( pfg );
+        CFilterGraph_InitIMediaPosition( pfg );
+        CFilterGraph_InitIMediaSeeking( pfg );
+        CFilterGraph_InitIBasicVideo2( pfg );
+        CFilterGraph_InitIBasicAudio( pfg );
+        CFilterGraph_InitIVideoWindow( pfg );
 
         pfg->unk.pEntries = IFEntries;
         pfg->unk.dwEntries = sizeof(IFEntries)/sizeof(IFEntries[0]);
 
-        *ppobj = (void*)pfg;
+        *ppobj = (void*)(&pfg->unk);
 
         return S_OK;