Changeset 6952

Timestamp:

Oct 6, 2001, 10:56:18 AM (24 years ago)

Author:

sandervl

Message:

Wine 20011004 resync

Location:

trunk

Files:

• include/win/evcode.h (added)
• include/win/strmif.h (modified) (13 diffs)
• include/win/uuids.h (modified) (1 diff)
• include/win/wine/obj_ksproperty.h (added)
• include/win/wine/obj_property.h (modified) (29 diffs)
• src/oleaut32/typelib.c (modified) (16 diffs)
• src/oleaut32/variant.c (modified) (1 diff)
• src/quartz/audren.c (added)
• src/quartz/audren.h (added)
• src/quartz/basefilt.c (added)
• src/quartz/basefilt.h (added)
• src/quartz/basepin.c (added)
• src/quartz/complist.c (modified) (1 diff)
• src/quartz/devenum.c (modified) (4 diffs)
• src/quartz/devmon.c (modified) (7 diffs)
• src/quartz/devmon.h (modified) (1 diff)
• src/quartz/enumunk.c (modified) (2 diffs)
• src/quartz/fgevent.c (added)
• src/quartz/fgidisp.c (modified) (1 diff)
• src/quartz/fgpass.c (added)
• src/quartz/fgraph.c (modified) (6 diffs)
• src/quartz/fgraph.h (modified) (7 diffs)
• src/quartz/fmap.c (modified) (3 diffs)
• src/quartz/fmap2.c (modified) (3 diffs)
• src/quartz/ibasaud.c (deleted)
• src/quartz/ibasvid.c (deleted)
• src/quartz/idevenum.c (deleted)
• src/quartz/ifgraph.c (modified) (22 diffs)
• src/quartz/ifmap.c (deleted)
• src/quartz/ifmap3.c (deleted)
• src/quartz/igconfig.c (added)
• src/quartz/igrver.c (modified) (1 diff)
• src/quartz/imcntl.c (modified) (1 diff)
• src/quartz/imem.c (deleted)
• src/quartz/imesink.c (deleted)
• src/quartz/imevent.c (deleted)
• src/quartz/imfilter.c (modified) (12 diffs)
• src/quartz/impos.c (modified) (1 diff)
• src/quartz/imseek.c (modified) (3 diffs)
• src/quartz/irclock.c (deleted)
• src/quartz/iunk.c (modified) (1 diff)
• src/quartz/ividwin.c (deleted)
• src/quartz/main.c (modified) (8 diffs)
• src/quartz/makefile (modified) (3 diffs)
• src/quartz/memalloc.c (modified) (4 diffs)
• src/quartz/memalloc.h (modified) (2 diffs)
• src/quartz/mtype.c (added)
• src/quartz/mtype.h (added)
• src/quartz/quartz_private.h (modified) (1 diff)
• src/quartz/regsvr.c (modified) (1 diff)
• src/quartz/sample.c (added)
• src/quartz/sample.h (added)
• src/quartz/seekpass.c (modified) (8 diffs)
• src/quartz/seekpass.h (modified) (2 diffs)
• src/quartz/sysclock.c (modified) (4 diffs)

trunk/include/win/strmif.h ¶

@@ -12 +12 @@
 
 #include "ole2.h"
+#include "wine/obj_oleaut.h"
+#include "wine/obj_property.h"
+#include "wine/obj_ksproperty.h"
 
 /* undef GetTimeFormat - FIXME? */
@@ -251 +254 @@
 
 typedef LONGLONG        REFERENCE_TIME;
-#ifdef __WIN32OS2__
-typedef DWORD           HSEMAPHORE;
-typedef DWORD           HEVENT;
-#else
 typedef DWORD_PTR       HSEMAPHORE;
 typedef DWORD_PTR       HEVENT;
-#endif
 
 /* enums. */
@@ -287 +285 @@
         REG_PINFLAG_B_OUTPUT = 0x8,
 } REG_PINFLAG;
+
+typedef enum
+{
+        AM_SAMPLE_SPLICEPOINT           = 0x1,
+        AM_SAMPLE_PREROLL               = 0x2,
+        AM_SAMPLE_DATADISCONTINUITY     = 0x4,
+        AM_SAMPLE_TYPECHANGED           = 0x8,
+        AM_SAMPLE_TIMEVALID             = 0x10,
+        AM_SAMPLE_TIMEDISCONTINUITY     = 0x40,
+        AM_SAMPLE_FLUSH_ON_PAUSE        = 0x80,
+        AM_SAMPLE_STOPVALID             = 0x100,
+        AM_SAMPLE_ENDOFSTREAM           = 0x200,
+
+        AM_STREAM_MEDIA                 = 0,
+        AM_STREAM_CONTROL               = 1
+} AM_SAMPLE_PROPERTY_FLAGS;
 
 
@@ -403 +417 @@
 } REGFILTER2;
 
+typedef struct
+{
+        DWORD           cbData;
+        DWORD           dwTypeSpecificFlags;
+        DWORD           dwSampleFlags;
+        LONG            lActual;
+        REFERENCE_TIME  tStart;
+        REFERENCE_TIME  tStop;
+        DWORD           dwStreamId;
+        AM_MEDIA_TYPE*  pMediaType;
+        BYTE*           pbBuffer;
+        LONG            cbBuffer;
+} AM_SAMPLE2_PROPERTIES;
+
+
 
 /* defines. */
@@ -410 +439 @@
 #define MAX_FILTER_NAME 128
 
+#define AM_GBF_PREVFRAMESKIPPED         1
+#define AM_GBF_NOTASYNCPOINT            2
+#define AM_GBF_NOWAIT                   4
+
 
 /* interfaces. */
+
+/**************************************************************************
+ *
+ * IAsyncReader interface
+ *
+ */
+
+#define ICOM_INTERFACE IAsyncReader
+#define IAsyncReader_METHODS \
+    ICOM_METHOD3(HRESULT,RequestAllocator,IMemAllocator*,a1,ALLOCATOR_PROPERTIES*,a2,IMemAllocator**,a3) \
+    ICOM_METHOD2(HRESULT,Request,IMediaSample*,a1,DWORD_PTR,a2) \
+    ICOM_METHOD3(HRESULT,WaitForNext,DWORD,a1,IMediaSample**,a2,DWORD_PTR*,a3) \
+    ICOM_METHOD1(HRESULT,SyncReadAligned,IMediaSample*,a1) \
+    ICOM_METHOD3(HRESULT,SyncRead,LONGLONG,a1,LONG,a2,BYTE*,a3) \
+    ICOM_METHOD2(HRESULT,Length,LONGLONG*,a1,LONGLONG*,a2) \
+    ICOM_METHOD (HRESULT,BeginFlush) \
+    ICOM_METHOD (HRESULT,EndFlush)
+
+#define IAsyncReader_IMETHODS \
+    IUnknown_IMETHODS \
+    IAsyncReader_METHODS
+
+ICOM_DEFINE(IAsyncReader,IUnknown)
+#undef ICOM_INTERFACE
+
+    /*** IUnknown methods ***/
+#define IAsyncReader_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
+#define IAsyncReader_AddRef(p) ICOM_CALL (AddRef,p)
+#define IAsyncReader_Release(p) ICOM_CALL (Release,p)
+    /*** IAsyncReader methods ***/
+#define IAsyncReader_RequestAllocator(p,a1,a2,a3) ICOM_CALL3(RequestAllocator,p,a1,a2,a3)
+#define IAsyncReader_Request(p,a1,a2) ICOM_CALL2(Request,p,a1,a2)
+#define IAsyncReader_WaitForNext(p,a1,a2,a3) ICOM_CALL3(WaitForNext,p,a1,a2,a3)
+#define IAsyncReader_SyncReadAligned(p,a1) ICOM_CALL1(SyncReadAligned,p,a1)
+#define IAsyncReader_SyncRead(p,a1,a2,a3) ICOM_CALL3(SyncRead,p,a1,a2,a3)
+#define IAsyncReader_Length(p,a1,a2) ICOM_CALL2(Length,p,a1,a2)
+#define IAsyncReader_BeginFlush(p) ICOM_CALL (BeginFlush,p)
+#define IAsyncReader_EndFlush(p) ICOM_CALL (EndFlush,p)
 
 /**************************************************************************
@@ -492 +563 @@
 /**************************************************************************
  *
+ * ICaptureGraphBuilder interface
+ *
+ */
+
+#define ICOM_INTERFACE ICaptureGraphBuilder
+#define ICaptureGraphBuilder_METHODS \
+    ICOM_METHOD1(HRESULT,SetFiltergraph,IGraphBuilder*,a1) \
+    ICOM_METHOD1(HRESULT,GetFiltergraph,IGraphBuilder**,a1) \
+    ICOM_METHOD4(HRESULT,SetOutputFileName,const GUID*,a1,LPCOLESTR,a2,IBaseFilter**,a3,IFileSinkFilter**,a4) \
+    ICOM_METHOD4(HRESULT,FindInterface,const GUID*,a1,IBaseFilter*,a2,REFIID,a3,void**,a4) \
+    ICOM_METHOD4(HRESULT,RenderStream,const GUID*,a1,IUnknown*,a2,IBaseFilter*,a3,IBaseFilter*,a4) \
+    ICOM_METHOD6(HRESULT,ControlStream,const GUID*,a1,IBaseFilter*,a2,REFERENCE_TIME*,a3,REFERENCE_TIME*,a4,WORD,a5,WORD,a6) \
+    ICOM_METHOD2(HRESULT,AllocCapFile,LPCOLESTR,a1,DWORDLONG,a2) \
+    ICOM_METHOD4(HRESULT,CopyCaptureFile,LPOLESTR,a1,LPOLESTR,a2,int,a3,IAMCopyCaptureFileProgress*,a4)
+
+#define ICaptureGraphBuilder_IMETHODS \
+    IUnknown_IMETHODS \
+    ICaptureGraphBuilder_METHODS
+
+ICOM_DEFINE(ICaptureGraphBuilder,IUnknown)
+#undef ICOM_INTERFACE
+
+    /*** IUnknown methods ***/
+#define ICaptureGraphBuilder_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
+#define ICaptureGraphBuilder_AddRef(p) ICOM_CALL (AddRef,p)
+#define ICaptureGraphBuilder_Release(p) ICOM_CALL (Release,p)
+    /*** ICaptureGraphBuilder methods ***/
+#define ICaptureGraphBuilder_SetFiltergraph(p,a1) ICOM_CALL1(SetFiltergraph,p,a1)
+#define ICaptureGraphBuilder_GetFiltergraph(p,a1) ICOM_CALL1(GetFiltergraph,p,a1)
+#define ICaptureGraphBuilder_SetOutputFileName(p,a1,a2,a3,a4) ICOM_CALL4(SetOutputFileName,p,a1,a2,a3,a4)
+#define ICaptureGraphBuilder_FindInterface(p,a1,a2,a3,a4) ICOM_CALL4(FindInterface,p,a1,a2,a3,a4)
+#define ICaptureGraphBuilder_RenderStream(p,a1,a2,a3,a4) ICOM_CALL4(RenderStream,p,a1,a2,a3,a4)
+#define ICaptureGraphBuilder_ControlStream(p,a1,a2,a3,a4,a5,a6) ICOM_CALL6(ControlStream,p,a1,a2,a3,a4,a5,a6)
+#define ICaptureGraphBuilder_AllocCapFile(p,a1,a2) ICOM_CALL2(AllocCapFile,p,a1,a2)
+#define ICaptureGraphBuilder_CopyCaptureFile(p,a1,a2,a3,a4) ICOM_CALL4(CopyCaptureFile,p,a1,a2,a3,a4)
+
+/**************************************************************************
+ *
+ * ICaptureGraphBuilder2 interface
+ *
+ */
+
+#define ICOM_INTERFACE ICaptureGraphBuilder2
+#define ICaptureGraphBuilder2_METHODS \
+    ICOM_METHOD1(HRESULT,SetFiltergraph,IGraphBuilder*,a1) \
+    ICOM_METHOD1(HRESULT,GetFiltergraph,IGraphBuilder**,a1) \
+    ICOM_METHOD4(HRESULT,SetOutputFileName,const GUID*,a1,LPCOLESTR,a2,IBaseFilter**,a3,IFileSinkFilter**,a4) \
+    ICOM_METHOD5(HRESULT,FindInterface,const GUID*,a1,const GUID*,a2,IBaseFilter*,a3,REFIID,a4,void**,a5) \
+    ICOM_METHOD5(HRESULT,RenderStream,const GUID*,a1,const GUID*,a2,IUnknown*,a3,IBaseFilter*,a4,IBaseFilter*,a5) \
+    ICOM_METHOD7(HRESULT,ControlStream,const GUID*,a1,const GUID*,a2,IBaseFilter*,a3,REFERENCE_TIME*,a4,REFERENCE_TIME*,a5,WORD,a6,WORD,a7) \
+    ICOM_METHOD2(HRESULT,AllocCapFile,LPCOLESTR,a1,DWORDLONG,a2) \
+    ICOM_METHOD4(HRESULT,CopyCaptureFile,LPOLESTR,a1,LPOLESTR,a2,int,a3,IAMCopyCaptureFileProgress*,a4) \
+    ICOM_METHOD7(HRESULT,FindPin,IUnknown*,a1,PIN_DIRECTION,a2,const GUID*,a3,const GUID*,a4,BOOL,a5,int,a6,IPin**,a7)
+
+#define ICaptureGraphBuilder2_IMETHODS \
+    IUnknown_IMETHODS \
+    ICaptureGraphBuilder2_METHODS
+
+ICOM_DEFINE(ICaptureGraphBuilder2,IUnknown)
+#undef ICOM_INTERFACE
+
+    /*** IUnknown methods ***/
+#define ICaptureGraphBuilder2_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
+#define ICaptureGraphBuilder2_AddRef(p) ICOM_CALL (AddRef,p)
+#define ICaptureGraphBuilder2_Release(p) ICOM_CALL (Release,p)
+    /*** ICaptureGraphBuilder2 methods ***/
+#define ICaptureGraphBuilder2_SetFiltergraph(p,a1) ICOM_CALL1(SetFiltergraph,p,a1)
+#define ICaptureGraphBuilder2_GetFiltergraph(p,a1) ICOM_CALL1(GetFiltergraph,p,a1)
+#define ICaptureGraphBuilder2_SetOutputFileName(p,a1,a2,a3,a4) ICOM_CALL4(SetOutputFileName,p,a1,a2,a3,a4)
+#define ICaptureGraphBuilder2_FindInterface(p,a1,a2,a3,a4,a5) ICOM_CALL5(FindInterface,p,a1,a2,a3,a4,a5)
+#define ICaptureGraphBuilder2_RenderStream(p,a1,a2,a3,a4,a5) ICOM_CALL5(RenderStream,p,a1,a2,a3,a4,a5)
+#define ICaptureGraphBuilder2_ControlStream(p,a1,a2,a3,a4,a5,a6,a7) ICOM_CALL7(ControlStream,p,a1,a2,a3,a4,a5,a6,a7)
+#define ICaptureGraphBuilder2_AllocCapFile(p,a1,a2) ICOM_CALL2(AllocCapFile,p,a1,a2)
+#define ICaptureGraphBuilder2_CopyCaptureFile(p,a1,a2,a3,a4) ICOM_CALL4(CopyCaptureFile,p,a1,a2,a3,a4)
+#define ICaptureGraphBuilder2_FindPin(p,a1,a2,a3,a4,a5,a6,a7) ICOM_CALL7(FindPin,p,a1,a2,a3,a4,a5,a6,a7)
+
+/**************************************************************************
+ *
  * ICreateDevEnum interface
  *
@@ -513 +662 @@
     /*** ICreateDevEnum methods ***/
 #define ICreateDevEnum_CreateClassEnumerator(p,a1,a2,a3) ICOM_CALL3(CreateClassEnumerator,p,a1,a2,a3)
+
+/**************************************************************************
+ *
+ * IDistributorNotify interface
+ *
+ */
+
+#define ICOM_INTERFACE IDistributorNotify
+#define IDistributorNotify_METHODS \
+    ICOM_METHOD (HRESULT,Stop) \
+    ICOM_METHOD (HRESULT,Pause) \
+    ICOM_METHOD1(HRESULT,Run,REFERENCE_TIME,a1) \
+    ICOM_METHOD1(HRESULT,SetSyncSource,IReferenceClock*,a1) \
+    ICOM_METHOD (HRESULT,NotifyGraphChange)
+
+#define IDistributorNotify_IMETHODS \
+    IUnknown_IMETHODS \
+    IDistributorNotify_METHODS
+
+ICOM_DEFINE(IDistributorNotify,IUnknown)
+#undef ICOM_INTERFACE
+
+    /*** IUnknown methods ***/
+#define IDistributorNotify_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
+#define IDistributorNotify_AddRef(p) ICOM_CALL (AddRef,p)
+#define IDistributorNotify_Release(p) ICOM_CALL (Release,p)
+    /*** IDistributorNotify methods ***/
+#define IDistributorNotify_Stop(p) ICOM_CALL (Stop,p)
+#define IDistributorNotify_Pause(p) ICOM_CALL (Pause,p)
+#define IDistributorNotify_Run(p,a1) ICOM_CALL1(Run,p,a1)
+#define IDistributorNotify_SetSyncSource(p,a1) ICOM_CALL1(SetSyncSource,p,a1)
+#define IDistributorNotify_NotifyGraphChange(p) ICOM_CALL (NotifyGraphChange,p)
+
+/**************************************************************************
+ *
+ * IDVSplitter interface
+ *
+ */
+
+#define ICOM_INTERFACE IDVSplitter
+#define IDVSplitter_METHODS \
+    ICOM_METHOD1(HRESULT,DiscardAlternateVideoFrames,int,a1)
+
+#define IDVSplitter_IMETHODS \
+    IUnknown_IMETHODS \
+    IDVSplitter_METHODS
+
+ICOM_DEFINE(IDVSplitter,IUnknown)
+#undef ICOM_INTERFACE
+
+    /*** IUnknown methods ***/
+#define IDVSplitter_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
+#define IDVSplitter_AddRef(p) ICOM_CALL (AddRef,p)
+#define IDVSplitter_Release(p) ICOM_CALL (Release,p)
+    /*** IDVSplitter methods ***/
+#define IDVSplitter_DiscardAlternateVideoFrames(p,a1) ICOM_CALL1(DiscardAlternateVideoFrames,p,a1)
 
 /**************************************************************************
@@ -684 +889 @@
 #define IFileSourceFilter_Load(p,a1,a2) ICOM_CALL2(Load,p,a1,a2)
 #define IFileSourceFilter_GetCurFile(p,a1,a2) ICOM_CALL2(GetCurFile,p,a1,a2)
+
+/**************************************************************************
+ *
+ * IFilterChain interface
+ *
+ */
+
+#define ICOM_INTERFACE IFilterChain
+#define IFilterChain_METHODS \
+    ICOM_METHOD2(HRESULT,StartChain,IBaseFilter*,a1,IBaseFilter*,a2) \
+    ICOM_METHOD2(HRESULT,PauseChain,IBaseFilter*,a1,IBaseFilter*,a2) \
+    ICOM_METHOD2(HRESULT,StopChain,IBaseFilter*,a1,IBaseFilter*,a2) \
+    ICOM_METHOD2(HRESULT,RemoveChain,IBaseFilter*,a1,IBaseFilter*,a2)
+
+#define IFilterChain_IMETHODS \
+    IUnknown_IMETHODS \
+    IFilterChain_METHODS
+
+ICOM_DEFINE(IFilterChain,IUnknown)
+#undef ICOM_INTERFACE
+
+    /*** IUnknown methods ***/
+#define IFilterChain_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
+#define IFilterChain_AddRef(p) ICOM_CALL (AddRef,p)
+#define IFilterChain_Release(p) ICOM_CALL (Release,p)
+    /*** IFilterChain methods ***/
+#define IFilterChain_StartChain(p,a1,a2) ICOM_CALL2(StartChain,p,a1,a2)
+#define IFilterChain_PauseChain(p,a1,a2) ICOM_CALL2(PauseChain,p,a1,a2)
+#define IFilterChain_StopChain(p,a1,a2) ICOM_CALL2(StopChain,p,a1,a2)
+#define IFilterChain_RemoveChain(p,a1,a2) ICOM_CALL2(RemoveChain,p,a1,a2)
 
 /**************************************************************************
@@ -912 +1147 @@
 /**************************************************************************
  *
+ * IGraphConfig interface
+ *
+ */
+
+#define ICOM_INTERFACE IGraphConfig
+#define IGraphConfig_METHODS \
+    ICOM_METHOD6(HRESULT,Reconnect,IPin*,a1,IPin*,a2,const AM_MEDIA_TYPE*,a3,IBaseFilter*,a4,HANDLE,a5,DWORD,a6) \
+    ICOM_METHOD4(HRESULT,Reconfigure,IGraphConfigCallback*,a1,PVOID,a2,DWORD,a3,HANDLE,a4) \
+    ICOM_METHOD1(HRESULT,AddFilterToCache,IBaseFilter*,a1) \
+    ICOM_METHOD1(HRESULT,EnumCacheFilter,IEnumFilters**,a1) \
+    ICOM_METHOD1(HRESULT,RemoveFilterFromCache,IBaseFilter*,a1) \
+    ICOM_METHOD1(HRESULT,GetStartTime,REFERENCE_TIME*,a1) \
+    ICOM_METHOD3(HRESULT,PushThroughData,IPin*,a1,IPinConnection*,a2,HANDLE,a3) \
+    ICOM_METHOD2(HRESULT,SetFilterFlags,IBaseFilter*,a1,DWORD,a2) \
+    ICOM_METHOD2(HRESULT,GetFilterFlags,IBaseFilter*,a1,DWORD*,a2) \
+    ICOM_METHOD2(HRESULT,RemoveFilterEx,IBaseFilter*,a1,DWORD,a2)
+
+#define IGraphConfig_IMETHODS \
+    IUnknown_IMETHODS \
+    IGraphConfig_METHODS
+
+ICOM_DEFINE(IGraphConfig,IUnknown)
+#undef ICOM_INTERFACE
+
+    /*** IUnknown methods ***/
+#define IGraphConfig_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
+#define IGraphConfig_AddRef(p) ICOM_CALL (AddRef,p)
+#define IGraphConfig_Release(p) ICOM_CALL (Release,p)
+    /*** IGraphConfig methods ***/
+#define IGraphConfig_Reconnect(p,a1,a2,a3,a4,a5,a6) ICOM_CALL6(Reconnect,p,a1,a2,a3,a4,a5,a6)
+#define IGraphConfig_Reconfigure(p,a1,a2,a3,a4) ICOM_CALL4(Reconfigure,p,a1,a2,a3,a4)
+#define IGraphConfig_AddFilterToCache(p,a1) ICOM_CALL1(AddFilterToCache,p,a1)
+#define IGraphConfig_EnumCacheFilter(p,a1) ICOM_CALL1(EnumCacheFilter,p,a1)
+#define IGraphConfig_RemoveFilterFromCache(p,a1) ICOM_CALL1(RemoveFilterFromCache,p,a1)
+#define IGraphConfig_GetStartTime(p,a1) ICOM_CALL1(GetStartTime,p,a1)
+#define IGraphConfig_PushThroughData(p,a1,a2,a3) ICOM_CALL3(PushThroughData,p,a1,a2,a3)
+#define IGraphConfig_SetFilterFlags(p,a1,a2) ICOM_CALL2(SetFilterFlags,p,a1,a2)
+#define IGraphConfig_GetFilterFlags(p,a1,a2) ICOM_CALL2(GetFilterFlags,p,a1,a2)
+#define IGraphConfig_RemoveFilterEx(p,a1,a2) ICOM_CALL2(RemoveFilterEx,p,a1,a2)
+
+/**************************************************************************
+ *
+ * IGraphConfigCallback interface
+ *
+ */
+
+#define ICOM_INTERFACE IGraphConfigCallback
+#define IGraphConfigCallback_METHODS \
+    ICOM_METHOD2(HRESULT,Reconfigure,PVOID,a1,DWORD,a2)
+
+#define IGraphConfigCallback_IMETHODS \
+    IUnknown_IMETHODS \
+    IGraphConfigCallback_METHODS
+
+ICOM_DEFINE(IGraphConfigCallback,IUnknown)
+#undef ICOM_INTERFACE
+
+    /*** IUnknown methods ***/
+#define IGraphConfigCallback_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
+#define IGraphConfigCallback_AddRef(p) ICOM_CALL (AddRef,p)
+#define IGraphConfigCallback_Release(p) ICOM_CALL (Release,p)
+    /*** IGraphConfigCallback methods ***/
+#define IGraphConfigCallback_Reconfigure(p,a1,a2) ICOM_CALL2(Reconfigure,p,a1,a2)
+
+/**************************************************************************
+ *
  * IGraphVersion interface
  *
@@ -934 +1235 @@
 #define IGraphVersion_QueryVersion(p,a1) ICOM_CALL1(QueryVersion,p,a1)
 
+
 /**************************************************************************
  *
@@ -957 +1259 @@
     /*** IMediaEventSink methods ***/
 #define IMediaEventSink_Notify(p,a1,a2,a3) ICOM_CALL3(Notify,p,a1,a2,a3)
