ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quartz: Remove superfluous pointer casts.

This commit is contained in:
Michael Stefaniuc 2009-01-29 11:14:55 +01:00 committed by Alexandre Julliard
parent 330e6d86f9
commit cc7fc4abef
21 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/quartz/acmwrapper.c
View File

@ -331,7 +331,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv)
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
*ppv = (LPVOID)This; *ppv = This;
This->lasttime_real = This->lasttime_sent = -1; This->lasttime_real = This->lasttime_sent = -1;
return hr; return hr;

2
dlls/quartz/avidec.c
View File

@ -336,7 +336,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv)
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
*ppv = (LPVOID)This; *ppv = This;
return hr; return hr;
} }

12
dlls/quartz/avisplit.c
View File

@ -403,7 +403,7 @@ static HRESULT AVISplitter_done_process(LPVOID iface);
*/ */
static HRESULT AVISplitter_first_request(LPVOID iface) static HRESULT AVISplitter_first_request(LPVOID iface)
{ {
AVISplitterImpl *This = (AVISplitterImpl *)iface; AVISplitterImpl *This = iface;
HRESULT hr = S_OK; HRESULT hr = S_OK;
DWORD x; DWORD x;
IMediaSample *sample = NULL; IMediaSample *sample = NULL;
@ -740,7 +740,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE
pvi = (VIDEOINFOHEADER *)amt.pbFormat; pvi = (VIDEOINFOHEADER *)amt.pbFormat;
pvi->AvgTimePerFrame = (LONGLONG)(10000000.0 / fSamplesPerSec); pvi->AvgTimePerFrame = (LONGLONG)(10000000.0 / fSamplesPerSec);
CopyMemory(&pvi->bmiHeader, (const BYTE *)(pChunk + 1), pChunk->cb); CopyMemory(&pvi->bmiHeader, pChunk + 1, pChunk->cb);
if (pvi->bmiHeader.biCompression) if (pvi->bmiHeader.biCompression)
amt.subtype.Data1 = pvi->bmiHeader.biCompression; amt.subtype.Data1 = pvi->bmiHeader.biCompression;
} }
@ -751,13 +751,13 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE
amt.cbFormat = sizeof(WAVEFORMATEX); amt.cbFormat = sizeof(WAVEFORMATEX);
amt.pbFormat = CoTaskMemAlloc(amt.cbFormat); amt.pbFormat = CoTaskMemAlloc(amt.cbFormat);
ZeroMemory(amt.pbFormat, amt.cbFormat); ZeroMemory(amt.pbFormat, amt.cbFormat);
CopyMemory(amt.pbFormat, (const BYTE *)(pChunk + 1), pChunk->cb); CopyMemory(amt.pbFormat, pChunk + 1, pChunk->cb);
} }
else else
{ {
amt.cbFormat = pChunk->cb; amt.cbFormat = pChunk->cb;
amt.pbFormat = CoTaskMemAlloc(amt.cbFormat); amt.pbFormat = CoTaskMemAlloc(amt.cbFormat);
CopyMemory(amt.pbFormat, (const BYTE *)(pChunk + 1), amt.cbFormat); CopyMemory(amt.pbFormat, pChunk + 1, amt.cbFormat);
} }
break; break;
case ckidSTREAMNAME: case ckidSTREAMNAME:
@ -1193,7 +1193,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin,
static HRESULT AVISplitter_Flush(LPVOID iface) static HRESULT AVISplitter_Flush(LPVOID iface)
{ {
AVISplitterImpl *This = (AVISplitterImpl*)iface; AVISplitterImpl *This = iface;
DWORD x; DWORD x;
TRACE("(%p)->()\n", This); TRACE("(%p)->()\n", This);
@ -1433,7 +1433,7 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv)
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
*ppv = (LPVOID)This; *ppv = This;
return hr; return hr;
} }

16
dlls/quartz/dsoundrender.c
View File

