November 2010 - Wine-commits

Maarten Lankhorst : quartz: Fix EC_COMPLETE handling on dsound renderer.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 89223ff78bc8bbf9430ecef0cd7e671d43c5630e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89223ff78bc8bbf9430ecef0c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:02:21 2010 +0100 quartz: Fix EC_COMPLETE handling on dsound renderer. --- dlls/quartz/dsoundrender.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index a51da6c..5e8d7b7 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -620,6 +620,7 @@ static HRESULT WINAPI DSoundRender_Run(IBaseFilter * iface, REFERENCE_TIME tStar TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); EnterCriticalSection(&This->filter.csFilter); + if (This->pInputPin->pin.pConnectedTo) { This->filter.rtStreamStart = tStart; if (This->filter.state == State_Paused) @@ -633,9 +634,18 @@ static HRESULT WINAPI DSoundRender_Run(IBaseFilter * iface, REFERENCE_TIME tStar This->pInputPin->end_of_stream = 0; } ResetEvent(This->blocked); - - This->filter.state = State_Running; + } else if (This->filter.filterInfo.pGraph) { + IMediaEventSink *pEventSink; + hr = IFilterGraph_QueryInterface(This->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + if (SUCCEEDED(hr)) + { + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)This); + IMediaEventSink_Release(pEventSink); + } + hr = S_OK; } + if (SUCCEEDED(hr)) + This->filter.state = State_Running; LeaveCriticalSection(&This->filter.csFilter); return hr; @@ -802,6 +812,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) BaseInputPin* This = (BaseInputPin*)iface; DSoundRenderImpl *me = (DSoundRenderImpl*)This->pin.pinInfo.pFilter; IMediaEventSink* pEventSink; + BYTE *silence; HRESULT hr; EnterCriticalSection(This->pin.pCritSec); @@ -815,21 +826,22 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) return hr; } - hr = IFilterGraph_QueryInterface(me->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); - if (SUCCEEDED(hr)) + silence = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, me->buf_size); + if (silence) { - BYTE * silence; + memset(silence, 0, me->buf_size); + DSoundRender_SendSampleData(me, silence, me->buf_size); + HeapFree(GetProcessHeap(), 0, silence); + } - silence = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, me->buf_size); - if (silence) + if (me->filter.filterInfo.pGraph) + { + hr = IFilterGraph_QueryInterface(me->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + if (SUCCEEDED(hr)) { - memset(silence, 0, me->buf_size); - DSoundRender_SendSampleData((DSoundRenderImpl*)This->pin.pinInfo.pFilter, silence, me->buf_size); - HeapFree(GetProcessHeap(), 0, silence); + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)me); + IMediaEventSink_Release(pEventSink); } - - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, 0); - IMediaEventSink_Release(pEventSink); } MediaSeekingPassThru_EOS(me->seekthru_unk); LeaveCriticalSection(This->pin.pCritSec);

1 0