+
+/**************************************************************************
+ *
+ * IMediaPropertyBag interface
+ *
+ */
+
+#define ICOM_INTERFACE IMediaPropertyBag
+#define IMediaPropertyBag_METHODS \
+    ICOM_METHOD3(HRESULT,EnumProperty,ULONG,a1,VARIANT*,a2,VARIANT*,a3)
+
+#define IMediaPropertyBag_IMETHODS \
+    IPropertyBag_IMETHODS \
+    IMediaPropertyBag_METHODS
+
+ICOM_DEFINE(IMediaPropertyBag,IPropertyBag)
+#undef ICOM_INTERFACE
+
+    /*** IUnknown methods ***/
+#define IMediaPropertyBag_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
+#define IMediaPropertyBag_AddRef(p) ICOM_CALL (AddRef,p)
+#define IMediaPropertyBag_Release(p) ICOM_CALL (Release,p)
+    /*** IPropertyBag methods ***/
+#define IMediaPropertyBag_Read(p,a1,a2,a3) ICOM_CALL3(Read,p,a1,a2,a3)
+#define IMediaPropertyBag_Write(p,a1,a2) ICOM_CALL2(Write,p,a1,a2)
+    /*** IMediaPropertyBag methods ***/
+#define IMediaPropertyBag_EnumProperty(p,a1,a2,a3) ICOM_CALL3(EnumProperty,p,a1,a2,a3)
 
 /**************************************************************************
@@ -1003 +1332 @@
 #define IMediaSample_IsPreroll(p) ICOM_CALL (IsPreroll,p)
 #define IMediaSample_SetPreroll(p,a1) ICOM_CALL1(SetPreroll,p,a1)
-#define IMediaSample_GetActualDataLength(p,a1) ICOM_CALL1(GetActualDataLength,p,a1)
+#define IMediaSample_GetActualDataLength(p) ICOM_CALL (GetActualDataLength,p)
 #define IMediaSample_SetActualDataLength(p,a1) ICOM_CALL1(SetActualDataLength,p,a1)
 #define IMediaSample_GetMediaType(p,a1) ICOM_CALL1(GetMediaType,p,a1)
@@ -1238 +1567 @@
 /**************************************************************************
  *
+ * IOverlay interface
+ *
+ */
+
+#define ICOM_INTERFACE IOverlay
+#define IOverlay_METHODS \
+    ICOM_METHOD2(HRESULT,GetPalette,DWORD*,a1,PALETTEENTRY**,a2) \
+    ICOM_METHOD2(HRESULT,SetPalette,DWORD,a1,PALETTEENTRY*,a2) \
+    ICOM_METHOD1(HRESULT,GetDefaultColorKey,COLORKEY*,a1) \
+    ICOM_METHOD1(HRESULT,GetColorKey,COLORKEY*,a1) \
+    ICOM_METHOD1(HRESULT,SetColorKey,COLORKEY*,a1) \
+    ICOM_METHOD1(HRESULT,GetWindowHandle,HWND*,a1) \
+    ICOM_METHOD3(HRESULT,GetClipList,RECT*,a1,RECT*,a2,RGNDATA**,a3) \
+    ICOM_METHOD2(HRESULT,GetVideoPosition,RECT*,a1,RECT*,a2) \
+    ICOM_METHOD2(HRESULT,Advise,IOverlayNotify*,a1,DWORD,a2) \
+    ICOM_METHOD (HRESULT,Unadvise)
+
+#define IOverlay_IMETHODS \
+    IUnknown_IMETHODS \
+    IOverlay_METHODS
+
+ICOM_DEFINE(IOverlay,IUnknown)
+#undef ICOM_INTERFACE
+
+    /*** IUnknown methods ***/
+#define IOverlay_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
+#define IOverlay_AddRef(p) ICOM_CALL (AddRef,p)
+#define IOverlay_Release(p) ICOM_CALL (Release,p)
+    /*** IOverlay methods ***/
+#define IOverlay_GetPalette(p,a1,a2) ICOM_CALL2(GetPalette,p,a1,a2)
+#define IOverlay_SetPalette(p,a1,a2) ICOM_CALL2(SetPalette,p,a1,a2)
+#define IOverlay_GetDefaultColorKey(p,a1) ICOM_CALL1(GetDefaultColorKey,p,a1)
+#define IOverlay_GetColorKey(p,a1) ICOM_CALL1(GetColorKey,p,a1)
+#define IOverlay_SetColorKey(p,a1) ICOM_CALL1(SetColorKey,p,a1)
+#define IOverlay_GetWindowHandle(p,a1) ICOM_CALL1(GetWindowHandle,p,a1)
+#define IOverlay_GetClipList(p,a1,a2,a3) ICOM_CALL3(GetClipList,p,a1,a2,a3)
+#define IOverlay_GetVideoPosition(p,a1,a2) ICOM_CALL2(GetVideoPosition,p,a1,a2)
+#define IOverlay_Advise(p,a1,a2) ICOM_CALL2(Advise,p,a1,a2)
+#define IOverlay_Unadvise(p) ICOM_CALL1(Unadvise,p)
+
+/**************************************************************************
+ *
  * IPin interface
  *

trunk/include/win/uuids.h ¶

@@ -1 +1 @@
 #ifndef __WINE_DSHOW_UUIDS_H
 #define __WINE_DSHOW_UUIDS_H
+
+#include "wine/obj_base.h"
 
 /* FIXME - many GUIDs should be defined in this header. */

trunk/include/win/wine/obj_property.h ¶

@@ -1 @@
-/* $Id: obj_property.h,v 1.5 1999-08-22 22:52:09 sandervl Exp $ */
 /*
  * Defines the COM interfaces and APIs from ocidl.h related to property
@@ -8 +7 @@
 #ifndef __WINE_WINE_OBJ_PROPERTY_H
 #define __WINE_WINE_OBJ_PROPERTY_H
-
-
-#include "winbase.h"
-#include "wine/obj_oleaut.h" /* for DISPID */
 
 #ifdef __cplusplus
@@ -56 +51 @@
 
 
+typedef enum tagPROPBAG2_TYPE
+{
+        PROPBAG2_TYPE_UNDEFINED = 0,
+        PROPBAG2_TYPE_DATA = 1,
+        PROPBAG2_TYPE_URL = 2,
+        PROPBAG2_TYPE_OBJECT = 3,
+        PROPBAG2_TYPE_STREAM = 4,
+        PROPBAG2_TYPE_STORAGE = 5,
+        PROPBAG2_TYPE_MONIKER = 6
+} PROPBAG2_TYPE;
+
+typedef struct tagPROPBAG2
+{
+        DWORD dwType;
+        VARTYPE vt;
+        CLIPFORMAT cfType;
+        DWORD dwHint; 
+        LPOLESTR pstrName; 
+        CLSID clsid; 
+} PROPBAG2;
+
 /*****************************************************************************
  * Predeclare the interfaces
@@ -83 +99 @@
 typedef struct IPersistPropertyBag IPersistPropertyBag,*LPPERSISTPROPERTYBAG;
  
+DEFINE_GUID(IID_IPersistPropertyBag2, 0x22f55881, 0x280b, 0x11d0, 0xa8, 0xa9, 0x00, 0xa0, 0xc9, 0x0c, 0x20, 0x04);
+typedef struct IPersistPropertyBag2 IPersistPropertyBag2,*LPPERSISTPROPERTYBAG2;
+
 DEFINE_GUID(IID_IErrorLog, 0x3127ca40L, 0x446e, 0x11ce, 0x81, 0x35, 0x00, 0xaa, 0x00, 0x4b, 0xb8, 0x51);
 typedef struct IErrorLog IErrorLog,*LPERRORLOG;
@@ -89 +108 @@
 typedef struct IPropertyBag IPropertyBag,*LPPROPERTYBAG;
  
+DEFINE_GUID(IID_IPropertyBag2, 0x22f55882, 0x280b, 0x11d0, 0xa8, 0xa9, 0x00, 0xa0, 0xc9, 0x0c, 0x20, 0x04);
+typedef struct IPropertyBag2 IPropertyBag2,*LPPROPERTYBAG2;
+
 DEFINE_GUID(IID_ISpecifyPropertyPages, 0xb196b28b, 0xbab4, 0x101a, 0xb6, 0x9c, 0x00, 0xaa, 0x00, 0x34, 0x1d, 0x07);
 typedef struct ISpecifyPropertyPages ISpecifyPropertyPages,*LPSPECIFYPROPERTYPAGES;
@@ -118 +140 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IPropertyPage_QueryInterface(p,a,b)     ICOM_CALL2(QueryInterface,p,a,b)
@@ -135 +156 @@
 #define IPropertyPage_Help(p,a)                 ICOM_CALL1(Help,p,a)
 #define IPropertyPage_TranslateAccelerator(p,a) ICOM_CALL1(TranslateAccelerator,p,a)
-#endif
                                  
 
@@ -150 +170 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IPropertyPage2_QueryInterface(p,a,b)     ICOM_CALL2(QueryInterface,p,a,b)
@@ -169 +188 @@
 /*** IPropertyPage2 methods ***/
 #define IPropertyPage2_EditProperty(p,a)         ICOM_CALL1(EditProperty,p,a)
-#endif
                                  
 
@@ -187 +205 @@
 #undef ICOM_INTERFACE 
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IPropertyPageSite_QueryInterface(p,a,b)     ICOM_CALL2(QueryInterface,p,a,b)
@@ -197 +214 @@
 #define IPropertyPageSite_GetPageContainer(p,a)     ICOM_CALL1(GetPageContainer,p,a)
 #define IPropertyPageSite_TranslateAccelerator(p,a) ICOM_CALL1(TranslateAccelerator,p,a)
-#endif
                                                  
 
@@ -213 +229 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IPropertyNotifySink_QueryInterface(p,a,b)     ICOM_CALL2(QueryInterface,p,a,b)
@@ -221 +236 @@
 #define IPropertyNotifySink_OnChanged(p,a)            ICOM_CALL1(OnChanged,p,a)
 #define IPropertyNotifySink_OnRequestEdit(p,a)        ICOM_CALL1(OnRequestEdit,p,a)
-#endif
 
                                  
@@ -237 +251 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define ISimpleFrameSite_QueryInterface(p,a,b)     ICOM_CALL2(QueryInterface,p,a,b)
@@ -245 +258 @@
 #define ISimpleFrameSite_PreMessageFilter(p,a,b,c,d,e,f) ICOM_CALL1(PreMessageFilter,p,a,b,c,d,e,f)
 #define ISimpleFrameSite_PostMessageFilter(p,a,b,c,d,e,f) ICOM_CALL1(PostMessageFilter,p,a,b,c,d,e,f)
-#endif
 
 
@@ -264 +276 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IPersistStreamInit_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -277 +288 @@
 #define IPersistStreamInit_GetSizeMax(p,a) ICOM_CALL1(GetSizeMax,p,a)
 #define IPersistStreamInit_InitNew(p)      ICOM_CALL (InitNew,p)
-#endif
 
                                  
@@ -296 +306 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IPersistMemory_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -309 +318 @@
 #define IPersistMemory_GetSizeMax(p,a)       ICOM_CALL1(GetSizeMax,p,a)
 #define IPersistMemory_InitNew(p)            ICOM_CALL (InitNew,p)
-#endif
 
 
@@ -326 +334 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IPersistPropertyBag_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -337 +344 @@
 #define IPersistPropertyBag_Load(p,a,b)           ICOM_CALL2(Load,p,a,b)
 #define IPersistPropertyBag_Save(p,a,b,c)         ICOM_CALL3(Save,p,a,b,c)
-#endif
+
+
+/*****************************************************************************
+ * IPersistPropertyBag2 interface
+ */
+#define ICOM_INTERFACE IPersistPropertyBag2
+#define IPersistPropertyBag2_METHODS \
+        ICOM_METHOD (HRESULT,InitNew) \
+        ICOM_METHOD2(HRESULT,Load, IPropertyBag2*,pPropBag, IErrorLog*,pErrorLog) \
+        ICOM_METHOD3(HRESULT,Save, IPropertyBag2*,pPropBag, BOOL,fClearDirty, BOOL,fSaveAllProperties) \
+    ICOM_METHOD (HRESULT,IsDirty)
+#define IPersistPropertyBag2_IMETHODS \
+        IPersist_IMETHODS \
+        IPersistPropertyBag2_METHODS
+ICOM_DEFINE(IPersistPropertyBag2,IPersist)
+#undef ICOM_INTERFACE
+
+/*** IUnknown methods ***/
+#define IPersistPropertyBag2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
+#define IPersistPropertyBag2_AddRef(p)             ICOM_CALL (AddRef,p)
+#define IPersistPropertyBag2_Release(p)            ICOM_CALL (Release,p)
+/*** IPersist methods ***/
+#define IPersistPropertyBag2_GetClassID(p,a)       ICOM_CALL1(GetClassID,p,a)
+/*** IPersistPropertyBag methods ***/
+#define IPersistPropertyBag2_InitNew(p)            ICOM_CALL (InitNew,p)
+#define IPersistPropertyBag2_Load(p,a,b)           ICOM_CALL2(Load,p,a,b)
+#define IPersistPropertyBag2_Save(p,a,b,c)         ICOM_CALL3(Save,p,a,b,c)
+#define IPersistPropertyBag2_IsDirty(p)            ICON_CALL (IsDirty,p)
 
 
@@ -352 +386 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IErrorLog_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -359 +392 @@
 /*** IErrorLog methods ***/
 #define IErrorLog_AddError(p,a,b)       ICOM_CALL2(GetClassID,p,a,b)
-#endif
                                  
 
@@ -375 +407 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IPropertyBag_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -383 +414 @@
 #define IPropertyBag_Read(p,a,b,c)         ICOM_CALL3(Read,p,a,b,c)
 #define IPropertyBag_Write(p,a,b)          ICOM_CALL2(Write,p,a,b)
-#endif
+
+
+/*****************************************************************************
+ * IPropertyBag2 interface
+ */
+#define ICOM_INTERFACE IPropertyBag2
+#define IPropertyBag2_METHODS \
+        ICOM_METHOD5(HRESULT,Read, ULONG,cProperties, PROPBAG2*,pPropBag, IErrorLog*,pErrLog, VARIANT*,pvarValue, HRESULT*,phrError) \
+        ICOM_METHOD3(HRESULT,Write, ULONG,cProperties, PROPBAG2*,pPropBag, VARIANT*,pvarValue) \
+    ICOM_METHOD1(HRESULT,CountProperties, ULONG*,pcProperties) \
+    ICOM_METHOD4(HRESULT,GetPropertyInfo, ULONG,iProperty, ULONG,cProperties, PROPBAG2*,pPropBag, ULONG*,pcProperties) \
+    ICOM_METHOD4(HRESULT,LoadObject, LPCOLESTR,pstrName, DWORD,dwHint, IUnknown*,pUnkObject, IErrorLog*,pErrLog)
+#define IPropertyBag2_IMETHODS \
+        IUnknown_IMETHODS \
+        IPropertyBag2_METHODS
+ICOM_DEFINE(IPropertyBag2,IUnknown)
+#undef ICOM_INTERFACE
+
+/*** IUnknown methods ***/
+#define IPropertyBag2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
+#define IPropertyBag2_AddRef(p)             ICOM_CALL (AddRef,p)
+#define IPropertyBag2_Release(p)            ICOM_CALL (Release,p)
+/*** IPropertyBag methods ***/
+#define IPropertyBag2_Read(p,a,b,c,d,e)     ICOM_CALL5(Read,p,a,b,c,d,e)
+#define IPropertyBag2_Write(p,a,b,c)        ICOM_CALL3(Write,p,a,b,c)
+#define IPropertyBag2_CountProperties(p,a)  ICOM_CALL1(CountProperties,p,a)
+#define IPropertyBag2_GetPropertyInfo(p,a,b,c,d) ICOM_CALL4(GetPropertyInfo,p,a,b,c,d)
+#define IPropertyBag2_LoadObject(p,a,b,c,d) ICOM_CALL4(LoadObject,p,a,b,c,d)
 
 
@@ -398 +456 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define ISpecifyPropertyPages_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -405 +462 @@
 /*** ISpecifyPropertyPages methods ***/
 #define ISpecifyPropertyPages_GetPages(p,a)         ICOM_CALL3(GetPages,p,a)