@ -233,7 +233,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, const BYTE *d
static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample)
{ {
DSoundRenderImpl *This = (DSoundRenderImpl *)iface; DSoundRenderImpl *This = iface;
LPBYTE pbSrcStream = NULL; LPBYTE pbSrcStream = NULL;
long cbSrcStream = 0; long cbSrcStream = 0;
REFERENCE_TIME tStart, tStop; REFERENCE_TIME tStart, tStop;
@ -438,7 +438,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv)
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
} }
*ppv = (LPVOID)pDSoundRender; *ppv = pDSoundRender;
} }
else else
{ {
@ -460,17 +460,17 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IPersist)) else if (IsEqualIID(riid, &IID_IPersist))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMediaFilter)) else if (IsEqualIID(riid, &IID_IMediaFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IBaseFilter)) else if (IsEqualIID(riid, &IID_IBaseFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IBasicAudio)) else if (IsEqualIID(riid, &IID_IBasicAudio))
*ppv = (LPVOID)&(This->IBasicAudio_vtbl); *ppv = &This->IBasicAudio_vtbl;
else if (IsEqualIID(riid, &IID_IReferenceClock)) else if (IsEqualIID(riid, &IID_IReferenceClock))
*ppv = (LPVOID)&(This->IReferenceClock_vtbl); *ppv = &This->IReferenceClock_vtbl;
else if (IsEqualIID(riid, &IID_IMediaSeeking)) else if (IsEqualIID(riid, &IID_IMediaSeeking))
*ppv = &This->mediaSeeking.lpVtbl; *ppv = &This->mediaSeeking.lpVtbl;

4
dlls/quartz/enumfilters.c
View File