Maarten Lankhorst : quartz: Add IAMFilterMiscFlags to directsound renderer.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 0196da9b4d2a9689a0a5bc219bb393ac590ad088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0196da9b4d2a9689a0a5bc219… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:02:22 2010 +0100 quartz: Add IAMFilterMiscFlags to directsound renderer. --- dlls/quartz/dsoundrender.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 5e8d7b7..7526e81 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -47,6 +47,7 @@ static const IBasicAudioVtbl IBasicAudio_Vtbl; static const IReferenceClockVtbl IReferenceClock_Vtbl; static const IMediaSeekingVtbl IMediaSeeking_Vtbl; static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; typedef struct DSoundRenderImpl { @@ -55,6 +56,7 @@ typedef struct DSoundRenderImpl const IBasicAudioVtbl *IBasicAudio_vtbl; const IReferenceClockVtbl *IReferenceClock_vtbl; const IAMDirectSoundVtbl *IAMDirectSound_vtbl; + const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl; IUnknown *seekthru_unk; REFERENCE_TIME rtLastStop; @@ -419,6 +421,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) pDSoundRender->IBasicAudio_vtbl = &IBasicAudio_Vtbl; pDSoundRender->IReferenceClock_vtbl = &IReferenceClock_Vtbl; pDSoundRender->IAMDirectSound_vtbl = &IAMDirectSound_Vtbl; + pDSoundRender->IAMFilterMiscFlags_vtbl = &IAMFilterMiscFlags_Vtbl; /* construct input pin */ piInput.dir = PINDIR_INPUT; @@ -486,6 +489,8 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); else if (IsEqualIID(riid, &IID_IAMDirectSound)) *ppv = &This->IAMDirectSound_vtbl; + else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) + *ppv = &This->IAMFilterMiscFlags_vtbl; if (*ppv) { @@ -1296,3 +1301,33 @@ static const IAMDirectSoundVtbl IAMDirectSound_Vtbl = AMDirectSound_SetFocusWindow, AMDirectSound_GetFocusWindow }; + +static DSoundRenderImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { + return (DSoundRenderImpl*)((char*)iface - offsetof(DSoundRenderImpl, IAMFilterMiscFlags_vtbl)); +} + +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { + DSoundRenderImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); +} + +static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { + DSoundRenderImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { + DSoundRenderImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_Release((IUnknown*)This); +} + +static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { + return AM_FILTER_MISC_FLAGS_IS_RENDERER; +} + +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { + AMFilterMiscFlags_QueryInterface, + AMFilterMiscFlags_AddRef, + AMFilterMiscFlags_Release, + AMFilterMiscFlags_GetMiscFlags +};

1 0

Maarten Lankhorst : quartz: Fix EC_COMPLETE handling on video renderer.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 6072a3b5ac86e983a14e5656c5be8a26c72495f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6072a3b5ac86e983a14e5656c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:02:23 2010 +0100 quartz: Fix EC_COMPLETE handling on video renderer. --- dlls/quartz/videorenderer.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 11e6099..c30ce06 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -829,12 +829,15 @@ static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { + HRESULT hr = S_OK; VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); EnterCriticalSection(&This->filter.csFilter); - if (This->filter.state != State_Running) + if (This->filter.state == State_Running) + goto out; + if (This->pInputPin->pin.pConnectedTo) { if (This->filter.state == State_Stopped) { @@ -845,10 +848,22 @@ static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tSta This->filter.rtStreamStart = tStart; This->filter.state = State_Running; + } else if (This->filter.filterInfo.pGraph) { + IMediaEventSink *pEventSink; + hr = IFilterGraph_QueryInterface(This->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + if (SUCCEEDED(hr)) + { + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)This); + IMediaEventSink_Release(pEventSink); + } + hr = S_OK; } + if (SUCCEEDED(hr)) + This->filter.state = State_Running; +out: LeaveCriticalSection(&This->filter.csFilter); - return S_OK; + return hr; } static HRESULT WINAPI VideoRenderer_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) @@ -913,7 +928,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndOfStream(IPin * iface) hr = IFilterGraph_QueryInterface(pFilter->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); if (SUCCEEDED(hr)) { - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, 0); + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)pFilter); IMediaEventSink_Release(pEventSink); } MediaSeekingPassThru_EOS(pFilter->seekthru_unk);

1 0

