wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Aric Stewart : quartz: Convert VideoRenderer to use strmbase BaseRenderer.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 896be1355b6c7eca0ad5cebea796ee1bca655d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896be1355b6c7eca0ad5cebea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:08:55 2012 -0500 quartz: Convert VideoRenderer to use strmbase BaseRenderer. --- dlls/quartz/videorenderer.c | 520 ++++++++++++------------------------------- 1 files changed, 142 insertions(+), 378 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=896be1355b6c7eca0ad5c…

1 0

Aric Stewart : quartz: Have the VideoRenderer use strmbase BaseWindow.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 8830470a8c248546075ee32bf00e6ba9d096b5be URL: http://source.winehq.org/git/wine.git/?a=commit;h=8830470a8c248546075ee32bf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:08:45 2012 -0500 quartz: Have the VideoRenderer use strmbase BaseWindow. --- dlls/quartz/main.c | 2 - dlls/quartz/videorenderer.c | 295 ++++++++++++++++++------------------------- 2 files changed, 126 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8830470a8c248546075ee…

1 0

Aric Stewart : strmbase: Implement renderer quality control into the base renderer.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 54eafc73e51666c3edf9fa78a0534ea7b1fa23c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54eafc73e51666c3edf9fa78a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 2 07:52:08 2012 -0500 strmbase: Implement renderer quality control into the base renderer. --- dlls/quartz/dsoundrender.c | 28 ++++++++++------------------ dlls/quartz/nullrenderer.c | 2 +- dlls/strmbase/renderer.c | 42 +++++++++++++++++++++++++++++++++++++++++- include/wine/strmbase.h | 4 ++++ 4 files changed, 56 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 5b4408d..4714b2b 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -49,13 +49,6 @@ static const IReferenceClockVtbl IReferenceClock_Vtbl; static const IMediaSeekingVtbl IMediaSeeking_Vtbl; static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; -static const IQualityControlVtbl DSoundRender_QualityControl_Vtbl = { - QualityControlImpl_QueryInterface, - QualityControlImpl_AddRef, - QualityControlImpl_Release, - QualityControlImpl_Notify, - QualityControlImpl_SetSink -}; typedef struct DSoundRenderImpl { @@ -66,8 +59,6 @@ typedef struct DSoundRenderImpl const IAMDirectSoundVtbl *IAMDirectSound_vtbl; const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl; - QualityControlImpl qcimpl; - IDirectSound8 *dsound; LPDIRECTSOUNDBUFFER dsbuffer; DWORD buf_size; @@ -322,6 +313,13 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM return S_OK; } +static HRESULT WINAPI DSoundRender_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample *pMediaSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime) +{ + /* We time ourselves do not use the base renderers timing */ + return S_OK; +} + + HRESULT WINAPI DSoundRender_PrepareReceive(BaseRenderer *iface, IMediaSample *pSample) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); @@ -409,7 +407,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam q.Proportion = 1.; q.Late = jitter; q.TimeStamp = tStart; - IQualityControl_Notify((IQualityControl *)&This->qcimpl, (IBaseFilter*)This, q); + IQualityControl_Notify((IQualityControl *)&This->renderer.qcimpl, (IBaseFilter*)This, q); } return hr; } @@ -455,7 +453,6 @@ static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) if (This->renderer.pInputPin->pin.pConnectedTo) { - QualityControlRender_Start(&This->qcimpl, This->renderer.filter.rtStreamStart); if (This->renderer.filter.state == State_Paused) { /* Unblock our thread, state changing from paused to running doesn't need a reset for state change */ @@ -604,7 +601,6 @@ static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) IDirectSoundBuffer_Unlock(This->dsbuffer, buffer, size, NULL, 0); This->writepos = This->buf_size; } - QualityControlRender_Start(&This->qcimpl, This->renderer.filter.rtStreamStart); return S_OK; } @@ -621,7 +617,7 @@ static const BaseRendererFuncTable BaseFuncTable = { NULL, NULL, NULL, - NULL, + DSoundRender_ShouldDrawSampleNow, DSoundRender_PrepareReceive, /**/ DSoundRender_CompleteConnect, @@ -687,8 +683,6 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) return HRESULT_FROM_WIN32(GetLastError()); } - QualityControlImpl_init(&pDSoundRender->qcimpl, (IPin*)pDSoundRender->renderer.pInputPin, (IBaseFilter*)pDSoundRender); - pDSoundRender->qcimpl.lpVtbl = &DSoundRender_QualityControl_Vtbl; *ppv = pDSoundRender; } else @@ -715,8 +709,6 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = &This->IAMDirectSound_vtbl; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) *ppv = &This->IAMFilterMiscFlags_vtbl; - else if (IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->qcimpl; else { HRESULT hr; @@ -782,7 +774,7 @@ static const IBaseFilterVtbl DSoundRender_Vtbl = BaseRendererImpl_Pause, BaseRendererImpl_Run, BaseRendererImpl_GetState, - BaseFilterImpl_SetSyncSource, + BaseRendererImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, BaseRendererImpl_FindPin, diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index ab4dba2..5d2680f 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -239,7 +239,7 @@ static const IBaseFilterVtbl NullRenderer_Vtbl = BaseRendererImpl_Pause, BaseRendererImpl_Run, BaseRendererImpl_GetState, - BaseFilterImpl_SetSyncSource, + BaseRendererImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, BaseRendererImpl_FindPin, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 3f665f7..a4261ee 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -47,6 +47,14 @@ static inline BaseRenderer *impl_from_BaseFilter(BaseFilter *iface) return CONTAINING_RECORD(iface, BaseRenderer, filter); } +static const IQualityControlVtbl Renderer_QualityControl_Vtbl = { + QualityControlImpl_QueryInterface, + QualityControlImpl_AddRef, + QualityControlImpl_Release, + QualityControlImpl_Notify, + QualityControlImpl_SetSink +}; + static HRESULT WINAPI BaseRenderer_InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); @@ -258,6 +266,9 @@ HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtb This->ThreadSignal = CreateEventW(NULL, TRUE, TRUE, NULL); This->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); This->pMediaSample = NULL; + + QualityControlImpl_init(&This->qcimpl, &This->pInputPin->pin.IPin_iface, &This->filter.IBaseFilter_iface); + This->qcimpl.lpVtbl = &Renderer_QualityControl_Vtbl; } return hr; @@ -269,6 +280,12 @@ HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter* iface, REFIID riid, if (IsEqualIID(riid, &IID_IMediaSeeking)) return IUnknown_QueryInterface(This->pPosition, riid, ppv); + else if (IsEqualIID(riid, &IID_IQualityControl)) + { + *ppv = &This->qcimpl.lpVtbl; + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } else return BaseFilterImpl_QueryInterface(iface, riid, ppv); } @@ -365,7 +382,9 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp { if (This->pFuncsTable->pfnOnWaitStart) This->pFuncsTable->pfnOnWaitStart(This); - /* TODO: Wait */ + + hr = QualityControlRender_WaitFor(&This->qcimpl, pSample, This->RenderEvent); + if (This->pFuncsTable->pfnOnWaitEnd) This->pFuncsTable->pfnOnWaitEnd(This); } @@ -378,7 +397,13 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp } if (SUCCEEDED(hr)) + { + QualityControlRender_BeginRender(&This->qcimpl); hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); + QualityControlRender_EndRender(&This->qcimpl); + } + + QualityControlRender_DoQOS(&This->qcimpl); BaseRendererImpl_ClearPendingSample(This); LeaveCriticalSection(&This->csRenderLock); @@ -457,6 +482,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) } if (SUCCEEDED(hr)) { + QualityControlRender_Start(&This->qcimpl, This->filter.rtStreamStart); if (This->pFuncsTable->pfnOnStartStreaming) This->pFuncsTable->pfnOnStartStreaming(This); if (This->filter.state == State_Stopped) @@ -501,6 +527,19 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) return S_OK; } +HRESULT WINAPI BaseRendererImpl_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock) +{ + BaseRenderer *This = impl_from_IBaseFilter(iface); + HRESULT hr; + + EnterCriticalSection(&This->filter.csFilter); + QualityControlRender_SetClock(&This->qcimpl, clock); + hr = BaseFilterImpl_SetSyncSource(iface, clock); + LeaveCriticalSection(&This->filter.csFilter); + return hr; +} + + HRESULT WINAPI BaseRendererImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) { HRESULT hr; @@ -553,6 +592,7 @@ HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); + QualityControlRender_Start(&iface->qcimpl, iface->filter.rtStreamStart); RendererPosPassThru_ResetMediaTime(iface->pPosition); ResetEvent(iface->ThreadSignal); ResetEvent(iface->RenderEvent); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7e25c04..6be9b0d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -587,6 +587,9 @@ typedef struct BaseRendererTag HANDLE RenderEvent; IMediaSample *pMediaSample; + IQualityControl *pQSink; + QualityControlImpl qcimpl; + const struct BaseRendererFuncTable * pFuncsTable; } BaseRenderer; @@ -638,6 +641,7 @@ HRESULT WINAPI BaseRendererImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin ** HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface); HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart); HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface); +HRESULT WINAPI BaseRendererImpl_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock); HRESULT WINAPI BaseRendererImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState); HRESULT WINAPI BaseRendererImpl_EndOfStream(BaseRenderer* iface); HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface);