@ -74,9 +74,9 @@ static HRESULT WINAPI IEnumFiltersImpl_QueryInterface(IEnumFilters * iface, REFI
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IEnumFilters)) else if (IsEqualIID(riid, &IID_IEnumFilters))
*ppv = (LPVOID)iface; *ppv = iface;
if (*ppv) if (*ppv)
{ {

4
dlls/quartz/enummedia.c
View File

@ -134,9 +134,9 @@ static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IEnumMediaTypes)) else if (IsEqualIID(riid, &IID_IEnumMediaTypes))
*ppv = (LPVOID)iface; *ppv = iface;
if (*ppv) if (*ppv)
{ {

2
dlls/quartz/enummoniker.c
View File

@ -84,7 +84,7 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface(
if (IsEqualGUID(riid, &IID_IUnknown) || if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_IEnumMoniker)) IsEqualGUID(riid, &IID_IEnumMoniker))
{ {
*ppvObj = (LPVOID)iface; *ppvObj = iface;
EnumMonikerImpl_AddRef(iface); EnumMonikerImpl_AddRef(iface);
return S_OK; return S_OK;
} }

4
dlls/quartz/enumpins.c
View File

@ -70,9 +70,9 @@ static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID rii
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IEnumPins)) else if (IsEqualIID(riid, &IID_IEnumPins))
*ppv = (LPVOID)iface; *ppv = iface;
if (*ppv) if (*ppv)
{ {

4
dlls/quartz/enumregfilters.c
View File

@ -97,9 +97,9 @@ static HRESULT WINAPI IEnumRegFiltersImpl_QueryInterface(IEnumRegFilters * iface
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IEnumRegFilters)) else if (IsEqualIID(riid, &IID_IEnumRegFilters))
*ppv = (LPVOID)iface; *ppv = iface;
if (*ppv) if (*ppv)
{ {

24
dlls/quartz/filesource.c
View File

@ -361,7 +361,7 @@ HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv)
pAsyncRead->pszFileName = NULL; pAsyncRead->pszFileName = NULL;
pAsyncRead->pmt = NULL; pAsyncRead->pmt = NULL;
*ppv = (LPVOID)pAsyncRead; *ppv = pAsyncRead;
TRACE("-- created at %p\n", pAsyncRead); TRACE("-- created at %p\n", pAsyncRead);
@ -379,15 +379,15 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IPersist)) else if (IsEqualIID(riid, &IID_IPersist))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMediaFilter)) else if (IsEqualIID(riid, &IID_IMediaFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IBaseFilter)) else if (IsEqualIID(riid, &IID_IBaseFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IFileSourceFilter)) else if (IsEqualIID(riid, &IID_IFileSourceFilter))
*ppv = (LPVOID)(&This->lpVtblFSF); *ppv = &This->lpVtblFSF;
if (*ppv) if (*ppv)
{ {
@ -531,7 +531,7 @@ static HRESULT AsyncReader_GetPin(IBaseFilter *iface, ULONG pos, IPin **pin, DWO
if (pos >= 1 || !This->pOutputPin) if (pos >= 1 || !This->pOutputPin)
return S_FALSE; return S_FALSE;
*pin = (IPin *)This->pOutputPin; *pin = This->pOutputPin;
IPin_AddRef(*pin); IPin_AddRef(*pin);
return S_OK; return S_OK;
} }
@ -781,8 +781,8 @@ static inline FileAsyncReader *impl_from_IAsyncReader( IAsyncReader *iface )
static HRESULT AcceptProcAFR(LPVOID iface, const AM_MEDIA_TYPE *pmt) static HRESULT AcceptProcAFR(LPVOID iface, const AM_MEDIA_TYPE *pmt)
{ {
AsyncReader *This = (AsyncReader *)iface; AsyncReader *This = iface;
FIXME("(%p, %p)\n", iface, pmt); FIXME("(%p, %p)\n", iface, pmt);
if (IsEqualGUID(&pmt->majortype, &This->pmt->majortype) && if (IsEqualGUID(&pmt->majortype, &This->pmt->majortype) &&
@ -803,11 +803,11 @@ static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin * iface, REFIID rii
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IPin)) else if (IsEqualIID(riid, &IID_IPin))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IAsyncReader)) else if (IsEqualIID(riid, &IID_IAsyncReader))
*ppv = (LPVOID)&This->lpVtblAR; *ppv = &This->lpVtblAR;
if (*ppv) if (*ppv)
{ {

2
dlls/quartz/filtergraph.c
View File

@ -2717,7 +2717,7 @@ static HRESULT GetTargetInterface(IFilterGraphImpl* pGraph, REFIID riid, LPVOID*
{ {
pGraph->ItfCacheEntries[entry].riid = riid; pGraph->ItfCacheEntries[entry].riid = riid;
pGraph->ItfCacheEntries[entry].filter = pGraph->ppFiltersInGraph[i]; pGraph->ItfCacheEntries[entry].filter = pGraph->ppFiltersInGraph[i];
pGraph->ItfCacheEntries[entry].iface = (IUnknown*)*ppvObj; pGraph->ItfCacheEntries[entry].iface = *ppvObj;
if (entry >= pGraph->nItfCacheEntries) if (entry >= pGraph->nItfCacheEntries)
pGraph->nItfCacheEntries++; pGraph->nItfCacheEntries++;
return S_OK; return S_OK;

6
dlls/quartz/filtermapper.c
View File

@ -970,8 +970,8 @@ static BOOL MatchTypes(
/* internal helper function for qsort of MONIKER_MERIT array */ /* internal helper function for qsort of MONIKER_MERIT array */
static int mm_compare(const void * left, const void * right) static int mm_compare(const void * left, const void * right)
{ {
const struct MONIKER_MERIT * mmLeft = (const struct MONIKER_MERIT *)left; const struct MONIKER_MERIT * mmLeft = left;
const struct MONIKER_MERIT * mmRight = (const struct MONIKER_MERIT *)right; const struct MONIKER_MERIT * mmRight = right;
if (mmLeft->dwMerit == mmRight->dwMerit) if (mmLeft->dwMerit == mmRight->dwMerit)
return 0; return 0;
@ -1346,7 +1346,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters(
if (SUCCEEDED(hrSub)) if (SUCCEEDED(hrSub))
{ {
len = (strlenW((WCHAR*)V_UNION(&var, bstrVal))+1) * sizeof(WCHAR); len = (strlenW(V_UNION(&var, bstrVal))+1) * sizeof(WCHAR);
if (!(regfilters[idx].Name = CoTaskMemAlloc(len*2))) if (!(regfilters[idx].Name = CoTaskMemAlloc(len*2)))
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
} }

12
dlls/quartz/memallocator.c
View File

@ -99,9 +99,9 @@ static HRESULT WINAPI BaseMemAllocator_QueryInterface(IMemAllocator * iface, REF
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMemAllocator)) else if (IsEqualIID(riid, &IID_IMemAllocator))
*ppv = (LPVOID)This; *ppv = This;
if (*ppv) if (*ppv)
{ {
@ -439,11 +439,11 @@ static HRESULT WINAPI StdMediaSample2_QueryInterface(IMediaSample2 * iface, REFI
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMediaSample)) else if (IsEqualIID(riid, &IID_IMediaSample))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMediaSample2)) else if (IsEqualIID(riid, &IID_IMediaSample2))
*ppv = (LPVOID)This; *ppv = This;
if (*ppv) if (*ppv)
{ {
@ -877,7 +877,7 @@ HRESULT StdMemAllocator_create(LPUNKNOWN lpUnkOuter, LPVOID * ppv)
pMemAlloc->pMemory = NULL; pMemAlloc->pMemory = NULL;
if (SUCCEEDED(hr = BaseMemAllocator_Init(StdMemAllocator_Alloc, StdMemAllocator_Free, NULL, NULL, NULL, StdMemAllocator_Destroy, &pMemAlloc->csState, &pMemAlloc->base))) if (SUCCEEDED(hr = BaseMemAllocator_Init(StdMemAllocator_Alloc, StdMemAllocator_Free, NULL, NULL, NULL, StdMemAllocator_Destroy, &pMemAlloc->csState, &pMemAlloc->base)))
*ppv = (LPVOID)pMemAlloc; *ppv = pMemAlloc;
else else
CoTaskMemFree(pMemAlloc); CoTaskMemFree(pMemAlloc);

8
dlls/quartz/mpegsplit.c
View File

@ -243,7 +243,7 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample)
static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR cookie) static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR cookie)
{ {
MPEGSplitterImpl *This = (MPEGSplitterImpl*)iface; MPEGSplitterImpl *This = iface;
BYTE *pbSrcStream; BYTE *pbSrcStream;
DWORD cbSrcStream = 0; DWORD cbSrcStream = 0;
REFERENCE_TIME tStart, tStop, tAviStart = This->position; REFERENCE_TIME tStart, tStop, tAviStart = This->position;
@ -615,7 +615,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO
static HRESULT MPEGSplitter_cleanup(LPVOID iface) static HRESULT MPEGSplitter_cleanup(LPVOID iface)
{ {
MPEGSplitterImpl *This = (MPEGSplitterImpl*)iface; MPEGSplitterImpl *This = iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
@ -709,7 +709,7 @@ static HRESULT MPEGSplitter_disconnect(LPVOID iface)
static HRESULT MPEGSplitter_first_request(LPVOID iface) static HRESULT MPEGSplitter_first_request(LPVOID iface)
{ {
MPEGSplitterImpl *This = (MPEGSplitterImpl*)iface; MPEGSplitterImpl *This = iface;
PullPin *pin = This->Parser.pInputPin; PullPin *pin = This->Parser.pInputPin;
HRESULT hr; HRESULT hr;
LONGLONG length; LONGLONG length;
@ -808,7 +808,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv)
This->seek = 1; This->seek = 1;
/* Note: This memory is managed by the parser filter once created */ /* Note: This memory is managed by the parser filter once created */
*ppv = (LPVOID)This; *ppv = This;
return hr; return hr;
} }

12
dlls/quartz/nullrenderer.c
View File

@ -69,7 +69,7 @@ typedef struct NullRendererImpl
static HRESULT NullRenderer_Sample(LPVOID iface, IMediaSample * pSample) static HRESULT NullRenderer_Sample(LPVOID iface, IMediaSample * pSample)
{ {
NullRendererImpl *This = (NullRendererImpl *)iface; NullRendererImpl *This = iface;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE("%p %p\n", iface, pSample); TRACE("%p %p\n", iface, pSample);
@ -180,7 +180,7 @@ HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv)
MediaSeekingImpl_Init((IBaseFilter*)pNullRenderer, NullRendererImpl_Change, NullRendererImpl_Change, NullRendererImpl_Change, &pNullRenderer->mediaSeeking, &pNullRenderer->csFilter); MediaSeekingImpl_Init((IBaseFilter*)pNullRenderer, NullRendererImpl_Change, NullRendererImpl_Change, NullRendererImpl_Change, &pNullRenderer->mediaSeeking, &pNullRenderer->csFilter);
pNullRenderer->mediaSeeking.lpVtbl = &TransformFilter_Seeking_Vtbl; pNullRenderer->mediaSeeking.lpVtbl = &TransformFilter_Seeking_Vtbl;
*ppv = (LPVOID)pNullRenderer; *ppv = pNullRenderer;
} }
else else
{ {
@ -203,13 +203,13 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)&(This->IInner_vtbl); *ppv = &This->IInner_vtbl;
else if (IsEqualIID(riid, &IID_IPersist)) else if (IsEqualIID(riid, &IID_IPersist))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMediaFilter)) else if (IsEqualIID(riid, &IID_IMediaFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IBaseFilter)) else if (IsEqualIID(riid, &IID_IBaseFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMediaSeeking)) else if (IsEqualIID(riid, &IID_IMediaSeeking))
*ppv = &This->mediaSeeking; *ppv = &This->mediaSeeking;

18
dlls/quartz/parser.c
View File

@ -115,15 +115,15 @@ HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID *
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IPersist)) else if (IsEqualIID(riid, &IID_IPersist))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMediaFilter)) else if (IsEqualIID(riid, &IID_IMediaFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IBaseFilter)) else if (IsEqualIID(riid, &IID_IBaseFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMediaSeeking)) else if (IsEqualIID(riid, &IID_IMediaSeeking))
*ppv = (LPVOID)&This->mediaSeeking; *ppv = &This->mediaSeeking;
if (*ppv) if (*ppv)
{ {
@ -496,7 +496,7 @@ HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PR
CopyMediaType(pin->pmt, amt); CopyMediaType(pin->pmt, amt);
pin->dwSamplesProcessed = 0; pin->dwSamplesProcessed = 0;
pin->pin.pin.pUserData = (LPVOID)This->ppPins[This->cStreams + 1]; pin->pin.pin.pUserData = This->ppPins[This->cStreams + 1];
pin->pin.pin.pinInfo.pFilter = (LPVOID)This; pin->pin.pin.pinInfo.pFilter = (LPVOID)This;
pin->pin.custom_allocator = 1; pin->pin.custom_allocator = 1;
This->cStreams++; This->cStreams++;
@ -613,9 +613,9 @@ static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid,
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IPin)) else if (IsEqualIID(riid, &IID_IPin))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IMediaSeeking)) else if (IsEqualIID(riid, &IID_IMediaSeeking))
{ {
return IBaseFilter_QueryInterface(This->pin.pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); return IBaseFilter_QueryInterface(This->pin.pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv);
@ -679,7 +679,7 @@ static HRESULT WINAPI Parser_OutputPin_Connect(IPin * iface, IPin * pReceivePin,
static HRESULT Parser_OutputPin_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) static HRESULT Parser_OutputPin_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt)
{ {
Parser_OutputPin *This = (Parser_OutputPin *)iface; Parser_OutputPin *This = iface;
TRACE("()\n"); TRACE("()\n");
dump_AM_MEDIA_TYPE(pmt); dump_AM_MEDIA_TYPE(pmt);

14
dlls/quartz/pin.c
View File

@ -323,11 +323,11 @@ HRESULT WINAPI InputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv)
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IPin)) else if (IsEqualIID(riid, &IID_IPin))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IMemInputPin)) else if (IsEqualIID(riid, &IID_IMemInputPin))
*ppv = (LPVOID)&This->lpVtblMemInput; *ppv = &This->lpVtblMemInput;
else if (IsEqualIID(riid, &IID_IMediaSeeking)) else if (IsEqualIID(riid, &IID_IMediaSeeking))
{ {
return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv);
@ -670,9 +670,9 @@ HRESULT WINAPI OutputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv)
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IPin)) else if (IsEqualIID(riid, &IID_IPin))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IMediaSeeking)) else if (IsEqualIID(riid, &IID_IMediaSeeking))
{ {
return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv);
@ -1203,9 +1203,9 @@ HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv)
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IPin)) else if (IsEqualIID(riid, &IID_IPin))
*ppv = (LPVOID)iface; *ppv = iface;
else if (IsEqualIID(riid, &IID_IMediaSeeking)) else if (IsEqualIID(riid, &IID_IMediaSeeking))
{ {
return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv);

2
dlls/quartz/systemclock.c
View File

@ -89,7 +89,7 @@ static void QUARTZ_InsertAviseEntryFromQueue(SystemClockImpl* This, SystemClockA
#define ADVISE_ADD_PERIODIC (WM_APP + 8) #define ADVISE_ADD_PERIODIC (WM_APP + 8)
static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) {
SystemClockImpl* This = (SystemClockImpl*) lpParam; SystemClockImpl* This = lpParam;
DWORD timeOut = INFINITE; DWORD timeOut = INFINITE;
DWORD tmpTimeOut; DWORD tmpTimeOut;
MSG msg; MSG msg;

10
dlls/quartz/transform.c
View File

@ -63,7 +63,7 @@ static HRESULT TransformFilter_Input_QueryAccept(LPVOID iface, const AM_MEDIA_TY
static HRESULT TransformFilter_Output_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) static HRESULT TransformFilter_Output_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt)
{ {
TransformFilterImpl* pTransformFilter = (TransformFilterImpl*)iface; TransformFilterImpl* pTransformFilter = iface;
AM_MEDIA_TYPE* outpmt = &pTransformFilter->pmt; AM_MEDIA_TYPE* outpmt = &pTransformFilter->pmt;
TRACE("%p\n", iface); TRACE("%p\n", iface);
@ -225,13 +225,13 @@ static HRESULT WINAPI TransformFilter_QueryInterface(IBaseFilter * iface, REFIID
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IPersist)) else if (IsEqualIID(riid, &IID_IPersist))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMediaFilter)) else if (IsEqualIID(riid, &IID_IMediaFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IBaseFilter)) else if (IsEqualIID(riid, &IID_IBaseFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMediaSeeking)) else if (IsEqualIID(riid, &IID_IMediaSeeking))
*ppv = &This->mediaSeeking; *ppv = &This->mediaSeeking;

