Michael Stefaniuc : quartz: COM cleanup for IAMFilterMiscFlags in NullRenderer.
Alexandre Julliard
julliard at winehq.org
Mon Jul 2 13:22:00 CDT 2012
Module: wine
Branch: master
Commit: 3501cb7b12c7ac6fb5dbe3abba87aec3c4183810
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3501cb7b12c7ac6fb5dbe3abba87aec3c4183810
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Mon Jul 2 01:00:40 2012 +0200
quartz: COM cleanup for IAMFilterMiscFlags in NullRenderer.
---
dlls/quartz/nullrenderer.c | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c
index 5d2680f..d3b04ce 100644
--- a/dlls/quartz/nullrenderer.c
+++ b/dlls/quartz/nullrenderer.c
@@ -50,7 +50,7 @@ typedef struct NullRendererImpl
BaseRenderer renderer;
const IUnknownVtbl * IInner_vtbl;
- const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl;
+ IAMFilterMiscFlags IAMFilterMiscFlags_iface;
IUnknown * pUnkOuter;
BOOL bUnkOuterValid;
@@ -104,7 +104,7 @@ HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv)
pNullRenderer->bUnkOuterValid = FALSE;
pNullRenderer->bAggregatable = FALSE;
pNullRenderer->IInner_vtbl = &IInner_VTable;
- pNullRenderer->IAMFilterMiscFlags_vtbl = &IAMFilterMiscFlags_Vtbl;
+ pNullRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl;
hr = BaseRenderer_Init(&pNullRenderer->renderer, &NullRenderer_Vtbl, pUnkOuter, &CLSID_NullRenderer, (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), &RendererFuncTable);
@@ -132,7 +132,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID
if (IsEqualIID(riid, &IID_IUnknown))
*ppv = &This->IInner_vtbl;
else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags))
- *ppv = &This->IAMFilterMiscFlags_vtbl;
+ *ppv = &This->IAMFilterMiscFlags_iface;
else
{
HRESULT hr;
@@ -248,26 +248,32 @@ static const IBaseFilterVtbl NullRenderer_Vtbl =
BaseFilterImpl_QueryVendorInfo
};
-static NullRendererImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) {
- return (NullRendererImpl*)((char*)iface - offsetof(NullRendererImpl, IAMFilterMiscFlags_vtbl));
+static NullRendererImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface)
+{
+ return CONTAINING_RECORD(iface, NullRendererImpl, IAMFilterMiscFlags_iface);
}
-static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) {
- NullRendererImpl *This = from_IAMFilterMiscFlags(iface);
+static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid,
+ void **ppv)
+{
+ NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
return IUnknown_QueryInterface((IUnknown*)This, riid, ppv);
}
-static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) {
- NullRendererImpl *This = from_IAMFilterMiscFlags(iface);
+static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface)
+{
+ NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
return IUnknown_AddRef((IUnknown*)This);
}
-static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) {
- NullRendererImpl *This = from_IAMFilterMiscFlags(iface);
+static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface)
+{
+ NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface);
return IUnknown_Release((IUnknown*)This);
}
-static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) {
+static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface)
+{
return AM_FILTER_MISC_FLAGS_IS_RENDERER;
}
More information about the wine-cvs
mailing list