-#endif
                                   
 
@@ -423 +479 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IPerPropertyBrowsing_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -433 +488 @@
 #define IPerPropertyBrowsing_GetPredefinedStrings(p,a,b,c) ICOM_CALL3(GetPredefinedStrings,p,a,b,c)
 #define IPerPropertyBrowsing_GetPredefinedValue(p,a,b,c)   ICOM_CALL3(GetPredefinedValue,p,a,b,c)
-#endif
 
 #ifdef __cplusplus

trunk/src/oleaut32/typelib.c ¶

@@ -123 +123 @@
         return S_OK;
 }
-#endif
- 
+#endif 
 /****************************************************************************
  *              QueryPathOfRegTypeLib   [OLEAUT32.164]
@@ -558 +557 @@
 }
 
-#ifdef __WIN32OS2__
+#ifndef __WIN32OS2__
 /****************************************************************************
  *      OaBuildVersion                          (TYPELIB.15)
@@ -596 +595 @@
 }
 #endif
+
 /* for better debugging info leave the static out for the time being */
 #define static
@@ -780 +780 @@
 //#define TYPELIBDEBUG
 #if defined(__WIN32OS2__) && defined(TYPELIBDEBUG)
+
 /*
  debug
@@ -1883 +1884 @@
           {
             *ppTypeLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength);
-            ITypeLib2_AddRef(*ppTypeLib);
           }
           else if ( dwSignature == SLTG_SIGNATURE)
           {
             *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength);
-            ITypeLib2_AddRef(*ppTypeLib);
           }
           UnmapViewOfFile(pBase);
@@ -1921 +1920 @@
               {
                   *ppTypeLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength);
-                  ITypeLib2_AddRef(*ppTypeLib);
               }
               else if ( dwSignature == SLTG_SIGNATURE)
               {
                   *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength);
-                  ITypeLib2_AddRef(*ppTypeLib);
               }
               else
@@ -2415 +2412 @@
 }
 
-static char *SLTG_DoImpls(SLTG_ImplInfo *info, ITypeInfoImpl *pTI,
+static char *SLTG_DoImpls(char *pBlk, ITypeInfoImpl *pTI,
                           BOOL OneOnly)
 {
+    SLTG_ImplInfo *info;
     TLBImplType **ppImplType = &pTI->impltypelist;
-
+    /* I don't really get this structure, usually it's 0x16 bytes
+       long, but iuser.tlb contains some that are 0x18 bytes long.
+       That's ok because we can use the next ptr to jump to the next
+       one. But how do we know the length of the last one?  The WORD
+       at offs 0x8 might be the clue.  For now I'm just assuming that
+       the last one is the regular 0x16 bytes. */
+
+    info = (SLTG_ImplInfo*)pBlk;
     while(1) {
         *ppImplType = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
@@ -2432 +2437 @@
         if(OneOnly)
             FIXME("Interface inheriting more than one interface\n");
-        info++;
-    }
-    info++;
+        info = (SLTG_ImplInfo*)(pBlk + info->next);
+    }
+    info++; /* see comment at top of function */
     return (char*)info;
 }
@@ -2456 +2461 @@
 
     if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) {
-        pNextItem = SLTG_DoImpls((SLTG_ImplInfo*)pFirstItem, pTI, FALSE);
+        pNextItem = SLTG_DoImpls(pFirstItem, pTI, FALSE);
     }
 
@@ -2483 +2488 @@
 
     if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) {
-        pNextItem = SLTG_DoImpls((SLTG_ImplInfo*)pFirstItem, pTI, TRUE);
+        pNextItem = SLTG_DoImpls(pFirstItem, pTI, TRUE);
     }
 
@@ -3847 +3852 @@
     TLBVarDesc * pVDesc; 
     HRESULT ret=S_OK;
-        UINT nNameLen = SysStringLen(*rgszNames);
-        
+
     TRACE("(%p) Name %s cNames %d\n", This, debugstr_w(*rgszNames),
             cNames);
     for(pFDesc=This->funclist; pFDesc; pFDesc=pFDesc->next) {
         int i, j;
-        if( !memcmp(*rgszNames, pFDesc->Name, nNameLen)) {
+        if(!lstrcmpiW(*rgszNames, pFDesc->Name)) {
             if(cNames) *pMemId=pFDesc->funcdesc.memid;
             for(i=1; i < cNames; i++){
-                                UINT nParamLen = SysStringLen(rgszNames[i]);
                 for(j=0; j<pFDesc->funcdesc.cParams; j++)
-                    if(memcmp(rgszNames[i],pFDesc->pParamDesc[j].Name, nParamLen))
+                    if(!lstrcmpiW(rgszNames[i],pFDesc->pParamDesc[j].Name))
                             break;
                 if( j<pFDesc->funcdesc.cParams)
@@ -3869 +3872 @@
     }   
     for(pVDesc=This->varlist; pVDesc; pVDesc=pVDesc->next) {
-        if( !memcmp(*rgszNames, pVDesc->Name, nNameLen)) {
+        if(!lstrcmpiW(*rgszNames, pVDesc->Name)) {
             if(cNames) *pMemId=pVDesc->vardesc.memid;
             return ret;
@@ -3984 +3987 @@
     for(pFDesc=This->funclist; pFDesc; pFDesc=pFDesc->next)
         if (pFDesc->funcdesc.memid == memid) {
-            if (pFDesc->funcdesc.invkind & (dwFlags & ~DISPATCH_METHOD))
+            if (pFDesc->funcdesc.invkind & dwFlags)
                 break;
         }
@@ -4000 +4003 @@
                 if (i<pDispParams->cArgs) {
                     TRACE("set %d to disparg type %d vs %d\n",i,
-                            V_VT(pDispParams->rgvarg+i),
+                            V_VT(&pDispParams->rgvarg[pDispParams->cArgs-i-1]),
                             pFDesc->funcdesc.lprgelemdescParam[i].tdesc.vt
                     );
-                    args[i+1] = V_UNION(pDispParams->rgvarg+i,lVal);
+                    args[i+1] = V_UNION(&pDispParams->rgvarg[pDispParams->cArgs-i-1],lVal);
                 } else {
                     TYPEDESC *tdesc = &(pFDesc->funcdesc.lprgelemdescParam[i].tdesc);
@@ -4084 +4087 @@
         }
     } else {
-        FIXME("variable based invoking not supported yet.\n");
         for(pVDesc=This->varlist; pVDesc; pVDesc=pVDesc->next) {
             if (pVDesc->vardesc.memid == memid) {
-                FIXME("varseek: Found memid name %s\n",debugstr_w(((LPWSTR)pVDesc->Name)));
+                FIXME("varseek: Found memid name %s, but variable-based invoking not supported\n",debugstr_w(((LPWSTR)pVDesc->Name)));
                 dump_TLBVarDesc(pVDesc);
                 break;
@@ -4093 +4095 @@
         }
     }
-    FIXME("Did not find member id %d!\n",(int)memid);
+    /* not found, look for it in inherited interfaces */
+    if (This->TypeAttr.typekind==TKIND_INTERFACE && This->TypeAttr.cImplTypes) {
+        /* recursive search */
+        ITypeInfo *pTInfo;
+        HRESULT hr;
+        hr=ITypeInfo_GetRefTypeInfo(iface, This->impltypelist->hRef, &pTInfo);
+        if(SUCCEEDED(hr)){
+            hr=ITypeInfo_Invoke(pTInfo,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr);
+            ITypeInfo_Release(pTInfo);
+            return hr;
+        }
+        WARN("Could not search inherited interface!\n");
+    }
+    ERR("did not find member id %d, flags %d!\n", (int)memid, dwFlags);
     return DISP_E_MEMBERNOTFOUND;
 }

trunk/src/oleaut32/variant.c ¶

@@ -1577 +1577 @@
         break;
 
+        case( VT_UNKNOWN ):
+            if (vtFrom == VT_DISPATCH)
+            {
+                res = IDispatch_QueryInterface(V_DISPATCH(ps), &IID_IUnknown, (LPVOID*)&V_UNKNOWN(pd));
+            }
+            else
+            {
+                res = DISP_E_TYPEMISMATCH;
+                FIXME("Coercion from %d to %d\n", vtFrom, vt );
+            }
+            break;
+
         default:
                 res = DISP_E_TYPEMISMATCH;

trunk/src/quartz/complist.c ¶

@@ -10 +10 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"

trunk/src/quartz/devenum.c ¶

@@ -2 +2 @@
  * Implementation of CLSID_SystemDeviceEnum.
  *
- * FIXME - stub.
+ * FIXME - not tested enough.
  *
  * hidenori@a2.ctktv.ne.jp
@@ -12 +12 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
-#include "wine/obj_oleaut.h"
+#include "objidl.h"
+#include "oleidl.h"
+#include "ocidl.h"
 #include "strmif.h"
 #include "control.h"
 #include "uuids.h"
+#include "wine/unicode.h"
 
 #include "debugtools.h"
@@ -24 +29 @@
 #include "quartz_private.h"
 #include "devenum.h"
+#include "regsvr.h"
+#include "enumunk.h"
+#include "complist.h"
+#include "devmon.h"
+
+
+/***************************************************************************
+ *
+ *      new/delete for CLSID_SystemDeviceEnum
+ *
+ */
 
 /* can I use offsetof safely? - FIXME? */
@@ -68 +84 @@
 }
 
+
+/***************************************************************************
+ *
+ *      CSysDevEnum::ICreateDevEnum
+ *
+ */
+
+
+static HRESULT WINAPI
+ICreateDevEnum_fnQueryInterface(ICreateDevEnum* iface,REFIID riid,void** ppobj)
+{
+        CSysDevEnum_THIS(iface,createdevenum);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_QueryInterface(This->unk.punkControl,riid,ppobj);
+}
+
+static ULONG WINAPI
+ICreateDevEnum_fnAddRef(ICreateDevEnum* iface)
+{
+        CSysDevEnum_THIS(iface,createdevenum);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_AddRef(This->unk.punkControl);
+}
+
+static ULONG WINAPI
+ICreateDevEnum_fnRelease(ICreateDevEnum* iface)
+{
+        CSysDevEnum_THIS(iface,createdevenum);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_Release(This->unk.punkControl);
+}
+
+static HRESULT WINAPI
+ICreateDevEnum_fnCreateClassEnumerator(ICreateDevEnum* iface,REFCLSID rclsidDeviceClass,IEnumMoniker** ppobj, DWORD dwFlags)
+{
+        CSysDevEnum_THIS(iface,createdevenum);
+        HRESULT hr;
+        HKEY    hKey;
+        QUARTZ_CompList*        pMonList;
+        IMoniker*       pMon;
+        DWORD   dwIndex;
+        LONG    lr;
+        WCHAR   wszPath[ 1024 ];
+        DWORD   dwLen;
+        DWORD   dwNameMax;
+        DWORD   cbName;
+        FILETIME        ftLastWrite;
+
+        TRACE("(%p)->(%s,%p,%08lx)\n",This,
+                debugstr_guid(rclsidDeviceClass),ppobj,dwFlags);
+        if ( dwFlags != 0 )
+        {
+                FIXME("unknown flags %08lx\n",dwFlags);
+                return E_NOTIMPL;
+        }
+
+        if ( ppobj == NULL )
+                return E_POINTER;
+        *ppobj = NULL;
+
+        hr = QUARTZ_CreateCLSIDPath(
+                wszPath, sizeof(wszPath)/sizeof(wszPath[0]),
+                rclsidDeviceClass, QUARTZ_wszInstance );
+        if ( FAILED(hr) )
+                return hr;
+
+        if ( RegOpenKeyExW( HKEY_CLASSES_ROOT, wszPath,
+                0, KEY_READ, &hKey ) != ERROR_SUCCESS )
+                return E_FAIL;
+
+        dwLen = strlenW(wszPath);
+        wszPath[dwLen++] = '\\'; wszPath[dwLen] = 0;
+        dwNameMax = sizeof(wszPath)/sizeof(wszPath[0]) - dwLen - 8;
+
+        pMonList = QUARTZ_CompList_Alloc();
+        if ( pMonList == NULL )
+        {
+                hr = E_OUTOFMEMORY;
+                goto err;
+        }
+
+        /* enumerate all subkeys. */
+        dwIndex = 0;
+        while ( 1 )
+        {
+                cbName = dwNameMax;
+                lr = RegEnumKeyExW(
+                        hKey, dwIndex, &wszPath[dwLen], &cbName,
+                        NULL, NULL, NULL, &ftLastWrite );
+                if ( lr == ERROR_NO_MORE_ITEMS )
+                        break;
+                if ( lr != ERROR_SUCCESS )
+                {
+                        hr = E_FAIL;
+                        goto err;
+                }
+
+                hr = QUARTZ_CreateDeviceMoniker(
+                        HKEY_CLASSES_ROOT, wszPath, &pMon );
+                if ( FAILED(hr) )
+                        goto err;
+
+                hr = QUARTZ_CompList_AddComp(
+                        pMonList, (IUnknown*)pMon, NULL, 0 );
+                IMoniker_Release( pMon );
+
+                if ( FAILED(hr) )
+                        goto err;
+
+                dwIndex ++;
+        }
+
+        /* create an enumerator. */
+        hr = QUARTZ_CreateEnumUnknown(
+                &IID_IEnumMoniker, (void**)ppobj, pMonList );
+        if ( FAILED(hr) )
+                goto err;
+
+        hr = S_OK;
+err:
+        if ( pMonList != NULL )
+                QUARTZ_CompList_Free( pMonList );
+        RegCloseKey( hKey );
+
+        return hr;
+}
+
+static ICOM_VTABLE(ICreateDevEnum) icreatedevenum =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        /* IUnknown fields */
+        ICreateDevEnum_fnQueryInterface,
+        ICreateDevEnum_fnAddRef,
+        ICreateDevEnum_fnRelease,
+        /* ICreateDevEnum fields */
+        ICreateDevEnum_fnCreateClassEnumerator,
+};
+
+HRESULT CSysDevEnum_InitICreateDevEnum( CSysDevEnum* psde )
+{
+        TRACE("(%p)\n",psde);
+        ICOM_VTBL(&psde->createdevenum) = &icreatedevenum;
+
+        return NOERROR;
+}
+
+void CSysDevEnum_UninitICreateDevEnum( CSysDevEnum* psde )
+{
+        TRACE("(%p)\n",psde);
+}

trunk/src/quartz/devmon.c ¶

@@ -1 +1 @@
 /*
  * Implements IMoniker for CLSID_CDeviceMoniker.
+ * Implements IPropertyBag. (internal)
  *
  * hidenori@a2.ctktv.ne.jp
@@ -27 +28 @@
 #include "quartz_private.h"
 #include "devmon.h"
-#include "monprop.h"
 #include "regsvr.h"
 
+
+/***************************************************************************
+ *
+ *      CDeviceMoniker::IMoniker
+ *
+ */
 
 static HRESULT WINAPI
@@ -150 +156 @@
                 return hr;
 
-        return CoCreateInstance(
+        hr = CoCreateInstance(
                 &clsid, NULL, CLSCTX_INPROC_SERVER, riid, ppvResult );
+        TRACE( "hr = %08lx\n", hr );
+
+        return hr;
 }
 
@@ -374 +383 @@
 }
 
+/***************************************************************************
+ *
+ *      new/delete for CDeviceMoniker
+ *
+ */
 
 static void QUARTZ_DestroyDeviceMoniker(IUnknown* punk)
@@ -383 +397 @@
 
 /* can I use offsetof safely? - FIXME? */
-static QUARTZ_IFEntry IFEntries[] =
+static QUARTZ_IFEntry CDeviceMoniker_IFEntries[] =
 {
   { &IID_IPersist, offsetof(CDeviceMoniker,moniker)-offsetof(CDeviceMoniker,unk) },
@@ -411 +425 @@
         }
 
-        pdm->unk.pEntries = IFEntries;
-        pdm->unk.dwEntries = sizeof(IFEntries)/sizeof(IFEntries[0]);
+        pdm->unk.pEntries = CDeviceMoniker_IFEntries;
+        pdm->unk.dwEntries = sizeof(CDeviceMoniker_IFEntries)/sizeof(CDeviceMoniker_IFEntries[0]);
         pdm->unk.pOnFinalRelease = &QUARTZ_DestroyDeviceMoniker;
 
@@ -421 +435 @@
 
 
+/***************************************************************************
+ *
+ *      CRegPropertyBag::IPropertyBag
+ *
+ */
+
+static HRESULT WINAPI
+IPropertyBag_fnQueryInterface(IPropertyBag* iface,REFIID riid,void** ppobj)
+{
+        CRegPropertyBag_THIS(iface,propbag);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_QueryInterface(This->unk.punkControl,riid,ppobj);
+}
+
+static ULONG WINAPI
+IPropertyBag_fnAddRef(IPropertyBag* iface)
+{
+        CRegPropertyBag_THIS(iface,propbag);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_AddRef(This->unk.punkControl);
+}
+
+static ULONG WINAPI
+IPropertyBag_fnRelease(IPropertyBag* iface)
+{
+        CRegPropertyBag_THIS(iface,propbag);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_Release(This->unk.punkControl);
+}
+
+static HRESULT WINAPI
+IPropertyBag_fnRead(IPropertyBag* iface,LPCOLESTR lpszPropName,VARIANT* pVar,IErrorLog* pLog)
+{
+        CRegPropertyBag_THIS(iface,propbag);
+        LONG    lr;
+        DWORD   dwSize;
+        DWORD   dwValueType;
+
+        TRACE("(%p)->(%s,%p,%p)\n",This,
+                debugstr_w(lpszPropName),pVar,pLog);
+
+        if ( lpszPropName == NULL || pVar == NULL )
+                return E_POINTER;
+
+        dwSize = 0;
+        lr = RegQueryValueExW(
+                This->m_hKey, lpszPropName, NULL,
+                &dwValueType, NULL, &dwSize );
+        if ( lr != ERROR_SUCCESS )
+        {
+                TRACE( "RegQueryValueExW failed.\n" );
+                return E_INVALIDARG;
+        }
+
+        switch ( dwValueType )
+        {
+        case REG_SZ:
+                TRACE( "REG_SZ / length = %lu\n", dwSize );
+                if ( pVar->n1.n2.vt == VT_EMPTY )
+                        pVar->n1.n2.vt = VT_BSTR;
+                if ( pVar->n1.n2.vt != VT_BSTR )
+                {
+                        TRACE( "type of VARIANT is not BSTR\n" );
+                        return E_FAIL;
+                }
+
+                pVar->n1.n2.n3.bstrVal = SysAllocStringByteLen(
+                        NULL, dwSize );
+                if ( pVar->n1.n2.n3.bstrVal == NULL )
+                {
+                        TRACE( "out of memory.\n" );
+                        return E_OUTOFMEMORY;
+                }
+                lr = RegQueryValueExW(
+                        This->m_hKey, lpszPropName, NULL,
+                        &dwValueType,
+                        (BYTE*)pVar->n1.n2.n3.bstrVal, &dwSize );
+                if ( lr != ERROR_SUCCESS )
+                {
+                        TRACE( "failed to query value\n" );
+                        SysFreeString(pVar->n1.n2.n3.bstrVal);
+                        return E_FAIL;
+                }
+                TRACE( "value is BSTR; %s\n", debugstr_w(pVar->n1.n2.n3.bstrVal) );
+                break;
+        default:
+                FIXME("(%p)->(%s,%p,%p) - unsupported value type.\n",This,
+                        debugstr_w(lpszPropName),pVar,pLog);
+                return E_FAIL;
+        }
+
+        TRACE( "returned successfully.\n" );
+        return NOERROR;
+}
+
+static HRESULT WINAPI
+IPropertyBag_fnWrite(IPropertyBag* iface,LPCOLESTR lpszPropName,VARIANT* pVar)
+{
+        CRegPropertyBag_THIS(iface,propbag);
+
+        FIXME("(%p)->(%s,%p) stub!\n",This,
+                debugstr_w(lpszPropName),pVar);
+
+        if ( lpszPropName == NULL || pVar == NULL )
+                return E_POINTER;
+
+        return E_NOTIMPL;
+}
+
+
+
+
+static ICOM_VTABLE(IPropertyBag) ipropbag =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        /* IUnknown fields */
+        IPropertyBag_fnQueryInterface,
+        IPropertyBag_fnAddRef,
+        IPropertyBag_fnRelease,
+        /* IPropertyBag fields */
+        IPropertyBag_fnRead,
+        IPropertyBag_fnWrite,
+};
+
+static HRESULT CRegPropertyBag_InitIPropertyBag(
+        CRegPropertyBag* prpb, HKEY hkRoot, LPCWSTR lpKeyPath )
+{
+        ICOM_VTBL(&prpb->propbag) = &ipropbag;
+
+        if ( RegOpenKeyExW(
+                hkRoot, lpKeyPath, 0,
+                KEY_ALL_ACCESS, &prpb->m_hKey ) != ERROR_SUCCESS )
+                return E_FAIL;
+
+        return NOERROR;
+}
+
+static void CRegPropertyBag_UninitIPropertyBag(
+        CRegPropertyBag* prpb )
+{
+        RegCloseKey( prpb->m_hKey );
+}
+
+
+/***************************************************************************
+ *
+ *      new/delete for CRegPropertyBag
+ *
+ */
+
+static void QUARTZ_DestroyRegPropertyBag(IUnknown* punk)
+{
+        CRegPropertyBag_THIS(punk,unk);
+
+        CRegPropertyBag_UninitIPropertyBag(This);
+}
+
+
+/* can I use offsetof safely? - FIXME? */
+static QUARTZ_IFEntry CRegPropertyBag_IFEntries[] =
+{
+  { &IID_IPropertyBag, offsetof(CRegPropertyBag,propbag)-offsetof(CRegPropertyBag,unk) },
+};
+
+HRESULT QUARTZ_CreateRegPropertyBag(
+        HKEY hkRoot, LPCWSTR lpKeyPath,
+        IPropertyBag** ppPropBag )
+{
+        CRegPropertyBag*        prpb;
+        HRESULT hr;
+
+        TRACE("(%08x,%s,%p)\n",hkRoot,debugstr_w(lpKeyPath),ppPropBag );
+
+        prpb = (CRegPropertyBag*)QUARTZ_AllocObj( sizeof(CRegPropertyBag) );
+        if ( prpb == NULL )
+                return E_OUTOFMEMORY;
+
+        QUARTZ_IUnkInit( &prpb->unk, NULL );
+        hr = CRegPropertyBag_InitIPropertyBag( prpb, hkRoot, lpKeyPath );
+        if ( FAILED(hr) )
+        {
+                QUARTZ_FreeObj( prpb );
+                return hr;
+        }
+
+        prpb->unk.pEntries = CRegPropertyBag_IFEntries;
+        prpb->unk.dwEntries = sizeof(CRegPropertyBag_IFEntries)/sizeof(CRegPropertyBag_IFEntries[0]);
+        prpb->unk.pOnFinalRelease = &QUARTZ_DestroyRegPropertyBag;
+
+        *ppPropBag = (IPropertyBag*)(&prpb->propbag);
+
+        return S_OK;
+}
+
+
+

trunk/src/quartz/devmon.h ¶

@@ -34 +34 @@
 
 
+/*
+                implements IPropertyBag for accessing registry.
+
+        - At least, the following interfaces should be implemented:
+
+        IUnknown
+                + IPropertyBag
+ */
+
+#include "iunk.h"
+
+typedef struct DMON_IPropertyBagImpl
+{
+        ICOM_VFIELD(IPropertyBag);
+} DMON_IPropertyBagImpl;
+
+typedef struct CRegPropertyBag
+{
+        QUARTZ_IUnkImpl unk;
+        DMON_IPropertyBagImpl   propbag;
+        /* IPropertyBag fields */
+        HKEY    m_hKey;
+} CRegPropertyBag;
+
+#define CRegPropertyBag_THIS(iface,member)      CRegPropertyBag*        This = (CRegPropertyBag*)(((char*)iface)-offsetof(CRegPropertyBag,member))
+
+HRESULT QUARTZ_CreateRegPropertyBag(
+        HKEY hkRoot, LPCWSTR lpKeyPath,
+        IPropertyBag** ppPropBag );
+
 #endif  /* WINE_DSHOW_DEVMON_H */

trunk/src/quartz/enumunk.c ¶

@@ -10 +10 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
@@ -177 +178 @@
                 (void**)ppunk,
                 This->pCompList );