22
dlls/quartz/videorenderer.c
View File

@ -204,7 +204,7 @@ static BOOL CreateRenderingWindow(VideoRendererImpl* This)
static DWORD WINAPI MessageLoop(LPVOID lpParameter) static DWORD WINAPI MessageLoop(LPVOID lpParameter)
{ {
VideoRendererImpl* This = (VideoRendererImpl*) lpParameter; VideoRendererImpl* This = lpParameter;
MSG msg; MSG msg;
BOOL fGotMessage; BOOL fGotMessage;
@ -237,7 +237,7 @@ static BOOL CreateRenderingSubsystem(VideoRendererImpl* This)
if (!This->hEvent) if (!This->hEvent)
return FALSE; return FALSE;
This->hThread = CreateThread(NULL, 0, MessageLoop, (LPVOID)This, 0, &This->ThreadID); This->hThread = CreateThread(NULL, 0, MessageLoop, This, 0, &This->ThreadID);
if (!This->hThread) if (!This->hThread)
{ {
CloseHandle(This->hEvent); CloseHandle(This->hEvent);
@ -337,7 +337,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data,
static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample)
{ {
VideoRendererImpl *This = (VideoRendererImpl *)iface; VideoRendererImpl *This = iface;
LPBYTE pbSrcStream = NULL; LPBYTE pbSrcStream = NULL;
long cbSrcStream = 0; long cbSrcStream = 0;
REFERENCE_TIME tStart, tStop; REFERENCE_TIME tStart, tStop;
@ -477,7 +477,7 @@ static HRESULT VideoRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt
IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB565) || IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB565) ||
IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB8)) IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB8))
{ {
VideoRendererImpl* This = (VideoRendererImpl*) iface; VideoRendererImpl* This = iface;
if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo))
{ {
@ -609,7 +609,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv)
pVideoRenderer->mediaSeeking.lpVtbl = &VideoRendererImpl_Seeking_Vtbl; pVideoRenderer->mediaSeeking.lpVtbl = &VideoRendererImpl_Seeking_Vtbl;
pVideoRenderer->sample_held = NULL; pVideoRenderer->sample_held = NULL;
*ppv = (LPVOID)pVideoRenderer; *ppv = pVideoRenderer;
} }
else else
{ {
@ -648,17 +648,17 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown * iface, REFIID
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = (LPVOID)&(This->IInner_vtbl); *ppv = &This->IInner_vtbl;
else if (IsEqualIID(riid, &IID_IPersist)) else if (IsEqualIID(riid, &IID_IPersist))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IMediaFilter)) else if (IsEqualIID(riid, &IID_IMediaFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IBaseFilter)) else if (IsEqualIID(riid, &IID_IBaseFilter))
*ppv = (LPVOID)This; *ppv = This;
else if (IsEqualIID(riid, &IID_IBasicVideo)) else if (IsEqualIID(riid, &IID_IBasicVideo))
*ppv = (LPVOID)&(This->IBasicVideo_vtbl); *ppv = &This->IBasicVideo_vtbl;
else if (IsEqualIID(riid, &IID_IVideoWindow)) else if (IsEqualIID(riid, &IID_IVideoWindow))
*ppv = (LPVOID)&(This->IVideoWindow_vtbl); *ppv = &This->IVideoWindow_vtbl;
else if (IsEqualIID(riid, &IID_IMediaSeeking)) else if (IsEqualIID(riid, &IID_IMediaSeeking))
*ppv = &This->mediaSeeking; *ppv = &This->mediaSeeking;

