October 2010 - Wine-Commits

Maarten Lankhorst : quartz: Add support for MediaSeekingPassThru to null renderer.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: f48f6099f75b19147dbe0db12e03862779db473c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48f6099f75b19147dbe0db12… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 22 16:06:00 2010 +0200 quartz: Add support for MediaSeekingPassThru to null renderer. --- dlls/quartz/nullrenderer.c | 99 ++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 63 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index d2aedfa..3d27587 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -53,6 +53,7 @@ typedef struct NullRendererImpl { const IBaseFilterVtbl * lpVtbl; const IUnknownVtbl * IInner_vtbl; + IUnknown *seekthru_unk; LONG refCount; CRITICAL_SECTION csFilter; @@ -65,16 +66,18 @@ typedef struct NullRendererImpl IUnknown * pUnkOuter; BOOL bUnkOuterValid; BOOL bAggregatable; - MediaSeekingImpl mediaSeeking; } NullRendererImpl; static HRESULT NullRenderer_Sample(LPVOID iface, IMediaSample * pSample) { NullRendererImpl *This = iface; HRESULT hr = S_OK; + REFERENCE_TIME start, stop; TRACE("%p %p\n", iface, pSample); + if (SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) + MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, start); EnterCriticalSection(&This->csFilter); if (This->pInputPin->flushing || This->pInputPin->end_of_stream) hr = S_FALSE; @@ -89,62 +92,6 @@ static HRESULT NullRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) return S_OK; } -static inline NullRendererImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) -{ - return (NullRendererImpl *)((char*)iface - FIELD_OFFSET(NullRendererImpl, mediaSeeking.lpVtbl)); -} - -static HRESULT WINAPI NullRendererImpl_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) -{ - NullRendererImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); -} - -static ULONG WINAPI NullRendererImpl_Seeking_AddRef(IMediaSeeking * iface) -{ - NullRendererImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_AddRef((IUnknown *)This); -} - -static ULONG WINAPI NullRendererImpl_Seeking_Release(IMediaSeeking * iface) -{ - NullRendererImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_Release((IUnknown *)This); -} - -static const IMediaSeekingVtbl TransformFilter_Seeking_Vtbl = -{ - NullRendererImpl_Seeking_QueryInterface, - NullRendererImpl_Seeking_AddRef, - NullRendererImpl_Seeking_Release, - MediaSeekingImpl_GetCapabilities, - MediaSeekingImpl_CheckCapabilities, - MediaSeekingImpl_IsFormatSupported, - MediaSeekingImpl_QueryPreferredFormat, - MediaSeekingImpl_GetTimeFormat, - MediaSeekingImpl_IsUsingTimeFormat, - MediaSeekingImpl_SetTimeFormat, - MediaSeekingImpl_GetDuration, - MediaSeekingImpl_GetStopPosition, - MediaSeekingImpl_GetCurrentPosition, - MediaSeekingImpl_ConvertTimeFormat, - MediaSeekingImpl_SetPositions, - MediaSeekingImpl_GetPositions, - MediaSeekingImpl_GetAvailable, - MediaSeekingImpl_SetRate, - MediaSeekingImpl_GetRate, - MediaSeekingImpl_GetPreroll -}; - -static HRESULT NullRendererImpl_Change(IBaseFilter *iface) -{ - TRACE("(%p)\n", iface); - return S_OK; -} - HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) { HRESULT hr; @@ -178,9 +125,15 @@ HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) if (SUCCEEDED(hr)) { - MediaSeekingImpl_Init((IBaseFilter*)pNullRenderer, NullRendererImpl_Change, NullRendererImpl_Change, NullRendererImpl_Change, &pNullRenderer->mediaSeeking, &pNullRenderer->csFilter); - pNullRenderer->mediaSeeking.lpVtbl = &TransformFilter_Seeking_Vtbl; - + ISeekingPassThru *passthru; + hr = CoCreateInstance(&CLSID_SeekingPassThru, pUnkOuter ? pUnkOuter : (IUnknown*)&pNullRenderer->IInner_vtbl, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&pNullRenderer->seekthru_unk); + if (FAILED(hr)) { + IUnknown_Release((IUnknown*)pNullRenderer); + return hr; + } + IUnknown_QueryInterface(pNullRenderer->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); + ISeekingPassThru_Init(passthru, TRUE, (IPin*)pNullRenderer->pInputPin); + ISeekingPassThru_Release(passthru); *ppv = pNullRenderer; } else @@ -212,7 +165,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID else if (IsEqualIID(riid, &IID_IBaseFilter)) *ppv = This; else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->mediaSeeking; + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); if (*ppv) { @@ -259,6 +212,8 @@ static ULONG WINAPI NullRendererInner_Release(IUnknown * iface) IPin_Release((IPin *)This->pInputPin); This->lpVtbl = NULL; + if (This->seekthru_unk) + IUnknown_Release(This->seekthru_unk); This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); @@ -350,6 +305,7 @@ static HRESULT WINAPI NullRenderer_Stop(IBaseFilter * iface) EnterCriticalSection(&This->csFilter); { This->state = State_Stopped; + MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); } LeaveCriticalSection(&This->csFilter); @@ -550,13 +506,15 @@ static HRESULT WINAPI NullRenderer_InputPin_EndOfStream(IPin * iface) { InputPin* This = (InputPin*)iface; IMediaEventSink* pEventSink; + NullRendererImpl *pNull; IFilterGraph *graph; HRESULT hr = S_OK; TRACE("(%p/%p)->()\n", This, iface); InputPin_EndOfStream(iface); - graph = ((NullRendererImpl*)This->pin.pinInfo.pFilter)->filterInfo.pGraph; + pNull = (NullRendererImpl*)This->pin.pinInfo.pFilter; + graph = pNull->filterInfo.pGraph; if (graph) { hr = IFilterGraph_QueryInterface(((NullRendererImpl*)This->pin.pinInfo.pFilter)->filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); @@ -566,7 +524,22 @@ static HRESULT WINAPI NullRenderer_InputPin_EndOfStream(IPin * iface) IMediaEventSink_Release(pEventSink); } } + MediaSeekingPassThru_EOS(pNull->seekthru_unk); + + return hr; +} + +static HRESULT WINAPI NullRenderer_InputPin_EndFlush(IPin * iface) +{ + InputPin* This = (InputPin*)iface; + NullRendererImpl *pNull; + HRESULT hr = S_OK; + + TRACE("(%p/%p)->()\n", This, iface); + hr = InputPin_EndOfStream(iface); + pNull = (NullRendererImpl*)This->pin.pinInfo.pFilter; + MediaSeekingPassThru_ResetMediaTime(pNull->seekthru_unk); return hr; } @@ -588,6 +561,6 @@ static const IPinVtbl NullRenderer_InputPin_Vtbl = IPinImpl_QueryInternalConnections, NullRenderer_InputPin_EndOfStream, InputPin_BeginFlush, - InputPin_EndFlush, + NullRenderer_InputPin_EndFlush, InputPin_NewSegment };

