wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Zebediah Figura : evr: Return E_NOINTERFACE when aggregation is requested with an interface other than IUnknown.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 664789cefcf4a5975b4e0f4ed8085d421ea1e75f URL: https://source.winehq.org/git/wine.git/?a=commit;h=664789cefcf4a5975b4e0f4e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 17:54:27 2019 -0500 evr: Return E_NOINTERFACE when aggregation is requested with an interface other than IUnknown. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/evr/main.c b/dlls/evr/main.c index 313d518..ba48207 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -118,6 +118,10 @@ static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown TRACE("(%p)->(%p,%s,%p)\n", This, outer_unk, debugstr_guid(riid), ppobj); *ppobj = NULL; + + if (outer_unk && !IsEqualGUID(riid, &IID_IUnknown)) + return E_NOINTERFACE; + hres = This->pfnCreateInstance(outer_unk, (void **) &unk); if (SUCCEEDED(hres)) {

1 0

Zebediah Figura : qedit/samplegrabber: Use strmbase filter aggregation support.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 9f3e7241616ae2399bf1ce32578838aee6a43260 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f3e7241616ae2399bf1ce32… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 17:54:26 2019 -0500 qedit/samplegrabber: Use strmbase filter aggregation support. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 148 +++++++++++---------------------------------- 1 file changed, 36 insertions(+), 112 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 27e08c4..0385ebb 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -212,12 +212,10 @@ static inline SG_Pin *impl_from_IPin(IPin *iface) /* Sample Grabber filter implementation */ typedef struct _SG_Impl { - IUnknown IUnknown_inner; BaseFilter filter; ISampleGrabber ISampleGrabber_iface; /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ IUnknown* seekthru_unk; - IUnknown *outer_unk; AM_MEDIA_TYPE mtype; SG_Pin pin_in; SG_Pin pin_out; @@ -237,11 +235,6 @@ enum { OneShot_Past, }; -static inline SG_Impl *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, SG_Impl, IUnknown_inner); -} - static inline SG_Impl *impl_from_BaseFilter(BaseFilter *iface) { return CONTAINING_RECORD(iface, SG_Impl, filter); @@ -281,64 +274,6 @@ static void SampleGrabber_cleanup(SG_Impl *This) IUnknown_Release(This->seekthru_unk); } -/* SampleGrabber inner IUnknown */ -static HRESULT WINAPI SampleGrabber_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - SG_Impl *This = impl_from_IUnknown(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = &This->IUnknown_inner; - else if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IMediaFilter) || - IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = &This->filter.IBaseFilter_iface; - else if (IsEqualIID(riid, &IID_ISampleGrabber)) - *ppv = &This->ISampleGrabber_iface; - else - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); - - if (!*ppv) - return E_NOINTERFACE; - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI SampleGrabber_AddRef(IUnknown *iface) -{ - SG_Impl *This = impl_from_IUnknown(iface); - ULONG ref = BaseFilterImpl_AddRef(&This->filter.IBaseFilter_iface); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; -} - -static ULONG WINAPI SampleGrabber_Release(IUnknown *iface) -{ - SG_Impl *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedDecrement(&This->filter.refcount); - - TRACE("(%p) ref=%d\n", This, ref); - - if (ref == 0) - { - SampleGrabber_cleanup(This); - strmbase_filter_cleanup(&This->filter); - CoTaskMemFree(This); - } - return ref; -} - -static const IUnknownVtbl samplegrabber_vtbl = -{ - SampleGrabber_QueryInterface, - SampleGrabber_AddRef, - SampleGrabber_Release, -}; - static IPin *sample_grabber_get_pin(BaseFilter *iface, unsigned int index) { SG_Impl *This = impl_from_BaseFilter(iface); @@ -355,8 +290,32 @@ static IPin *sample_grabber_get_pin(BaseFilter *iface, unsigned int index) return pin; } +static void sample_grabber_destroy(BaseFilter *iface) +{ + SG_Impl *filter = impl_from_BaseFilter(iface); + + SampleGrabber_cleanup(filter); + strmbase_filter_cleanup(&filter->filter); + CoTaskMemFree(filter); +} + +static HRESULT sample_grabber_query_interface(BaseFilter *iface, REFIID iid, void **out) +{ + SG_Impl *filter = impl_from_BaseFilter(iface); + + if (IsEqualGUID(iid, &IID_ISampleGrabber)) + *out = &filter->ISampleGrabber_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const BaseFilterFuncTable basefunc_vtbl = { .filter_get_pin = sample_grabber_get_pin, + .filter_destroy = sample_grabber_destroy, + .filter_query_interface = sample_grabber_query_interface, }; /* Helper that buffers data and/or calls installed sample callbacks */ @@ -417,33 +376,6 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) } } - -/* SampleGrabber implementation of IBaseFilter interface */ - -/* IUnknown */ -static HRESULT WINAPI -SampleGrabber_IBaseFilter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - SG_Impl *This = impl_from_IBaseFilter(iface); - return IUnknown_QueryInterface(This->outer_unk, riid, ppv); -} - -/* IUnknown */ -static ULONG WINAPI -SampleGrabber_IBaseFilter_AddRef(IBaseFilter *iface) -{ - SG_Impl *This = impl_from_IBaseFilter(iface); - return IUnknown_AddRef(This->outer_unk); -} - -/* IUnknown */ -static ULONG WINAPI -SampleGrabber_IBaseFilter_Release(IBaseFilter *iface) -{ - SG_Impl *This = impl_from_IBaseFilter(iface); - return IUnknown_Release(This->outer_unk); -} - /* IMediaFilter */ static HRESULT WINAPI SampleGrabber_IBaseFilter_Stop(IBaseFilter *iface) @@ -532,7 +464,7 @@ static HRESULT WINAPI SampleGrabber_ISampleGrabber_QueryInterface(ISampleGrabber *iface, REFIID riid, void **ppv) { SG_Impl *This = impl_from_ISampleGrabber(iface); - return IUnknown_QueryInterface(This->outer_unk, riid, ppv); + return IUnknown_QueryInterface(This->filter.outer_unk, riid, ppv); } /* IUnknown */ @@ -540,7 +472,7 @@ static ULONG WINAPI SampleGrabber_ISampleGrabber_AddRef(ISampleGrabber *iface) { SG_Impl *This = impl_from_ISampleGrabber(iface); - return IUnknown_AddRef(This->outer_unk); + return IUnknown_AddRef(This->filter.outer_unk); } /* IUnknown */ @@ -548,7 +480,7 @@ static ULONG WINAPI SampleGrabber_ISampleGrabber_Release(ISampleGrabber *iface) { SG_Impl *This = impl_from_ISampleGrabber(iface); - return IUnknown_Release(This->outer_unk); + return IUnknown_Release(This->filter.outer_unk); } /* ISampleGrabber */ @@ -1139,9 +1071,9 @@ SampleGrabber_IPin_NewSegment(IPin *iface, REFERENCE_TIME tStart, REFERENCE_TIME static const IBaseFilterVtbl IBaseFilter_VTable = { - SampleGrabber_IBaseFilter_QueryInterface, - SampleGrabber_IBaseFilter_AddRef, - SampleGrabber_IBaseFilter_Release, + BaseFilterImpl_QueryInterface, + BaseFilterImpl_AddRef, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, SampleGrabber_IBaseFilter_Stop, SampleGrabber_IBaseFilter_Pause, @@ -1252,24 +1184,21 @@ static const IPinVtbl IPin_Out_VTable = SampleGrabber_IPin_NewSegment, }; -HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) +HRESULT SampleGrabber_create(IUnknown *outer, void **out) { SG_Impl* obj = NULL; ISeekingPassThru *passthru; HRESULT hr; - TRACE("(%p,%p)\n", pUnkOuter, ppv); - obj = CoTaskMemAlloc(sizeof(SG_Impl)); if (NULL == obj) { - *ppv = NULL; + *out = NULL; return E_OUTOFMEMORY; } ZeroMemory(obj, sizeof(SG_Impl)); - strmbase_filter_init(&obj->filter, &IBaseFilter_VTable, NULL, &CLSID_SampleGrabber, + strmbase_filter_init(&obj->filter, &IBaseFilter_VTable, outer, &CLSID_SampleGrabber, (DWORD_PTR)(__FILE__ ": SG_Impl.csFilter"), &basefunc_vtbl); - obj->IUnknown_inner.lpVtbl = &samplegrabber_vtbl; obj->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable; obj->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; obj->pin_in.IPin_iface.lpVtbl = &IPin_In_VTable; @@ -1293,19 +1222,14 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) obj->bufferLen = -1; obj->bufferData = NULL; - if (pUnkOuter) - obj->outer_unk = pUnkOuter; - else - obj->outer_unk = &obj->IUnknown_inner; - - hr = CoCreateInstance(&CLSID_SeekingPassThru, &obj->IUnknown_inner, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&obj->seekthru_unk); + hr = CoCreateInstance(&CLSID_SeekingPassThru, &obj->filter.IUnknown_inner, + CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&obj->seekthru_unk); if(hr) return hr; IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); ISeekingPassThru_Init(passthru, FALSE, &obj->pin_in.IPin_iface); ISeekingPassThru_Release(passthru); - *ppv = &obj->IUnknown_inner; + *out = &obj->filter.IUnknown_inner; return S_OK; }

