October 2010 - Wine-commits

Maarten Lankhorst : quartz: Use MediaSeekingPassThru for DirectSound renderer.
by Alexandre Julliard 05 Oct '10

05 Oct '10

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 support for MediaSeekingPassThru to null renderer.
by Alexandre Julliard 05 Oct '10

05 Oct '10

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: Add support for MediaSeekingPassThru to transform filter.
by Alexandre Julliard 05 Oct '10

05 Oct '10

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

Maarten Lankhorst : quartz: Remove forwarding from base class.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: b6c523252dfe39bce4481853df50b5085ecb7f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c523252dfe39bce4481853d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 22 17:17:43 2010 +0200 quartz: Remove forwarding from base class. --- dlls/quartz/control.c | 189 +------------------------------------------------ 1 files changed, 2 insertions(+), 187 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index bf5a46f..b1485a4 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -224,81 +224,6 @@ HRESULT SeekingPassThru_create(IUnknown *pUnkOuter, LPVOID *ppObj) return S_OK; } -typedef HRESULT (*SeekFunc)( IMediaSeeking *to, LPVOID arg ); - -static HRESULT ForwardCmdSeek( PCRITICAL_SECTION crit_sect, IBaseFilter* from, SeekFunc fnSeek, LPVOID arg ) -{ - HRESULT hr = S_OK; - HRESULT hr_return = S_OK; - IEnumPins *enumpins = NULL; - BOOL foundend = FALSE, allnotimpl = TRUE; - - hr = IBaseFilter_EnumPins( from, &enumpins ); - if (FAILED(hr)) - goto out; - - hr = IEnumPins_Reset( enumpins ); - while (hr == S_OK) { - IPin *pin = NULL; - hr = IEnumPins_Next( enumpins, 1, &pin, NULL ); - if (hr == VFW_E_ENUM_OUT_OF_SYNC) - { - hr = IEnumPins_Reset( enumpins ); - continue; - } - if (pin) - { - PIN_DIRECTION dir; - - IPin_QueryDirection( pin, &dir ); - if (dir == PINDIR_INPUT) - { - IPin *connected = NULL; - - IPin_ConnectedTo( pin, &connected ); - if (connected) - { - HRESULT hr_local; - IMediaSeeking *seek = NULL; - - hr_local = IPin_QueryInterface( connected, &IID_IMediaSeeking, (void**)&seek ); - if (hr_local == S_OK) - { - foundend = TRUE; - if (crit_sect) - { - LeaveCriticalSection( crit_sect ); - hr_local = fnSeek( seek , arg ); - EnterCriticalSection( crit_sect ); - } - else - hr_local = fnSeek( seek , arg ); - - if (hr_local != E_NOTIMPL) - allnotimpl = FALSE; - - hr_return = updatehres( hr_return, hr_local ); - IMediaSeeking_Release( seek ); - } - IPin_Release(connected); - } - } - IPin_Release( pin ); - } - } - IEnumPins_Release( enumpins ); - - if (foundend && allnotimpl) - hr = E_NOTIMPL; - else - hr = hr_return; - -out: - TRACE("Returning: %08x\n", hr); - return hr; -} - - HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, CHANGEPROC fnChangeCurrent, CHANGEPROC fnChangeRate, MediaSeekingImpl * pSeeking, PCRITICAL_SECTION crit_sect) { assert(fnChangeStop && fnChangeCurrent && fnChangeRate); @@ -319,93 +244,9 @@ HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, C pSeeking->dRate = 1.0; pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME; pSeeking->crst = crit_sect; - return S_OK; } -struct pos_args { - LONGLONG* current, *stop; - DWORD curflags, stopflags; -}; - -static HRESULT fwd_setposition(IMediaSeeking *seek, LPVOID pargs) -{ - struct pos_args *args = (void*)pargs; - - return IMediaSeeking_SetPositions(seek, args->current, args->curflags, args->stop, args->stopflags); -} - -static HRESULT fwd_checkcaps(IMediaSeeking *iface, LPVOID pcaps) -{ - DWORD *caps = pcaps; - return IMediaSeeking_CheckCapabilities(iface, caps); -} - -static HRESULT fwd_settimeformat(IMediaSeeking *iface, LPVOID pformat) -{ - const GUID *format = pformat; - return IMediaSeeking_SetTimeFormat(iface, format); -} - -static HRESULT fwd_getduration(IMediaSeeking *iface, LPVOID pdur) -{ - LONGLONG *duration = pdur; - LONGLONG mydur = *duration; - HRESULT hr; - - hr = IMediaSeeking_GetDuration(iface, &mydur); - if (FAILED(hr)) - return hr; - - if ((mydur < *duration) || (*duration < 0 && mydur > 0)) - *duration = mydur; - return hr; -} - -static HRESULT fwd_getstopposition(IMediaSeeking *iface, LPVOID pdur) -{ - LONGLONG *duration = pdur; - LONGLONG mydur = *duration; - HRESULT hr; - - hr = IMediaSeeking_GetStopPosition(iface, &mydur); - if (FAILED(hr)) - return hr; - - if ((mydur < *duration) || (*duration < 0 && mydur > 0)) - *duration = mydur; - return hr; -} - -static HRESULT fwd_getcurposition(IMediaSeeking *iface, LPVOID pdur) -{ - LONGLONG *duration = pdur; - LONGLONG mydur = *duration; - HRESULT hr; - - hr = IMediaSeeking_GetCurrentPosition(iface, &mydur); - if (FAILED(hr)) - return hr; - - if ((mydur < *duration) || (*duration < 0 && mydur > 0)) - *duration = mydur; - return hr; -} - -static HRESULT fwd_setrate(IMediaSeeking *iface, LPVOID prate) -{ - double *rate = prate; - - HRESULT hr; - - hr = IMediaSeeking_SetRate(iface, *rate); - if (FAILED(hr)) - return hr; - - return hr; -} - - HRESULT WINAPI MediaSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; @@ -428,12 +269,6 @@ HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * if (!pCapabilities) return E_POINTER; - EnterCriticalSection(This->crst); - hr = ForwardCmdSeek(This->crst, This->pUserData, fwd_checkcaps, pCapabilities); - LeaveCriticalSection(This->crst); - if (FAILED(hr) && hr != E_NOTIMPL) - return hr; - dwCommonCaps = *pCapabilities & This->dwCapabilities; if (!dwCommonCaps) @@ -441,7 +276,6 @@ HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * else hr = (*pCapabilities == dwCommonCaps) ? S_OK : S_FALSE; *pCapabilities = dwCommonCaps; - return hr; } @@ -487,17 +321,11 @@ HRESULT WINAPI MediaSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const G return hr; } - HRESULT WINAPI MediaSeekingImpl_SetTimeFormat(IMediaSeeking * iface, const GUID * pFormat) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; - TRACE("(%s)\n", qzdebugstr_guid(pFormat)); - - EnterCriticalSection(This->crst); - ForwardCmdSeek(This->crst, This->pUserData, fwd_settimeformat, (LPVOID)pFormat); - LeaveCriticalSection(This->crst); - - return (IsEqualIID(pFormat, &TIME_FORMAT_MEDIA_TIME) ? S_OK : S_FALSE); + TRACE("%p %s\n", This, qzdebugstr_guid(pFormat)); + return (IsEqualIID(pFormat, &TIME_FORMAT_MEDIA_TIME) ? S_OK : E_INVALIDARG); } @@ -509,7 +337,6 @@ HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pD EnterCriticalSection(This->crst); *pDuration = This->llDuration; - ForwardCmdSeek(This->crst, This->pUserData, fwd_getduration, pDuration); LeaveCriticalSection(This->crst); return S_OK; @@ -523,7 +350,6 @@ HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG EnterCriticalSection(This->crst); *pStop = This->llStop; - ForwardCmdSeek(This->crst, This->pUserData, fwd_getstopposition, pStop); LeaveCriticalSection(This->crst); return S_OK; @@ -538,7 +364,6 @@ HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLO EnterCriticalSection(This->crst); *pCurrent = This->llCurrent; - ForwardCmdSeek(This->crst, This->pUserData, fwd_getcurposition, pCurrent); LeaveCriticalSection(This->crst); return S_OK; @@ -577,15 +402,8 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p MediaSeekingImpl *This = (MediaSeekingImpl *)iface; BOOL bChangeCurrent = FALSE, bChangeStop = FALSE; LONGLONG llNewCurrent, llNewStop; - struct pos_args args; TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags); - - args.current = pCurrent; - args.stop = pStop; - args.curflags = dwCurrentFlags; - args.stopflags = dwStopFlags; - EnterCriticalSection(This->crst); llNewCurrent = Adjust(This->llCurrent, pCurrent, dwCurrentFlags); @@ -605,8 +423,6 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p *pCurrent = llNewCurrent; if (pStop && (dwStopFlags & AM_SEEKING_ReturnTime)) *pStop = llNewStop; - - ForwardCmdSeek(This->crst, This->pUserData, fwd_setposition, &args); LeaveCriticalSection(This->crst); if (bChangeCurrent) @@ -663,7 +479,6 @@ HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) This->dRate = dRate; if (bChangeRate) hr = This->fnChangeRate(This->pUserData); - ForwardCmdSeek(This->crst, This->pUserData, fwd_setrate, &dRate); LeaveCriticalSection(This->crst); return hr;

