[QUARTZ] Implementation of IFilterGraphImpl_EnumFilters and IEnumFilters
interface
Christian Costa
titan.costa at wanadoo.fr
Wed Mar 3 17:02:43 CST 2004
Hi,
Changelog :
Implemented IFilterGraphImpl_EnumFilters and IEnumFilters interface.
Renamed contructor of IEnumRegFilters interface.
Small fix in IFilterMapper_EnumMatchingFilters.
Christian Costa titan.costa at wanadoo.fr
-------------- next part --------------
Index: quartz_private.h
===================================================================
RCS file: /home/wine/wine/dlls/quartz/quartz_private.h,v
retrieving revision 1.15
diff -u -r1.15 quartz_private.h
--- quartz_private.h 1 Mar 2004 23:32:04 -0000 1.15
+++ quartz_private.h 3 Mar 2004 21:52:16 -0000
@@ -59,7 +59,8 @@
HRESULT IEnumPinsImpl_Construct(const ENUMPINDETAILS * pDetails, IEnumPins ** ppEnum);
HRESULT IEnumMediaTypesImpl_Construct(const ENUMMEDIADETAILS * pDetails, IEnumMediaTypes ** ppEnum);
-HRESULT IEnumRegFiltersImpl_Create(REGFILTER* pInRegFilters, const ULONG size, IEnumRegFilters ** ppEnum);
+HRESULT IEnumRegFiltersImpl_Construct(REGFILTER * pInRegFilters, const ULONG size, IEnumRegFilters ** ppEnum);
+HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEnumFilters ** ppEnum);
extern const char * qzdebugstr_guid(const GUID * id);
extern const char * qzdebugstr_State(FILTER_STATE state);
Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/quartz/Makefile.in,v
retrieving revision 1.35
diff -u -r1.35 Makefile.in
--- Makefile.in 1 Mar 2004 23:32:04 -0000 1.35
+++ Makefile.in 3 Mar 2004 21:52:16 -0000
@@ -9,6 +9,7 @@
C_SRCS = \
avisplit.c \
control.c \
+ enumfilters.c \
enummedia.c \
enummoniker.c \
enumpins.c \
Index: filtergraph.c
===================================================================
RCS file: /home/wine/wine/dlls/quartz/filtergraph.c,v
retrieving revision 1.8
diff -u -r1.8 filtergraph.c
--- filtergraph.c 3 Mar 2004 02:18:13 -0000 1.8
+++ filtergraph.c 3 Mar 2004 21:52:20 -0000
@@ -288,9 +288,9 @@
IEnumFilters **ppEnum) {
ICOM_THIS_MULTI(IFilterGraphImpl, IGraphBuilder_vtbl, iface);
- TRACE("(%p/%p)->(%p): stub !!!\n", This, iface, ppEnum);
-
- return S_OK;
+ TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum);
+
+ return IEnumFiltersImpl_Construct(This->ppFiltersInGraph, This->nFilters, ppEnum);
}
static HRESULT WINAPI Graphbuilder_FindFilterByName(IGraphBuilder *iface,
Index: filtermapper.c
===================================================================
RCS file: /home/wine/wine/dlls/quartz/filtermapper.c,v
retrieving revision 1.8
diff -u -r1.8 filtermapper.c
--- filtermapper.c 1 Mar 2004 23:32:04 -0000 1.8
+++ filtermapper.c 3 Mar 2004 21:52:23 -0000
@@ -1094,7 +1094,7 @@
if (!nb_mon)
{
IEnumMoniker_Release(ppEnumMoniker);
- return IEnumRegFiltersImpl_Create(NULL, 0, ppEnum);
+ return IEnumRegFiltersImpl_Construct(NULL, 0, ppEnum);
}
regfilters = CoTaskMemAlloc(nb_mon * sizeof(REGFILTER));
@@ -1122,9 +1122,7 @@
hrSub = IPropertyBag_Read(pPropBagCat, wszClsidName, &var, NULL);
if (SUCCEEDED(hrSub))
- {
- CLSIDFromString(V_UNION(&var, bstrVal), &clsid);
- }
+ hrSub = CLSIDFromString(V_UNION(&var, bstrVal), &clsid);
if (SUCCEEDED(hrSub))
hrSub = IPropertyBag_Read(pPropBagCat, wszFriendlyName, &var, NULL);
@@ -1158,7 +1156,7 @@
return hr;
}
- hr = IEnumRegFiltersImpl_Create(regfilters, nb_mon, ppEnum);
+ hr = IEnumRegFiltersImpl_Construct(regfilters, nb_mon, ppEnum);
CoTaskMemFree(regfilters);
IEnumMoniker_Release(ppEnumMoniker);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ enumfilters.c 2004-03-03 22:53:37.000000000 +0000
@@ -0,0 +1,187 @@
+/*
+ * Implementation of IEnumFilters Interface
+ *
+ * Copyright 2004 Christian Costa
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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
+ */
+
+#include "quartz_private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
+
+typedef struct IEnumFiltersImpl
+{
+ const IEnumFiltersVtbl * lpVtbl;
+ ULONG refCount;
+ IBaseFilter ** ppFilters;
+ int nFilters;
+ ULONG uIndex;
+} IEnumFiltersImpl;
+
+static const struct IEnumFiltersVtbl IEnumFiltersImpl_Vtbl;
+
+HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEnumFilters ** ppEnum)
+{
+ /* Note: The incoming IBaseFilter interfaces are not AddRef'd here as in Windows,
+ * they should have been previously AddRef'd. */
+ IEnumFiltersImpl * pEnumFilters = CoTaskMemAlloc(sizeof(IEnumFiltersImpl));
+
+ TRACE("(%p, %ld, %p)\n", ppFilters, nFilters, ppEnum);
+
+ *ppEnum = NULL;
+
+ if (!pEnumFilters)
+ {
+ return E_OUTOFMEMORY;
+ }
+
+ pEnumFilters->lpVtbl = &IEnumFiltersImpl_Vtbl;
+ pEnumFilters->refCount = 1;
+ pEnumFilters->uIndex = 0;
+ pEnumFilters->nFilters = nFilters;
+ pEnumFilters->ppFilters = CoTaskMemAlloc(sizeof(IBaseFilter*) * nFilters);
+ if (!pEnumFilters->ppFilters)
+ {
+ CoTaskMemFree(pEnumFilters);
+ return E_OUTOFMEMORY;
+ }
+
+ memcpy(pEnumFilters->ppFilters, ppFilters, nFilters * sizeof(IBaseFilter*));
+
+ *ppEnum = (IEnumFilters *)(&pEnumFilters->lpVtbl);
+ return S_OK;
+}
+
+static HRESULT WINAPI IEnumFiltersImpl_QueryInterface(IEnumFilters * iface, REFIID riid, LPVOID * ppv)
+{
+ TRACE("(%p)->(%s, %p)\n", iface, qzdebugstr_guid(riid), ppv);
+
+ *ppv = NULL;
+
+ if (IsEqualIID(riid, &IID_IUnknown))
+ *ppv = (LPVOID)iface;
+ else if (IsEqualIID(riid, &IID_IEnumFilters))
+ *ppv = (LPVOID)iface;
+
+ if (*ppv)
+ {
+ IUnknown_AddRef((IUnknown *)(*ppv));
+ return S_OK;
+ }
+
+ FIXME("No interface for %s!\n", qzdebugstr_guid(riid));
+
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI IEnumFiltersImpl_AddRef(IEnumFilters * iface)
+{
+ ICOM_THIS(IEnumFiltersImpl, iface);
+ TRACE("(%p)->()\n", iface);
+ return ++This->refCount;
+}
+
+static ULONG WINAPI IEnumFiltersImpl_Release(IEnumFilters * iface)
+{
+ ICOM_THIS(IEnumFiltersImpl, iface);
+ TRACE("(%p)->()\n", iface);
+ if (!--This->refCount)
+ {
+ CoTaskMemFree(This->ppFilters);
+ CoTaskMemFree(This);
+ return 0;
+ }
+ else
+ return This->refCount;
+}
+
+static HRESULT WINAPI IEnumFiltersImpl_Next(IEnumFilters * iface, ULONG cFilters, IBaseFilter ** ppFilters, ULONG * pcFetched)
+{
+ ULONG cFetched;
+ ULONG i;
+ ICOM_THIS(IEnumFiltersImpl, iface);
+
+ cFetched = min(This->nFilters, This->uIndex + cFilters) - This->uIndex;
+
+ TRACE("(%p)->(%lu, %p, %p)\n", iface, cFilters, ppFilters, pcFetched);
+
+ for (i = 0; i < cFetched; i++)
+ {
+ ppFilters[i] = This->ppFilters[This->uIndex + i];
+ IBaseFilter_AddRef(ppFilters[i]);
+ }
+
+ This->uIndex += cFetched;
+
+ if (pcFetched)
+ *pcFetched = cFetched;
+
+ if (cFetched != cFilters)
+ return S_FALSE;
+ return S_OK;
+}
+
+static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters)
+{
+ ICOM_THIS(IEnumFiltersImpl, iface);
+
+ TRACE("(%p)->(%lu)\n", iface, cFilters);
+
+ if (This->uIndex + cFilters < This->nFilters)
+ {
+ This->uIndex += cFilters;
+ return S_OK;
+ }
+ return S_FALSE;
+}
+
+static HRESULT WINAPI IEnumFiltersImpl_Reset(IEnumFilters * iface)
+{
+ ICOM_THIS(IEnumFiltersImpl, iface);
+
+ TRACE("(%p)->()\n", iface);
+
+ This->uIndex = 0;
+ return S_OK;
+}
+
+static HRESULT WINAPI IEnumFiltersImpl_Clone(IEnumFilters * iface, IEnumFilters ** ppEnum)
+{
+ HRESULT hr;
+ ICOM_THIS(IEnumFiltersImpl, iface);
+
+ TRACE("(%p)->(%p)\n", iface, ppEnum);
+
+ hr = IEnumFiltersImpl_Construct(This->ppFilters, This->nFilters, ppEnum);
+ if (FAILED(hr))
+ return hr;
+ return IEnumFilters_Skip(*ppEnum, This->uIndex);
+}
+
+static const IEnumFiltersVtbl IEnumFiltersImpl_Vtbl =
+{
+ ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+ IEnumFiltersImpl_QueryInterface,
+ IEnumFiltersImpl_AddRef,
+ IEnumFiltersImpl_Release,
+ IEnumFiltersImpl_Next,
+ IEnumFiltersImpl_Skip,
+ IEnumFiltersImpl_Reset,
+ IEnumFiltersImpl_Clone
+};
+
More information about the wine-patches
mailing list