From 2724adae2d34c756c74703448ff20eb1ce9d3ecf Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Wed, 21 Jan 2009 09:35:17 +0100 Subject: [PATCH] quartz/tests: Remove superfluous pointer casts. --- dlls/quartz/tests/filtergraph.c | 24 ++++++++++++------------ dlls/quartz/tests/filtermapper.c | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 53f39d52aee..e3ae100c335 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -400,9 +400,9 @@ static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)iface; + *ppv = iface; else if (IsEqualIID(riid, &IID_IEnumMediaTypes)) - *ppv = (LPVOID)iface; + *ppv = iface; if (*ppv) { @@ -535,9 +535,9 @@ static HRESULT WINAPI TestFilter_Pin_QueryInterface(IPin * iface, REFIID riid, *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)iface; + *ppv = iface; else if (IsEqualIID(riid, &IID_IPin)) - *ppv = (LPVOID)iface; + *ppv = iface; if (*ppv) { @@ -912,9 +912,9 @@ static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID rii *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)iface; + *ppv = iface; else if (IsEqualIID(riid, &IID_IEnumPins)) - *ppv = (LPVOID)iface; + *ppv = iface; if (*ppv) { @@ -1121,7 +1121,7 @@ static HRESULT TestFilter_Create(const CLSID* pClsid, const TestFilterPinData *p } pTestFilter->nPins = nPins; - *ppv = (LPVOID)pTestFilter; + *ppv = pTestFilter; return S_OK; error: @@ -1147,13 +1147,13 @@ static HRESULT WINAPI TestFilter_QueryInterface(IBaseFilter * iface, REFIID riid *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)This; + *ppv = This; else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = (LPVOID)This; + *ppv = This; else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = (LPVOID)This; + *ppv = This; else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = (LPVOID)This; + *ppv = This; if (*ppv) { @@ -1359,7 +1359,7 @@ static HRESULT WINAPI Test_IClassFactory_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = (LPVOID)iface; + *ppvObj = iface; IClassFactory_AddRef(iface); return S_OK; } diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 3025b187f64..f7d47abb3e5 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -59,7 +59,7 @@ static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum) { CHAR val1[512], val2[512]; - WideCharToMultiByte(CP_ACP, 0, (WCHAR*)V_UNION(&var, bstrVal), -1, val1, sizeof(val1), 0, 0); + WideCharToMultiByte(CP_ACP, 0, V_UNION(&var, bstrVal), -1, val1, sizeof(val1), 0, 0); WideCharToMultiByte(CP_ACP, 0, wszFilterName, -1, val2, sizeof(val2), 0, 0); if (!lstrcmpA(val1, val2)) found = TRUE; }