1 0

Maarten Lankhorst : quartz: Add additional notifications to transform filter.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 781cb486534145ca39c97c22185a4114057819b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781cb486534145ca39c97c221… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 12 17:10:04 2010 +0200 quartz: Add additional notifications to transform filter. --- dlls/quartz/transform.c | 60 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/quartz/transform.h | 4 +++ 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index b6ec768..e8056b0 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -515,6 +515,60 @@ static HRESULT WINAPI TransformFilter_InputPin_Disconnect(IPin * iface) return IPinImpl_Disconnect(iface); } +static HRESULT WINAPI TransformFilter_InputPin_BeginFlush(IPin * iface) +{ + InputPin* This = (InputPin*) iface; + TransformFilterImpl* pTransform; + HRESULT hr = S_OK; + + TRACE("(%p)->()\n", iface); + + pTransform = (TransformFilterImpl*)This->pin.pinInfo.pFilter; + EnterCriticalSection(&pTransform->csFilter); + if (pTransform->pFuncsTable->pfnBeginFlush) + hr = pTransform->pFuncsTable->pfnBeginFlush(This); + if (SUCCEEDED(hr)) + hr = InputPin_BeginFlush(iface); + LeaveCriticalSection(&pTransform->csFilter); + return hr; +} + +static HRESULT WINAPI TransformFilter_InputPin_EndFlush(IPin * iface) +{ + InputPin* This = (InputPin*) iface; + TransformFilterImpl* pTransform; + HRESULT hr = S_OK; + + TRACE("(%p)->()\n", iface); + + pTransform = (TransformFilterImpl*)This->pin.pinInfo.pFilter; + EnterCriticalSection(&pTransform->csFilter); + if (pTransform->pFuncsTable->pfnEndFlush) + hr = pTransform->pFuncsTable->pfnEndFlush(This); + if (SUCCEEDED(hr)) + hr = InputPin_EndFlush(iface); + LeaveCriticalSection(&pTransform->csFilter); + return hr; +} + +static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +{ + InputPin* This = (InputPin*) iface; + TransformFilterImpl* pTransform; + HRESULT hr = S_OK; + + TRACE("(%p)->()\n", iface); + + pTransform = (TransformFilterImpl*)This->pin.pinInfo.pFilter; + EnterCriticalSection(&pTransform->csFilter); + if (pTransform->pFuncsTable->pfnNewSegment) + hr = pTransform->pFuncsTable->pfnNewSegment(This, tStart, tStop, dRate); + if (SUCCEEDED(hr)) + hr = InputPin_NewSegment(iface, tStart, tStop, dRate); + LeaveCriticalSection(&pTransform->csFilter); + return hr; +} + static const IPinVtbl TransformFilter_InputPin_Vtbl = { InputPin_QueryInterface, @@ -532,9 +586,9 @@ static const IPinVtbl TransformFilter_InputPin_Vtbl = IPinImpl_EnumMediaTypes, IPinImpl_QueryInternalConnections, TransformFilter_InputPin_EndOfStream, - InputPin_BeginFlush, - InputPin_EndFlush, - InputPin_NewSegment + TransformFilter_InputPin_BeginFlush, + TransformFilter_InputPin_EndFlush, + TransformFilter_InputPin_NewSegment }; static HRESULT WINAPI TransformFilter_Output_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) diff --git a/dlls/quartz/transform.h b/dlls/quartz/transform.h index 8d3a3a0..e2486cd 100644 --- a/dlls/quartz/transform.h +++ b/dlls/quartz/transform.h @@ -29,6 +29,10 @@ typedef struct TransformFuncsTable { HRESULT (*pfnQueryConnect) (TransformFilterImpl *This, const AM_MEDIA_TYPE * pmt); HRESULT (*pfnConnectInput) (InputPin *pin, const AM_MEDIA_TYPE * pmt); HRESULT (*pfnCleanup) (InputPin *pin); + HRESULT (*pfnEndOfStream) (InputPin *pin); + HRESULT (*pfnBeginFlush) (InputPin *pin); + HRESULT (*pfnEndFlush) (InputPin *pin); + HRESULT (*pfnNewSegment) (InputPin *pin, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); } TransformFuncsTable; struct TransformFilterImpl

