[QCAP] CaptureGraphBuilder rewrite
Maarten Lankhorst
m.b.lankhorst at gmail.com
Tue May 17 13:45:48 CDT 2005
Rolf Kalbermatter's version didn't work for me, so basically I took my
old capturegraphbuilder1 source, renamed all calls and made the old
calls being forwarded to the new...
of course it was probably easier to just find out what's wrong but I'm
not always in such a mood...
This requires the vfwcapture interface to be patched in, else this
define need to be put in qcap_main.h:
#define ICOM_THIS_MULTI(impl,field,iface) impl* const
This=(impl*)((char*)(iface) - offsetof(impl,field))
ChangeLog
Rewrote capturegraphbuilder.c
-------------- next part --------------
Index: capturegraph.c
===================================================================
RCS file: /home/wine/wine/dlls/qcap/capturegraph.c,v
retrieving revision 1.1
diff -u -p -r1.1 capturegraph.c
--- capturegraph.c 7 May 2005 18:18:39 -0000 1.1
+++ capturegraph.c 17 May 2005 18:39:36 -0000
@@ -1,7 +1,5 @@
-/* Capture Graph Builder, Minimal edition
- *
+/* Capture Graph Builder, Minimal edition..
* Copyright 2005 Maarten Lankhorst
- * Copyright 2005 Rolf Kalbermatter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -16,8 +14,12 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Rolf kalbermatter made a CaptureGraphBuilder2, but it was broken,
+ * I didn't feel like looking into what was broken so I decided to rewrite it
+ * (Being a bunch of stubs)
+ * It's not like it's that much code anyway..
*/
-#include "config.h"
#include <stdio.h>
#include <stdarg.h>
@@ -35,454 +37,262 @@
#include "evcode.h"
#include "strmif.h"
#include "control.h"
-/*
- *#include "amvideo.h"
- *#include "mmreg.h"
- *#include "vfwmsgs.h"
- *#include "dshow.h"
- *#include "ddraw.h"
- */
-#include "qcap_main.h"
-
-#include "wine/unicode.h"
#include "wine/debug.h"
+#include "qcap_main.h"
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
+WINE_DEFAULT_DEBUG_CHANNEL(qcap);
-static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0};
+static const ICaptureGraphBuilder2Vtbl Builder2_Vtbl;
+static const ICaptureGraphBuilderVtbl Builder_Vtbl;
-/***********************************************************************
-* ICaptureGraphBuilder & ICaptureGraphBuilder2 implementation
-*/
typedef struct CaptureGraphImpl
{
- const ICaptureGraphBuilder2Vtbl * lpVtbl2;
- const ICaptureGraphBuilderVtbl * lpVtbl;
- DWORD ref;
- IGraphBuilder *mygraph;
+ const ICaptureGraphBuilder2Vtbl * lpVtbl2;
+ const ICaptureGraphBuilderVtbl * lpVtbl;
+ IGraphBuilder *mygraph;
- CRITICAL_SECTION csFilter;
+ ULONG refCount;
+ CRITICAL_SECTION csFilter;
} CaptureGraphImpl;
-static const ICaptureGraphBuilderVtbl builder_Vtbl;
-static const ICaptureGraphBuilder2Vtbl builder2_Vtbl;
-
-#define _ICaptureGraphBuilder_Offset ((int)(&(((CaptureGraphImpl*)0)->lpVtbl)))
-#define _ICOM_THIS_From_ICaptureGraphBuilder(class, name) class* This = (class*)(((char*)name)-_ICaptureGraphBuilder_Offset)
-
-#define _ICaptureGraphBuilder2_Offset ((int)(&(((CaptureGraphImpl*)0)->lpVtbl2)))
-#define _ICOM_THIS_From_ICaptureGraphBuilder2(class, name) class* This = (class*)(((char*)name)-_ICaptureGraphBuilder2_Offset)
-
-/*
- converts This to an interface pointer
-*/
-#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl2)
-#define _ICaptureGraphBuilder_(This) (ICaptureGraphBuilder*)&(This->lpVtbl)
-#define _ICaptureGraphBuilder2_(This) (ICaptureGraphBuilder2*)&(This->lpVtbl2)
-
-
-IUnknown * CALLBACK QCAP_createCaptureGraphBuilder2(IUnknown *pUnkOuter,
- HRESULT *phr)
+IUnknown * WINAPI QCAP_createCaptureGraphBuilder2(IUnknown * pUnkOuter, HRESULT * phr)
{
- CaptureGraphImpl * pCapture = NULL;
-
- TRACE("(%p, %p)\n", pUnkOuter, phr);
-
- *phr = CLASS_E_NOAGGREGATION;
- if (pUnkOuter)
- {
- return NULL;
- }
- *phr = E_OUTOFMEMORY;
-
- pCapture = CoTaskMemAlloc(sizeof(CaptureGraphImpl));
- if (pCapture)
- {
- pCapture->lpVtbl2 = &builder2_Vtbl;
- pCapture->lpVtbl = &builder_Vtbl;
- pCapture->ref = 1;
- pCapture->mygraph = NULL;
- InitializeCriticalSection(&pCapture->csFilter);
- *phr = S_OK;
- }
- return (IUnknown *)pCapture;
+ CaptureGraphImpl * pCapture;
+ TRACE("(%p, %p)\n", pUnkOuter, phr);
+ *phr = CLASS_E_NOAGGREGATION;
+ if (pUnkOuter) return NULL;
+ *phr = E_OUTOFMEMORY;
+ pCapture = CoTaskMemAlloc(sizeof(CaptureGraphImpl));
+ if (!pCapture) return NULL;
+ pCapture->lpVtbl = &Builder_Vtbl;
+ pCapture->lpVtbl2 = &Builder2_Vtbl;
+ pCapture->refCount = 1;
+ pCapture->mygraph = NULL;
+ InitializeCriticalSection(&pCapture->csFilter);
+ *phr = S_OK;
+ TRACE("Created at address %p\n", pCapture);
+ return (IUnknown *)pCapture;
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder2_QueryInterface(ICaptureGraphBuilder2 * iface,
- REFIID riid,
- LPVOID * ppv)
+static HRESULT WINAPI CaptureGraphBuilder2_QueryInterface(ICaptureGraphBuilder2 * iface, REFIID riid, LPVOID * ppv)
{
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl2, iface);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv);
+ *ppv = NULL;
+ if (IsEqualIID(riid, &IID_IUnknown))
+ *ppv = (LPVOID)This;
+ else if (IsEqualIID(riid, &IID_ICaptureGraphBuilder2))
+ *ppv = (LPVOID)&This->lpVtbl2;
+ else if (IsEqualIID(riid, &IID_ICaptureGraphBuilder))
+ *ppv = (LPVOID)&This->lpVtbl;
- TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv);
+ if (*ppv)
+ {
+ IUnknown_AddRef((IUnknown *)(*ppv));
+ return S_OK;
+ }
- *ppv = NULL;
- if (IsEqualIID(riid, &IID_IUnknown))
- *ppv = _IUnknown_(This);
- else if (IsEqualIID(riid, &IID_ICaptureGraphBuilder))
- *ppv = _ICaptureGraphBuilder_(This);
- else if (IsEqualIID(riid, &IID_ICaptureGraphBuilder2))
- *ppv = _ICaptureGraphBuilder2_(This);
-
- if (*ppv)
- {
- IUnknown_AddRef((IUnknown *)(*ppv));
- TRACE ("-- Interface = %p\n", *ppv);
- return S_OK;
- }
-
- TRACE ("-- Interface: E_NOINTERFACE\n");
- return E_NOINTERFACE;
+ FIXME("No interface for %s!\n", debugstr_guid(riid));
+ return E_NOINTERFACE;
}
-static ULONG WINAPI
-fnCaptureGraphBuilder2_AddRef(ICaptureGraphBuilder2 * iface)
+static ULONG WINAPI CaptureGraphBuilder2_AddRef(ICaptureGraphBuilder2 * iface)
{
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
- DWORD ref = InterlockedIncrement(&This->ref);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl2, iface);
+ ULONG refCount = InterlockedIncrement(&This->refCount);
- TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, ref - 1);
- return ref;
+ TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, refCount - 1);
+ return refCount;
}
-static ULONG WINAPI
-fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface)
+static ULONG WINAPI CaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface)
{
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
- DWORD ref = InterlockedDecrement(&This->ref);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl2, iface);
+ ULONG refCount = InterlockedDecrement(&This->refCount);
- TRACE("(%p/%p)->() Release from %ld\n", This, iface, ref + 1);
+ TRACE("(%p/%p)->() Release from %ld\n", This, iface, refCount + 1);
- if (!ref)
- {
- FIXME("Release IGraphFilter or w/e\n");
- DeleteCriticalSection(&This->csFilter);
- This->lpVtbl = NULL;
- This->lpVtbl2 = NULL;
- if (This->mygraph != NULL)
- IGraphBuilder_Release((IGraphBuilder *)This->mygraph);
- CoTaskMemFree(This);
- return 0;
- }
- else
- return ref;
+ if (!refCount) {
+ TRACE("Destroying everything..\n");
+ DeleteCriticalSection(&This->csFilter);
+ if (This->mygraph != NULL)
+ IGraphBuilder_Release((IGraphBuilder *)This->mygraph);
+ CoTaskMemFree(This);
+ return 0;
+ }
+ else return refCount;
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder2_SetFilterGraph(ICaptureGraphBuilder2 * iface,
- IGraphBuilder *pfg)
+static HRESULT WINAPI CaptureGraphBuilder2_SetFilterGraph(ICaptureGraphBuilder2 * iface, IGraphBuilder *pfg)
{
-/* The graph builder will automatically create a filter graph if you don't call
- this method. If you call this method after the graph builder has created its
- own filter graph, the call will fail. */
- IMediaEvent *pmev;
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
-
- TRACE("(%p/%p)->(%p)\n", This, iface, pfg);
-
- if (!This->mygraph)
- return E_UNEXPECTED;
-
- if (!pfg)
- return E_POINTER;
-
- This->mygraph = pfg;
- IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph);
- if (SUCCEEDED(IUnknown_QueryInterface(This->mygraph,
- &IID_IMediaEvent, (LPVOID *)&pmev)))
- {
- IMediaEvent_CancelDefaultHandling(pmev, EC_REPAINT);
- IMediaEvent_Release(pmev);
- }
- return S_OK;
+/* The graph builder will automatically create a filter graph if you don't call this method. If you call this method after the graph builder has created its own filter graph, the call will fail. */
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl2, iface);
+ if (This->mygraph != NULL) return E_NOTIMPL;
+ This->mygraph = pfg;
+ IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph);
+ TRACE("%p: %p\n", iface, pfg);
+ return S_OK;
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder2_GetFilterGraph(ICaptureGraphBuilder2 * iface,
- IGraphBuilder **pfg)
+static HRESULT WINAPI CaptureGraphBuilder2_GetFilterGraph(ICaptureGraphBuilder2 * iface, IGraphBuilder **pfg)
{
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
-
- TRACE("(%p/%p)->(%p)\n", This, iface, pfg);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl2, iface);
+ FIXME("%p: Make our own filtergraph if we haven't got one already - stub\n", iface);
+ if (This->mygraph == NULL) return E_NOTIMPL;
- if (!pfg)
- return E_POINTER;
-
- *pfg = This->mygraph;
- if (!This->mygraph)
- {
- TRACE("(%p) Getting NULL filtergraph\n", iface);
- return E_UNEXPECTED;
- }
-
- IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph);
+ *pfg = This->mygraph;
+ IGraphBuilder_AddRef((IGraphBuilder *)This->mygraph);
- TRACE("(%p) return filtergraph %p\n", iface, *pfg);
- return S_OK;
+ TRACE("%p: %p\n", iface, *pfg);
+ return S_OK;
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder2_SetOutputFileName(ICaptureGraphBuilder2 * iface,
- const GUID *pType,
- LPCOLESTR lpstrFile,
- IBaseFilter **ppf,
- IFileSinkFilter **ppSink)
+static HRESULT WINAPI CaptureGraphBuilder2_SetOutputFileName(ICaptureGraphBuilder2 * iface, const GUID *pType, LPCOLESTR lpstrFile,IBaseFilter **ppf, IFileSinkFilter **ppSink)
{
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
-
- FIXME("(%p/%p)->(%s, %s, %p, %p) Stub!\n", This, iface,
- debugstr_guid(pType), debugstr_w(lpstrFile), ppf, ppSink);
-
- return E_NOTIMPL;
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl2, iface);
+ FIXME("%p: %p, %p, %p, %p - stub\n", This, pType, lpstrFile, *ppf, *ppSink);
+ return E_NOTIMPL;
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder2_FindInterface(ICaptureGraphBuilder2 * iface,
- const GUID *pCategory,
- const GUID *pType,
- IBaseFilter *pf,
- REFIID riid,
- void **ppint)
+static HRESULT WINAPI CaptureGraphBuilder2_FindInterface(ICaptureGraphBuilder2 * iface, const GUID *pCategory, const GUID *pType, IBaseFilter *pf, REFIID riid, void **ppint)
{
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
-
- FIXME("(%p/%p)->(%s, %s, %p, %s, %p) - workaround stub!\n", This, iface,
- debugstr_guid(pCategory), debugstr_guid(pType),
- pf, debugstr_guid(riid), ppint);
-
- return IBaseFilter_QueryInterface(pf, riid, ppint);
- /* Looks for the specified interface on the filter, upstream and
- * downstream from the filter, and, optionally, only on the output
- * pin of the given category.
- */
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl2, iface);
+ FIXME("%p: %s %p %p %s %p - unwanted partial stub!\n", This, debugstr_guid(pCategory), pType, pf, debugstr_guid(riid), *ppint);
+ return IBaseFilter_QueryInterface(pf, riid, ppint);
+ /* Looks for the specified interface on the filter, upstream and
+ * downstream from the filter, and, optionally, only on the output
+ * pin of the given category.
+ */
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface,
- const GUID *pCategory,
- const GUID *pType,
- IUnknown *pSource,
- IBaseFilter *pfCompressor,
- IBaseFilter *pfRenderer)
+static HRESULT WINAPI CaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, const GUID *pCategory, const GUID *pType, IUnknown *pSource, IBaseFilter *pfCompressor, IBaseFilter *pfRenderer)
{
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
-
- FIXME("(%p/%p)->(%s, %s, %p, %p, %p) Stub!\n", This, iface,
- debugstr_guid(pCategory), debugstr_guid(pType),
- pSource, pfCompressor, pfRenderer);
-
- return E_NOTIMPL;
+ FIXME("%p: stub\n", iface);
+ return E_NOTIMPL;
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder2_ControlStream(ICaptureGraphBuilder2 * iface,
- const GUID *pCategory,
- const GUID *pType,
- IBaseFilter *pFilter,
- REFERENCE_TIME *pstart,
- REFERENCE_TIME *pstop,
- WORD wStartCookie,
- WORD wStopCookie)
+static HRESULT WINAPI CaptureGraphBuilder2_ControlStream(ICaptureGraphBuilder2 * iface, const GUID *pCategory, const GUID *pType, IBaseFilter *pFilter, REFERENCE_TIME *pstart, REFERENCE_TIME *pstop, WORD wStartCookie, WORD wStopCookie)
{
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
-
- FIXME("(%p/%p)->(%s, %s, %p, %p, %p, %i, %i) Stub!\n", This, iface,
- debugstr_guid(pCategory), debugstr_guid(pType),
- pFilter, pstart, pstop, wStartCookie, wStopCookie);
-
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI
-fnCaptureGraphBuilder2_AllocCapFile(ICaptureGraphBuilder2 * iface,
- LPCOLESTR lpwstr,
- DWORDLONG dwlSize)
-{
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
-
- FIXME("(%p/%p)->(%s, %lld) Stub!\n", This, iface,
- debugstr_w(lpwstr), dwlSize);
-
- return E_NOTIMPL;
+ FIXME("%p: stub\n", iface);
+ return E_NOTIMPL;
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder2_CopyCaptureFile(ICaptureGraphBuilder2 * iface,
- LPOLESTR lpwstrOld,
- LPOLESTR lpwstrNew,
- int fAllowEscAbort,
- IAMCopyCaptureFileProgress *pCallback)
+static HRESULT WINAPI CaptureGraphBuilder2_AllocCapFile(ICaptureGraphBuilder2 * iface, LPCOLESTR lpstr, DWORDLONG dwlSize)
{
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
-
- FIXME("(%p/%p)->(%s, %s, %i, %p) Stub!\n", This, iface,
- debugstr_w(lpwstrOld), debugstr_w(lpwstrNew),
- fAllowEscAbort, pCallback);
-
- return E_NOTIMPL;
+ FIXME("%p: stub\n", iface);
+ return E_NOTIMPL;
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface,
- IUnknown *pSource,
- PIN_DIRECTION pindir,
- const GUID *pCategory,
- const GUID *pType,
- BOOL fUnconnected,
- int num,
- IPin **ppPin)
+static HRESULT WINAPI CaptureGraphBuilder2_CopyCaptureFile(ICaptureGraphBuilder2 * iface, LPOLESTR lpwstrOld, LPOLESTR lpwstrNew, int fAllowEscAbort, IAMCopyCaptureFileProgress *pCallback)
{
- _ICOM_THIS_From_ICaptureGraphBuilder2(CaptureGraphImpl, iface);
-
- FIXME("(%p/%p)->(%p, %x, %s, %s, %d, %i, %p) Stub!\n", This, iface,
- pSource, pindir, debugstr_guid(pCategory), debugstr_guid(pType),
- fUnconnected, num, ppPin);
-
- return E_NOTIMPL;
+ FIXME("%p: stub\n", iface);
+ return E_NOTIMPL;
}
-static const ICaptureGraphBuilder2Vtbl builder2_Vtbl =
+static const ICaptureGraphBuilder2Vtbl Builder2_Vtbl =
{
- fnCaptureGraphBuilder2_QueryInterface,
- fnCaptureGraphBuilder2_AddRef,
- fnCaptureGraphBuilder2_Release,
- fnCaptureGraphBuilder2_SetFilterGraph,
- fnCaptureGraphBuilder2_GetFilterGraph,
- fnCaptureGraphBuilder2_SetOutputFileName,
- fnCaptureGraphBuilder2_FindInterface,
- fnCaptureGraphBuilder2_RenderStream,
- fnCaptureGraphBuilder2_ControlStream,
- fnCaptureGraphBuilder2_AllocCapFile,
- fnCaptureGraphBuilder2_CopyCaptureFile,
- fnCaptureGraphBuilder2_FindPin
+ CaptureGraphBuilder2_QueryInterface,
+ CaptureGraphBuilder2_AddRef,
+ CaptureGraphBuilder2_Release,
+ CaptureGraphBuilder2_SetFilterGraph,
+ CaptureGraphBuilder2_GetFilterGraph,
+ CaptureGraphBuilder2_SetOutputFileName,
+ CaptureGraphBuilder2_FindInterface,
+ CaptureGraphBuilder2_RenderStream,
+ CaptureGraphBuilder2_ControlStream,
+ CaptureGraphBuilder2_AllocCapFile,
+ CaptureGraphBuilder2_CopyCaptureFile
};
-
-static HRESULT WINAPI
-fnCaptureGraphBuilder_QueryInterface(ICaptureGraphBuilder * iface,
- REFIID riid, LPVOID * ppv)
+static HRESULT WINAPI CaptureGraphBuilder_QueryInterface(ICaptureGraphBuilder * iface, REFIID riid, LPVOID * ppv)
{
- _ICOM_THIS_From_ICaptureGraphBuilder(CaptureGraphImpl, iface);
-
- return IUnknown_QueryInterface(_ICaptureGraphBuilder2_(This), riid, ppv);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl, iface);
+ TRACE(" Forwarding %p to %p\n", iface, This);
+ return CaptureGraphBuilder_QueryInterface((ICaptureGraphBuilder2 *)&This->lpVtbl2, riid, ppv);
}
-static ULONG WINAPI
-fnCaptureGraphBuilder_AddRef(ICaptureGraphBuilder * iface)
+static ULONG WINAPI CaptureGraphBuilder_AddRef(ICaptureGraphBuilder * iface)
{
- _ICOM_THIS_From_ICaptureGraphBuilder(CaptureGraphImpl, iface);
-
- return IUnknown_AddRef(_ICaptureGraphBuilder2_(This));
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl, iface);
+ TRACE(" Forwarding %p to %p\n", iface, This);
+ return CaptureGraphBuilder2_AddRef((ICaptureGraphBuilder2 *)&This->lpVtbl2);
}
-static ULONG WINAPI
-fnCaptureGraphBuilder_Release(ICaptureGraphBuilder * iface)
+static ULONG WINAPI CaptureGraphBuilder_Release(ICaptureGraphBuilder * iface)
{
- _ICOM_THIS_From_ICaptureGraphBuilder(CaptureGraphImpl, iface);
-
- return IUnknown_Release(_ICaptureGraphBuilder2_(This));
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl, iface);
+ TRACE(" Forwarding %p to %p\n", iface, This);
+ return CaptureGraphBuilder2_Release((ICaptureGraphBuilder2 *)&This->lpVtbl2);
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder_SetFiltergraph(ICaptureGraphBuilder * iface,
- IGraphBuilder *pfg)
+static HRESULT WINAPI CaptureGraphBuilder_SetFilterGraph(ICaptureGraphBuilder * iface, IGraphBuilder *pfg)
{
- _ICOM_THIS_From_ICaptureGraphBuilder(CaptureGraphImpl, iface);
-
- return ICaptureGraphBuilder2_SetFiltergraph(_ICaptureGraphBuilder2_(This), pfg);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl, iface);
+ TRACE(" Forwarding %p to %p\n", iface, This);
+ return CaptureGraphBuilder2_SetFilterGraph((ICaptureGraphBuilder2 *)&This->lpVtbl2, pfg);
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder_GetFiltergraph(ICaptureGraphBuilder * iface,
- IGraphBuilder **pfg)
-{
- _ICOM_THIS_From_ICaptureGraphBuilder(CaptureGraphImpl, iface);
+static HRESULT WINAPI CaptureGraphBuilder_GetFilterGraph(ICaptureGraphBuilder * iface, IGraphBuilder **pfg)
+{
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl, iface);
+ TRACE(" Forwarding %p to %p\n", iface, This);
+ return CaptureGraphBuilder2_GetFilterGraph((ICaptureGraphBuilder2 *)&This->lpVtbl2, pfg);
+}
- return ICaptureGraphBuilder2_GetFiltergraph(_ICaptureGraphBuilder2_(This), pfg);
-}
-
-static HRESULT WINAPI
-fnCaptureGraphBuilder_SetOutputFileName(ICaptureGraphBuilder * iface,
- const GUID *pType, LPCOLESTR lpstrFile,
- IBaseFilter **ppf, IFileSinkFilter **ppSink)
+static HRESULT WINAPI CaptureGraphBuilder_SetOutputFileName(ICaptureGraphBuilder * iface, const GUID *pType, LPCOLESTR lpstrFile,IBaseFilter **ppf, IFileSinkFilter **ppSink)
{
- _ICOM_THIS_From_ICaptureGraphBuilder(CaptureGraphImpl, iface);
-
- return ICaptureGraphBuilder2_SetOutputFileName(_ICaptureGraphBuilder2_(This),
- pType, lpstrFile, ppf, ppSink);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl, iface);
+ TRACE(" Forwarding %p to %p\n", iface, This);
+ return CaptureGraphBuilder2_SetOutputFileName((ICaptureGraphBuilder2 *)&This->lpVtbl2, pType, lpstrFile, ppf, ppSink);
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder_FindInterface(ICaptureGraphBuilder * iface,
- const GUID *pCategory, IBaseFilter *pf,
- REFIID riid, void **ppint)
+static HRESULT WINAPI CaptureGraphBuilder_FindInterface(ICaptureGraphBuilder * iface, const GUID *pCategory, IBaseFilter *pf, REFIID riid, void **ppint)
{
- _ICOM_THIS_From_ICaptureGraphBuilder(CaptureGraphImpl, iface);
-
- return ICaptureGraphBuilder2_FindInterface(_ICaptureGraphBuilder2_(This),
- pCategory, NULL, pf, riid, ppint);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl, iface);
+ TRACE(" Forwarding %p to %p\n", iface, This);
+ return CaptureGraphBuilder2_FindInterface((ICaptureGraphBuilder2 *)&This->lpVtbl2, pCategory, NULL, pf, riid, ppint);
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder_RenderStream(ICaptureGraphBuilder * iface,
- const GUID *pCategory, IUnknown *pSource,
- IBaseFilter *pfCompressor, IBaseFilter *pfRenderer)
+static HRESULT WINAPI CaptureGraphBuilder_RenderStream(ICaptureGraphBuilder * iface, const GUID *pCategory, IUnknown *pSource, IBaseFilter *pfCompressor, IBaseFilter *pfRenderer)
{
- _ICOM_THIS_From_ICaptureGraphBuilder(CaptureGraphImpl, iface);
-
- return ICaptureGraphBuilder2_RenderStream(_ICaptureGraphBuilder2_(This),
- pCategory, NULL, pSource,
- pfCompressor, pfRenderer);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl, iface);
+ TRACE(" Forwarding %p to %p\n", iface, This);
+ return CaptureGraphBuilder2_RenderStream((ICaptureGraphBuilder2 *)&This->lpVtbl2, pCategory, NULL, pSource, pfCompressor, pfRenderer);
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder_ControlStream(ICaptureGraphBuilder * iface,
- const GUID *pCategory, IBaseFilter *pFilter,
- REFERENCE_TIME *pstart, REFERENCE_TIME *pstop,
- WORD wStartCookie, WORD wStopCookie)
+static HRESULT WINAPI CaptureGraphBuilder_ControlStream(ICaptureGraphBuilder * iface, const GUID *pCategory, IBaseFilter *pFilter, REFERENCE_TIME *pstart, REFERENCE_TIME *pstop, WORD wStartCookie, WORD wStopCookie)
{
- _ICOM_THIS_From_ICaptureGraphBuilder(CaptureGraphImpl, iface);
-
- return ICaptureGraphBuilder2_ControlStream(_ICaptureGraphBuilder2_(This),
- pCategory, NULL, pFilter, pstart,
- pstop, wStartCookie, wStopCookie);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl, iface);
+ TRACE(" Forwarding %p to %p\n", iface, This);
+ return CaptureGraphBuilder2_ControlStream((ICaptureGraphBuilder2 *)&This->lpVtbl2, pCategory, NULL, pFilter, pstart, pstop, wStartCookie, wStopCookie);
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder_AllocCapFile(ICaptureGraphBuilder * iface,
- LPCOLESTR lpstr, DWORDLONG dwlSize)
+static HRESULT WINAPI CaptureGraphBuilder_AllocCapFile(ICaptureGraphBuilder * iface, LPCOLESTR lpstr, DWORDLONG dwlSize)
{
- _ICOM_THIS_From_ICaptureGraphBuilder(CaptureGraphImpl, iface);
-
- return ICaptureGraphBuilder2_AllocCapFile(_ICaptureGraphBuilder2_(This),
- lpstr, dwlSize);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl, iface);
+ TRACE(" Forwarding %p to %p\n", iface, This);
+ return CaptureGraphBuilder2_AllocCapFile((ICaptureGraphBuilder2 *)&This->lpVtbl2, lpstr, dwlSize);
}
-static HRESULT WINAPI
-fnCaptureGraphBuilder_CopyCaptureFile(ICaptureGraphBuilder * iface,
- LPOLESTR lpwstrOld, LPOLESTR lpwstrNew,
- int fAllowEscAbort,
- IAMCopyCaptureFileProgress *pCallback)
+static HRESULT WINAPI CaptureGraphBuilder_CopyCaptureFile(ICaptureGraphBuilder * iface, LPOLESTR lpwstrOld, LPOLESTR lpwstrNew, int fAllowEscAbort, IAMCopyCaptureFileProgress *pCallback)
{
- _ICOM_THIS_From_ICaptureGraphBuilder(CaptureGraphImpl, iface);
-
- return ICaptureGraphBuilder2_CopyCaptureFile(_ICaptureGraphBuilder2_(This),
- lpwstrOld, lpwstrNew,
- fAllowEscAbort, pCallback);
+ ICOM_THIS_MULTI(CaptureGraphImpl, lpVtbl, iface);
+ TRACE(" Forwarding %p to %p\n", iface, This);
+ return CaptureGraphBuilder2_CopyCaptureFile((ICaptureGraphBuilder2 *)&This->lpVtbl2, lpwstrOld, lpwstrNew, fAllowEscAbort, pCallback);
}
-static const ICaptureGraphBuilderVtbl builder_Vtbl =
+static const ICaptureGraphBuilderVtbl Builder_Vtbl =
{
- fnCaptureGraphBuilder_QueryInterface,
- fnCaptureGraphBuilder_AddRef,
- fnCaptureGraphBuilder_Release,
- fnCaptureGraphBuilder_SetFiltergraph,
- fnCaptureGraphBuilder_GetFiltergraph,
- fnCaptureGraphBuilder_SetOutputFileName,
- fnCaptureGraphBuilder_FindInterface,
- fnCaptureGraphBuilder_RenderStream,
- fnCaptureGraphBuilder_ControlStream,
- fnCaptureGraphBuilder_AllocCapFile,
- fnCaptureGraphBuilder_CopyCaptureFile
+ CaptureGraphBuilder_QueryInterface,
+ CaptureGraphBuilder_AddRef,
+ CaptureGraphBuilder_Release,
+ CaptureGraphBuilder_SetFilterGraph,
+ CaptureGraphBuilder_GetFilterGraph,
+ CaptureGraphBuilder_SetOutputFileName,
+ CaptureGraphBuilder_FindInterface,
+ CaptureGraphBuilder_RenderStream,
+ CaptureGraphBuilder_ControlStream,
+ CaptureGraphBuilder_AllocCapFile,
+ CaptureGraphBuilder_CopyCaptureFile
};
+
More information about the wine-patches
mailing list