Maarten Lankhorst : quartz: Add IAMFilterMiscFlags to video renderer.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 822c3fe9eab143c0213a0e5a95d9ecdf77c93b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=822c3fe9eab143c0213a0e5a9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:02:24 2010 +0100 quartz: Add IAMFilterMiscFlags to video renderer. --- dlls/quartz/videorenderer.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index c30ce06..3a35f38 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -52,6 +52,7 @@ static const IUnknownVtbl IInner_VTable; static const IBasicVideoVtbl IBasicVideo_VTable; static const IVideoWindowVtbl IVideoWindow_VTable; static const IPinVtbl VideoRenderer_InputPin_Vtbl; +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; typedef struct VideoRendererImpl { @@ -59,6 +60,7 @@ typedef struct VideoRendererImpl const IBasicVideoVtbl * IBasicVideo_vtbl; const IVideoWindowVtbl * IVideoWindow_vtbl; const IUnknownVtbl * IInner_vtbl; + const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl; IUnknown *seekthru_unk; BaseInputPin *pInputPin; @@ -581,6 +583,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) pVideoRenderer->bUnkOuterValid = FALSE; pVideoRenderer->bAggregatable = FALSE; pVideoRenderer->IInner_vtbl = &IInner_VTable; + pVideoRenderer->IAMFilterMiscFlags_vtbl = &IAMFilterMiscFlags_Vtbl; BaseFilter_Init(&pVideoRenderer->filter, &VideoRenderer_Vtbl, &CLSID_VideoRenderer, (DWORD_PTR)(__FILE__ ": VideoRendererImpl.csFilter"), &BaseFuncTable); @@ -666,6 +669,8 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown * iface, REFIID *ppv = &This->IVideoWindow_vtbl; else if (IsEqualIID(riid, &IID_IMediaSeeking)) return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); + else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) + *ppv = &This->IAMFilterMiscFlags_vtbl; if (*ppv) { @@ -2169,3 +2174,33 @@ static const IVideoWindowVtbl IVideoWindow_VTable = Videowindow_HideCursor, Videowindow_IsCursorHidden }; + +static VideoRendererImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { + return (VideoRendererImpl*)((char*)iface - offsetof(VideoRendererImpl, IAMFilterMiscFlags_vtbl)); +} + +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { + VideoRendererImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); +} + +static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { + VideoRendererImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { + VideoRendererImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_Release((IUnknown*)This); +} + +static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { + return AM_FILTER_MISC_FLAGS_IS_RENDERER; +} + +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { + AMFilterMiscFlags_QueryInterface, + AMFilterMiscFlags_AddRef, + AMFilterMiscFlags_Release, + AMFilterMiscFlags_GetMiscFlags +};

1 0

Maarten Lankhorst : quartz: Fix EC_COMPLETE handling on null renderer.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 79f717bb91e5ffca95413e8d80e84a6a0bcf91fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f717bb91e5ffca95413e8d8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:02:25 2010 +0100 quartz: Fix EC_COMPLETE handling on null renderer. --- dlls/quartz/nullrenderer.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 1764e23..cab2090 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -334,19 +334,36 @@ static HRESULT WINAPI NullRenderer_Pause(IBaseFilter * iface) static HRESULT WINAPI NullRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { + HRESULT hr = S_OK; NullRendererImpl *This = (NullRendererImpl *)iface; TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); EnterCriticalSection(&This->filter.csFilter); + if (This->filter.state == State_Running) + goto out; + if (This->pInputPin->pin.pConnectedTo) { This->filter.rtStreamStart = tStart; - This->filter.state = State_Running; This->pInputPin->end_of_stream = 0; } + else if (This->filter.filterInfo.pGraph) + { + IMediaEventSink *pEventSink; + hr = IFilterGraph_QueryInterface(This->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + if (SUCCEEDED(hr)) + { + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)This); + IMediaEventSink_Release(pEventSink); + } + hr = S_OK; + } + if (SUCCEEDED(hr)) + This->filter.state = State_Running; +out: LeaveCriticalSection(&This->filter.csFilter); - return S_OK; + return hr; } /** IBaseFilter implementation **/ @@ -404,10 +421,10 @@ static HRESULT WINAPI NullRenderer_InputPin_EndOfStream(IPin * iface) graph = pNull->filter.filterInfo.pGraph; if (graph) { - hr = IFilterGraph_QueryInterface(((NullRendererImpl*)This->pin.pinInfo.pFilter)->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + hr = IFilterGraph_QueryInterface(pNull->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); if (SUCCEEDED(hr)) { - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, 0); + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)pNull); IMediaEventSink_Release(pEventSink); } }

1 0