1 0

Detlef Riekenberg : inetcpl: Make a TRACE more silent.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 5f1c6542c06c2117ba060e9e132805a9864ba9e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f1c6542c06c2117ba060e9e1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 4 23:52:57 2010 +0200 inetcpl: Make a TRACE more silent. --- dlls/inetcpl.cpl/content.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/content.c b/dlls/inetcpl.cpl/content.c index 10f2201..8fb1729 100644 --- a/dlls/inetcpl.cpl/content.c +++ b/dlls/inetcpl.cpl/content.c @@ -79,8 +79,8 @@ BOOL WINAPI LaunchSiteCertDialog(HWND parent) */ INT_PTR CALLBACK content_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - - TRACE("(%p, 0x%08x/%d, 0x%lx, 0x%lx)\n", hwnd, msg, msg, wparam, lparam); + if ((msg != WM_SETCURSOR) && (msg != WM_NCHITTEST) && (msg != WM_MOUSEMOVE)) + TRACE("(%p, 0x%08x/%d, 0x%lx, 0x%lx)\n", hwnd, msg, msg, wparam, lparam); if (msg == WM_COMMAND) {

1 0

Detlef Riekenberg : include: Add mprerror.h from mingw w64.
by Alexandre Julliard 05 Oct '10

05 Oct '10

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

Detlef Riekenberg : mprapi: Add a stub for MprAdminGetErrorString.
by Alexandre Julliard 05 Oct '10

05 Oct '10

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

Stefan Oberhumer : ntdll: qsort: Check if necessary to sort.
by Alexandre Julliard 05 Oct '10

05 Oct '10

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

Stefan Oberhumer : ntdll: qsort: Comparator must not get the same pointer.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: c8fb366eb007c6fbed724012700d6edd21b03764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8fb366eb007c6fbed7240127… Author: Stefan Oberhumer <stefan(a)obssys.com> Date: Tue Oct 5 00:03:05 2010 +0200 ntdll: qsort: Comparator must not get the same pointer. --- 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 9291909..7a939c2 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -272,7 +272,7 @@ NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(co /* i=left; j=right; */ for (k=left; i<=m && j>m; k++) { - if (compar(X(barr,i),X(barr,j))<=0) { + if (i==j || compar(X(barr,i),X(barr,j))<=0) { memcpy(X(arr,k),X(barr,i),elemsize); i++; } else {

1 0