+        FIXME( "current pointer must be seeked correctly\n" );
 
         QUARTZ_CompList_Unlock( This->pCompList );

trunk/src/quartz/fgidisp.c ¶

@@ -12 +12 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"

trunk/src/quartz/fgraph.c ¶

@@ -10 +10 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
@@ -23 +24 @@
 #include "fgraph.h"
 
+/***************************************************************************
+ *
+ *      new/delete for CFilterGraph
+ *
+ */
+
 /* can I use offsetof safely? - FIXME? */
 static QUARTZ_IFEntry IFEntries[] =
@@ -32 +39 @@
   { &IID_IFilterGraph2, offsetof(CFilterGraph,fgraph)-offsetof(CFilterGraph,unk) },
   { &IID_IGraphVersion, offsetof(CFilterGraph,graphversion)-offsetof(CFilterGraph,unk) },
+  { &IID_IGraphConfig, offsetof(CFilterGraph,grphconf)-offsetof(CFilterGraph,unk) },
   { &IID_IMediaControl, offsetof(CFilterGraph,mediacontrol)-offsetof(CFilterGraph,unk) },
   { &IID_IMediaFilter, offsetof(CFilterGraph,mediafilter)-offsetof(CFilterGraph,unk) },
@@ -60 +68 @@
         FGENT(IFilterGraph2)
         FGENT(IGraphVersion)
+        FGENT(IGraphConfig)
         FGENT(IMediaControl)
         FGENT(IMediaFilter)
@@ -80 +89 @@
         int     i;
 
+        TRACE( "(%p)\n", punk );
+
         /* At first, call Stop. */
         IMediaControl_Stop( CFilterGraph_IMediaControl(This) );
@@ -136 +147 @@
 
 
+/***************************************************************************
+ *
+ *      CFilterGraph::IPersist
+ *
+ */
+
+static HRESULT WINAPI
+IPersist_fnQueryInterface(IPersist* iface,REFIID riid,void** ppobj)
+{
+        CFilterGraph_THIS(iface,persist);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_QueryInterface(This->unk.punkControl,riid,ppobj);
+}
+
+static ULONG WINAPI
+IPersist_fnAddRef(IPersist* iface)
+{
+        CFilterGraph_THIS(iface,persist);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_AddRef(This->unk.punkControl);
+}
+
+static ULONG WINAPI
+IPersist_fnRelease(IPersist* iface)
+{
+        CFilterGraph_THIS(iface,persist);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_Release(This->unk.punkControl);
+}
+
+
+static HRESULT WINAPI
+IPersist_fnGetClassID(IPersist* iface,CLSID* pclsid)
+{
+        CFilterGraph_THIS(iface,persist);
+
+        TRACE("(%p)->()\n",This);
+
+        if ( pclsid == NULL )
+                return E_POINTER;
+        memcpy( pclsid, &CLSID_FilterGraph, sizeof(CLSID) );
+
+        return E_NOTIMPL;
+}
+
+
+static ICOM_VTABLE(IPersist) ipersist =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        /* IUnknown fields */
+        IPersist_fnQueryInterface,
+        IPersist_fnAddRef,
+        IPersist_fnRelease,
+        /* IPersist fields */
+        IPersist_fnGetClassID,
+};
+
+HRESULT CFilterGraph_InitIPersist( CFilterGraph* pfg )
+{
+        TRACE("(%p)\n",pfg);
+        ICOM_VTBL(&pfg->persist) = &ipersist;
+
+        return NOERROR;
+}
+
+void CFilterGraph_UninitIPersist( CFilterGraph* pfg )
+{
+        TRACE("(%p)\n",pfg);
+}

trunk/src/quartz/fgraph.h ¶

@@ -12 +12 @@
                 + IFilterGraph - IGraphBuilder - IFilterGraph2
                 + IGraphVersion
+                + IGraphConfig
                 + IDispatch - IMediaControl
                 + IPersist - IMediaFilter
@@ -50 +51 @@
         ICOM_VFIELD(IGraphVersion);
 } FG_IGraphVersionImpl;
+
+typedef struct FG_IGraphConfigImpl
+{
+        ICOM_VFIELD(IGraphConfig);
+} FG_IGraphConfigImpl;
 
 typedef struct FG_IMediaControlImpl
@@ -96 +102 @@
 } FG_IVideoWindowImpl;
 
+typedef struct FilterGraph_MEDIAEVENT   FilterGraph_MEDIAEVENT;
 
 typedef struct CFilterGraph
@@ -104 +111 @@
         FG_IFilterGraph2Impl    fgraph;
         FG_IGraphVersionImpl    graphversion;
+        FG_IGraphConfigImpl     grphconf;
         FG_IMediaControlImpl    mediacontrol;
         FG_IMediaFilterImpl     mediafilter;
@@ -124 +132 @@
         CRITICAL_SECTION        m_csGraphState;
         FILTER_STATE    m_stateGraph; /* must NOT accessed directly! */
+        CRITICAL_SECTION        m_csClock;
+        IReferenceClock*        m_pClock;
         /* IMediaEvent fields. */
         HANDLE  m_hMediaEvent;
+        CRITICAL_SECTION        m_csMediaEvents;
+        FilterGraph_MEDIAEVENT* m_pMediaEvents;
+        ULONG   m_cbMediaEventsPut;
+        ULONG   m_cbMediaEventsGet;
+        ULONG   m_cbMediaEventsMax;
+        HWND    m_hwndEventNotify;
+        long    m_lEventNotifyMsg;
+        LONG_PTR        m_lEventNotifyParam;
+        long    m_lEventNotifyFlags;
         /* IMediaEventSink fields. */
         /* IMediaPosition fields. */
@@ -138 +157 @@
 #define CFilterGraph_IDispatch(th)              ((IDispatch*)&((th)->disp))
 #define CFilterGraph_IFilterGraph2(th)          ((IFilterGraph2*)&((th)->fgraph))
+#define CFilterGraph_IMediaControl(th)          ((IMediaControl*)&((th)->mediacontrol))
 #define CFilterGraph_IMediaFilter(th)           ((IMediaFilter*)&((th)->mediafilter))
-#define CFilterGraph_IMediaControl(th)          ((IMediaControl*)&((th)->mediacontrol))
+#define CFilterGraph_IMediaEventEx(th)          ((IMediaEventEx*)&((th)->mediaevent))
+#define CFilterGraph_IMediaEventSink(th)                ((IMediaEventSink*)&((th)->mediaeventsink))
 
 HRESULT QUARTZ_CreateFilterGraph(IUnknown* punkOuter,void** ppobj);
@@ -151 +172 @@
 HRESULT CFilterGraph_InitIGraphVersion( CFilterGraph* pfg );
 void CFilterGraph_UninitIGraphVersion( CFilterGraph* pfg );
+HRESULT CFilterGraph_InitIGraphConfig( CFilterGraph* pfg );
+void CFilterGraph_UninitIGraphConfig( CFilterGraph* pfg );
 HRESULT CFilterGraph_InitIMediaControl( CFilterGraph* pfg );
 void CFilterGraph_UninitIMediaControl( CFilterGraph* pfg );

trunk/src/quartz/fmap.c ¶

@@ -12 +12 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
@@ -24 +26 @@
 #include "quartz_private.h"
 #include "fmap.h"
+#include "regsvr.h"
+
+
+/***************************************************************************
+ *
+ *      new/delete for CLSID_FilterMapper
+ *
+ */
 
 /* can I use offsetof safely? - FIXME? */
@@ -66 +76 @@
         return S_OK;
 }
+
+/***************************************************************************
+ *
+ *      CLSID_FilterMapper::IFilterMapper
+ *
+ */
+
+static HRESULT WINAPI
+IFilterMapper_fnQueryInterface(IFilterMapper* iface,REFIID riid,void** ppobj)
+{
+        CFilterMapper_THIS(iface,fmap);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_QueryInterface(This->unk.punkControl,riid,ppobj);
+}
+
+static ULONG WINAPI
+IFilterMapper_fnAddRef(IFilterMapper* iface)
+{
+        CFilterMapper_THIS(iface,fmap);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_AddRef(This->unk.punkControl);
+}
+
+static ULONG WINAPI
+IFilterMapper_fnRelease(IFilterMapper* iface)
+{
+        CFilterMapper_THIS(iface,fmap);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_Release(This->unk.punkControl);
+}
+
+
+static HRESULT WINAPI
+IFilterMapper_fnRegisterFilter(IFilterMapper* iface,CLSID clsid,LPCWSTR lpwszName,DWORD dwMerit)
+{
+        CFilterMapper_THIS(iface,fmap);
+
+        FIXME("(%p)->(%s,%s,%08lx)\n",This,
+                debugstr_guid(&clsid),debugstr_w(lpwszName),dwMerit);
+
+        /* FIXME */
+        /* FIXME - handle dwMerit! */
+        return QUARTZ_RegisterAMovieFilter(
+                &CLSID_LegacyAmFilterCategory,
+                &clsid,
+                NULL, 0,
+                lpwszName, NULL, TRUE );
+}
+
+static HRESULT WINAPI
+IFilterMapper_fnRegisterFilterInstance(IFilterMapper* iface,CLSID clsid,LPCWSTR lpwszName,CLSID* pclsidMedia)
+{
+        CFilterMapper_THIS(iface,fmap);
+        HRESULT hr;
+
+        FIXME("(%p)->()\n",This);
+
+        if ( pclsidMedia == NULL )
+                return E_POINTER;
+        hr = CoCreateGuid(pclsidMedia);
+        if ( FAILED(hr) )
+                return hr;
+
+        /* FIXME */
+        /* this doesn't work. */
+        /* return IFilterMapper_RegisterFilter(iface,
+                *pclsidMedia,lpwszName,0x60000000); */
+
+        return E_NOTIMPL;
+}
+
+static HRESULT WINAPI
+IFilterMapper_fnRegisterPin(IFilterMapper* iface,CLSID clsidFilter,LPCWSTR lpwszName,BOOL bRendered,BOOL bOutput,BOOL bZero,BOOL bMany,CLSID clsidReserved,LPCWSTR lpwszReserved)
+{
+        CFilterMapper_THIS(iface,fmap);
+
+        FIXME("(%p)->() stub!\n",This);
+
+        return E_NOTIMPL;
+}
+
+static HRESULT WINAPI
+IFilterMapper_fnRegisterPinType(IFilterMapper* iface,CLSID clsidFilter,LPCWSTR lpwszName,CLSID clsidMajorType,CLSID clsidSubType)
+{
+        CFilterMapper_THIS(iface,fmap);
+
+        FIXME("(%p)->() stub!\n",This);
+
+        return E_NOTIMPL;
+}
+
+static HRESULT WINAPI
+IFilterMapper_fnUnregisterFilter(IFilterMapper* iface,CLSID clsidFilter)
+{
+        CFilterMapper_THIS(iface,fmap);
+
+        FIXME("(%p)->(%s)\n",This,debugstr_guid(&clsidFilter));
+
+        /* FIXME */
+        return QUARTZ_RegisterAMovieFilter(
+                &CLSID_LegacyAmFilterCategory,
+                &clsidFilter,
+                NULL, 0, NULL, NULL, FALSE );
+}
+
+static HRESULT WINAPI
+IFilterMapper_fnUnregisterFilterInstance(IFilterMapper* iface,CLSID clsidMedia)
+{
+        CFilterMapper_THIS(iface,fmap);
+
+        FIXME("(%p)->(%s)\n",This,debugstr_guid(&clsidMedia));
+
+        /* FIXME */
+        /* this doesn't work. */
+        /* return IFilterMapper_UnregisterFilter(iface,clsidMedia); */
+
+        return E_NOTIMPL;
+}
+
+static HRESULT WINAPI
+IFilterMapper_fnUnregisterPin(IFilterMapper* iface,CLSID clsidPin,LPCWSTR lpwszName)
+{
+        CFilterMapper_THIS(iface,fmap);
+
+        FIXME("(%p)->(%s,%s) stub!\n",This,
+                debugstr_guid(&clsidPin),debugstr_w(lpwszName));
+
+        return E_NOTIMPL;
+}
+
+static HRESULT WINAPI
+IFilterMapper_fnEnumMatchingFilters(IFilterMapper* iface,IEnumRegFilters** ppobj,DWORD dwMerit,BOOL bInputNeeded,CLSID clsInMajorType,CLSID clsidSubType,BOOL bRender,BOOL bOutputNeeded,CLSID clsOutMajorType,CLSID clsOutSubType)
+{
+        CFilterMapper_THIS(iface,fmap);
+
+        FIXME("(%p)->() stub!\n",This);
+
+        return E_NOTIMPL;
+}
+
+
+
+static ICOM_VTABLE(IFilterMapper) ifmap =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        /* IUnknown fields */
+        IFilterMapper_fnQueryInterface,
+        IFilterMapper_fnAddRef,
+        IFilterMapper_fnRelease,
+        /* IFilterMapper fields */
+        IFilterMapper_fnRegisterFilter,
+        IFilterMapper_fnRegisterFilterInstance,
+        IFilterMapper_fnRegisterPin,
+        IFilterMapper_fnRegisterPinType,
+        IFilterMapper_fnUnregisterFilter,
+        IFilterMapper_fnUnregisterFilterInstance,
+        IFilterMapper_fnUnregisterPin,
+        IFilterMapper_fnEnumMatchingFilters,
+};
+
+
+HRESULT CFilterMapper_InitIFilterMapper( CFilterMapper* pfm )
+{
+        TRACE("(%p)\n",pfm);
+        ICOM_VTBL(&pfm->fmap) = &ifmap;
+
+        return NOERROR;
+}
+
+void CFilterMapper_UninitIFilterMapper( CFilterMapper* pfm )
+{
+        TRACE("(%p)\n",pfm);
+}

trunk/src/quartz/fmap2.c ¶

@@ -12 +12 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
@@ -24 +26 @@
 #include "quartz_private.h"
 #include "fmap2.h"
+#include "regsvr.h"
+
+
+/***************************************************************************
+ *
+ *      new/delete for CLSID_FilterMapper2
+ *
+ */
 
 /* can I use offsetof safely? - FIXME? */
@@ -67 +77 @@
         return S_OK;
 }