Maarten Lankhorst : quartz: Add IAMFilterMiscFlags to null renderer.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 443e24fe887f6c0233b159fd6e034f2dfb09fdf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443e24fe887f6c0233b159fd6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:02:26 2010 +0100 quartz: Add IAMFilterMiscFlags to null renderer. --- dlls/quartz/nullrenderer.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index cab2090..0d35d97 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -48,11 +48,13 @@ static const WCHAR wcsAltInputPinName[] = {'I','n',0}; static const IBaseFilterVtbl NullRenderer_Vtbl; static const IUnknownVtbl IInner_VTable; static const IPinVtbl NullRenderer_InputPin_Vtbl; +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; typedef struct NullRendererImpl { BaseFilter filter; const IUnknownVtbl * IInner_vtbl; + const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl; IUnknown *seekthru_unk; BaseInputPin *pInputPin; @@ -133,6 +135,7 @@ HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) pNullRenderer->bUnkOuterValid = FALSE; pNullRenderer->bAggregatable = FALSE; pNullRenderer->IInner_vtbl = &IInner_VTable; + pNullRenderer->IAMFilterMiscFlags_vtbl = &IAMFilterMiscFlags_Vtbl; BaseFilter_Init(&pNullRenderer->filter, &NullRenderer_Vtbl, &CLSID_NullRenderer, (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), &BaseFuncTable); @@ -185,6 +188,8 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID *ppv = This; else if (IsEqualIID(riid, &IID_IMediaSeeking)) return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); + else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) + *ppv = &This->IAMFilterMiscFlags_vtbl; if (*ppv) { @@ -468,3 +473,33 @@ static const IPinVtbl NullRenderer_InputPin_Vtbl = NullRenderer_InputPin_EndFlush, BaseInputPinImpl_NewSegment }; + +static NullRendererImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { + return (NullRendererImpl*)((char*)iface - offsetof(NullRendererImpl, IAMFilterMiscFlags_vtbl)); +} + +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { + NullRendererImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); +} + +static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { + NullRendererImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { + NullRendererImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_Release((IUnknown*)This); +} + +static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { + return AM_FILTER_MISC_FLAGS_IS_RENDERER; +} + +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { + AMFilterMiscFlags_QueryInterface, + AMFilterMiscFlags_AddRef, + AMFilterMiscFlags_Release, + AMFilterMiscFlags_GetMiscFlags +};

1 0

Maarten Lankhorst : quartz: Add IAMFilterMiscFlags to file source.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 9dedc4a795bfbd0ec5c65a3a9d4788875b2ebc09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dedc4a795bfbd0ec5c65a3a9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:06:53 2010 +0100 quartz: Add IAMFilterMiscFlags to file source. --- dlls/quartz/filesource.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 2f91849..6a59857 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -41,6 +41,7 @@ typedef struct AsyncReader { BaseFilter filter; const IFileSourceFilterVtbl * lpVtblFSF; + const IAMFilterMiscFlagsVtbl * IAMFilterMiscFlags_vtbl; IPin * pOutputPin; LPOLESTR pszFileName; @@ -50,6 +51,7 @@ typedef struct AsyncReader static const IBaseFilterVtbl AsyncReader_Vtbl; static const IFileSourceFilterVtbl FileSource_Vtbl; static const IAsyncReaderVtbl FileAsyncReader_Vtbl; +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); @@ -369,6 +371,7 @@ HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) BaseFilter_Init(&pAsyncRead->filter, &AsyncReader_Vtbl, &CLSID_AsyncReader, (DWORD_PTR)(__FILE__ ": AsyncReader.csFilter"), &BaseFuncTable); pAsyncRead->lpVtblFSF = &FileSource_Vtbl; + pAsyncRead->IAMFilterMiscFlags_vtbl = &IAMFilterMiscFlags_Vtbl; pAsyncRead->pOutputPin = NULL; pAsyncRead->pszFileName = NULL; @@ -401,6 +404,8 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii *ppv = This; else if (IsEqualIID(riid, &IID_IFileSourceFilter)) *ppv = &This->lpVtblFSF; + else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) + *ppv = &This->IAMFilterMiscFlags_vtbl; if (*ppv) { @@ -1334,3 +1339,34 @@ static const IAsyncReaderVtbl FileAsyncReader_Vtbl = FileAsyncReader_BeginFlush, FileAsyncReader_EndFlush, }; + + +static AsyncReader *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { + return (AsyncReader*)((char*)iface - offsetof(AsyncReader, IAMFilterMiscFlags_vtbl)); +} + +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { + AsyncReader *This = from_IAMFilterMiscFlags(iface); + return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); +} + +static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { + AsyncReader *This = from_IAMFilterMiscFlags(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { + AsyncReader *This = from_IAMFilterMiscFlags(iface); + return IUnknown_Release((IUnknown*)This); +} + +static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { + return AM_FILTER_MISC_FLAGS_IS_SOURCE; +} + +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { + AMFilterMiscFlags_QueryInterface, + AMFilterMiscFlags_AddRef, + AMFilterMiscFlags_Release, + AMFilterMiscFlags_GetMiscFlags +};

1 0

Nikolay Sivov : msxml3: Encode special characters while setting attribute content.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 8f976c5d5350c46a7b52e9096fb1b6dc849e82e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f976c5d5350c46a7b52e9096… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 4 18:35:58 2010 +0300 msxml3: Encode special characters while setting attribute content. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 34cc007..e7e8f48 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -207,7 +207,7 @@ static HRESULT WINAPI domattr_put_nodeValue( TRACE("(%p)->(v%d)\n", This, V_VT(&value)); - return node_put_value(&This->node, &value); + return node_put_value_escaped(&This->node, &value); } static HRESULT WINAPI domattr_get_nodeType( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 4be8c1d..4af9bca 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -184,6 +184,7 @@ extern HRESULT node_get_nodeName(xmlnode*,BSTR*); extern HRESULT node_get_content(xmlnode*,VARIANT*); extern HRESULT node_set_content(xmlnode*,LPCWSTR); extern HRESULT node_put_value(xmlnode*,VARIANT*); +extern HRESULT node_put_value_escaped(xmlnode*,VARIANT*); extern HRESULT node_get_parent(xmlnode*,IXMLDOMNode**); extern HRESULT node_get_child_nodes(xmlnode*,IXMLDOMNodeList**); extern HRESULT node_get_first_child(xmlnode*,IXMLDOMNode**); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3220800..9aafa83 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -151,6 +151,29 @@ HRESULT node_set_content(xmlnode *This, LPCWSTR value) return S_OK; } +static HRESULT node_set_content_escaped(xmlnode *This, LPCWSTR value) +{ + xmlChar *str, *escaped; + + str = xmlChar_from_wchar(value); + if(!str) + return E_OUTOFMEMORY; + + escaped = xmlEncodeSpecialChars(NULL, str); + if(!escaped) + { + heap_free(str); + return E_OUTOFMEMORY; + } + + xmlNodeSetContent(This->node, escaped); + + heap_free(str); + xmlFree(escaped); + + return S_OK; +} + HRESULT node_put_value(xmlnode *This, VARIANT *value) { VARIANT string_value; @@ -169,6 +192,24 @@ HRESULT node_put_value(xmlnode *This, VARIANT *value) return S_OK; } +HRESULT node_put_value_escaped(xmlnode *This, VARIANT *value) +{ + VARIANT string_value; + HRESULT hr; + + VariantInit(&string_value); + hr = VariantChangeType(&string_value, value, 0, VT_BSTR); + if(FAILED(hr)) { + WARN("Couldn't convert to VT_BSTR\n"); + return hr; + } + + hr = node_set_content_escaped(This, V_BSTR(&string_value)); + VariantClear(&string_value); + + return S_OK; +} + static HRESULT get_node( xmlnode *This, const char *name, diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9a6d202..e8f0102 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6056,8 +6056,11 @@ static void test_TransformWithLoadingLocalFile(void) static void test_put_nodeValue(void) { + static const WCHAR jeevesW[] = {'J','e','e','v','e','s',' ','&',' ','W','o','o','s','t','e','r',0}; IXMLDOMDocument *doc; + IXMLDOMText *text; IXMLDOMEntityReference *entityref; + IXMLDOMAttribute *attr; IXMLDOMNode *node; HRESULT hr; VARIANT data, type; @@ -6115,6 +6118,28 @@ static void test_put_nodeValue(void) IXMLDOMNode_Release(node); IXMLDOMEntityReference_Release(entityref); + /* supported types */ + hr = IXMLDOMDocument_createTextNode(doc, _bstr_(""), &text); + ok(hr == S_OK, "ret %08x\n", hr ); + V_VT(&data) = VT_BSTR; + V_BSTR(&data) = _bstr_("Jeeves & Wooster"); + hr = IXMLDOMText_put_nodeValue(text, data); + ok(hr == S_OK, "ret %08x\n", hr ); + IXMLDOMText_Release(text); + + hr = IXMLDOMDocument_createAttribute(doc, _bstr_("attr"), &attr); + ok(hr == S_OK, "ret %08x\n", hr ); + V_VT(&data) = VT_BSTR; + V_BSTR(&data) = _bstr_("Jeeves & Wooster"); + hr = IXMLDOMAttribute_put_nodeValue(attr, data); + ok(hr == S_OK, "ret %08x\n", hr ); + hr = IXMLDOMAttribute_get_nodeValue(attr, &data); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(memcmp(V_BSTR(&data), jeevesW, sizeof(jeevesW)) == 0, "got %s\n", + wine_dbgstr_w(V_BSTR(&data))); + VariantClear(&data); + IXMLDOMAttribute_Release(attr); + free_bstrs(); IXMLDOMDocument_Release(doc);

1 0

Nikolay Sivov : msxml3: For tested cases use TRACE instead of FIXME.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: a353a91f3292b2f1019a9d6c4cdafa6bc04be3c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a353a91f3292b2f1019a9d6c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 4 19:14:04 2010 +0300 msxml3: For tested cases use TRACE instead of FIXME. --- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 792298c..ec86579 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -212,7 +212,7 @@ static HRESULT WINAPI domfrag_put_nodeValue( VARIANT value) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - FIXME("(%p)->(v%d)\n", This, V_VT(&value)); + TRACE("(%p)->(v%d)\n", This, V_VT(&value)); return E_FAIL; } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2596630..8e12098 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1009,7 +1009,7 @@ static HRESULT WINAPI domdoc_put_nodeValue( VARIANT value) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("(%p)->(v%d)\n", This, V_VT(&value)); + TRACE("(%p)->(v%d)\n", This, V_VT(&value)); return E_FAIL; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 418307e..1400088 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -221,7 +221,7 @@ static HRESULT WINAPI domelem_put_nodeValue( VARIANT value) { domelem *This = impl_from_IXMLDOMElement( iface ); - FIXME("(%p)->(v%d)\n", This, V_VT(&value)); + TRACE("(%p)->(v%d)\n", This, V_VT(&value)); return E_FAIL; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 308b9ce..570d711 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -208,7 +208,7 @@ static HRESULT WINAPI entityref_put_nodeValue( VARIANT value) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - FIXME("(%p)->(v%d)\n", This, V_VT(&value)); + TRACE("(%p)->(v%d)\n", This, V_VT(&value)); return E_FAIL; }

1 0

Nikolay Sivov : msxml3: Don't force put_nodeValue return value.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 6d48656fb201e8c44a473831da3412523eedc1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d48656fb201e8c44a473831d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 4 19:16:12 2010 +0300 msxml3: Don't force put_nodeValue return value. --- dlls/msxml3/node.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 9aafa83..9e8177a 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -189,7 +189,7 @@ HRESULT node_put_value(xmlnode *This, VARIANT *value) hr = node_set_content(This, V_BSTR(&string_value)); VariantClear(&string_value); - return S_OK; + return hr; } HRESULT node_put_value_escaped(xmlnode *This, VARIANT *value) @@ -207,7 +207,7 @@ HRESULT node_put_value_escaped(xmlnode *This, VARIANT *value) hr = node_set_content_escaped(This, V_BSTR(&string_value)); VariantClear(&string_value); - return S_OK; + return hr; } static HRESULT get_node(

1 0