8
dlls/quartz/waveparser.c
View File

@ -73,7 +73,7 @@ static LONGLONG duration_to_bytepos(WAVEParserImpl *This, LONGLONG duration)
static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR cookie) static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR cookie)
{ {
WAVEParserImpl *This = (WAVEParserImpl *)iface; WAVEParserImpl *This = iface;
LPBYTE pbSrcStream = NULL; LPBYTE pbSrcStream = NULL;
ULONG cbSrcStream = 0; ULONG cbSrcStream = 0;
REFERENCE_TIME tStart, tStop; REFERENCE_TIME tStart, tStop;
@ -333,7 +333,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin,
static HRESULT WAVEParser_Cleanup(LPVOID iface) static HRESULT WAVEParser_Cleanup(LPVOID iface)
{ {
WAVEParserImpl *This = (WAVEParserImpl*)iface; WAVEParserImpl *This = iface;
TRACE("(%p)->()\n", This); TRACE("(%p)->()\n", This);
@ -342,7 +342,7 @@ static HRESULT WAVEParser_Cleanup(LPVOID iface)
static HRESULT WAVEParser_first_request(LPVOID iface) static HRESULT WAVEParser_first_request(LPVOID iface)
{ {
WAVEParserImpl *This = (WAVEParserImpl *)iface; WAVEParserImpl *This = iface;
PullPin *pin = This->Parser.pInputPin; PullPin *pin = This->Parser.pInputPin;
HRESULT hr; HRESULT hr;
IMediaSample *sample; IMediaSample *sample;
@ -431,7 +431,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv)
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
*ppv = (LPVOID)This; *ppv = This;
return hr; return hr;
} }