+
+/***************************************************************************
+ *
+ *      CLSID_FilterMapper2::IFilterMapper3
+ *
+ */
+
+
+static HRESULT WINAPI
+IFilterMapper3_fnQueryInterface(IFilterMapper3* iface,REFIID riid,void** ppobj)
+{
+        CFilterMapper2_THIS(iface,fmap3);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_QueryInterface(This->unk.punkControl,riid,ppobj);
+}
+
+static ULONG WINAPI
+IFilterMapper3_fnAddRef(IFilterMapper3* iface)
+{
+        CFilterMapper2_THIS(iface,fmap3);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_AddRef(This->unk.punkControl);
+}
+
+static ULONG WINAPI
+IFilterMapper3_fnRelease(IFilterMapper3* iface)
+{
+        CFilterMapper2_THIS(iface,fmap3);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_Release(This->unk.punkControl);
+}
+
+static HRESULT WINAPI
+IFilterMapper3_fnCreateCategory(IFilterMapper3* iface,REFCLSID rclsidCategory,DWORD dwMerit,LPCWSTR lpwszDesc)
+{
+        CFilterMapper2_THIS(iface,fmap3);
+
+        FIXME("(%p)->(%s,%lu,%s) stub!\n",This,
+                debugstr_guid(rclsidCategory),
+                (unsigned long)dwMerit,debugstr_w(lpwszDesc));
+
+        return E_NOTIMPL;
+}
+
+
+static HRESULT WINAPI
+IFilterMapper3_fnUnregisterFilter(IFilterMapper3* iface,const CLSID* pclsidCategory,const OLECHAR* lpwszInst,REFCLSID rclsidFilter)
+{
+        CFilterMapper2_THIS(iface,fmap3);
+
+        FIXME("(%p)->(%s,%s,%s) stub!\n",This,
+                debugstr_guid(pclsidCategory),
+                debugstr_w(lpwszInst),
+                debugstr_guid(rclsidFilter));
+
+        if ( pclsidCategory == NULL )
+                pclsidCategory = &CLSID_LegacyAmFilterCategory;
+
+        /* FIXME */
+        return QUARTZ_RegisterAMovieFilter(
+                pclsidCategory,
+                rclsidFilter,
+                NULL, 0,
+                NULL, lpwszInst, FALSE );
+}
+
+
+static HRESULT WINAPI
+IFilterMapper3_fnRegisterFilter(IFilterMapper3* iface,REFCLSID rclsidFilter,LPCWSTR lpName,IMoniker** ppMoniker,const CLSID* pclsidCategory,const OLECHAR* lpwszInst,const REGFILTER2* pRF2)
+{
+        CFilterMapper2_THIS(iface,fmap3);
+
+        FIXME( "(%p)->(%s,%s,%p,%s,%s,%p) stub!\n",This,
+                debugstr_guid(rclsidFilter),debugstr_w(lpName),
+                ppMoniker,debugstr_guid(pclsidCategory),
+                debugstr_w(lpwszInst),pRF2 );
+
+        if ( lpName == NULL || pRF2 == NULL )
+                return E_POINTER;
+
+        if ( ppMoniker != NULL )
+        {
+                FIXME( "ppMoniker != NULL - not implemented!\n" );
+                return E_NOTIMPL;
+        }
+
+        if ( pclsidCategory == NULL )
+                pclsidCategory = &CLSID_LegacyAmFilterCategory;
+
+        /* FIXME!! - all members in REGFILTER2 are ignored ! */
+
+        return QUARTZ_RegisterAMovieFilter(
+                pclsidCategory,
+                rclsidFilter,
+                NULL, 0,
+                lpName, lpwszInst, TRUE );
+}
+
+
+static HRESULT WINAPI
+IFilterMapper3_fnEnumMatchingFilters(IFilterMapper3* iface,IEnumMoniker** ppMoniker,DWORD dwFlags,BOOL bExactMatch,DWORD dwMerit,BOOL bInputNeeded,DWORD cInputTypes,const GUID* pguidInputTypes,const REGPINMEDIUM* pPinMediumIn,const CLSID* pPinCategoryIn,BOOL bRender,BOOL bOutputNeeded,DWORD cOutputTypes,const GUID* pguidOutputTypes,const REGPINMEDIUM* pPinMediumOut,const CLSID* pPinCategoryOut)
+{
+        CFilterMapper2_THIS(iface,fmap3);
+
+        FIXME("(%p)->() stub!\n",This);
+
+        return E_NOTIMPL;
+}
+
+static HRESULT WINAPI
+IFilterMapper3_fnGetICreateDevEnum(IFilterMapper3* iface,ICreateDevEnum** ppDevEnum)
+{
+        CFilterMapper2_THIS(iface,fmap3);
+
+        /* undocumented */
+        FIXME("(%p)->() stub!\n",This);
+
+        return E_NOTIMPL;
+}
+
+
+
+
+static ICOM_VTABLE(IFilterMapper3) ifmap3 =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        /* IUnknown fields */
+        IFilterMapper3_fnQueryInterface,
+        IFilterMapper3_fnAddRef,
+        IFilterMapper3_fnRelease,
+        /* IFilterMapper2 fields */
+        IFilterMapper3_fnCreateCategory,
+        IFilterMapper3_fnUnregisterFilter,
+        IFilterMapper3_fnRegisterFilter,
+        IFilterMapper3_fnEnumMatchingFilters,
+        /* IFilterMapper3 fields */
+        IFilterMapper3_fnGetICreateDevEnum,
+};
+
+
+HRESULT CFilterMapper2_InitIFilterMapper3( CFilterMapper2* pfm )
+{
+        TRACE("(%p)\n",pfm);
+        ICOM_VTBL(&pfm->fmap3) = &ifmap3;
+
+        return NOERROR;
+}
+
+void CFilterMapper2_UninitIFilterMapper3( CFilterMapper2* pfm )
+{
+        TRACE("(%p)\n",pfm);
+}
+

trunk/src/quartz/ifgraph.c ¶

@@ -2 +2 @@
  * Implementation of IFilterGraph.
  *
- * FIXME - stub.
- * FIXME - implement IGraphBuilder / IFilterGraph2.
+ * FIXME - create a thread to process some methods correctly.
+ *
+ * FIXME - ReconnectEx
+ * FIXME - process Pause/Stop asynchronously and notify when completed.
+ *
  *
  * hidenori@a2.ctktv.ne.jp
@@ -13 +16 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
@@ -21 +25 @@
 #include "vfwmsgs.h"
 #include "wine/unicode.h"
+#include "evcode.h"
 
 #include "debugtools.h"
@@ -28 +33 @@
 #include "fgraph.h"
 #include "enumunk.h"
+#include "sysclock.h"
 
 
@@ -75 +81 @@
 
 
+static HRESULT CFilterGraph_GraphChanged( CFilterGraph* This )
+{
+        /* IDistributorNotify_NotifyGraphChange() */
+
+        IMediaEventSink_Notify(CFilterGraph_IMediaEventSink(This),
+                        EC_GRAPH_CHANGED, 0, 0);
+        EnterCriticalSection( &This->m_csGraphVersion );
+        This->m_lGraphVersion ++;
+        LeaveCriticalSection( &This->m_csGraphVersion );
+
+        return NOERROR;
+}
+
+
 /****************************************************************************/
 
@@ -111 +131 @@
 {
         CFilterGraph_THIS(iface,fgraph);
+        FILTER_STATE fs;
         FILTER_INFO     info;
         HRESULT hr;
@@ -120 +141 @@
 
         QUARTZ_CompList_Lock( This->m_pFilterList );
+
+        hr = IMediaFilter_GetState(CFilterGraph_IMediaFilter(This),0,&fs);
+        if ( hr == VFW_S_STATE_INTERMEDIATE )
+                hr = VFW_E_STATE_CHANGED;
+        if ( fs != State_Stopped )
+                hr = VFW_E_NOT_STOPPED;
+        if ( FAILED(hr) )
+                goto end;
+
+        TRACE( "(%p) search the specified name.\n",This );
 
         if ( pName != NULL )
@@ -180 +211 @@
 
 name_ok:
+        TRACE( "(%p) add this filter.\n",This );
+
         /* register this filter. */
         hr = QUARTZ_CompList_AddComp(
@@ -188 +221 @@
 
         hr = IBaseFilter_JoinFilterGraph(pFilter,(IFilterGraph*)iface,pName);
-        if ( FAILED(hr) )
-        {
+        if ( SUCCEEDED(hr) )
+        {
+                EnterCriticalSection( &This->m_csClock );
+                hr = IBaseFilter_SetSyncSource( pFilter, This->m_pClock );
+                LeaveCriticalSection( &This->m_csClock );
+        }
+        if ( FAILED(hr) )
+        {
+                IBaseFilter_JoinFilterGraph(pFilter,NULL,pName);
                 QUARTZ_CompList_RemoveComp(
                         This->m_pFilterList,(IUnknown*)pFilter);
@@ -195 +235 @@
         }
 
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
+        hr = CFilterGraph_GraphChanged(This);
+        if ( FAILED(hr) )
+                goto end;
 
         hr = hrSucceeded;
@@ -203 +243 @@
         QUARTZ_CompList_Unlock( This->m_pFilterList );
 
+        TRACE( "(%p) return %08lx\n", This, hr );
+
         return hr;
 }
@@ -211 +253 @@
         CFilterGraph_THIS(iface,fgraph);
         QUARTZ_CompListItem*    pItem;
+        FILTER_STATE fs;
         HRESULT hr = NOERROR;
 
@@ -217 +260 @@
         QUARTZ_CompList_Lock( This->m_pFilterList );
 
+        hr = IMediaFilter_GetState(CFilterGraph_IMediaFilter(This),0,&fs);
+        if ( hr == VFW_S_STATE_INTERMEDIATE )
+                hr = VFW_E_STATE_CHANGED;
+        if ( fs != State_Stopped )
+                hr = VFW_E_NOT_STOPPED;
+        if ( FAILED(hr) )
+                goto end;
+
+        hr = S_FALSE; /* FIXME? */
         pItem = QUARTZ_CompList_SearchComp(
                 This->m_pFilterList, (IUnknown*)pFilter );
@@ -222 +274 @@
         {
                 CFilterGraph_DisconnectAllPins(pFilter);
+                IBaseFilter_SetSyncSource( pFilter, NULL );
                 hr = IBaseFilter_JoinFilterGraph(
                         pFilter, NULL, QUARTZ_CompList_GetDataPtr(pItem) );
@@ -228 +281 @@
         }
 
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
-
+        hr = CFilterGraph_GraphChanged(This);
+        if ( FAILED(hr) )
+                goto end;
+
+end:;
         QUARTZ_CompList_Unlock( This->m_pFilterList );
 
@@ -332 +386 @@
         pConnTo = NULL;
         hr = IPin_ConnectedTo(pIn,&pConnTo);
-        if ( FAILED(hr) )
-                goto end;
-        if ( pConnTo != NULL )
+        if ( hr == NOERROR && pConnTo != NULL )
         {
                 IPin_Release(pConnTo);
+                hr = VFW_E_ALREADY_CONNECTED;
                 goto end;
         }
@@ -342 +395 @@
         pConnTo = NULL;
         hr = IPin_ConnectedTo(pOut,&pConnTo);
-        if ( FAILED(hr) )
-                goto end;
-        if ( pConnTo != NULL )
+        if ( hr == NOERROR && pConnTo != NULL )
         {
                 IPin_Release(pConnTo);
-                goto end;
-        }
-
-        hr = IPin_Connect(pIn,pOut,pmt);
-        if ( FAILED(hr) )
-                goto end;
+                hr = VFW_E_ALREADY_CONNECTED;
+                goto end;
+        }
+
+        TRACE("(%p) try to connect %p<->%p\n",This,pIn,pOut);
         hr = IPin_Connect(pOut,pIn,pmt);
         if ( FAILED(hr) )
         {
+                TRACE("(%p)->Connect(%p,%p) hr = %08lx\n",pOut,pIn,pmt,hr);
+                IPin_Disconnect(pOut);
                 IPin_Disconnect(pIn);
                 goto end;
         }
 
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
+        hr = CFilterGraph_GraphChanged(This);
+        if ( FAILED(hr) )
+                goto end;
 
 end:
@@ -384 +436 @@
         CFilterGraph_THIS(iface,fgraph);
 
-        FIXME( "(%p)->(%p) stub!\n",This,pPin );
-
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
-
-        return E_NOTIMPL;
+        TRACE( "(%p)->(%p)\n",This,pPin );
+
+        return IFilterGraph2_ReconnectEx(iface,pPin,NULL);
 }
 
@@ -397 +445 @@
 {
         CFilterGraph_THIS(iface,fgraph);
-
-        FIXME( "(%p)->(%p) stub!\n",This,pPin );
-
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
-
-        return E_NOTIMPL;
+        IPin* pConnTo;
+        HRESULT hr;
+
+        TRACE( "(%p)->(%p)\n",This,pPin );
+
+        QUARTZ_CompList_Lock( This->m_pFilterList );
+
+        pConnTo = NULL;
+        hr = IPin_ConnectedTo(pPin,&pConnTo);
+        if ( hr == NOERROR && pConnTo != NULL )
+        {
+                IPin_Disconnect(pConnTo);
+                IPin_Release(pConnTo);
+        }
+        hr = IPin_Disconnect(pPin);
+        if ( FAILED(hr) )
+                goto end;
+
+        hr = CFilterGraph_GraphChanged(This);
+        if ( FAILED(hr) )
+                goto end;
+
+end:
+        QUARTZ_CompList_Unlock( This->m_pFilterList );
+
+        return hr;
 }
 
@@ -411 +477 @@
 {
         CFilterGraph_THIS(iface,fgraph);
+        IUnknown* punk;
+        IReferenceClock* pClock;
+        HRESULT hr;
 
         FIXME( "(%p)->() stub!\n", This );
-        return E_NOTIMPL;
+
+        /* FIXME - search all filters. */
+
+        hr = QUARTZ_CreateSystemClock( NULL, (void**)&punk );
+        if ( FAILED(hr) )
+                return hr;
+        hr = IUnknown_QueryInterface( punk, &IID_IReferenceClock, (void**)&pClock );    IUnknown_Release( punk );
+        if ( FAILED(hr) )
+                return hr;
+
+        hr = IMediaFilter_SetSyncSource(
+                CFilterGraph_IMediaFilter(This), pClock );
+        IReferenceClock_Release( pClock );
+
+        return hr;
 }
 
@@ -580 +663 @@
 {
         CFilterGraph_THIS(iface,fgraph);
+        HRESULT hr;
 
         FIXME( "(%p)->(%p,%p) stub!\n",This,pPin,pmt );
 
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
+        /* reconnect asynchronously. */
+
+        hr = CFilterGraph_GraphChanged(This);
 
         return E_NOTIMPL;
@@ -657 +741 @@
                 if ( pItem == NULL )
                         break;
-                IFilterGraph2_fnRemoveFilter(
+                IFilterGraph2_RemoveFilter(
                         (IFilterGraph2*)(&pfg->fgraph),
                         (IBaseFilter*)QUARTZ_CompList_GetItemPtr(pItem) );

trunk/src/quartz/igrver.c ¶

@@ -12 +12 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"

trunk/src/quartz/imcntl.c ¶

@@ -12 +12 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"

trunk/src/quartz/imfilter.c ¶

@@ -12 +12 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
@@ -19 +20 @@
 #include "uuids.h"
 #include "vfwmsgs.h"
+#include "evcode.h"
 
 #include "debugtools.h"
@@ -127 +129 @@
         if ( This->m_stateGraph != State_Stopped )
         {
+                /* IDistributorNotify_Stop() */
+
                 QUARTZ_CompList_Lock( This->m_pFilterList );
 
@@ -171 +175 @@
         if ( This->m_stateGraph != State_Paused )
         {
+                /* IDistributorNotify_Pause() */
+
                 QUARTZ_CompList_Lock( This->m_pFilterList );
 
@@ -210 +216 @@
         TRACE("(%p)->()\n",This);
 
-        /* handle the special time. */
-        if ( rtStart == (REFERENCE_TIME)0 )
-        {
-                hr = IMediaFilter_GetSyncSource(iface,&pClock);
-                if ( hr == S_OK && pClock != NULL )
-                {
-                        IReferenceClock_GetTime(pClock,&rtStart);
-                        IReferenceClock_Release(pClock);
-                }
-        }
-
-        hr = S_OK;
-
         EnterCriticalSection( &This->m_csGraphState );
 
+        if ( This->m_stateGraph == State_Stopped )
+        {
+                hr = IMediaFilter_Pause(iface);
+                if ( FAILED(hr) )
+                        goto end;
+        }
+
+        /* handle the special time. */
+        if ( rtStart == (REFERENCE_TIME)0 )
+        {
+                hr = IMediaFilter_GetSyncSource(iface,&pClock);
+                if ( hr == S_OK && pClock != NULL )
+                {
+                        IReferenceClock_GetTime(pClock,&rtStart);
+                        IReferenceClock_Release(pClock);
+                }
+        }
+
+        hr = NOERROR;
+
         if ( This->m_stateGraph != State_Running )
         {
+                /* IDistributorNotify_Run() */
+
                 QUARTZ_CompList_Lock( This->m_pFilterList );
 
@@ -249 +264 @@
         }
 
+end:
         LeaveCriticalSection( &This->m_csGraphState );
 
@@ -265 +281 @@
         if ( pState == NULL )
                 return E_POINTER;
-
-        EnterCriticalSection( &This->m_csGraphState );
-        *pState = This->m_stateGraph;
-        LeaveCriticalSection( &This->m_csGraphState );
 
         dwTickStart = GetTickCount();
@@ -292 +304 @@
         }
 
+        EnterCriticalSection( &This->m_csGraphState );
+        *pState = This->m_stateGraph;
+        LeaveCriticalSection( &This->m_csGraphState );
+
         return hr;
 }
@@ -299 +315 @@
 {
         CFilterGraph_THIS(iface,mediafilter);
-
-        FIXME("(%p)->() stub!\n",This);
-
-        return E_NOTIMPL;
+        QUARTZ_CompListItem*    pItem;
+        IBaseFilter*    pFilter;
+        HRESULT hr = NOERROR;
+        HRESULT hrCur;
+
+        TRACE("(%p)->(%p)\n",This,pobjClock);
+
+        /* IDistributorNotify_SetSyncSource() */
+
+        EnterCriticalSection( &This->m_csClock );
+        QUARTZ_CompList_Lock( This->m_pFilterList );
+
+        if ( This->m_pClock != NULL )
+        {
+                IReferenceClock_Release(This->m_pClock);
+                This->m_pClock = NULL;
+        }
+
+        This->m_pClock = pobjClock;
+        if ( pobjClock != NULL )
+                IReferenceClock_AddRef( pobjClock );
+
+        pItem = QUARTZ_CompList_GetFirst( This->m_pFilterList );
+        while ( pItem != NULL )
+        {
+                pFilter = (IBaseFilter*)QUARTZ_CompList_GetItemPtr( pItem );
+                hrCur = IBaseFilter_SetSyncSource(pFilter,pobjClock);
+                if ( FAILED(hrCur) )
+                        hr = hrCur;
+                pItem = QUARTZ_CompList_GetNext( This->m_pFilterList, pItem );
+        }
+
+        QUARTZ_CompList_Unlock( This->m_pFilterList );
+
+        IMediaEventSink_Notify(CFilterGraph_IMediaEventSink(This),
+                EC_CLOCK_CHANGED, 0, 0);
+
+        LeaveCriticalSection( &This->m_csClock );
+
+        TRACE( "hr = %08lx\n", hr );
+
+        return hr;
 }
 
@@ -309 +363 @@
 {
         CFilterGraph_THIS(iface,mediafilter);
-
-        FIXME("(%p)->() stub!\n",This);
-
-        return E_NOTIMPL;
+        HRESULT hr = VFW_E_NO_CLOCK;
+
+        TRACE("(%p)->(%p)\n",This,ppobjClock);
+
+        if ( ppobjClock == NULL )
+                return E_POINTER;
+
+        EnterCriticalSection( &This->m_csClock );
+        *ppobjClock = This->m_pClock;
+        if ( This->m_pClock != NULL )
+        {
+                hr = NOERROR;
+                IReferenceClock_AddRef( This->m_pClock );
+        }
+        LeaveCriticalSection( &This->m_csClock );
+
+        TRACE( "hr = %08lx\n", hr );
+
+        return hr;
 }
 
@@ -342 +411 @@
 
         InitializeCriticalSection( &pfg->m_csGraphState );
+        InitializeCriticalSection( &pfg->m_csClock );
         pfg->m_stateGraph = State_Stopped;
+        pfg->m_pClock = NULL;
 
         return NOERROR;
@@ -351 +422 @@
         TRACE("(%p)\n",pfg);
 
+        if ( pfg->m_pClock != NULL )
+        {
+                IReferenceClock_Release( pfg->m_pClock );
+                pfg->m_pClock = NULL;
+        }
+
         DeleteCriticalSection( &pfg->m_csGraphState );
-}
+        DeleteCriticalSection( &pfg->m_csClock );
+}

trunk/src/quartz/impos.c ¶

@@ -12 +12 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"

trunk/src/quartz/imseek.c ¶

@@ -3 +3 @@
  *
  * FIXME - stub.
+ * FIXME - this interface should be allocated as a plug-in(?)
  *
  * hidenori@a2.ctktv.ne.jp
@@ -12 +13 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
@@ -133 +135 @@
         CFilterGraph_THIS(iface,mediaseeking);
 
+        /* the following line may produce too many FIXMEs... */
         FIXME("(%p)->() stub!\n",This);
 

trunk/src/quartz/iunk.c ¶

@@ -66 +66 @@
                         if ( hr == E_NOINTERFACE )
                         {
-                                FIXME("unknown interface: %s\n",debugstr_guid(riid));
+                                FIXME("(%p) unknown interface: %s\n",This,debugstr_guid(riid));
                         }
 

trunk/src/quartz/main.c ¶

@@ +1 @@
+/*
+ * Exported APIs.
+ *
+ * hidenori@a2.ctktv.ne.jp
+ */
+
 #include "config.h"
 
@@ -5 +11 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "mmsystem.h"
 #include "ole2.h"
 #include "wine/obj_oleaut.h"
@@ -10 +19 @@
 #include "control.h"
 #include "uuids.h"
+#include "errors.h"
 
 #include "debugtools.h"
@@ -22 +32 @@
 #include "fmap2.h"
 #include "seekpass.h"
+#include "audren.h"
 
 
@@ -66 +77 @@
         { &CLSID_FilterMapper2, &QUARTZ_CreateFilterMapper2 },
         { &CLSID_SeekingPassThru, &QUARTZ_CreateSeekingPassThru },
+        { &CLSID_AudioRender, &QUARTZ_CreateAudioRenderer },
         { NULL, NULL },
 };
@@ -105 +117 @@
         HeapFree( hDLLHeap, 0, pMem );
 }