1 0

Maarten Lankhorst : quartz: Use MediaSeekingPassThru for DirectSound renderer.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: deaeeb71837afaea7c8f4f2bb3cfd0727b63c816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deaeeb71837afaea7c8f4f2bb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 22 15:59:35 2010 +0200 quartz: Use MediaSeekingPassThru for DirectSound renderer. --- dlls/quartz/dsoundrender.c | 111 +++++++------------------------------------- 1 files changed, 17 insertions(+), 94 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 8631cd5..043f328 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -54,6 +54,7 @@ typedef struct DSoundRenderImpl const IBasicAudioVtbl *IBasicAudio_vtbl; const IReferenceClockVtbl *IReferenceClock_vtbl; const IAMDirectSoundVtbl *IAMDirectSound_vtbl; + IUnknown *seekthru_unk; LONG refCount; CRITICAL_SECTION csFilter; @@ -75,7 +76,6 @@ typedef struct DSoundRenderImpl DWORD in_loop; REFERENCE_TIME play_time; - MediaSeekingImpl mediaSeeking; HANDLE state_change, blocked; @@ -83,41 +83,6 @@ typedef struct DSoundRenderImpl LONG pan; } DSoundRenderImpl; -/* Seeking is not needed for a renderer, rely on newsegment for the appropriate changes */ -static HRESULT sound_mod_stop(IBaseFilter *iface) -{ - TRACE("(%p)\n", iface); - return S_OK; -} - -static HRESULT sound_mod_start(IBaseFilter *iface) -{ - TRACE("(%p)\n", iface); - - return S_OK; -} - -static HRESULT sound_mod_rate(IBaseFilter *iface) -{ - DSoundRenderImpl *This = (DSoundRenderImpl *)iface; - - WAVEFORMATEX *format = (WAVEFORMATEX*)This->pInputPin->pin.mtCurrent.pbFormat; - DWORD freq = format->nSamplesPerSec; - double rate = This->mediaSeeking.dRate; - - freq = (DWORD)((double)freq * rate); - - TRACE("(%p)\n", iface); - - if (freq > DSBFREQUENCY_MAX) - return VFW_E_UNSUPPORTED_AUDIO; - - if (freq < DSBFREQUENCY_MIN) - return VFW_E_UNSUPPORTED_AUDIO; - - return S_OK; -} - static inline HRESULT DSoundRender_GetPos(DSoundRenderImpl *This, DWORD *pPlayPos, REFERENCE_TIME *pRefTime) { HRESULT hr; @@ -319,6 +284,8 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) hr = IMediaSample_GetTime(pSample, &tStart, &tStop); if (FAILED(hr)) ERR("Cannot get sample time (%x)\n", hr); + else + MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); if (This->rtLastStop != tStart && (IMediaSample_IsDiscontinuity(pSample) == S_FALSE)) WARN("Unexpected discontinuity: Last: %u.%03u, tStart: %u.%03u\n", @@ -352,6 +319,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) LeaveCriticalSection(&This->csFilter); return S_OK; } + SetEvent(This->state_change); } cbSrcStream = IMediaSample_GetActualDataLength(pSample); @@ -442,18 +410,19 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) if (SUCCEEDED(hr)) { - MediaSeekingImpl_Init((IBaseFilter*)pDSoundRender, sound_mod_stop, sound_mod_start, sound_mod_rate, &pDSoundRender->mediaSeeking, &pDSoundRender->csFilter); - pDSoundRender->mediaSeeking.lpVtbl = &IMediaSeeking_Vtbl; - + ISeekingPassThru *passthru; pDSoundRender->state_change = CreateEventW(NULL, TRUE, TRUE, NULL); - pDSoundRender->blocked = CreateEventW(NULL, FALSE, FALSE, NULL); - - if (!pDSoundRender->state_change || !pDSoundRender->blocked) + pDSoundRender->blocked = CreateEventW(NULL, TRUE, TRUE, NULL); + hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)pDSoundRender, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&pDSoundRender->seekthru_unk); + if (!pDSoundRender->state_change || !pDSoundRender->blocked || FAILED(hr)) { IUnknown_Release((IUnknown *)pDSoundRender); return HRESULT_FROM_WIN32(GetLastError()); } + IUnknown_QueryInterface(pDSoundRender->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); + ISeekingPassThru_Init(passthru, TRUE, (IPin*)pDSoundRender->pInputPin); + ISeekingPassThru_Release(passthru); *ppv = pDSoundRender; } else @@ -488,7 +457,7 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri else if (IsEqualIID(riid, &IID_IReferenceClock)) *ppv = &This->IReferenceClock_vtbl; else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->mediaSeeking.lpVtbl; + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); else if (IsEqualIID(riid, &IID_IAMDirectSound)) *ppv = &This->IAMDirectSound_vtbl; @@ -546,7 +515,8 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) This->lpVtbl = NULL; This->IBasicAudio_vtbl = NULL; - + if (This->seekthru_unk) + IUnknown_Release(This->seekthru_unk); This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); @@ -601,6 +571,7 @@ static HRESULT WINAPI DSoundRender_Stop(IBaseFilter * iface) /* Complete our transition */ SetEvent(This->state_change); SetEvent(This->blocked); + MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); } LeaveCriticalSection(&This->csFilter); @@ -967,6 +938,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, 0); IMediaEventSink_Release(pEventSink); } + MediaSeekingPassThru_EOS(me->seekthru_unk); LeaveCriticalSection(This->pin.pCritSec); return hr; @@ -1024,6 +996,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndFlush(IPin * iface) } hr = InputPin_EndFlush(iface); LeaveCriticalSection(This->pin.pCritSec); + MediaSeekingPassThru_ResetMediaTime(pFilter->seekthru_unk); return hr; } @@ -1301,56 +1274,6 @@ static const IReferenceClockVtbl IReferenceClock_Vtbl = ReferenceClock_Unadvise }; -static inline DSoundRenderImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) -{ - return (DSoundRenderImpl *)((char*)iface - FIELD_OFFSET(DSoundRenderImpl, mediaSeeking.lpVtbl)); -} - -static HRESULT WINAPI sound_seek_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) -{ - DSoundRenderImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); -} - -static ULONG WINAPI sound_seek_AddRef(IMediaSeeking * iface) -{ - DSoundRenderImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_AddRef((IUnknown *)This); -} - -static ULONG WINAPI sound_seek_Release(IMediaSeeking * iface) -{ - DSoundRenderImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_Release((IUnknown *)This); -} - -static const IMediaSeekingVtbl IMediaSeeking_Vtbl = -{ - sound_seek_QueryInterface, - sound_seek_AddRef, - sound_seek_Release, - MediaSeekingImpl_GetCapabilities, - MediaSeekingImpl_CheckCapabilities, - MediaSeekingImpl_IsFormatSupported, - MediaSeekingImpl_QueryPreferredFormat, - MediaSeekingImpl_GetTimeFormat, - MediaSeekingImpl_IsUsingTimeFormat, - MediaSeekingImpl_SetTimeFormat, - MediaSeekingImpl_GetDuration, - MediaSeekingImpl_GetStopPosition, - MediaSeekingImpl_GetCurrentPosition, - MediaSeekingImpl_ConvertTimeFormat, - MediaSeekingImpl_SetPositions, - MediaSeekingImpl_GetPositions, - MediaSeekingImpl_GetAvailable, - MediaSeekingImpl_SetRate, - MediaSeekingImpl_GetRate, - MediaSeekingImpl_GetPreroll -}; - /*** IUnknown methods ***/ static HRESULT WINAPI AMDirectSound_QueryInterface(IAMDirectSound *iface, REFIID riid,

1 0

Maarten Lankhorst : quartz: Add MediaSeekingPassThru to video renderer.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 81b15f35bf956a6df9ed66635b3289a31a5877d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b15f35bf956a6df9ed66635… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 22 15:58:15 2010 +0200 quartz: Add MediaSeekingPassThru to video renderer. --- dlls/quartz/videorenderer.c | 97 ++++++++++++------------------------------ 1 files changed, 28 insertions(+), 69 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 9469427..b4b0547 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -59,6 +59,7 @@ typedef struct VideoRendererImpl const IBasicVideoVtbl * IBasicVideo_vtbl; const IVideoWindowVtbl * IVideoWindow_vtbl; const IUnknownVtbl * IInner_vtbl; + IUnknown *seekthru_unk; LONG refCount; CRITICAL_SECTION csFilter; @@ -380,6 +381,8 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) hr = IMediaSample_GetTime(pSample, &tStart, &tStop); if (FAILED(hr)) ERR("Cannot get sample time (%x)\n", hr); + else + MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); if (This->rtLastStop != tStart && This->state == State_Running) { @@ -536,67 +539,12 @@ static HRESULT VideoRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt return S_FALSE; } -static inline VideoRendererImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) -{ - return (VideoRendererImpl *)((char*)iface - FIELD_OFFSET(VideoRendererImpl, mediaSeeking.lpVtbl)); -} - -static HRESULT WINAPI VideoRendererImpl_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) -{ - VideoRendererImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); -} - -static ULONG WINAPI VideoRendererImpl_Seeking_AddRef(IMediaSeeking * iface) -{ - VideoRendererImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_AddRef((IUnknown *)This); -} - -static ULONG WINAPI VideoRendererImpl_Seeking_Release(IMediaSeeking * iface) -{ - VideoRendererImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_Release((IUnknown *)This); -} - -static const IMediaSeekingVtbl VideoRendererImpl_Seeking_Vtbl = -{ - VideoRendererImpl_Seeking_QueryInterface, - VideoRendererImpl_Seeking_AddRef, - VideoRendererImpl_Seeking_Release, - MediaSeekingImpl_GetCapabilities, - MediaSeekingImpl_CheckCapabilities, - MediaSeekingImpl_IsFormatSupported, - MediaSeekingImpl_QueryPreferredFormat, - MediaSeekingImpl_GetTimeFormat, - MediaSeekingImpl_IsUsingTimeFormat, - MediaSeekingImpl_SetTimeFormat, - MediaSeekingImpl_GetDuration, - MediaSeekingImpl_GetStopPosition, - MediaSeekingImpl_GetCurrentPosition, - MediaSeekingImpl_ConvertTimeFormat, - MediaSeekingImpl_SetPositions, - MediaSeekingImpl_GetPositions, - MediaSeekingImpl_GetAvailable, - MediaSeekingImpl_SetRate, - MediaSeekingImpl_GetRate, - MediaSeekingImpl_GetPreroll -}; - -static HRESULT VideoRendererImpl_Change(IBaseFilter *iface) -{ - TRACE("(%p)->()\n", iface); - return S_OK; -} - HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) { HRESULT hr; PIN_INFO piInput; VideoRendererImpl * pVideoRenderer; + ISeekingPassThru *passthru; TRACE("(%p, %p)\n", pUnkOuter, ppv); @@ -636,18 +584,19 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) if (SUCCEEDED(hr)) { - MediaSeekingImpl_Init((IBaseFilter*)pVideoRenderer, VideoRendererImpl_Change, VideoRendererImpl_Change, VideoRendererImpl_Change, &pVideoRenderer->mediaSeeking, &pVideoRenderer->csFilter); - pVideoRenderer->mediaSeeking.lpVtbl = &VideoRendererImpl_Seeking_Vtbl; - + hr = CoCreateInstance(&CLSID_SeekingPassThru, pUnkOuter ? pUnkOuter : (IUnknown*)&pVideoRenderer->IInner_vtbl, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&pVideoRenderer->seekthru_unk); + if (FAILED(hr)) { + IPin_Release((IPin*)pVideoRenderer->pInputPin); + goto fail; + } + IUnknown_QueryInterface(pVideoRenderer->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); + ISeekingPassThru_Init(passthru, TRUE, (IPin*)pVideoRenderer->pInputPin); + ISeekingPassThru_Release(passthru); pVideoRenderer->sample_held = NULL; *ppv = pVideoRenderer; } - else - { - pVideoRenderer->csFilter.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&pVideoRenderer->csFilter); - CoTaskMemFree(pVideoRenderer); - } + if (FAILED(hr)) + goto fail; if (!CreateRenderingSubsystem(pVideoRenderer)) return E_FAIL; @@ -660,6 +609,11 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) } return hr; +fail: + pVideoRenderer->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&pVideoRenderer->csFilter); + CoTaskMemFree(pVideoRenderer); + return hr; } HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv) @@ -691,7 +645,7 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown * iface, REFIID else if (IsEqualIID(riid, &IID_IVideoWindow)) *ppv = &This->IVideoWindow_vtbl; else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->mediaSeeking; + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); if (*ppv) { @@ -734,7 +688,7 @@ static ULONG WINAPI VideoRendererInner_Release(IUnknown * iface) if (This->pClock) IReferenceClock_Release(This->pClock); - + if (SUCCEEDED(IPin_ConnectedTo((IPin *)This->pInputPin, &pConnectedTo))) { IPin_Disconnect(pConnectedTo); @@ -745,7 +699,7 @@ static ULONG WINAPI VideoRendererInner_Release(IUnknown * iface) IPin_Release((IPin *)This->pInputPin); This->lpVtbl = NULL; - + IUnknown_Release(This->seekthru_unk); This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); @@ -839,6 +793,7 @@ static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface) This->state = State_Stopped; SetEvent(This->hEvent); SetEvent(This->blocked); + MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); } LeaveCriticalSection(&This->csFilter); @@ -1049,17 +1004,20 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl = static HRESULT WINAPI VideoRenderer_InputPin_EndOfStream(IPin * iface) { InputPin* This = (InputPin*)iface; + VideoRendererImpl *pFilter; IMediaEventSink* pEventSink; HRESULT hr; TRACE("(%p/%p)->()\n", This, iface); - hr = IFilterGraph_QueryInterface(((VideoRendererImpl*)This->pin.pinInfo.pFilter)->filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + pFilter = (VideoRendererImpl*)This->pin.pinInfo.pFilter; + hr = IFilterGraph_QueryInterface(pFilter->filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); if (SUCCEEDED(hr)) { hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, 0); IMediaEventSink_Release(pEventSink); } + MediaSeekingPassThru_EOS(pFilter->seekthru_unk); return hr; } @@ -1096,6 +1054,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface) hr = InputPin_EndFlush(iface); LeaveCriticalSection(This->pin.pCritSec); + MediaSeekingPassThru_ResetMediaTime(pVideoRenderer->seekthru_unk); return hr; }