1 0

Zebediah Figura : qedit/nullrenderer: Use strmbase filter aggregation support.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 70df61424445f09e2187e7a10f5852263eec7adc URL: https://source.winehq.org/git/wine.git/?a=commit;h=70df61424445f09e2187e7a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 17:54:25 2019 -0500 qedit/nullrenderer: Use strmbase filter aggregation support. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 124 ++++++++-------------------------------------- 1 file changed, 21 insertions(+), 103 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index b2bfb22..74055d7 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -29,10 +29,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); typedef struct NullRendererImpl { BaseRenderer renderer; - IUnknown IUnknown_inner; - IUnknown *outer_unk; } NullRendererImpl; +static inline NullRendererImpl *impl_from_BaseRenderer(BaseRenderer *iface) +{ + return CONTAINING_RECORD(iface, NullRendererImpl, renderer); +} + static HRESULT WINAPI NullRenderer_DoRenderSample(BaseRenderer *iface, IMediaSample *pMediaSample) { return S_OK; @@ -44,6 +47,14 @@ static HRESULT WINAPI NullRenderer_CheckMediaType(BaseRenderer *iface, const AM_ return S_OK; } +static void null_renderer_destroy(BaseRenderer *iface) +{ + NullRendererImpl *filter = impl_from_BaseRenderer(iface); + + strmbase_renderer_cleanup(&filter->renderer); + CoTaskMemFree(filter); +} + static const BaseRendererFuncTable RendererFuncTable = { NullRenderer_CheckMediaType, NullRenderer_DoRenderSample, @@ -64,99 +75,14 @@ static const BaseRendererFuncTable RendererFuncTable = { NULL, NULL, NULL, + null_renderer_destroy, }; -static inline NullRendererImpl *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, NullRendererImpl, IUnknown_inner); -} - -static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - NullRendererImpl *This = impl_from_IUnknown(iface); - - TRACE("filter %p, iid %s, out %p.\n", This, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = &This->IUnknown_inner; - else - { - HRESULT hr; - hr = BaseRendererImpl_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); - if (SUCCEEDED(hr)) - return hr; - } - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)*ppv); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) - FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - -static ULONG WINAPI NullRendererInner_AddRef(IUnknown *iface) -{ - NullRendererImpl *This = impl_from_IUnknown(iface); - return BaseFilterImpl_AddRef(&This->renderer.filter.IBaseFilter_iface); -} - -static ULONG WINAPI NullRendererInner_Release(IUnknown *iface) -{ - NullRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = InterlockedDecrement(&This->renderer.filter.refcount); - - if (!refCount) - { - TRACE("Destroying Null Renderer\n"); - strmbase_renderer_cleanup(&This->renderer); - CoTaskMemFree(This); - } - - return refCount; -} - -static const IUnknownVtbl IInner_VTable = -{ - NullRendererInner_QueryInterface, - NullRendererInner_AddRef, - NullRendererInner_Release -}; - -static inline NullRendererImpl *impl_from_IBaseFilter(IBaseFilter *iface) -{ - return CONTAINING_RECORD(iface, NullRendererImpl, renderer.filter.IBaseFilter_iface); -} - -static HRESULT WINAPI NullRenderer_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - NullRendererImpl *This = impl_from_IBaseFilter(iface); - return IUnknown_QueryInterface(This->outer_unk, riid, ppv); -} - -static ULONG WINAPI NullRenderer_AddRef(IBaseFilter * iface) -{ - NullRendererImpl *This = impl_from_IBaseFilter(iface); - return IUnknown_AddRef(This->outer_unk); -} - -static ULONG WINAPI NullRenderer_Release(IBaseFilter * iface) -{ - NullRendererImpl *This = impl_from_IBaseFilter(iface); - return IUnknown_Release(This->outer_unk); -} - static const IBaseFilterVtbl NullRenderer_Vtbl = { - NullRenderer_QueryInterface, - NullRenderer_AddRef, - NullRenderer_Release, + BaseFilterImpl_QueryInterface, + BaseFilterImpl_AddRef, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, BaseRendererImpl_Stop, BaseRendererImpl_Pause, @@ -171,33 +97,25 @@ static const IBaseFilterVtbl NullRenderer_Vtbl = BaseFilterImpl_QueryVendorInfo }; -HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv) +HRESULT NullRenderer_create(IUnknown *outer, void **out) { static const WCHAR sink_name[] = {'I','n',0}; HRESULT hr; NullRendererImpl *pNullRenderer; - TRACE("(%p, %p)\n", pUnkOuter, ppv); - - *ppv = NULL; + *out = NULL; pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl)); - pNullRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; - - if (pUnkOuter) - pNullRenderer->outer_unk = pUnkOuter; - else - pNullRenderer->outer_unk = &pNullRenderer->IUnknown_inner; - hr = strmbase_renderer_init(&pNullRenderer->renderer, &NullRenderer_Vtbl, NULL, + hr = strmbase_renderer_init(&pNullRenderer->renderer, &NullRenderer_Vtbl, outer, &CLSID_NullRenderer, sink_name, (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), &RendererFuncTable); if (FAILED(hr)) CoTaskMemFree(pNullRenderer); else - *ppv = &pNullRenderer->IUnknown_inner; + *out = &pNullRenderer->renderer.filter.IUnknown_inner; return S_OK; }