+
+void* QUARTZ_ReallocMem( void* pMem, DWORD dwSize )
+{
+        if ( pMem == NULL )
+                return QUARTZ_AllocMem( dwSize );
+
+        return HeapReAlloc( hDLLHeap, 0, pMem, dwSize );
+}
+
+static
+LPWSTR QUARTZ_strncpyAtoW( LPWSTR lpwstr, LPCSTR lpstr, INT wbuflen )
+{
+        INT     len;
+
+        len = MultiByteToWideChar( CP_ACP, 0, lpstr, -1, lpwstr, wbuflen );
+        if ( len == 0 )
+                *lpwstr = 0;
+        return lpwstr;
+}
+
 
 /************************************************************************/
@@ -264 +296 @@
         LPVOID lpvReserved )
 {
+        TRACE("(%08x,%08lx,%p)\n",hInstDLL,fdwReason,lpvReserved);
+
         switch ( fdwReason )
         {
@@ -337 +371 @@
 }
 
-
-
+/**************************************************************************/
+/**************************************************************************/
+
+/* FIXME - all string should be defined in the resource of quartz. */
+
+static LPCSTR hresult_to_string( HRESULT hr )
+{
+        switch ( hr )
+        {
+        #define ENTRY(x)        case x: return (const char*)#x
+        /* some known codes */
+        ENTRY(S_OK);
+        ENTRY(S_FALSE);
+        ENTRY(E_FAIL);
+        ENTRY(E_POINTER);
+        ENTRY(E_NOTIMPL);
+        ENTRY(E_NOINTERFACE);
+        ENTRY(E_OUTOFMEMORY);
+        ENTRY(CLASS_E_CLASSNOTAVAILABLE);
+        ENTRY(CLASS_E_NOAGGREGATION);
+
+        /* vfwmsgs.h */
+        ENTRY(VFW_S_NO_MORE_ITEMS);
+        ENTRY(VFW_E_BAD_KEY);
+        ENTRY(VFW_E_INVALIDMEDIATYPE);
+        ENTRY(VFW_E_INVALIDSUBTYPE);
+        ENTRY(VFW_E_NEED_OWNER);
+        ENTRY(VFW_E_ENUM_OUT_OF_SYNC);
+        ENTRY(VFW_E_ALREADY_CONNECTED);
+        ENTRY(VFW_E_FILTER_ACTIVE);
+        ENTRY(VFW_E_NO_TYPES);
+        ENTRY(VFW_E_NO_ACCEPTABLE_TYPES);
+        ENTRY(VFW_E_INVALID_DIRECTION);
+        ENTRY(VFW_E_NOT_CONNECTED);
+        ENTRY(VFW_E_NO_ALLOCATOR);
+        ENTRY(VFW_E_RUNTIME_ERROR);
+        ENTRY(VFW_E_BUFFER_NOTSET);
+        ENTRY(VFW_E_BUFFER_OVERFLOW);
+        ENTRY(VFW_E_BADALIGN);
+        ENTRY(VFW_E_ALREADY_COMMITTED);
+        ENTRY(VFW_E_BUFFERS_OUTSTANDING);
+        ENTRY(VFW_E_NOT_COMMITTED);
+        ENTRY(VFW_E_SIZENOTSET);
+        ENTRY(VFW_E_NO_CLOCK);
+        ENTRY(VFW_E_NO_SINK);
+        ENTRY(VFW_E_NO_INTERFACE);
+        ENTRY(VFW_E_NOT_FOUND);
+        ENTRY(VFW_E_CANNOT_CONNECT);
+        ENTRY(VFW_E_CANNOT_RENDER);
+        ENTRY(VFW_E_CHANGING_FORMAT);
+        ENTRY(VFW_E_NO_COLOR_KEY_SET);
+        ENTRY(VFW_E_NOT_OVERLAY_CONNECTION);
+        ENTRY(VFW_E_NOT_SAMPLE_CONNECTION);
+        ENTRY(VFW_E_PALETTE_SET);
+        ENTRY(VFW_E_COLOR_KEY_SET);
+        ENTRY(VFW_E_NO_COLOR_KEY_FOUND);
+        ENTRY(VFW_E_NO_PALETTE_AVAILABLE);
+        ENTRY(VFW_E_NO_DISPLAY_PALETTE);
+        ENTRY(VFW_E_TOO_MANY_COLORS);
+        ENTRY(VFW_E_STATE_CHANGED);
+        ENTRY(VFW_E_NOT_STOPPED);
+        ENTRY(VFW_E_NOT_PAUSED);
+        ENTRY(VFW_E_NOT_RUNNING);
+        ENTRY(VFW_E_WRONG_STATE);
+        ENTRY(VFW_E_START_TIME_AFTER_END);
+        ENTRY(VFW_E_INVALID_RECT);
+        ENTRY(VFW_E_TYPE_NOT_ACCEPTED);
+        ENTRY(VFW_E_SAMPLE_REJECTED);
+        ENTRY(VFW_E_SAMPLE_REJECTED_EOS);
+        ENTRY(VFW_S_DUPLICATE_NAME);
+        ENTRY(VFW_E_DUPLICATE_NAME);
+        ENTRY(VFW_E_TIMEOUT);
+        ENTRY(VFW_E_INVALID_FILE_FORMAT);
+        ENTRY(VFW_E_ENUM_OUT_OF_RANGE);
+        ENTRY(VFW_E_CIRCULAR_GRAPH);
+        ENTRY(VFW_E_NOT_ALLOWED_TO_SAVE);
+        ENTRY(VFW_E_TIME_ALREADY_PASSED);
+        ENTRY(VFW_E_ALREADY_CANCELLED);
+        ENTRY(VFW_E_CORRUPT_GRAPH_FILE);
+        ENTRY(VFW_E_ADVISE_ALREADY_SET);
+        ENTRY(VFW_S_STATE_INTERMEDIATE);
+        ENTRY(VFW_E_NO_MODEX_AVAILABLE);
+        ENTRY(VFW_E_NO_ADVISE_SET);
+        ENTRY(VFW_E_NO_FULLSCREEN);
+        ENTRY(VFW_E_IN_FULLSCREEN_MODE);
+        ENTRY(VFW_E_UNKNOWN_FILE_TYPE);
+        ENTRY(VFW_E_CANNOT_LOAD_SOURCE_FILTER);
+        ENTRY(VFW_S_PARTIAL_RENDER);
+        ENTRY(VFW_E_FILE_TOO_SHORT);
+        ENTRY(VFW_E_INVALID_FILE_VERSION);
+        ENTRY(VFW_S_SOME_DATA_IGNORED);
+        ENTRY(VFW_S_CONNECTIONS_DEFERRED);
+        ENTRY(VFW_E_INVALID_CLSID);
+        ENTRY(VFW_E_INVALID_MEDIA_TYPE);
+        ENTRY(VFW_E_SAMPLE_TIME_NOT_SET);
+        ENTRY(VFW_S_RESOURCE_NOT_NEEDED);
+        ENTRY(VFW_E_MEDIA_TIME_NOT_SET);
+        ENTRY(VFW_E_NO_TIME_FORMAT_SET);
+        ENTRY(VFW_E_MONO_AUDIO_HW);
+        ENTRY(VFW_S_MEDIA_TYPE_IGNORED);
+        ENTRY(VFW_E_NO_DECOMPRESSOR);
+        ENTRY(VFW_E_NO_AUDIO_HARDWARE);
+        ENTRY(VFW_S_VIDEO_NOT_RENDERED);
+        ENTRY(VFW_S_AUDIO_NOT_RENDERED);
+        ENTRY(VFW_E_RPZA);
+        ENTRY(VFW_S_RPZA);
+        ENTRY(VFW_E_PROCESSOR_NOT_SUITABLE);
+        ENTRY(VFW_E_UNSUPPORTED_AUDIO);
+        ENTRY(VFW_E_UNSUPPORTED_VIDEO);
+        ENTRY(VFW_E_MPEG_NOT_CONSTRAINED);
+        ENTRY(VFW_E_NOT_IN_GRAPH);
+        ENTRY(VFW_S_ESTIMATED);
+        ENTRY(VFW_E_NO_TIME_FORMAT);
+        ENTRY(VFW_E_READ_ONLY);
+        ENTRY(VFW_S_RESERVED);
+        ENTRY(VFW_E_BUFFER_UNDERFLOW);
+        ENTRY(VFW_E_UNSUPPORTED_STREAM);
+        ENTRY(VFW_E_NO_TRANSPORT);
+        ENTRY(VFW_S_STREAM_OFF);
+        ENTRY(VFW_S_CANT_CUE);
+        ENTRY(VFW_E_BAD_VIDEOCD);
+        ENTRY(VFW_S_NO_STOP_TIME);
+        ENTRY(VFW_E_OUT_OF_VIDEO_MEMORY);
+        ENTRY(VFW_E_VP_NEGOTIATION_FAILED);
+        ENTRY(VFW_E_DDRAW_CAPS_NOT_SUITABLE);
+        ENTRY(VFW_E_NO_VP_HARDWARE);
+        ENTRY(VFW_E_NO_CAPTURE_HARDWARE);
+        ENTRY(VFW_E_DVD_OPERATION_INHIBITED);
+        ENTRY(VFW_E_DVD_INVALIDDOMAIN);
+        ENTRY(VFW_E_DVD_NO_BUTTON);
+        ENTRY(VFW_E_DVD_GRAPHNOTREADY);
+        ENTRY(VFW_E_DVD_RENDERFAIL);
+        ENTRY(VFW_E_DVD_DECNOTENOUGH);
+        ENTRY(VFW_E_DDRAW_VERSION_NOT_SUITABLE);
+        ENTRY(VFW_E_COPYPROT_FAILED);
+        ENTRY(VFW_S_NOPREVIEWPIN);
+        ENTRY(VFW_E_TIME_EXPIRED);
+        ENTRY(VFW_S_DVD_NON_ONE_SEQUENTIAL);
+        ENTRY(VFW_E_DVD_WRONG_SPEED);
+        ENTRY(VFW_E_DVD_MENU_DOES_NOT_EXIST);
+        ENTRY(VFW_E_DVD_CMD_CANCELLED);
+        ENTRY(VFW_E_DVD_STATE_WRONG_VERSION);
+        ENTRY(VFW_E_DVD_STATE_CORRUPT);
+        ENTRY(VFW_E_DVD_STATE_WRONG_DISC);
+        ENTRY(VFW_E_DVD_INCOMPATIBLE_REGION);
+        ENTRY(VFW_E_DVD_NO_ATTRIBUTES);
+        ENTRY(VFW_E_DVD_NO_GOUP_PGC);
+        ENTRY(VFW_E_DVD_LOW_PARENTAL_LEVEL);
+        ENTRY(VFW_E_DVD_NOT_IN_KARAOKE_MODE);
+        ENTRY(VFW_S_DVD_CHANNEL_CONTENTS_NOT_AVAILABLE);
+        ENTRY(VFW_S_DVD_NOT_ACCURATE);
+        ENTRY(VFW_E_FRAME_STEP_UNSUPPORTED);
+        ENTRY(VFW_E_DVD_STREAM_DISABLED);
+        ENTRY(VFW_E_DVD_TITLE_UNKNOWN);
+        ENTRY(VFW_E_DVD_INVALID_DISC);
+        ENTRY(VFW_E_DVD_NO_RESUME_INFORMATION);
+        ENTRY(VFW_E_PIN_ALREADY_BLOCKED_ON_THIS_THREAD);
+        ENTRY(VFW_E_PIN_ALREADY_BLOCKED);
+        ENTRY(VFW_E_CERTIFICATION_FAILURE);
+        #undef  ENTRY
+        }
+
+        return NULL;
+}
+
+/***********************************************************************
+ *      AMGetErrorTextA (quartz.@)
+ */
+DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR pszbuf, DWORD dwBufLen)
+{
+        LPCSTR  lpszRes;
+        DWORD len;
+
+        lpszRes = hresult_to_string( hr );
+        if ( lpszRes == NULL )
+                return 0;
+        len = (DWORD)(strlen(lpszRes)+1);
+        if ( len > dwBufLen )
+                return 0;
+
+        memcpy( pszbuf, lpszRes, len );
+        return len;
+}
+
+/***********************************************************************
+ *      AMGetErrorTextW (quartz.@)
+ */
+DWORD WINAPI AMGetErrorTextW(HRESULT hr, LPWSTR pwszbuf, DWORD dwBufLen)
+{
+        CHAR    szBuf[MAX_ERROR_TEXT_LEN+1];
+        DWORD   dwLen;
+
+        dwLen = AMGetErrorTextA(hr,szBuf,MAX_ERROR_TEXT_LEN);
+        if ( dwLen == 0 )
+                return 0;
+        szBuf[dwLen] = 0;
+
+        QUARTZ_strncpyAtoW( pwszbuf, szBuf, dwBufLen );
+
+        return lstrlenW( pwszbuf );
+}

trunk/src/quartz/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.4 2001-10-01 01:41:21 bird Exp $
+# $Id: makefile,v 1.5 2001-10-06 08:54:26 sandervl Exp $
 
 #
@@ -28 +28 @@
 #
 OBJS = \
-$(OBJDIR)\amerror.obj \
 $(OBJDIR)\amundoc.obj \
+$(OBJDIR)\audren.obj \
+$(OBJDIR)\basefilt.obj \
+$(OBJDIR)\basepin.obj \
 $(OBJDIR)\complist.obj \
-$(OBJDIR)\fgclsid.obj \
+$(OBJDIR)\devenum.obj \
+$(OBJDIR)\devmon.obj \
+$(OBJDIR)\enumunk.obj \
+$(OBJDIR)\fgevent.obj \
 $(OBJDIR)\fgidisp.obj \
+$(OBJDIR)\fgpass.obj \
 $(OBJDIR)\fgraph.obj \
 $(OBJDIR)\fmap.obj \
 $(OBJDIR)\fmap2.obj \
-$(OBJDIR)\ibasaud.obj \
-$(OBJDIR)\ibasvid.obj \
 $(OBJDIR)\ifgraph.obj \
-$(OBJDIR)\ifmap.obj \
-$(OBJDIR)\ifmap3.obj \
+$(OBJDIR)\igconfig.obj \
 $(OBJDIR)\igrver.obj \
 $(OBJDIR)\imcntl.obj \
-$(OBJDIR)\imem.obj \
-$(OBJDIR)\imesink.obj \
-$(OBJDIR)\imevent.obj \
 $(OBJDIR)\imfilter.obj \
 $(OBJDIR)\impos.obj \
 $(OBJDIR)\imseek.obj \
-$(OBJDIR)\irclock.obj \
 $(OBJDIR)\iunk.obj \
-$(OBJDIR)\ividwin.obj \
 $(OBJDIR)\main.obj \
 $(OBJDIR)\memalloc.obj \
-$(OBJDIR)\monprop.obj \
+$(OBJDIR)\mtype.obj \
 $(OBJDIR)\regsvr.obj \
+$(OBJDIR)\sample.obj \
 $(OBJDIR)\seekpass.obj \
 $(OBJDIR)\sysclock.obj \
-$(OBJDIR)\devenum.obj \
-$(OBJDIR)\devmon.obj \
-$(OBJDIR)\enumunk.obj \
-$(OBJDIR)\idevenum.obj \
 $(OBJDIR)\initterm.obj \
 $(OBJDIR)\initquartz.obj \
@@ -74 +69 @@
 $(ODIN32_LIB)/kernel32.lib \
 $(ODIN32_LIB)/user32.lib \
+$(ODIN32_LIB)/winmm.lib \
+$(ODIN32_LIB)/ntdll.lib \
 $(ODIN32_LIB)/ole32.lib \
 $(ODIN32_LIB)/oleaut32.lib \

trunk/src/quartz/memalloc.c ¶

@@ -2 +2 @@
  * Implementation of CLSID_MemoryAllocator.
  *
- * FIXME - stub.
- *
  * hidenori@a2.ctktv.ne.jp
  */
@@ -12 +10 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
@@ -24 +23 @@
 
 
+/***************************************************************************
+ *
+ *      new/delete for CLSID_MemoryAllocator.
+ *
+ */
+
 /* can I use offsetof safely? - FIXME? */
 static QUARTZ_IFEntry IFEntries[] =
@@ -64 +69 @@
         return S_OK;
 }