1 0

Jacek Caban : include: Added d3d10_1.idl.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 4c5c1f93bc3e58061af7146b3c7112e4f4e97a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5c1f93bc3e58061af7146b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 2 15:29:49 2010 +0200 include: Added d3d10_1.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/d3d10_1.idl | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 5666c5a..dcbab53 100644 --- a/.gitignore +++ b/.gitignore @@ -157,6 +157,7 @@ include/control.h include/ctfutb.h include/ctxtcall.h include/d3d10.h +include/d3d10_1.h include/d3dcommon.h include/ddstream.h include/devicetopology.h diff --git a/include/Makefile.in b/include/Makefile.in index e27c6ca..fc84b32 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -20,6 +20,7 @@ PUBLIC_IDL_H_SRCS = \ ctfutb.idl \ ctxtcall.idl \ d3d10.idl \ + d3d10_1.idl \ d3dcommon.idl \ ddstream.idl \ devicetopology.idl \ diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl new file mode 100644 index 0000000..dc94492 --- /dev/null +++ b/include/d3d10_1.idl @@ -0,0 +1,133 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +import "d3d10.idl"; + +typedef enum D3D10_FEATURE_LEVEL1 +{ + D3D10_FEATURE_LEVEL_10_0 = 0xa000, + D3D10_FEATURE_LEVEL_10_1 = 0xa100, + D3D10_FEATURE_LEVEL_9_1 = 0x9100, + D3D10_FEATURE_LEVEL_9_2 = 0x9200, + D3D10_FEATURE_LEVEL_9_3 = 0x9300 +} D3D10_FEATURE_LEVEL1; + +typedef struct D3D10_RENDER_TARGET_BLEND_DESC1 +{ + BOOL BlendEnable; + D3D10_BLEND SrcBlend; + D3D10_BLEND DestBlend; + D3D10_BLEND_OP BlendOp; + D3D10_BLEND SrcBlendAlpha; + D3D10_BLEND DestBlendAlpha; + D3D10_BLEND_OP BlendOpAlpha; + UINT8 RenderTargetWriteMask; +} D3D10_RENDER_TARGET_BLEND_DESC1; + +typedef struct D3D10_BLEND_DESC1 +{ + BOOL AlphaToCoverageEnable; + BOOL IndependentBlendEnable; + D3D10_RENDER_TARGET_BLEND_DESC1 RenderTarget[D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT]; +} D3D10_BLEND_DESC1; + +[ + uuid(edad8d99-8a35-4d6d-8566-2ea276cde161), + object, + local, + pointer_default(unique) +] +interface ID3D10BlendState1 : ID3D10BlendState +{ + void GetDesc1([out] D3D10_BLEND_DESC1 *pDesc); +} + +typedef struct D3D10_TEXCUBE_ARRAY_SRV1 +{ + UINT MostDetailedMip; + UINT MipLevels; + UINT First2DArrayFace; + UINT NumCubes; +} D3D10_TEXCUBE_ARRAY_SRV1; + +typedef enum D3D10_SRV_DIMENSION1 +{ + D3D10_1_SRV_DIMENSION_UNKNOWN = 0, + D3D10_1_SRV_DIMENSION_BUFFER = 1, + D3D10_1_SRV_DIMENSION_TEXTURE1D = 2, + D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY = 3, + D3D10_1_SRV_DIMENSION_TEXTURE2D = 4, + D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY = 5, + D3D10_1_SRV_DIMENSION_TEXTURE2DMS = 6, + D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY = 7, + D3D10_1_SRV_DIMENSION_TEXTURE3D = 8, + D3D10_1_SRV_DIMENSION_TEXTURECUBE = 9, + D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY = 10 +} D3D10_SRV_DIMENSION1; + +typedef struct D3D10_SHADER_RESOURCE_VIEW_DESC1 +{ + DXGI_FORMAT Format; + D3D10_SRV_DIMENSION1 ViewDimension; + union { + D3D10_BUFFER_SRV Buffer; + D3D10_TEX1D_SRV Texture1D; + D3D10_TEX1D_ARRAY_SRV Texture1DArray; + D3D10_TEX2D_SRV Texture2D; + D3D10_TEX2D_ARRAY_SRV Texture2DArray; + D3D10_TEX2DMS_SRV Texture2DMS; + D3D10_TEX2DMS_ARRAY_SRV Texture2DMSArray; + D3D10_TEX3D_SRV Texture3D; + D3D10_TEXCUBE_SRV TextureCube; + D3D10_TEXCUBE_ARRAY_SRV1 TextureCubeArray; + }; +} D3D10_SHADER_RESOURCE_VIEW_DESC1; + +[ + uuid(9b7e4c87-342c-4106-a19f-4f2704f689f0), + object, + local, + pointer_default(unique) +] +interface ID3D10ShaderResourceView1 : ID3D10ShaderResourceView +{ + void GetDesc1([out] D3D10_SHADER_RESOURCE_VIEW_DESC1 *pDesc); +} + +[ + uuid(9b7e4c8f-342c-4106-a19f-4f2704f689f0), + object, + local, + pointer_default(unique) +] +interface ID3D10Device1 : ID3D10Device +{ + HRESULT CreateShaderResourceView1( + [in] ID3D10Resource *pResource, + [in, out] const D3D10_SHADER_RESOURCE_VIEW_DESC1 *pDesc, + [out] ID3D10ShaderResourceView1 **ppSRView); + + HRESULT CreateBlendState1( + [in] const D3D10_BLEND_DESC1 *pBlendStateDesc, + [out] ID3D10BlendState1 **ppBlendState); + + D3D10_FEATURE_LEVEL1 GetFeatureLevel(); +}

