[PATCH] amstream: Remove some casts
Nikolay Sivov
nsivov at codeweavers.com
Wed Aug 31 19:06:48 CDT 2016
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/amstream/amstream.c | 2 +-
dlls/amstream/mediastreamfilter.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c
index 1f8428b..463cba6 100644
--- a/dlls/amstream/amstream.c
+++ b/dlls/amstream/amstream.c
@@ -67,7 +67,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj)
object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl;
object->ref = 1;
- *ppObj = object;
+ *ppObj = &object->IAMMultiMediaStream_iface;
return S_OK;
}
diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c
index d0c6714..3eeafd3 100644
--- a/dlls/amstream/mediastreamfilter.c
+++ b/dlls/amstream/mediastreamfilter.c
@@ -360,7 +360,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i
if (!pins)
return E_OUTOFMEMORY;
This->pins = pins;
- info.pFilter = (IBaseFilter*)&This->filter;
+ info.pFilter = &This->filter.IBaseFilter_iface;
info.dir = PINDIR_INPUT;
hr = IAMMediaStream_GetInformation(pAMMediaStream, &purpose_id, NULL);
if (FAILED(hr))
@@ -374,11 +374,11 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i
return hr;
pin = (MediaStreamFilter_InputPin*)This->pins[This->nb_streams];
- pin->pin.pin.pinInfo.pFilter = (LPVOID)This;
+ pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface;
This->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream;
This->nb_streams++;
- IMediaStream_AddRef((IMediaStream*)pAMMediaStream);
+ IAMMediaStream_AddRef(pAMMediaStream);
return S_OK;
}
@@ -522,7 +522,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj)
BaseFilter_Init(&object->filter, (IBaseFilterVtbl*)&MediaStreamFilter_Vtbl, &CLSID_MediaStreamFilter, (DWORD_PTR)(__FILE__ ": MediaStreamFilterImpl.csFilter"), &BaseFuncTable);
- *ppObj = object;
+ *ppObj = &object->filter.IBaseFilter_iface;
return S_OK;
}
--
2.9.3
More information about the wine-patches
mailing list