Module: wine Branch: master Commit: c83e4f130f7d4362015d24c0d207824c1b0192c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83e4f130f7d4362015d24c0d2...
Author: Christian Costa titan.costa@wanadoo.fr Date: Mon Dec 29 12:00:10 2008 +0100
quartz: Fix some traces and fixmes.
---
dlls/quartz/videorenderer.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 437779c..0d9896e 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -277,7 +277,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, HDC hDC; BITMAPINFOHEADER *bmiHeader;
- TRACE("%p %p %d\n", This, data, size); + TRACE("(%p)->(%p, %d)\n", This, data, size);
sdesc.dwSize = sizeof(sdesc); hr = IPin_ConnectionMediaType((IPin *)This->pInputPin, &amt); @@ -356,6 +356,8 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) REFERENCE_TIME tStart, tStop; HRESULT hr;
+ TRACE("(%p)->(%p)\n", iface, pSample); + EnterCriticalSection(&This->csFilter);
if (This->pInputPin->flushing || This->pInputPin->end_of_stream) @@ -370,8 +372,6 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) return VFW_E_WRONG_STATE; }
- TRACE("%p %p\n", iface, pSample); - hr = IMediaSample_GetTime(pSample, &tStart, &tStop); if (FAILED(hr)) ERR("Cannot get sample time (%x)\n", hr); @@ -571,7 +571,7 @@ static const IMediaSeekingVtbl VideoRendererImpl_Seeking_Vtbl =
static HRESULT VideoRendererImpl_Change(IBaseFilter *iface) { - TRACE("(%p)\n", iface); + TRACE("(%p)->()\n", iface); return S_OK; }
@@ -961,9 +961,7 @@ static HRESULT WINAPI VideoRenderer_FindPin(IBaseFilter * iface, LPCWSTR Id, IPi { VideoRendererImpl *This = (VideoRendererImpl *)iface;
- TRACE("(%p/%p)->(%p,%p)\n", This, iface, debugstr_w(Id), ppPin); - - FIXME("VideoRenderer::FindPin(...)\n"); + FIXME("(%p/%p)->(%p,%p): stub !!!\n", This, iface, debugstr_w(Id), ppPin);
/* FIXME: critical section */
@@ -1541,6 +1539,8 @@ static HRESULT WINAPI Basicvideo_GetCurrentImage(IBasicVideo *iface, AM_MEDIA_TYPE *amt = &This->pInputPin->pin.mtCurrent; char *ptr;
+ FIXME("(%p/%p)->(%p, %p): partial stub\n", This, iface, pBufferSize, pDIBImage); + EnterCriticalSection(&This->csFilter);
if (!This->sample_held) @@ -1549,8 +1549,6 @@ static HRESULT WINAPI Basicvideo_GetCurrentImage(IBasicVideo *iface, return (This->state == State_Paused ? E_UNEXPECTED : VFW_E_NOT_PAUSED); }
- FIXME("(%p/%p)->(%p, %p): partial stub\n", This, iface, pBufferSize, pDIBImage); - if (IsEqualIID(&amt->formattype, &FORMAT_VideoInfo)) { bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; @@ -1815,7 +1813,7 @@ static HRESULT WINAPI Videowindow_put_AutoShow(IVideoWindow *iface,
TRACE("(%p/%p)->(%ld)\n", This, iface, AutoShow);
- This->AutoShow = 1; /* FXIME: Should be AutoShow */; + This->AutoShow = 1; /* FIXME: Should be AutoShow */;
return S_OK; }