1 0

Maarten Lankhorst : quartz: Add support for MediaSeekingPassThru to transform filter.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 4fe2be86a68f040aaaafb3865ef885f123725c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe2be86a68f040aaaafb3865… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 22 16:15:03 2010 +0200 quartz: Add support for MediaSeekingPassThru to transform filter. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/transform.c | 93 ++++------------------------------------------ dlls/quartz/transform.h | 4 +- 4 files changed, 12 insertions(+), 89 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index a032391..05863b3 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -326,7 +326,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) This = CoTaskMemAlloc(sizeof(ACMWrapperImpl)); ZeroMemory(This, sizeof(ACMWrapperImpl)); - hr = TransformFilter_Create(&(This->tf), &CLSID_ACMWrapper, &ACMWrapper_FuncsTable, NULL, NULL, NULL); + hr = TransformFilter_Create(&(This->tf), &CLSID_ACMWrapper, &ACMWrapper_FuncsTable); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b7d45e9..605bc5c 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -331,7 +331,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pBihIn = NULL; This->pBihOut = NULL; - hr = TransformFilter_Create(&(This->tf), &CLSID_AVIDec, &AVIDec_FuncsTable, NULL, NULL, NULL); + hr = TransformFilter_Create(&(This->tf), &CLSID_AVIDec, &AVIDec_FuncsTable); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index adb753d..b6ec768 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -73,80 +73,7 @@ static HRESULT TransformFilter_Output_QueryAccept(LPVOID iface, const AM_MEDIA_T return S_FALSE; } - -static inline TransformFilterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) -{ - return (TransformFilterImpl *)((char*)iface - FIELD_OFFSET(TransformFilterImpl, mediaSeeking.lpVtbl)); -} - -static HRESULT WINAPI TransformFilter_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) -{ - TransformFilterImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); -} - -static ULONG WINAPI TransformFilter_Seeking_AddRef(IMediaSeeking * iface) -{ - TransformFilterImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_AddRef((IUnknown *)This); -} - -static ULONG WINAPI TransformFilter_Seeking_Release(IMediaSeeking * iface) -{ - TransformFilterImpl *This = impl_from_IMediaSeeking(iface); - - return IUnknown_Release((IUnknown *)This); -} - -static const IMediaSeekingVtbl TransformFilter_Seeking_Vtbl = -{ - TransformFilter_Seeking_QueryInterface, - TransformFilter_Seeking_AddRef, - TransformFilter_Seeking_Release, - MediaSeekingImpl_GetCapabilities, - MediaSeekingImpl_CheckCapabilities, - MediaSeekingImpl_IsFormatSupported, - MediaSeekingImpl_QueryPreferredFormat, - MediaSeekingImpl_GetTimeFormat, - MediaSeekingImpl_IsUsingTimeFormat, - MediaSeekingImpl_SetTimeFormat, - MediaSeekingImpl_GetDuration, - MediaSeekingImpl_GetStopPosition, - MediaSeekingImpl_GetCurrentPosition, - MediaSeekingImpl_ConvertTimeFormat, - MediaSeekingImpl_SetPositions, - MediaSeekingImpl_GetPositions, - MediaSeekingImpl_GetAvailable, - MediaSeekingImpl_SetRate, - MediaSeekingImpl_GetRate, - MediaSeekingImpl_GetPreroll -}; - -/* These shouldn't be implemented by default. - * Usually only source filters should implement these - * and even it's not needed all of the time - */ -static HRESULT TransformFilter_ChangeCurrent(IBaseFilter *iface) -{ - TRACE("(%p) filter hasn't implemented current position change!\n", iface); - return S_OK; -} - -static HRESULT TransformFilter_ChangeStop(IBaseFilter *iface) -{ - TRACE("(%p) filter hasn't implemented stop position change!\n", iface); - return S_OK; -} - -static HRESULT TransformFilter_ChangeRate(IBaseFilter *iface) -{ - TRACE("(%p) filter hasn't implemented rate change!\n", iface); - return S_OK; -} - -HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSID* pClsid, const TransformFuncsTable* pFuncsTable, CHANGEPROC stop, CHANGEPROC current, CHANGEPROC rate) +HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSID* pClsid, const TransformFuncsTable* pFuncsTable) { HRESULT hr; PIN_INFO piInput; @@ -195,18 +122,14 @@ HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSI ERR("Cannot create output pin (%x)\n", hr); else { - if (!stop) - stop = TransformFilter_ChangeStop; - if (!current) - current = TransformFilter_ChangeCurrent; - if (!rate) - rate = TransformFilter_ChangeRate; - - MediaSeekingImpl_Init((IBaseFilter*)pTransformFilter, stop, current, rate, &pTransformFilter->mediaSeeking, &pTransformFilter->csFilter); - pTransformFilter->mediaSeeking.lpVtbl = &TransformFilter_Seeking_Vtbl; + ISeekingPassThru *passthru; + hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)pTransformFilter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&pTransformFilter->seekthru_unk); + IUnknown_QueryInterface(pTransformFilter->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); + ISeekingPassThru_Init(passthru, FALSE, (IPin*)pTransformFilter->ppPins[0]); + ISeekingPassThru_Release(passthru); } } - else + if (FAILED(hr)) { CoTaskMemFree(pTransformFilter->ppPins); pTransformFilter->csFilter.DebugInfo->Spare[0] = 0; @@ -233,7 +156,7 @@ static HRESULT WINAPI TransformFilter_QueryInterface(IBaseFilter * iface, REFIID else if (IsEqualIID(riid, &IID_IBaseFilter)) *ppv = This; else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->mediaSeeking; + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); if (*ppv) { diff --git a/dlls/quartz/transform.h b/dlls/quartz/transform.h index f39ff47..8d3a3a0 100644 --- a/dlls/quartz/transform.h +++ b/dlls/quartz/transform.h @@ -34,6 +34,7 @@ typedef struct TransformFuncsTable { struct TransformFilterImpl { const IBaseFilterVtbl * lpVtbl; + IUnknown *seekthru_unk; LONG refCount; CRITICAL_SECTION csFilter; @@ -42,7 +43,6 @@ struct TransformFilterImpl IReferenceClock * pClock; FILTER_INFO filterInfo; CLSID clsid; - struct MediaSeekingImpl mediaSeeking; IPin **ppPins; ULONG npins; @@ -51,4 +51,4 @@ struct TransformFilterImpl const TransformFuncsTable * pFuncsTable; }; -HRESULT TransformFilter_Create(TransformFilterImpl*, const CLSID*, const TransformFuncsTable* pFuncsTable, CHANGEPROC stop, CHANGEPROC current, CHANGEPROC rate); +HRESULT TransformFilter_Create(TransformFilterImpl*, const CLSID*, const TransformFuncsTable* pFuncsTable);

1 0

Austin Lund : comctl32/tests: Add tests for negative subitems independent of local settings.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 227b1fe2ca387f53895df7f5b1036dc8cff54835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=227b1fe2ca387f53895df7f5b… Author: Austin Lund <austin.lund(a)gmail.com> Date: Tue Oct 5 09:54:26 2010 +1000 comctl32/tests: Add tests for negative subitems independent of local settings. --- dlls/comctl32/tests/listview.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index de7369c..d249af8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2992,7 +2992,8 @@ static void test_hittest(void) LVITEMA item; static CHAR text[] = "1234567890ABCDEFGHIJKLMNOPQRST"; POINT pos; - INT x, y; + INT x, y, i; + WORD horiz, vert; HIMAGELIST himl, himl2; HBITMAP hbmp; @@ -3020,6 +3021,11 @@ static void test_hittest(void) r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&bounds); ok(bounds.bottom - bounds.top > 0, "Expected non zero item height\n"); ok(bounds.right - bounds.left > 0, "Expected non zero item width\n"); + r = SendMessage(hwnd, LVM_GETITEMSPACING, TRUE, 0); + horiz = LOWORD(r); + vert = HIWORD(r); + ok(bounds.bottom - bounds.top == vert, + "Horizontal spacing inconsistent (%d != %d)\n", bounds.bottom - bounds.top, vert); r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pos); expect(TRUE, r); @@ -3052,8 +3058,18 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE); /* subitem returned with -1 item too */ x = pos.x + 150; - y = -1; + y = bounds.top - vert; test_lvm_subitemhittest(hwnd, x, y, -1, 1, LVHT_NOWHERE, FALSE, FALSE, FALSE); + test_lvm_subitemhittest(hwnd, x, y - vert + 1, -1, 1, LVHT_NOWHERE, FALSE, FALSE, FALSE); + /* return values appear to underflow with negative indices */ + i = -2; + y = y - vert; + while (i > -10) { + test_lvm_subitemhittest(hwnd, x, y, i, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE); + test_lvm_subitemhittest(hwnd, x, y - vert + 1, i, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE); + y = y - vert; + i--; + } /* parent client area is 100x100 by default */ MoveWindow(hwnd, 0, 0, 300, 100, FALSE); x = pos.x + 150; /* outside column */