1 0

Zebediah Figura : qcap/vfwcapture: Use strmbase filter aggregation support.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 3bce180dbdf2b6aa579eede1b467aabc89c4eacb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bce180dbdf2b6aa579eede1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 17:54:24 2019 -0500 qcap/vfwcapture: Use strmbase filter aggregation support. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 187 ++++++++++++++----------------------------------- 1 file changed, 53 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3bce180dbdf2b6aa579e…

1 0

Zebediah Figura : qcap/smartteefilter: Use strmbase filter aggregation support.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: c52bc25dd8241cea2fbc0bc3077a64889da5cae3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c52bc25dd8241cea2fbc0bc3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 17:54:23 2019 -0500 qcap/smartteefilter: Use strmbase filter aggregation support. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 116 ++++++++------------------------------------- 1 file changed, 20 insertions(+), 96 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index a79e4bb..4095d95 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -36,19 +36,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { - IUnknown IUnknown_iface; - IUnknown *outerUnknown; BaseFilter filter; BaseInputPin *input; BaseOutputPin *capture; BaseOutputPin *preview; } SmartTeeFilter; -static inline SmartTeeFilter *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, SmartTeeFilter, IUnknown_iface); -} - static inline SmartTeeFilter *impl_from_BaseFilter(BaseFilter *filter) { return CONTAINING_RECORD(filter, SmartTeeFilter, filter); @@ -71,80 +64,6 @@ static inline SmartTeeFilter *impl_from_IPin(IPin *iface) return impl_from_IBaseFilter(bp->pinInfo.pFilter); } -static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - SmartTeeFilter *This = impl_from_IUnknown(iface); - if (IsEqualIID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown, %p)\n", This, ppv); - *ppv = &This->IUnknown_iface; - } else if (IsEqualIID(riid, &IID_IPersist)) { - TRACE("(%p)->(IID_IPersist, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else if (IsEqualIID(riid, &IID_IMediaFilter)) { - TRACE("(%p)->(IID_IMediaFilter, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else if (IsEqualIID(riid, &IID_IBaseFilter)) { - TRACE("(%p)->(IID_IBaseFilter, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else { - FIXME("(%p): no interface for %s\n", This, debugstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI Unknown_AddRef(IUnknown *iface) -{ - SmartTeeFilter *This = impl_from_IUnknown(iface); - return BaseFilterImpl_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI Unknown_Release(IUnknown *iface) -{ - SmartTeeFilter *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedDecrement(&This->filter.refcount); - - TRACE("(%p)->() ref=%d\n", This, ref); - - if (!ref) { - if(This->input) - BaseInputPinImpl_Release(&This->input->pin.IPin_iface); - if(This->capture) - BaseOutputPinImpl_Release(&This->capture->pin.IPin_iface); - if(This->preview) - BaseOutputPinImpl_Release(&This->preview->pin.IPin_iface); - strmbase_filter_cleanup(&This->filter); - CoTaskMemFree(This); - } - return ref; -} - -static const IUnknownVtbl UnknownVtbl = { - Unknown_QueryInterface, - Unknown_AddRef, - Unknown_Release -}; - -static HRESULT WINAPI SmartTeeFilter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - return IUnknown_QueryInterface(This->outerUnknown, riid, ppv); -} - -static ULONG WINAPI SmartTeeFilter_AddRef(IBaseFilter *iface) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - return IUnknown_AddRef(This->outerUnknown); -} - -static ULONG WINAPI SmartTeeFilter_Release(IBaseFilter *iface) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - return IUnknown_Release(This->outerUnknown); -} - static HRESULT WINAPI SmartTeeFilter_Stop(IBaseFilter *iface) { SmartTeeFilter *This = impl_from_IBaseFilter(iface); @@ -182,9 +101,9 @@ static HRESULT WINAPI SmartTeeFilter_Run(IBaseFilter *iface, REFERENCE_TIME tSta } static const IBaseFilterVtbl SmartTeeFilterVtbl = { - SmartTeeFilter_QueryInterface, - SmartTeeFilter_AddRef, - SmartTeeFilter_Release, + BaseFilterImpl_QueryInterface, + BaseFilterImpl_AddRef, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, SmartTeeFilter_Stop, SmartTeeFilter_Pause, @@ -217,8 +136,23 @@ static IPin *smart_tee_get_pin(BaseFilter *iface, unsigned int index) return ret; } +static void smart_tee_destroy(BaseFilter *iface) +{ + SmartTeeFilter *filter = impl_from_BaseFilter(iface); + + if (filter->input) + BaseInputPinImpl_Release(&filter->input->pin.IPin_iface); + if (filter->capture) + BaseOutputPinImpl_Release(&filter->capture->pin.IPin_iface); + if (filter->preview) + BaseOutputPinImpl_Release(&filter->preview->pin.IPin_iface); + strmbase_filter_cleanup(&filter->filter); + CoTaskMemFree(filter); +} + static const BaseFilterFuncTable SmartTeeFilterFuncs = { .filter_get_pin = smart_tee_get_pin, + .filter_destroy = smart_tee_destroy, }; static ULONG WINAPI SmartTeeFilterInput_AddRef(IPin *iface) @@ -586,21 +520,14 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) HRESULT hr; SmartTeeFilter *This = NULL; - TRACE("(%p, %p)\n", outer, phr); - This = CoTaskMemAlloc(sizeof(*This)); if (This == NULL) { *phr = E_OUTOFMEMORY; return NULL; } memset(This, 0, sizeof(*This)); - This->IUnknown_iface.lpVtbl = &UnknownVtbl; - if (outer) - This->outerUnknown = outer; - else - This->outerUnknown = &This->IUnknown_iface; - strmbase_filter_init(&This->filter, &SmartTeeFilterVtbl, NULL, &CLSID_SmartTee, + strmbase_filter_init(&This->filter, &SmartTeeFilterVtbl, outer, &CLSID_SmartTee, (DWORD_PTR)(__FILE__ ": SmartTeeFilter.csFilter"), &SmartTeeFilterFuncs); inputPinInfo.pFilter = &This->filter.IBaseFilter_iface; @@ -626,10 +553,7 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) end: *phr = hr; if (SUCCEEDED(hr)) { - if (outer) - return &This->IUnknown_iface; - else - return (IUnknown*)&This->filter.IBaseFilter_iface; + return &This->filter.IUnknown_inner; } else { strmbase_filter_cleanup(&This->filter); return NULL;

1 0

Alexandre Julliard : imaadp32.acm: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: d78e2d0c8d0293a38e1fcab6208cd59ab01f02e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d78e2d0c8d0293a38e1fcab6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:39:33 2019 +0200 imaadp32.acm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/imaadp32.acm/Makefile.in b/dlls/imaadp32.acm/Makefile.in index ff982fd..967a690 100644 --- a/dlls/imaadp32.acm/Makefile.in +++ b/dlls/imaadp32.acm/Makefile.in @@ -1,4 +1,6 @@ MODULE = imaadp32.acm IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = imaadp32.c

1 0

Alexandre Julliard : ifsmgr.vxd: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 5a91b907ef85427ee98b5da5dbd6e01de7274584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a91b907ef85427ee98b5da5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:39:20 2019 +0200 ifsmgr.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ifsmgr.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ifsmgr.vxd/Makefile.in b/dlls/ifsmgr.vxd/Makefile.in index 65c6be2..be1afa3 100644 --- a/dlls/ifsmgr.vxd/Makefile.in +++ b/dlls/ifsmgr.vxd/Makefile.in @@ -1,5 +1,7 @@ MODULE = ifsmgr.vxd IMPORTS = kernel +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ ifsmgr.c

1 0

Alexandre Julliard : ieproxy: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 485d95c7e2f2cde2089ee396e2d86bbc235bf5dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=485d95c7e2f2cde2089ee396… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:39:12 2019 +0200 ieproxy: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieproxy/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieproxy/Makefile.in b/dlls/ieproxy/Makefile.in index 00c5fd1..661cf92 100644 --- a/dlls/ieproxy/Makefile.in +++ b/dlls/ieproxy/Makefile.in @@ -1,6 +1,8 @@ MODULE = ieproxy.dll IMPORTS = uuid ole32 rpcrt4 +EXTRADLLFLAGS = -mno-cygwin + IDL_SRCS = \ ieproxy_ieautomation.idl \ ieproxy_perhist.idl

1 0

Alexandre Julliard : ieframe: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 0cc13be47c8625f2137c3bfa6b9cb5b6336e2a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cc13be47c8625f2137c3bfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:39:04 2019 +0200 ieframe: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/Makefile.in | 2 ++ dlls/ieframe/dochost.c | 2 +- dlls/ieframe/ieframe.h | 5 ++--- dlls/ieframe/iexplore.c | 14 +++++++------- dlls/ieframe/intshcut.c | 12 ++++++------ dlls/ieframe/navigate.c | 4 ++-- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 4b1005d..6103714 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -2,6 +2,8 @@ MODULE = ieframe.dll IMPORTLIB = ieframe IMPORTS = uuid urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ classinfo.c \ client.c \ diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 389c0af..46d5cc5 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -427,7 +427,7 @@ static void update_travellog(DocHost *This) static const WCHAR about_schemeW[] = {'a','b','o','u','t',':'}; - if(This->url && !strncmpiW(This->url, about_schemeW, ARRAY_SIZE(about_schemeW))) { + if(This->url && !wcsnicmp(This->url, about_schemeW, ARRAY_SIZE(about_schemeW))) { TRACE("Skipping about URL\n"); return; } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 8adf47e..2b4861d 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -37,7 +37,6 @@ #include "shdeprecated.h" #include "docobjectservice.h" -#include "wine/unicode.h" #include "wine/heap.h" #include "wine/list.h" @@ -342,7 +341,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) if(str) { DWORD size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); if(ret) memcpy(ret, str, size); @@ -353,7 +352,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) static inline LPWSTR co_strdupW(LPCWSTR str) { - WCHAR *ret = CoTaskMemAlloc((strlenW(str) + 1)*sizeof(WCHAR)); + WCHAR *ret = CoTaskMemAlloc((lstrlenW(str) + 1)*sizeof(WCHAR)); if (ret) lstrcpyW(ret, str); return ret; diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 4f3df13..00883c8 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -957,7 +957,7 @@ static BOOL create_ie_window(BOOL nohome, const WCHAR *cmdline) VARIANT var_url; int cmdlen; - cmdlen = strlenW(cmdline); + cmdlen = lstrlenW(cmdline); if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') { cmdline++; cmdlen -= 2; @@ -988,18 +988,18 @@ static HDDEDATA open_dde_url(WCHAR *dde_url) url = dde_url; if(*url == '"') { url++; - url_end = strchrW(url, '"'); + url_end = wcschr(url, '"'); if(!url_end) { FIXME("missing string terminator\n"); return 0; } *url_end = 0; }else { - url_end = strchrW(url, ','); + url_end = wcschr(url, ','); if(url_end) *url_end = 0; else - url_end = url + strlenW(url); + url_end = url + lstrlenW(url); } LIST_FOR_EACH_ENTRY(iter, &ie_list, InternetExplorer, entry) { @@ -1149,11 +1149,11 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) while (cmdline[length] && cmdline[length] != ' ' && cmdline[length] != '\t') length++; - if (!strncmpiW(cmdline, embeddingW, length)) + if (!wcsnicmp(cmdline, embeddingW, length)) embedding = TRUE; - else if (!strncmpiW(cmdline, nohomeW, length)) + else if (!wcsnicmp(cmdline, nohomeW, length)) nohome = TRUE; - else if (!strncmpiW(cmdline, startmanagerW, length)) + else if (!wcsnicmp(cmdline, startmanagerW, length)) manager = TRUE; else break; diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 8bf8ae8..13a5582 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -94,15 +94,15 @@ static BOOL run_winemenubuilder( const WCHAR *args ) void *redir; GetSystemDirectoryW( app, MAX_PATH - ARRAY_SIZE( menubuilder )); - strcatW( app, menubuilder ); + lstrcatW( app, menubuilder ); - len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); + len = (lstrlenW( app ) + lstrlenW( args ) + 1) * sizeof(WCHAR); buffer = heap_alloc( len ); if( !buffer ) return FALSE; - strcpyW( buffer, app ); - strcatW( buffer, args ); + lstrcpyW( buffer, app ); + lstrcatW( buffer, args ); TRACE("starting %s\n",debugstr_w(buffer)); @@ -136,7 +136,7 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) if( !buffer ) return FALSE; - sprintfW( buffer, szFormat, szLink ); + swprintf( buffer, len / sizeof(WCHAR), szFormat, szLink ); ret = run_winemenubuilder( buffer ); heap_free( buffer ); return ret; @@ -521,7 +521,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam int iconindex; PROPSPEC ps; PROPVARIANT pv; - iconindex = strtolW(iconindexstring, NULL, 10); + iconindex = wcstol(iconindexstring, NULL, 10); ps.ulKind = PRSPEC_PROPID; ps.u.propid = PID_IS_ICONINDEX; pv.vt = VT_I4; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 48187d9..9efdacc 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -111,7 +111,7 @@ static void set_status_text(BindStatusCallback *This, ULONG statuscode, LPCWSTR fmt[0] = 0; /* the format string must have one "%s" for the str */ LoadStringW(ieframe_instance, IDS_STATUSFMT_FIRST + statuscode, fmt, IDS_STATUSFMT_MAXLEN); - snprintfW(buffer, ARRAY_SIZE(buffer), fmt, str); + swprintf(buffer, ARRAY_SIZE(buffer), fmt, str); } V_VT(&arg) = VT_BSTR; @@ -466,7 +466,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, dwReserved, pszAdditionalHeaders); if(This->headers) { - int size = (strlenW(This->headers)+1)*sizeof(WCHAR); + int size = (lstrlenW(This->headers)+1)*sizeof(WCHAR); *pszAdditionalHeaders = CoTaskMemAlloc(size); memcpy(*pszAdditionalHeaders, This->headers, size); }

1 0

Alexandre Julliard : iccvid: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 3d15828334a8a7b1a55516d619102a8a9b579fce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d15828334a8a7b1a55516d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:38:34 2019 +0200 iccvid: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iccvid/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index 7725452..62cbcf0 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -1,6 +1,8 @@ MODULE = iccvid.dll IMPORTS = user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ iccvid.c

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
87
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 June 2019