1 0

Michael Stefaniuc : devenum: COM cleanup for IParseDisplayName.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 448986f1c4f89d0bb089f8d76e2aadbbba95a1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=448986f1c4f89d0bb089f8d76… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:22:12 2012 +0200 devenum: COM cleanup for IParseDisplayName. --- dlls/devenum/devenum_private.h | 2 +- dlls/devenum/parsedisplayname.c | 36 +++++++++++++----------------------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index fe3c5d2..45736a5 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -67,7 +67,7 @@ typedef struct typedef struct { - const IParseDisplayNameVtbl *lpVtbl; + IParseDisplayName IParseDisplayName_iface; } ParseDisplayNameImpl; typedef struct diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index b36b3ed..40850b2 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -27,31 +27,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface( - LPPARSEDISPLAYNAME iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface(IParseDisplayName *iface, + REFIID riid, void **ppv) { TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); - if (ppvObj == NULL) return E_POINTER; + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) { - *ppvObj = iface; - IParseDisplayName_AddRef(iface); - return S_OK; + *ppv = iface; + IParseDisplayName_AddRef(iface); + return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } -/********************************************************************** - * DEVENUM_IParseDisplayName_AddRef (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(LPPARSEDISPLAYNAME iface) +static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(IParseDisplayName *iface) { TRACE("\n"); @@ -60,10 +57,7 @@ static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(LPPARSEDISPLAYNAME iface) return 2; /* non-heap based object */ } -/********************************************************************** - * DEVENUM_IParseDisplayName_Release (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IParseDisplayName_Release(LPPARSEDISPLAYNAME iface) +static ULONG WINAPI DEVENUM_IParseDisplayName_Release(IParseDisplayName *iface) { TRACE("\n"); @@ -81,12 +75,8 @@ static ULONG WINAPI DEVENUM_IParseDisplayName_Release(LPPARSEDISPLAYNAME iface) * Might not handle more complicated strings properly (ie anything * not in "@device:sw:{CLSID1}\<filter name or CLSID>" format */ -static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName( - LPPARSEDISPLAYNAME iface, - IBindCtx *pbc, - LPOLESTR pszDisplayName, - ULONG *pchEaten, - IMoniker **ppmkOut) +static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(IParseDisplayName *iface, + IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { LPOLESTR pszBetween = NULL; LPOLESTR pszClass = NULL; @@ -163,4 +153,4 @@ static const IParseDisplayNameVtbl IParseDisplayName_Vtbl = }; /* The one instance of this class */ -ParseDisplayNameImpl DEVENUM_ParseDisplayName = { &IParseDisplayName_Vtbl }; +ParseDisplayNameImpl DEVENUM_ParseDisplayName = { { &IParseDisplayName_Vtbl } };

1 0

Michael Stefaniuc : devenum: Don' t use DEVENUM_IPropertyBag_AddRef method directly.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 91203006e171a584edc6036e7f4f0505ad85d22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91203006e171a584edc6036e7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:19:59 2012 +0200 devenum: Don't use DEVENUM_IPropertyBag_AddRef method directly. --- dlls/devenum/mediacatenum.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 3562a69..1ff06df 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -30,8 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface); - typedef struct { IEnumMoniker IEnumMoniker_iface; @@ -68,7 +66,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface( IsEqualGUID(riid, &IID_IPropertyBag)) { *ppvObj = iface; - DEVENUM_IPropertyBag_AddRef(iface); + IPropertyBag_AddRef(iface); return S_OK; }

1 0

Michael Stefaniuc : devenum: COM cleanup for IMoniker (MediaCatMoniker).
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 25aa60b33cf53c85a5b2955989f672bfd1f8576f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25aa60b33cf53c85a5b295598… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:18:39 2012 +0200 devenum: COM cleanup for IMoniker (MediaCatMoniker). --- dlls/devenum/devenum_private.h | 2 +- dlls/devenum/mediacatenum.c | 180 ++++++++++++++------------------------- dlls/devenum/parsedisplayname.c | 4 +- 3 files changed, 68 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25aa60b33cf53c85a5b29…

1 0

Michael Stefaniuc : devenum: COM cleanup for IEnumMoniker.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 201b72e8b600cceb0435d2053c48acd0056be17a URL: http://source.winehq.org/git/wine.git/?a=commit;h=201b72e8b600cceb0435d2053… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:16:52 2012 +0200 devenum: COM cleanup for IEnumMoniker. --- dlls/devenum/devenum_private.h | 8 ---- dlls/devenum/mediacatenum.c | 70 ++++++++++++++++++++------------------- 2 files changed, 36 insertions(+), 42 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 0c1800e..811c4b8 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -72,14 +72,6 @@ typedef struct typedef struct { - const IEnumMonikerVtbl *lpVtbl; - LONG ref; - DWORD index; - HKEY hkey; -} EnumMonikerImpl; - -typedef struct -{ const IMonikerVtbl *lpVtbl; LONG ref; HKEY hkey; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 7b44c13..6a1cf2d 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -30,12 +30,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(LPENUMMONIKER iface); static ULONG WINAPI DEVENUM_IMediaCatMoniker_AddRef(LPMONIKER iface); static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface); typedef struct { + IEnumMoniker IEnumMoniker_iface; + LONG ref; + DWORD index; + HKEY hkey; +} EnumMonikerImpl; + +typedef struct +{ IPropertyBag IPropertyBag_iface; LONG ref; HKEY hkey; @@ -706,54 +713,48 @@ MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) return pMoniker; } -/********************************************************************** - * DEVENUM_IEnumMoniker_QueryInterface (also IUnknown) - */ -static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface( - LPENUMMONIKER iface, - REFIID riid, - LPVOID *ppvObj) +static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + return CONTAINING_RECORD(iface, EnumMonikerImpl, IEnumMoniker_iface); +} - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); +static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface(IEnumMoniker *iface, REFIID riid, + void **ppv) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - if (This == NULL || ppvObj == NULL) return E_POINTER; + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumMoniker)) { - *ppvObj = iface; - DEVENUM_IEnumMoniker_AddRef(iface); + *ppv = iface; + IEnumMoniker_AddRef(iface); return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } -/********************************************************************** - * DEVENUM_IEnumMoniker_AddRef (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(LPENUMMONIKER iface) +static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(IEnumMoniker *iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->() AddRef from %d\n", iface, ref - 1); + TRACE("(%p) ref=%d\n", This, ref); return ref; } -/********************************************************************** - * DEVENUM_IEnumMoniker_Release (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IEnumMoniker_Release(LPENUMMONIKER iface) +static ULONG WINAPI DEVENUM_IEnumMoniker_Release(IEnumMoniker *iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->() Release from %d\n", iface, ref + 1); + TRACE("(%p) ref=%d\n", This, ref); if (!ref) { @@ -765,13 +766,14 @@ static ULONG WINAPI DEVENUM_IEnumMoniker_Release(LPENUMMONIKER iface) return ref; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(LPENUMMONIKER iface, ULONG celt, IMoniker ** rgelt, ULONG * pceltFetched) +static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, IMoniker **rgelt, + ULONG *pceltFetched) { + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); WCHAR buffer[MAX_PATH + 1]; LONG res; ULONG fetched = 0; MediaCatMoniker * pMoniker; - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched); @@ -808,9 +810,9 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(LPENUMMONIKER iface, ULONG celt, return S_OK; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(LPENUMMONIKER iface, ULONG celt) +static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(IEnumMoniker *iface, ULONG celt) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); DWORD subKeys; TRACE("(%p)->(%d)\n", iface, celt); @@ -831,9 +833,9 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(LPENUMMONIKER iface, ULONG celt) return S_OK; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Reset(LPENUMMONIKER iface) +static HRESULT WINAPI DEVENUM_IEnumMoniker_Reset(IEnumMoniker *iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); TRACE("(%p)->()\n", iface); @@ -842,7 +844,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Reset(LPENUMMONIKER iface) return S_OK; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Clone(LPENUMMONIKER iface, IEnumMoniker ** ppenum) +static HRESULT WINAPI DEVENUM_IEnumMoniker_Clone(IEnumMoniker *iface, IEnumMoniker **ppenum) { FIXME("(%p)->(%p): stub\n", iface, ppenum); @@ -869,12 +871,12 @@ HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) if (!pEnumMoniker) return E_OUTOFMEMORY; - pEnumMoniker->lpVtbl = &IEnumMoniker_Vtbl; + pEnumMoniker->IEnumMoniker_iface.lpVtbl = &IEnumMoniker_Vtbl; pEnumMoniker->ref = 1; pEnumMoniker->index = 0; pEnumMoniker->hkey = hkey; - *ppEnumMoniker = (IEnumMoniker *)pEnumMoniker; + *ppEnumMoniker = &pEnumMoniker->IEnumMoniker_iface; DEVENUM_LockModule();

1 0

Michael Stefaniuc : devenum: COM cleanup for ICreateDevEnum.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 1e40dea125b3361c28a6c87f298a49cac8f9cbb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e40dea125b3361c28a6c87f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:15:31 2012 +0200 devenum: COM cleanup for ICreateDevEnum. --- dlls/devenum/createdevenum.c | 18 +++++++++--------- dlls/devenum/devenum_private.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 615305d..266e1d8 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -59,24 +59,24 @@ static HRESULT DEVENUM_CreateSpecialCategories(void); /********************************************************************** * DEVENUM_ICreateDevEnum_QueryInterface (also IUnknown) */ -static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface( - ICreateDevEnum * iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface(ICreateDevEnum *iface, REFIID riid, + void **ppv) { TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); - if (ppvObj == NULL) return E_POINTER; + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ICreateDevEnum)) { - *ppvObj = iface; + *ppv = iface; DEVENUM_ICreateDevEnum_AddRef(iface); return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } @@ -463,9 +463,9 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( HKEY hkey; HKEY hbasekey; HRESULT hr; - CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface; - TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); + TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", iface, debugstr_guid(clsidDeviceClass), + ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); if (!ppEnumMoniker) return E_POINTER; @@ -519,7 +519,7 @@ static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl = /********************************************************************** * static CreateDevEnum instance */ -CreateDevEnumImpl DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl }; +CreateDevEnumImpl DEVENUM_CreateDevEnum = { { &ICreateDevEnum_Vtbl } }; /********************************************************************** * DEVENUM_CreateAMCategoryKey (INTERNAL) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 7515877..0c1800e 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -62,7 +62,7 @@ typedef struct typedef struct { - const ICreateDevEnumVtbl *lpVtbl; + ICreateDevEnum ICreateDevEnum_iface; } CreateDevEnumImpl; typedef struct

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DCubeTexture9Impl_QueryInterface ().
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 9d5413012862a3f4c008d911f36d4fff57859c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5413012862a3f4c008d911f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 2 22:42:23 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DCubeTexture9Impl_QueryInterface(). --- dlls/d3d9/cubetexture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 349f790..e7df0e1 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -34,20 +34,20 @@ static inline IDirect3DCubeTexture9Impl *impl_from_IDirect3DCubeTexture9(IDirect static HRESULT WINAPI IDirect3DCubeTexture9Impl_QueryInterface(IDirect3DCubeTexture9 *iface, REFIID riid, void **ppobj) { - IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) - || IsEqualGUID(riid, &IID_IDirect3DCubeTexture9)) { + if (IsEqualGUID(riid, &IID_IDirect3DCubeTexture9) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DCubeTexture9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DDevice9Impl_QueryInterface ().
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: f47267ad55214784f9cb63f117283c87b6d64dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f47267ad55214784f9cb63f11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 2 22:42:22 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DDevice9Impl_QueryInterface(). --- dlls/d3d9/device.c | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ab96d79..bec3c4b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -186,38 +186,39 @@ static inline IDirect3DDevice9Impl *impl_from_IDirect3DDevice9Ex(IDirect3DDevice return CONTAINING_RECORD(iface, IDirect3DDevice9Impl, IDirect3DDevice9Ex_iface); } -static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, - void **ppobj) +static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DDevice9)) { + if (IsEqualGUID(riid, &IID_IDirect3DDevice9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DDevice9Ex_AddRef(iface); - *ppobj = This; - TRACE("Returning IDirect3DDevice9 interface at %p\n", *ppobj); + *out = iface; return S_OK; - } else if(IsEqualGUID(riid, &IID_IDirect3DDevice9Ex)) { + } + + if (IsEqualGUID(riid, &IID_IDirect3DDevice9Ex)) + { + IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface); + /* Find out if the creating d3d9 interface was created with Direct3DCreate9Ex. * It doesn't matter with which function the device was created. */ - - if (This->d3d_parent->extended) + if (!device->d3d_parent->extended) { - *ppobj = iface; - IDirect3DDevice9Ex_AddRef((IDirect3DDevice9Ex *) *ppobj); - TRACE("Returning IDirect3DDevice9Ex interface at %p\n", *ppobj); - return S_OK; - } else { - WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE\n"); - *ppobj = NULL; + WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE.\n"); + *out = NULL; return E_NOINTERFACE; } + + IDirect3DDevice9Ex_AddRef(iface); + *out = iface; + return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); - *ppobj = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; }

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012