1 0

Stefan Oberhumer : ntdll: Fix possible overflow computing middle in NTDLL_mergesort().
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 6a3ca3ca5dbd45126c11fb714ef50121773f1e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3ca3ca5dbd45126c11fb714… Author: Stefan Oberhumer <stefan(a)obssys.com> Date: Tue Oct 5 00:03:34 2010 +0200 ntdll: Fix possible overflow computing middle in NTDLL_mergesort(). --- dlls/ntdll/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 7a939c2..8496113 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -260,7 +260,7 @@ NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(co { if(right>left) { size_t i, j, k, m; - m=(right+left)/2; + m=left+(right-left)/2; NTDLL_mergesort( arr, barr, elemsize, compar, left, m); NTDLL_mergesort( arr, barr, elemsize, compar, m+1, right);

1 0

Stefan Oberhumer : ntdll: qsort: Check if necessary to sort.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 38769ddfe9de03d157e03d7e82d7839cf34279c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38769ddfe9de03d157e03d7e8… Author: Stefan Oberhumer <stefan(a)obssys.com> Date: Tue Oct 5 00:04:44 2010 +0200 ntdll: qsort: Check if necessary to sort. --- dlls/ntdll/misc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index a2c08c5..9291909 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -294,7 +294,9 @@ NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(co void __cdecl NTDLL_qsort( void *base, size_t nmemb, size_t size, int(__cdecl *compar)(const void *, const void *) ) { - void *secondarr = RtlAllocateHeap (GetProcessHeap(), 0, nmemb*size); + void *secondarr; + if (nmemb < 2 || size == 0) return; + secondarr = RtlAllocateHeap (GetProcessHeap(), 0, nmemb*size); NTDLL_mergesort( base, secondarr, size, compar, 0, nmemb-1 ); RtlFreeHeap (GetProcessHeap(),0, secondarr); }

1 0

Detlef Riekenberg : mprapi: Add a stub for MprAdminGetErrorString.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: c812a6253d28aaeadda8fbbe73dcf32839c58fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c812a6253d28aaeadda8fbbe7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 4 23:51:57 2010 +0200 mprapi: Add a stub for MprAdminGetErrorString. --- dlls/mprapi/mprapi.c | 26 ++++++++++++++++++++++++++ dlls/mprapi/mprapi.spec | 2 +- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/mprapi/mprapi.c b/dlls/mprapi/mprapi.c index 90f47ae..715f1b8 100644 --- a/dlls/mprapi/mprapi.c +++ b/dlls/mprapi/mprapi.c @@ -45,6 +45,32 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) } /*********************************************************************** + * MprAdminGetErrorString (MPRAPI.@) + * + * Return a unicode string for the given mpr errorcode + * + * PARAMS + * mprerror [i] errorcode, for which a description is requested + * localstr [o] pointer, where a buffer with the error description is returned + * + * RETURNS + * Failure: ERROR_MR_MID_NOT_FOUND, when mprerror is not known + * Success: ERROR_SUCCESS, and in localstr a pointer to a buffer from LocalAlloc, + * which contains the error description. + * + * NOTES + * The caller must free the returned buffer with LocalFree + * + */ +DWORD APIENTRY MprAdminGetErrorString(DWORD mprerror, LPWSTR *localstr) +{ + FIXME("(0x%x/%u, %p): stub!\n", mprerror, mprerror, localstr); + + *localstr = NULL; + return ERROR_MR_MID_NOT_FOUND; +} + +/*********************************************************************** * MprAdminIsServiceRunning (MPRAPI.@) */ BOOL APIENTRY MprAdminIsServiceRunning(LPWSTR server) diff --git a/dlls/mprapi/mprapi.spec b/dlls/mprapi/mprapi.spec index 6fb8439..4b5937b 100644 --- a/dlls/mprapi/mprapi.spec +++ b/dlls/mprapi/mprapi.spec @@ -6,7 +6,7 @@ @ stub MprAdminDeregisterConnectionNotification @ stub MprAdminDeviceEnum @ stub MprAdminEstablishDomainRasServer -@ stub MprAdminGetErrorString +@ stdcall MprAdminGetErrorString(long ptr) @ stub MprAdminGetPDCServer @ stub MprAdminInterfaceConnect @ stub MprAdminInterfaceCreate

1 0

Detlef Riekenberg : include: Add mprerror.h from mingw w64.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: c1de9e2380da3e020ca2a287d9779906fbfe346a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1de9e2380da3e020ca2a287d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 4 23:51:36 2010 +0200 include: Add mprerror.h from mingw w64. --- include/Makefile.in | 1 + include/mprerror.h | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 0c41dd4..e27c6ca 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -326,6 +326,7 @@ SRCDIR_INCLUDES = \ mmreg.h \ mmsystem.h \ mprapi.h \ + mprerror.h \ msacm.h \ msacmdlg.h \ msacmdrv.h \ diff --git a/include/mprerror.h b/include/mprerror.h new file mode 100644 index 0000000..ac87e81 --- /dev/null +++ b/include/mprerror.h @@ -0,0 +1,74 @@ +/* + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given: + * The w64 mingw-runtime package and its code is distributed in the hope that it + * will be useful but WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESSED OR + * IMPLIED ARE HEREBY DISCLAIMED. This includes but is not limited to + * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +#ifndef _MPRERROR_H_ +#define _MPRERROR_H_ + +#define ROUTEBASE 900 +#define SUCCESS 0 + +#define ERROR_ROUTER_STOPPED (ROUTEBASE+0) +#define ERROR_ALREADY_CONNECTED (ROUTEBASE+1) +#define ERROR_UNKNOWN_PROTOCOL_ID (ROUTEBASE+2) +#define ERROR_DDM_NOT_RUNNING (ROUTEBASE+3) +#define ERROR_INTERFACE_ALREADY_EXISTS (ROUTEBASE+4) +#define ERROR_NO_SUCH_INTERFACE (ROUTEBASE+5) +#define ERROR_INTERFACE_NOT_CONNECTED (ROUTEBASE+6) +#define ERROR_PROTOCOL_STOP_PENDING (ROUTEBASE+7) +#define ERROR_INTERFACE_CONNECTED (ROUTEBASE+8) +#define ERROR_NO_INTERFACE_CREDENTIALS_SET (ROUTEBASE+9) +#define ERROR_ALREADY_CONNECTING (ROUTEBASE+10) +#define ERROR_UPDATE_IN_PROGRESS (ROUTEBASE+11) +#define ERROR_INTERFACE_CONFIGURATION (ROUTEBASE+12) +#define ERROR_NOT_CLIENT_PORT (ROUTEBASE+13) +#define ERROR_NOT_ROUTER_PORT (ROUTEBASE+14) +#define ERROR_CLIENT_INTERFACE_ALREADY_EXISTS (ROUTEBASE+15) +#define ERROR_INTERFACE_DISABLED (ROUTEBASE+16) +#define ERROR_AUTH_PROTOCOL_REJECTED (ROUTEBASE+17) +#define ERROR_NO_AUTH_PROTOCOL_AVAILABLE (ROUTEBASE+18) +#define ERROR_PEER_REFUSED_AUTH (ROUTEBASE+19) +#define ERROR_REMOTE_NO_DIALIN_PERMISSION (ROUTEBASE+20) +#define ERROR_REMOTE_PASSWD_EXPIRED (ROUTEBASE+21) +#define ERROR_REMOTE_ACCT_DISABLED (ROUTEBASE+22) +#define ERROR_REMOTE_RESTRICTED_LOGON_HOURS (ROUTEBASE+23) +#define ERROR_REMOTE_AUTHENTICATION_FAILURE (ROUTEBASE+24) +#define ERROR_INTERFACE_HAS_NO_DEVICES (ROUTEBASE+25) +#define ERROR_IDLE_DISCONNECTED (ROUTEBASE+26) +#define ERROR_INTERFACE_UNREACHABLE (ROUTEBASE+27) +#define ERROR_SERVICE_IS_PAUSED (ROUTEBASE+28) +#define ERROR_INTERFACE_DISCONNECTED (ROUTEBASE+29) +#define ERROR_AUTH_SERVER_TIMEOUT (ROUTEBASE+30) +#define ERROR_PORT_LIMIT_REACHED (ROUTEBASE+31) +#define ERROR_PPP_SESSION_TIMEOUT (ROUTEBASE+32) +#define ERROR_MAX_LAN_INTERFACE_LIMIT (ROUTEBASE+33) +#define ERROR_MAX_WAN_INTERFACE_LIMIT (ROUTEBASE+34) +#define ERROR_MAX_CLIENT_INTERFACE_LIMIT (ROUTEBASE+35) +#define ERROR_BAP_DISCONNECTED (ROUTEBASE+36) +#define ERROR_USER_LIMIT (ROUTEBASE+37) +#define ERROR_NO_RADIUS_SERVERS (ROUTEBASE+38) +#define ERROR_INVALID_RADIUS_RESPONSE (ROUTEBASE+39) +#define ERROR_DIALIN_HOURS_RESTRICTION (ROUTEBASE+40) +#define ERROR_ALLOWED_PORT_TYPE_RESTRICTION (ROUTEBASE+41) +#define ERROR_AUTH_PROTOCOL_RESTRICTION (ROUTEBASE+42) +#define ERROR_BAP_REQUIRED (ROUTEBASE+43) +#define ERROR_DIALOUT_HOURS_RESTRICTION (ROUTEBASE+44) +#define ERROR_ROUTER_CONFIG_INCOMPATIBLE (ROUTEBASE+45) +#define WARNING_NO_MD5_MIGRATION (ROUTEBASE+46) +#define ERROR_PROTOCOL_ALREADY_INSTALLED (ROUTEBASE+48) +#define ERROR_INVALID_SIGNATURE_LENGTH (ROUTEBASE+49) +#define ERROR_INVALID_SIGNATURE (ROUTEBASE+50) +#define ERROR_NO_SIGNATURE (ROUTEBASE+51) +#define ERROR_INVALID_PACKET_LENGTH_OR_ID (ROUTEBASE+52) +#define ERROR_INVALID_ATTRIBUTE_LENGTH (ROUTEBASE+53) +#define ERROR_INVALID_PACKET (ROUTEBASE+54) +#define ERROR_AUTHENTICATOR_MISMATCH (ROUTEBASE+55) +#define ROUTEBASEEND (ROUTEBASE+56) + +#endif

1 0