+
+
+/***************************************************************************
+ *
+ *      CMemoryAllocator::IMemAllocator
+ *
+ */
+
+
+static HRESULT WINAPI
+IMemAllocator_fnQueryInterface(IMemAllocator* iface,REFIID riid,void** ppobj)
+{
+        CMemoryAllocator_THIS(iface,memalloc);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_QueryInterface(This->unk.punkControl,riid,ppobj);
+}
+
+static ULONG WINAPI
+IMemAllocator_fnAddRef(IMemAllocator* iface)
+{
+        CMemoryAllocator_THIS(iface,memalloc);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_AddRef(This->unk.punkControl);
+}
+
+static ULONG WINAPI
+IMemAllocator_fnRelease(IMemAllocator* iface)
+{
+        CMemoryAllocator_THIS(iface,memalloc);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_Release(This->unk.punkControl);
+}
+
+static HRESULT WINAPI
+IMemAllocator_fnSetProperties(IMemAllocator* iface,ALLOCATOR_PROPERTIES* pPropReq,ALLOCATOR_PROPERTIES* pPropActual)
+{
+        CMemoryAllocator_THIS(iface,memalloc);
+        long    padding;
+        HRESULT hr;
+
+        TRACE( "(%p)->(%p,%p)\n", This, pPropReq, pPropActual );
+
+        if ( pPropReq == NULL || pPropActual == NULL )
+                return E_POINTER;
+        if ( pPropReq->cBuffers < 0 ||
+             pPropReq->cbBuffer < 0 ||
+             pPropReq->cbAlign < 0 ||
+             pPropReq->cbPrefix < 0 )
+                return E_INVALIDARG;
+
+        if ( ( pPropReq->cbAlign & (pPropReq->cbAlign-1) ) != 0 )
+                return E_INVALIDARG;
+
+        hr = NOERROR;
+
+        EnterCriticalSection( &This->csMem );
+
+        if ( This->pData != NULL || This->ppSamples != NULL )
+        {
+                /* if commited, properties must not be changed. */
+                hr = E_UNEXPECTED;
+                goto end;
+        }
+
+        This->prop.cBuffers = pPropReq->cBuffers;
+        This->prop.cbBuffer = pPropReq->cbBuffer;
+        This->prop.cbAlign = pPropReq->cbAlign;
+        This->prop.cbPrefix = pPropReq->cbPrefix;
+
+        if ( This->prop.cbAlign == 0 )
+                This->prop.cbAlign = 1;
+        padding = This->prop.cbAlign -
+                ( (This->prop.cbBuffer+This->prop.cbPrefix) % This->prop.cbAlign );
+
+        This->prop.cbBuffer += padding;
+
+        memcpy( pPropActual, &This->prop, sizeof(ALLOCATOR_PROPERTIES) );
+
+end:
+        LeaveCriticalSection( &This->csMem );
+
+        return hr;
+}
+
+static HRESULT WINAPI
+IMemAllocator_fnGetProperties(IMemAllocator* iface,ALLOCATOR_PROPERTIES* pProp)
+{
+        CMemoryAllocator_THIS(iface,memalloc);
+
+        TRACE( "(%p)->(%p)\n", This, pProp );
+
+        if ( pProp == NULL )
+                return E_POINTER;
+
+        EnterCriticalSection( &This->csMem );
+
+        memcpy( pProp, &This->prop, sizeof(ALLOCATOR_PROPERTIES) );
+
+        LeaveCriticalSection( &This->csMem );
+
+        return NOERROR;
+}
+
+static HRESULT WINAPI
+IMemAllocator_fnCommit(IMemAllocator* iface)
+{
+        CMemoryAllocator_THIS(iface,memalloc);
+        HRESULT hr;
+        LONG    lBufSize;
+        LONG    i;
+        BYTE*   pCur;
+
+        TRACE( "(%p)->()\n", This );
+
+        EnterCriticalSection( &This->csMem );
+
+        hr = NOERROR;
+        if ( This->pData != NULL || This->ppSamples != NULL ||
+             This->prop.cBuffers <= 0 )
+                goto end;
+
+        lBufSize = This->prop.cBuffers *
+                (This->prop.cbBuffer + This->prop.cbPrefix) +
+                This->prop.cbAlign;
+        if ( lBufSize <= 0 )
+                lBufSize = 1;
+
+        This->pData = (BYTE*)QUARTZ_AllocMem( lBufSize );
+        if ( This->pData == NULL )
+        {
+                hr = E_OUTOFMEMORY;
+                goto end;
+        }
+
+        This->ppSamples = (CMemMediaSample**)QUARTZ_AllocMem(
+                sizeof(CMemMediaSample*) * This->prop.cBuffers );
+        if ( This->ppSamples == NULL )
+        {
+                hr = E_OUTOFMEMORY;
+                goto end;
+        }
+
+        for ( i = 0; i < This->prop.cBuffers; i++ )
+                This->ppSamples[i] = NULL;
+
+        pCur = This->pData + This->prop.cbAlign - ((This->pData-(BYTE*)NULL) & (This->prop.cbAlign-1));
+
+        for ( i = 0; i < This->prop.cBuffers; i++ )
+        {
+                hr = QUARTZ_CreateMemMediaSample(
+                        pCur, (This->prop.cbBuffer + This->prop.cbPrefix),
+                        iface, &This->ppSamples[i] );
+                if ( FAILED(hr) )
+                        goto end;
+                pCur += (This->prop.cbBuffer + This->prop.cbPrefix);
+        }
+
+        hr = NOERROR;
+end:
+        if ( FAILED(hr) )
+                IMemAllocator_Decommit(iface);
+
+        LeaveCriticalSection( &This->csMem );
+
+        return hr;
+}
+
+static HRESULT WINAPI
+IMemAllocator_fnDecommit(IMemAllocator* iface)
+{
+        CMemoryAllocator_THIS(iface,memalloc);
+        HRESULT hr;
+        LONG    i;
+        BOOL    bBlock;
+
+        TRACE( "(%p)->()\n", This );
+
+        EnterCriticalSection( &This->csMem );
+
+        hr = NOERROR;
+
+        if ( This->pData == NULL && This->ppSamples == NULL )
+                goto end;
+
+        while ( 1 )
+        {
+                bBlock = FALSE;
+                i = 0;
+
+                ResetEvent( This->hEventSample );
+
+                while ( 1 )
+                {
+                        if ( i >= This->prop.cBuffers )
+                                break;
+
+                        if ( This->ppSamples[i] != NULL )
+                        {
+                                if ( This->ppSamples[i]->ref == 0 )
+                                {
+                                        QUARTZ_DestroyMemMediaSample( This->ppSamples[i] );
+                                        This->ppSamples[i] = NULL;
+                                }
+                                else
+                                {
+                                        bBlock = TRUE;
+                                }
+                        }
+                        i++;
+                }
+
+                if ( !bBlock )
+                {
+                        QUARTZ_FreeMem(This->ppSamples);
+                        This->ppSamples = NULL;
+                        QUARTZ_FreeMem(This->pData);
+                        This->pData = NULL;
+                        hr = NOERROR;
+                        break;
+                }
+
+                WaitForSingleObject( This->hEventSample, INFINITE );
+        }
+
+end:
+        LeaveCriticalSection( &This->csMem );
+
+        return hr;
+}
+
+static HRESULT WINAPI
+IMemAllocator_fnGetBuffer(IMemAllocator* iface,IMediaSample** ppSample,REFERENCE_TIME* prtStart,REFERENCE_TIME* prtEnd,DWORD dwFlags)
+{
+        CMemoryAllocator_THIS(iface,memalloc);
+        LONG    i;
+        HRESULT hr;
+
+        TRACE( "(%p)->(%p,%p,%p,%lu)\n", This, ppSample, prtStart, prtEnd, dwFlags );
+
+        if ( ppSample == NULL )
+                return E_POINTER;
+
+        EnterCriticalSection( &This->csMem );
+
+        hr = NOERROR;
+
+        if ( This->pData == NULL || This->ppSamples == NULL ||
+             This->prop.cBuffers <= 0 )
+        {
+                hr = E_FAIL; /* FIXME? */
+                goto end;
+        }
+
+        while ( 1 )
+        {
+                ResetEvent( This->hEventSample );
+
+                for ( i = 0; i < This->prop.cBuffers; i++ )
+                {
+                        if ( This->ppSamples[i]->ref == 0 )
+                        {
+                                *ppSample = (IMediaSample*)(This->ppSamples[i]);
+                                IMediaSample_AddRef( *ppSample );
+                                hr = NOERROR;
+                                goto end;
+                        }
+                }
+
+                if ( dwFlags & AM_GBF_NOWAIT )
+                {
+                        hr = E_FAIL; /* FIXME? */
+                        goto end;
+                }
+
+                WaitForSingleObject( This->hEventSample, INFINITE );
+        }
+
+end:
+        LeaveCriticalSection( &This->csMem );
+
+        return hr;
+}
+
+static HRESULT WINAPI
+IMemAllocator_fnReleaseBuffer(IMemAllocator* iface,IMediaSample* pSample)
+{
+        CMemoryAllocator_THIS(iface,memalloc);
+
+        TRACE( "(%p)->(%p)\n", This, pSample );
+        SetEvent( This->hEventSample );
+
+        return NOERROR;
+}
+
+
+
+static ICOM_VTABLE(IMemAllocator) imemalloc =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        /* IUnknown fields */
+        IMemAllocator_fnQueryInterface,
+        IMemAllocator_fnAddRef,
+        IMemAllocator_fnRelease,
+        /* IMemAllocator fields */
+        IMemAllocator_fnSetProperties,
+        IMemAllocator_fnGetProperties,
+        IMemAllocator_fnCommit,
+        IMemAllocator_fnDecommit,
+        IMemAllocator_fnGetBuffer,
+        IMemAllocator_fnReleaseBuffer,
+};
+
+
+HRESULT CMemoryAllocator_InitIMemAllocator( CMemoryAllocator* pma )
+{
+        TRACE("(%p)\n",pma);
+
+        ICOM_VTBL(&pma->memalloc) = &imemalloc;
+
+        ZeroMemory( &pma->prop, sizeof(pma->prop) );
+        pma->hEventSample = (HANDLE)NULL;
+        pma->pData = NULL;
+        pma->ppSamples = NULL;
+
+        pma->hEventSample = CreateEventA( NULL, TRUE, FALSE, NULL );
+        if ( pma->hEventSample == (HANDLE)NULL )
+                return E_OUTOFMEMORY;
+
+        InitializeCriticalSection( &pma->csMem );
+
+        return NOERROR;
+}
+
+void CMemoryAllocator_UninitIMemAllocator( CMemoryAllocator* pma )
+{
+        TRACE("(%p)\n",pma);
+
+        IMemAllocator_Decommit( (IMemAllocator*)(&pma->memalloc) );
+
+        DeleteCriticalSection( &pma->csMem );
+
+        if ( pma->hEventSample != (HANDLE)NULL )
+                CloseHandle( pma->hEventSample );
+}

trunk/src/quartz/memalloc.h ¶

@@ -13 +13 @@
 
 #include "iunk.h"
+#include "sample.h"
 
 typedef struct MA_IMemAllocatorImpl
@@ -27 +28 @@
         CRITICAL_SECTION        csMem;
         ALLOCATOR_PROPERTIES    prop;
+        HANDLE  hEventSample;
+        BYTE*   pData;
+        CMemMediaSample**       ppSamples;
 } CMemoryAllocator;
 

trunk/src/quartz/quartz_private.h ¶

@@ -8 +8 @@
 void* QUARTZ_AllocMem( DWORD dwSize );
 void QUARTZ_FreeMem( void* pMem );
+void* QUARTZ_ReallocMem( void* pMem, DWORD dwSize );
 
 #endif  /* QUARTZ_PRIVATE_H */

trunk/src/quartz/regsvr.c ¶

@@ -13 +13 @@
 #include "winerror.h"
 #include "winreg.h"
-#ifdef __WIN32OS2__
-#include "wine/obj_base.h"
-#endif
 #include "uuids.h"
 #include "wine/unicode.h"

trunk/src/quartz/seekpass.c ¶

@@ -1 +1 @@
 /*
- * Implementation of CLSID_SeekingPassThru.
+ *      Implementation of CLSID_SeekingPassThru
+ *
+ *      FIXME - not tested yet.
  *
  * hidenori@a2.ctktv.ne.jp
@@ -10 +12 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
 #include "strmif.h"
+#include "control.h"
 #include "uuids.h"
 
@@ -22 +26 @@
 
 
+/***************************************************************************
+ *
+ *      CSeekingPassThru::ISeekingPassThru
+ *
+ */
 
 static HRESULT WINAPI
@@ -58 +67 @@
         CSeekingPassThru_THIS(iface,seekpass);
 
-        FIXME("(%p)->(%d,%p) stub!\n",This,bRendering,pPin);
-
-        return E_NOTIMPL;
+        FIXME("(%p)->(%d,%p) not tested!\n",This,bRendering,pPin);
+
+        if ( pPin == NULL )
+                return E_POINTER;
+
+        /* Why is 'bRendering' given as an argument?? */
+        EnterCriticalSection( &This->cs );
+
+        if ( This->passthru.pPin != NULL )
+                IPin_Release( This->passthru.pPin );
+        This->passthru.pPin = pPin; IPin_AddRef( pPin );
+
+        LeaveCriticalSection( &This->cs );
+
+        return NOERROR;
 }
 
@@ -80 +101 @@
         TRACE("(%p)\n",This);
         ICOM_VTBL(&This->seekpass) = &iseekingpassthru;
+        This->passthru.punk = This->unk.punkControl;
+        This->passthru.pPin = NULL;
+        InitializeCriticalSection( &This->cs );
 
         return NOERROR;
@@ -88 +112 @@
 {
         TRACE("(%p)\n",This);
-}
-
+        if ( This->passthru.pPin != NULL )
+        {
+                IPin_Release( This->passthru.pPin );
+                This->passthru.pPin = NULL;
+        }
+        DeleteCriticalSection( &This->cs );
+}
+
+/***************************************************************************
+ *
+ *      new/delete for CLSID_SeekingPassThru.
+ *
+ */
 
 /* can I use offsetof safely? - FIXME? */
@@ -95 +130 @@
 {
   { &IID_ISeekingPassThru, offsetof(CSeekingPassThru,seekpass)-offsetof(CSeekingPassThru,unk) },
+  { &IID_IMediaPosition, offsetof(CSeekingPassThru,passthru.mpos)-offsetof(CSeekingPassThru,unk) },
+  { &IID_IMediaSeeking, offsetof(CSeekingPassThru,passthru.mseek)-offsetof(CSeekingPassThru,unk) },
 };
 
@@ -133 +170 @@
 }
 
+
+
+
+/***************************************************************************
+ *
+ *      CPassThruImpl Helper methods.
+ *
+ */
+
+static
+HRESULT CPassThruImpl_GetConnected( CPassThruImpl* pImpl, IPin** ppPin )
+{
+        return IPin_ConnectedTo( pImpl->pPin, ppPin );
+}
+
+HRESULT CPassThruImpl_QueryPosPass(
+        CPassThruImpl* pImpl, IMediaPosition** ppPosition )
+{
+        IPin*   pPin;
+        HRESULT hr;
+
+        hr = CPassThruImpl_GetConnected( pImpl, &pPin );
+        if ( FAILED(hr) )
+                return hr;
+        hr = IPin_QueryInterface(pPin,&IID_IMediaPosition,(void**)ppPosition);
+        IPin_Release(pPin);
+
+        return hr;
+}
+
+HRESULT CPassThruImpl_QuerySeekPass(
+        CPassThruImpl* pImpl, IMediaSeeking** ppSeeking )
+{
+        IPin*   pPin;
+        HRESULT hr;
+
+        hr = CPassThruImpl_GetConnected( pImpl, &pPin );
+        if ( FAILED(hr) )
+                return hr;
+        hr = IPin_QueryInterface(pPin,&IID_IMediaSeeking,(void**)ppSeeking);
+        IPin_Release(pPin);
+
+        return hr;
+}
+
+/***************************************************************************
+ *
+ *      An implementation for CPassThruImpl::IMediaPosition.
+ *
+ */
+
+
+#define QUERYPOSPASS \
+        IMediaPosition* pPos = NULL; \
+        HRESULT hr; \
+        hr = CPassThruImpl_QueryPosPass( This, &pPos ); \
+        if ( FAILED(hr) ) return hr;
+
+static HRESULT WINAPI
+IMediaPosition_fnQueryInterface(IMediaPosition* iface,REFIID riid,void** ppobj)
+{
+        CPassThruImpl_THIS(iface,mpos);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_QueryInterface(This->punk,riid,ppobj);
+}
+
+static ULONG WINAPI
+IMediaPosition_fnAddRef(IMediaPosition* iface)
+{
+        CPassThruImpl_THIS(iface,mpos);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_AddRef(This->punk);
+}
+
+static ULONG WINAPI
+IMediaPosition_fnRelease(IMediaPosition* iface)
+{
+        CPassThruImpl_THIS(iface,mpos);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_Release(This->punk);
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnGetTypeInfoCount(IMediaPosition* iface,UINT* pcTypeInfo)
+{
+        CPassThruImpl_THIS(iface,mpos);
+
+        FIXME("(%p)->() stub!\n",This);
+
+        return E_NOTIMPL;
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnGetTypeInfo(IMediaPosition* iface,UINT iTypeInfo, LCID lcid, ITypeInfo** ppobj)
+{
+        CPassThruImpl_THIS(iface,mpos);
+
+        FIXME("(%p)->() stub!\n",This);
+
+        return E_NOTIMPL;
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnGetIDsOfNames(IMediaPosition* iface,REFIID riid, LPOLESTR* ppwszName, UINT cNames, LCID lcid, DISPID* pDispId)
+{
+        CPassThruImpl_THIS(iface,mpos);
+
+        FIXME("(%p)->() stub!\n",This);
+
+        return E_NOTIMPL;
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnInvoke(IMediaPosition* iface,DISPID DispId, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarRes, EXCEPINFO* pExcepInfo, UINT* puArgErr)
+{
+        CPassThruImpl_THIS(iface,mpos);
+
+        FIXME("(%p)->() stub!\n",This);
+
+        return E_NOTIMPL;
+}
+
+
+static HRESULT WINAPI
+IMediaPosition_fnget_Duration(IMediaPosition* iface,REFTIME* prefTime)
+{
+        CPassThruImpl_THIS(iface,mpos);
+        QUERYPOSPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaPosition_get_Duration(pPos,prefTime);
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnput_CurrentPosition(IMediaPosition* iface,REFTIME refTime)
+{
+        CPassThruImpl_THIS(iface,mpos);
+        QUERYPOSPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaPosition_put_CurrentPosition(pPos,refTime);
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnget_CurrentPosition(IMediaPosition* iface,REFTIME* prefTime)
+{
+        CPassThruImpl_THIS(iface,mpos);
+        QUERYPOSPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaPosition_get_CurrentPosition(pPos,prefTime);
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnget_StopTime(IMediaPosition* iface,REFTIME* prefTime)
+{
+        CPassThruImpl_THIS(iface,mpos);
+        QUERYPOSPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaPosition_get_StopTime(pPos,prefTime);
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnput_StopTime(IMediaPosition* iface,REFTIME refTime)
+{
+        CPassThruImpl_THIS(iface,mpos);
+        QUERYPOSPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaPosition_put_StopTime(pPos,refTime);
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnget_PrerollTime(IMediaPosition* iface,REFTIME* prefTime)
+{
+        CPassThruImpl_THIS(iface,mpos);
+        QUERYPOSPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaPosition_get_PrerollTime(pPos,prefTime);
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnput_PrerollTime(IMediaPosition* iface,REFTIME refTime)
+{
+        CPassThruImpl_THIS(iface,mpos);
+        QUERYPOSPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaPosition_put_PrerollTime(pPos,refTime);
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnput_Rate(IMediaPosition* iface,double dblRate)
+{
+        CPassThruImpl_THIS(iface,mpos);
+        QUERYPOSPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaPosition_put_Rate(pPos,dblRate);
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnget_Rate(IMediaPosition* iface,double* pdblRate)
+{
+        CPassThruImpl_THIS(iface,mpos);
+        QUERYPOSPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaPosition_get_Rate(pPos,pdblRate);
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnCanSeekForward(IMediaPosition* iface,LONG* pCanSeek)
+{
+        CPassThruImpl_THIS(iface,mpos);
+        QUERYPOSPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaPosition_CanSeekForward(pPos,pCanSeek);
+}
+
+static HRESULT WINAPI
+IMediaPosition_fnCanSeekBackward(IMediaPosition* iface,LONG* pCanSeek)
+{
+        CPassThruImpl_THIS(iface,mpos);
+        QUERYPOSPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaPosition_CanSeekBackward(pPos,pCanSeek);
+}
+
+
+static ICOM_VTABLE(IMediaPosition) impos =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        /* IUnknown fields */
+        IMediaPosition_fnQueryInterface,
+        IMediaPosition_fnAddRef,
+        IMediaPosition_fnRelease,
+        /* IDispatch fields */
+        IMediaPosition_fnGetTypeInfoCount,
+        IMediaPosition_fnGetTypeInfo,
+        IMediaPosition_fnGetIDsOfNames,
+        IMediaPosition_fnInvoke,
+        /* IMediaPosition fields */
+        IMediaPosition_fnget_Duration,
+        IMediaPosition_fnput_CurrentPosition,
+        IMediaPosition_fnget_CurrentPosition,
+        IMediaPosition_fnget_StopTime,
+        IMediaPosition_fnput_StopTime,
+        IMediaPosition_fnget_PrerollTime,
+        IMediaPosition_fnput_PrerollTime,
+        IMediaPosition_fnput_Rate,
+        IMediaPosition_fnget_Rate,
+        IMediaPosition_fnCanSeekForward,
+        IMediaPosition_fnCanSeekBackward,
+};
+
+
+HRESULT CPassThruImpl_InitIMediaPosition( CPassThruImpl* pImpl )
+{
+        TRACE("(%p)\n",pImpl);
+        ICOM_VTBL(&pImpl->mpos) = &impos;
+
+        return NOERROR;
+}
+
+void CPassThruImpl_UninitIMediaPosition( CPassThruImpl* pImpl )
+{
+        TRACE("(%p)\n",pImpl);
+}
+
+#undef QUERYPOSPASS
+
+
+/***************************************************************************
+ *
+ *      An implementation for CPassThruImpl::IMediaSeeking.
+ *
+ */
+
+#define QUERYSEEKPASS \
+        IMediaSeeking* pSeek = NULL; \
+        HRESULT hr; \
+        hr = CPassThruImpl_QuerySeekPass( This, &pSeek ); \
+        if ( FAILED(hr) ) return hr;
+
+
+static HRESULT WINAPI
+IMediaSeeking_fnQueryInterface(IMediaSeeking* iface,REFIID riid,void** ppobj)
+{
+        CPassThruImpl_THIS(iface,mseek);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_QueryInterface(This->punk,riid,ppobj);
+}
+
+static ULONG WINAPI
+IMediaSeeking_fnAddRef(IMediaSeeking* iface)
+{
+        CPassThruImpl_THIS(iface,mseek);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_AddRef(This->punk);
+}
+
+static ULONG WINAPI
+IMediaSeeking_fnRelease(IMediaSeeking* iface)
+{
+        CPassThruImpl_THIS(iface,mseek);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_Release(This->punk);
+}
+
+
+static HRESULT WINAPI
+IMediaSeeking_fnGetCapabilities(IMediaSeeking* iface,DWORD* pdwCaps)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_GetCapabilities(pSeek,pdwCaps);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnCheckCapabilities(IMediaSeeking* iface,DWORD* pdwCaps)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_CheckCapabilities(pSeek,pdwCaps);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnIsFormatSupported(IMediaSeeking* iface,const GUID* pidFormat)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_IsFormatSupported(pSeek,pidFormat);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnQueryPreferredFormat(IMediaSeeking* iface,GUID* pidFormat)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_QueryPreferredFormat(pSeek,pidFormat);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnGetTimeFormat(IMediaSeeking* iface,GUID* pidFormat)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_GetTimeFormat(pSeek,pidFormat);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnIsUsingTimeFormat(IMediaSeeking* iface,const GUID* pidFormat)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_IsUsingTimeFormat(pSeek,pidFormat);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnSetTimeFormat(IMediaSeeking* iface,const GUID* pidFormat)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_SetTimeFormat(pSeek,pidFormat);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnGetDuration(IMediaSeeking* iface,LONGLONG* pllDuration)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_GetDuration(pSeek,pllDuration);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnGetStopPosition(IMediaSeeking* iface,LONGLONG* pllPos)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_GetStopPosition(pSeek,pllPos);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnGetCurrentPosition(IMediaSeeking* iface,LONGLONG* pllPos)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_GetCurrentPosition(pSeek,pllPos);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnConvertTimeFormat(IMediaSeeking* iface,LONGLONG* pllOut,const GUID* pidFmtOut,LONGLONG llIn,const GUID* pidFmtIn)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_ConvertTimeFormat(pSeek,pllOut,pidFmtOut,llIn,pidFmtIn);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnSetPositions(IMediaSeeking* iface,LONGLONG* pllCur,DWORD dwCurFlags,LONGLONG* pllStop,DWORD dwStopFlags)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_SetPositions(pSeek,pllCur,dwCurFlags,pllStop,dwStopFlags);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnGetPositions(IMediaSeeking* iface,LONGLONG* pllCur,LONGLONG* pllStop)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_GetPositions(pSeek,pllCur,pllStop);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnGetAvailable(IMediaSeeking* iface,LONGLONG* pllFirst,LONGLONG* pllLast)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_GetAvailable(pSeek,pllFirst,pllLast);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnSetRate(IMediaSeeking* iface,double dblRate)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_SetRate(pSeek,dblRate);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnGetRate(IMediaSeeking* iface,double* pdblRate)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_GetRate(pSeek,pdblRate);
+}
+
+static HRESULT WINAPI
+IMediaSeeking_fnGetPreroll(IMediaSeeking* iface,LONGLONG* pllPreroll)
+{
+        CPassThruImpl_THIS(iface,mseek);
+        QUERYSEEKPASS
+
+        TRACE("(%p)->()\n",This);
+
+        return IMediaSeeking_GetPreroll(pSeek,pllPreroll);
+}
+
+
+
+
+static ICOM_VTABLE(IMediaSeeking) imseek =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        /* IUnknown fields */
+        IMediaSeeking_fnQueryInterface,
+        IMediaSeeking_fnAddRef,
+        IMediaSeeking_fnRelease,
+        /* IMediaSeeking fields */
+        IMediaSeeking_fnGetCapabilities,
+        IMediaSeeking_fnCheckCapabilities,
+        IMediaSeeking_fnIsFormatSupported,
+        IMediaSeeking_fnQueryPreferredFormat,
+        IMediaSeeking_fnGetTimeFormat,
+        IMediaSeeking_fnIsUsingTimeFormat,
+        IMediaSeeking_fnSetTimeFormat,
+        IMediaSeeking_fnGetDuration,
+        IMediaSeeking_fnGetStopPosition,
+        IMediaSeeking_fnGetCurrentPosition,
+        IMediaSeeking_fnConvertTimeFormat,
+        IMediaSeeking_fnSetPositions,
+        IMediaSeeking_fnGetPositions,
+        IMediaSeeking_fnGetAvailable,
+        IMediaSeeking_fnSetRate,
+        IMediaSeeking_fnGetRate,
+        IMediaSeeking_fnGetPreroll,
+};
+
+
+
+HRESULT CPassThruImpl_InitIMediaSeeking( CPassThruImpl* pImpl )
+{
+        TRACE("(%p)\n",pImpl);
+        ICOM_VTBL(&pImpl->mseek) = &imseek;
+
+        return NOERROR;
+}
+
+void CPassThruImpl_UninitIMediaSeeking( CPassThruImpl* pImpl )
+{
+        TRACE("(%p)\n",pImpl);
+}
+
+#undef QUERYSEEKPASS

trunk/src/quartz/seekpass.h ¶

@@ -14 +14 @@
 #include "iunk.h"
 
+
+/****************************************************************************/
+
+typedef struct CPassThruImpl
+{
+        struct { ICOM_VFIELD(IMediaPosition); } mpos;
+        struct { ICOM_VFIELD(IMediaSeeking); } mseek;
+
+        IUnknown* punk;
+        IPin* pPin;
+} CPassThruImpl;
+
+#define CPassThruImpl_THIS(iface,member)                CPassThruImpl*  This = ((CPassThruImpl*)(((char*)iface)-offsetof(CPassThruImpl,member)))
+
+HRESULT CPassThruImpl_InitIMediaPosition( CPassThruImpl* pImpl );
+void CPassThruImpl_UninitIMediaPosition( CPassThruImpl* pImpl );
+HRESULT CPassThruImpl_InitIMediaSeeking( CPassThruImpl* pImpl );
+void CPassThruImpl_UninitIMediaSeeking( CPassThruImpl* pImpl );
+
+HRESULT CPassThruImpl_QueryPosPass(
+        CPassThruImpl* pImpl, IMediaPosition** ppPosition );
+HRESULT CPassThruImpl_QuerySeekPass(
+        CPassThruImpl* pImpl, IMediaSeeking** ppSeeking );
+
+/****************************************************************************/
+
 typedef struct QUARTZ_ISeekingPassThruImpl
 {
         ICOM_VFIELD(ISeekingPassThru);
 } QUARTZ_ISeekingPassThruImpl;
-
 
 typedef struct CSeekingPassThru
@@ -26 +51 @@
 
         /* ISeekingPassThru fields. */
+        CRITICAL_SECTION        cs;
+        CPassThruImpl   passthru;
 } CSeekingPassThru;
 

trunk/src/quartz/sysclock.c ¶

@@ -2 +2 @@
  * Implementation of CLSID_SystemClock.
  *
- * FIXME - stub.
- *
  * hidenori@a2.ctktv.ne.jp
  */
@@ -12 +10 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
@@ -24 +23 @@
 
 
+/***************************************************************************
+ *
+ *      new/delete for CLSID_SystemClock
+ *
+ */
+
 /* can I use offsetof safely? - FIXME? */
 static QUARTZ_IFEntry IFEntries[] =
@@ -65 +70 @@
         return S_OK;
 }
+
+
+/***************************************************************************
+ *
+ *      CLSID_SystemClock::IReferenceClock
+ *
+ */
+
+#define QUARTZ_MSG_ADDTIMER                     (WM_APP+0)
+#define QUARTZ_MSG_REMOVETIMER          (WM_APP+1)
+#define QUARTZ_MSG_EXITTHREAD           (WM_APP+2)
+
+
+/****************************************************************************/
+
+static QUARTZ_TimerEntry* IReferenceClock_AllocTimerEntry(CSystemClock* This)
+{
+        QUARTZ_TimerEntry*      pEntry;
+        DWORD   dw;
+
+        pEntry = &This->m_timerEntries[0];
+        for ( dw = 0; dw < WINE_QUARTZ_SYSCLOCK_TIMER_MAX; dw++ )
+        {
+                if ( pEntry->hEvent == (HANDLE)NULL )
+                        return pEntry;
+                pEntry ++;
+        }
+
+        return NULL;
+}
+
+static QUARTZ_TimerEntry* IReferenceClock_SearchTimer(CSystemClock* This, DWORD dwAdvCookie)
+{
+        QUARTZ_TimerEntry*      pEntry;
+        DWORD   dw;
+
+        pEntry = &This->m_timerEntries[0];
+        for ( dw = 0; dw < WINE_QUARTZ_SYSCLOCK_TIMER_MAX; dw++ )
+        {
+                if ( pEntry->hEvent != (HANDLE)NULL &&
+                         pEntry->dwAdvCookie == dwAdvCookie )
+                        return pEntry;
+                pEntry ++;
+        }
+
+        return NULL;
+}
+
+static DWORD IReferenceClock_OnTimerUpdated(CSystemClock* This)
+{
+        QUARTZ_TimerEntry*      pEntry;
+        REFERENCE_TIME  rtCur;
+        REFERENCE_TIME  rtSignal;
+        REFERENCE_TIME  rtCount;
+        HRESULT hr;
+        LONG    lCount;
+        DWORD   dw;
+        DWORD   dwTimeout = INFINITE;
+        DWORD   dwTimeoutCur;
+
+        hr = IReferenceClock_GetTime((IReferenceClock*)(&This->refclk),&rtCur);
+        if ( hr != NOERROR )
+                return INFINITE;
+
+        pEntry = &This->m_timerEntries[0];
+        for ( dw = 0; dw < WINE_QUARTZ_SYSCLOCK_TIMER_MAX; dw++ )
+        {
+                if ( pEntry->hEvent != (HANDLE)NULL )
+                {
+                        rtSignal = pEntry->rtStart + pEntry->rtInterval;
+                        if ( rtCur >= rtSignal )
+                        {
+                                if ( pEntry->fPeriodic )
+                                {
+                                        rtCount = ((rtCur - pEntry->rtStart) / pEntry->rtInterval);
+                                        lCount = ( rtCount > (REFERENCE_TIME)0x7fffffff ) ?
+                                                (LONG)0x7fffffff : (LONG)rtCount;
+                                        if ( !ReleaseSemaphore( pEntry->hEvent, lCount, NULL ) )
+                                        {
+                                                while ( lCount > 0 )
+                                                {
+                                                        if ( !ReleaseSemaphore( pEntry->hEvent, 1, NULL ) )
+                                                                break;
+                                                }
+                                        }
+                                        dwTimeout = 0;
+                                }
+                                else
+                                {
+                                        TRACE( "signal an event\n" );
+                                        SetEvent( pEntry->hEvent );
+                                        pEntry->hEvent = (HANDLE)NULL;
+                                }
+                        }
+                        else
+                        {
+                                rtCount = rtSignal - rtCur;
+                                /* [100ns] -> [ms] */
+                                rtCount = (rtCount+(REFERENCE_TIME)9999)/(REFERENCE_TIME)10000;
+                                dwTimeoutCur = (rtCount >= 0xfffffffe) ? (DWORD)0xfffffffe : (DWORD)rtCount;
+                                if ( dwTimeout > dwTimeoutCur )
+                                        dwTimeout = dwTimeoutCur;
+                        }
+                }
+                pEntry ++;
+        }
+
+        return dwTimeout;
+}
+
+static
+DWORD WINAPI IReferenceClock_TimerEntry( LPVOID lpvParam )
+{
+        CSystemClock*   This = (CSystemClock*)lpvParam;
+        MSG     msg;
+        DWORD   dwRes;
+        DWORD   dwTimeout;
+
+        /* initialize the message queue. */
+        PeekMessageA( &msg, (HWND)NULL, 0, 0, PM_NOREMOVE );
+        /* resume the owner thread. */
+        SetEvent( This->m_hEventInit );
+
+        TRACE( "Enter message loop.\n" );
+
+        /* message loop. */
+        dwTimeout = INFINITE;
+        while ( 1 )
+        {
+                if ( dwTimeout > 0 )
+                {
+                        dwRes = MsgWaitForMultipleObjects(
+                                0, NULL, FALSE,
+                                dwTimeout,
+                                QS_ALLEVENTS );
+                }
+
+                EnterCriticalSection( &This->m_csClock );
+                dwTimeout = IReferenceClock_OnTimerUpdated(This);
+                LeaveCriticalSection( &This->m_csClock );
+                TRACE( "catch an event / timeout %lu\n", dwTimeout );
+
+                while ( PeekMessageA( &msg, (HWND)NULL, 0, 0, PM_REMOVE ) )
+                {
+                        if ( msg.message == WM_QUIT )
+                                goto quitthread;
+
+                        if ( msg.hwnd != (HWND)NULL )
+                        {
+                                TranslateMessage( &msg );
+                                DispatchMessageA( &msg );
+                        }
+                        else
+                        {
+                                switch ( msg.message )
+                                {
+                                case QUARTZ_MSG_ADDTIMER:
+                                case QUARTZ_MSG_REMOVETIMER:
+                                        dwTimeout = 0;
+                                        break;
+                                case QUARTZ_MSG_EXITTHREAD:
+                                        PostQuitMessage(0);
+                                        break;
+                                default:
+                                        FIXME( "invalid message %04u\n", (unsigned)msg.message );
+                                        break;
+                                }
+                        }
+                }
+        }
+
+quitthread:
+        TRACE( "quit thread\n" );
+        return 0;
+}
+
+/****************************************************************************/
+
+static HRESULT WINAPI
+IReferenceClock_fnQueryInterface(IReferenceClock* iface,REFIID riid,void** ppobj)
+{
+        CSystemClock_THIS(iface,refclk);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_QueryInterface(This->unk.punkControl,riid,ppobj);
+}
+
+static ULONG WINAPI
+IReferenceClock_fnAddRef(IReferenceClock* iface)
+{
+        CSystemClock_THIS(iface,refclk);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_AddRef(This->unk.punkControl);
+}
+
+static ULONG WINAPI
+IReferenceClock_fnRelease(IReferenceClock* iface)
+{
+        CSystemClock_THIS(iface,refclk);
+
+        TRACE("(%p)->()\n",This);
+
+        return IUnknown_Release(This->unk.punkControl);
+}
+
+static HRESULT WINAPI
+IReferenceClock_fnGetTime(IReferenceClock* iface,REFERENCE_TIME* prtTime)
+{
+        CSystemClock_THIS(iface,refclk);
+        DWORD   dwTimeCur;
+
+        TRACE( "(%p)->(%p)\n", This, prtTime );
+
+        if ( prtTime == NULL )
+                return E_POINTER;
+
+        EnterCriticalSection( &This->m_csClock );
+
+        dwTimeCur = GetTickCount();
+        This->m_rtLast += (REFERENCE_TIME)(DWORD)(dwTimeCur - This->m_dwTimeLast) * (REFERENCE_TIME)10000;
+
+        This->m_dwTimeLast = dwTimeCur;
+
+        *prtTime = This->m_rtLast;
+
+        LeaveCriticalSection( &This->m_csClock );
+
+        return NOERROR;
+}
+
+static HRESULT WINAPI
+IReferenceClock_fnAdviseTime(IReferenceClock* iface,REFERENCE_TIME rtBase,REFERENCE_TIME rtStream,HEVENT hEvent,DWORD_PTR* pdwAdvCookie)
+{
+        CSystemClock_THIS(iface,refclk);
+        QUARTZ_TimerEntry*      pEntry;
+        HRESULT hr;
+        REFERENCE_TIME  rtCur;
+
+        TRACE( "(%p)->()\n", This );
+
+        if ( pdwAdvCookie == NULL )
+                return E_POINTER;
+        if ( hEvent == (HANDLE)NULL )
+                return E_INVALIDARG;
+
+        EnterCriticalSection( &This->m_csClock );
+
+        *pdwAdvCookie = (DWORD_PTR)(This->m_dwAdvCookieNext ++);
+
+        hr = IReferenceClock_GetTime(iface,&rtCur);
+        if ( hr != NOERROR )
+                goto err;
+        if ( rtCur >= (rtBase+rtStream) )
+        {
+                SetEvent(hEvent);
+                hr = NOERROR;
+                goto err;
+        }
+
+        pEntry = IReferenceClock_AllocTimerEntry(This);
+        if ( pEntry == NULL )
+        {
+                hr = E_FAIL;
+                goto err;
+        }
+
+        pEntry->dwAdvCookie = *pdwAdvCookie;
+        pEntry->fPeriodic = FALSE;
+        pEntry->hEvent = hEvent;
+        pEntry->rtStart = rtBase;
+        pEntry->rtInterval = rtStream;
+
+        if ( !PostThreadMessageA(
+                        This->m_idThreadTimer,
+                        QUARTZ_MSG_ADDTIMER,
+                        0, 0 ) )
+        {
+                pEntry->hEvent = (HANDLE)NULL;
+                hr = E_FAIL;
+                goto err;
+        }
+
+        hr = NOERROR;
+err:
+        LeaveCriticalSection( &This->m_csClock );
+
+        return hr;
+}
+
+static HRESULT WINAPI
+IReferenceClock_fnAdvisePeriodic(IReferenceClock* iface,REFERENCE_TIME rtStart,REFERENCE_TIME rtPeriod,HSEMAPHORE hSemaphore,DWORD_PTR* pdwAdvCookie)
+{
+        CSystemClock_THIS(iface,refclk);
+        QUARTZ_TimerEntry*      pEntry;
+        HRESULT hr;
+
+        TRACE( "(%p)->()\n", This );
+
+        if ( pdwAdvCookie == NULL )
+                return E_POINTER;
+        if ( hSemaphore == (HSEMAPHORE)NULL )
+                return E_INVALIDARG;
+
+        EnterCriticalSection( &This->m_csClock );
+
+        *pdwAdvCookie = (DWORD_PTR)(This->m_dwAdvCookieNext ++);
+
+        pEntry = IReferenceClock_AllocTimerEntry(This);
+        if ( pEntry == NULL )
+        {
+                hr = E_FAIL;
+                goto err;
+        }
+
+        pEntry->dwAdvCookie = *pdwAdvCookie;
+        pEntry->fPeriodic = TRUE;
+        pEntry->hEvent = (HANDLE)hSemaphore;
+        pEntry->rtStart = rtStart;
+        pEntry->rtInterval = rtPeriod;
+
+        if ( !PostThreadMessageA(
+                        This->m_idThreadTimer,
+                        QUARTZ_MSG_ADDTIMER,
+                        0, 0 ) )
+        {
+                pEntry->hEvent = (HANDLE)NULL;
+                hr = E_FAIL;
+                goto err;
+        }
+
+        hr = NOERROR;
+err:
+        LeaveCriticalSection( &This->m_csClock );
+
+        return hr;
+}
+
+static HRESULT WINAPI
+IReferenceClock_fnUnadvise(IReferenceClock* iface,DWORD_PTR dwAdvCookie)
+{
+        CSystemClock_THIS(iface,refclk);
+        QUARTZ_TimerEntry*      pEntry;
+
+        TRACE( "(%p)->(%lu)\n", This, (DWORD)dwAdvCookie );
+
+        EnterCriticalSection( &This->m_csClock );
+
+        pEntry = IReferenceClock_SearchTimer(This,(DWORD)dwAdvCookie);
+        if ( pEntry != NULL )
+        {
+                pEntry->hEvent = (HANDLE)NULL;
+        }
+
+        LeaveCriticalSection( &This->m_csClock );
+
+        return NOERROR;
+}
+
+static ICOM_VTABLE(IReferenceClock) irefclk =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        /* IUnknown fields */
+        IReferenceClock_fnQueryInterface,
+        IReferenceClock_fnAddRef,
+        IReferenceClock_fnRelease,
+        /* IReferenceClock fields */
+        IReferenceClock_fnGetTime,
+        IReferenceClock_fnAdviseTime,
+        IReferenceClock_fnAdvisePeriodic,
+        IReferenceClock_fnUnadvise,
+};
+
+
+HRESULT CSystemClock_InitIReferenceClock( CSystemClock* psc )
+{
+        HANDLE  hEvents[2];
+
+        TRACE("(%p)\n",psc);
+        ICOM_VTBL(&psc->refclk) = &irefclk;
+
+        InitializeCriticalSection( &psc->m_csClock );
+        psc->m_dwTimeLast = GetTickCount();
+        psc->m_rtLast = (REFERENCE_TIME)0;
+        psc->m_hThreadTimer = (HANDLE)NULL;
+        psc->m_hEventInit = (HANDLE)NULL;
+        psc->m_idThreadTimer = 0;
+        psc->m_dwAdvCookieNext = 1;
+        ZeroMemory( psc->m_timerEntries, sizeof(psc->m_timerEntries) );
+
+        psc->m_hEventInit = CreateEventA( NULL, TRUE, FALSE, NULL );
+        if ( psc->m_hEventInit == (HANDLE)NULL )
+                goto err;
+
+        psc->m_hThreadTimer = CreateThread(
+                NULL, 0,
+                IReferenceClock_TimerEntry,
+                psc, 0, &psc->m_idThreadTimer );
+
+        if ( psc->m_hThreadTimer == (HANDLE)NULL )
+        {
+                CloseHandle( psc->m_hEventInit );
+                psc->m_hEventInit = (HANDLE)NULL;
+                goto err;
+        }
+
+        hEvents[0] = psc->m_hEventInit;
+        hEvents[1] = psc->m_hThreadTimer;
+        if ( WaitForMultipleObjects( 2, hEvents, FALSE, INFINITE )
+                        != WAIT_OBJECT_0 )
+        {
+                CloseHandle( psc->m_hEventInit );
+                psc->m_hEventInit = (HANDLE)NULL;
+                CloseHandle( psc->m_hThreadTimer );
+                psc->m_hThreadTimer = (HANDLE)NULL;
+                goto err;
+        }
+
+        return NOERROR;
+
+err:
+        DeleteCriticalSection( &psc->m_csClock );
+        return E_FAIL;
+}
+
+void CSystemClock_UninitIReferenceClock( CSystemClock* psc )
+{
+        TRACE("(%p)\n",psc);
+
+        if ( psc->m_hThreadTimer != (HANDLE)NULL )
+        {
+                if ( PostThreadMessageA(
+                        psc->m_idThreadTimer,
+                        QUARTZ_MSG_EXITTHREAD,
+                        0, 0 ) )
+                {
+                        WaitForSingleObject( psc->m_hThreadTimer, INFINITE );
+                }
+                CloseHandle( psc->m_hThreadTimer );
+                psc->m_hThreadTimer = (HANDLE)NULL;
+        }
+
+        DeleteCriticalSection( &psc->m_csClock );
+}