May 2019 - Wine-commits - list.winehq.org

Paul Gofman : ddraw/tests: Test lighting with ambient light and material in ddraw1.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 034d2b9963b58eca2112757b1bdbfe17e9e8e8a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=034d2b9963b58eca2112757b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 14 13:19:09 2019 +0300 ddraw/tests: Test lighting with ambient light and material in ddraw1. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 99 ++++++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=034d2b9963b58eca2112…

1 0

Zebediah Figura : strmbase: Remove function pointers from the IEnumPinsImpl structure.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: a95c1f300e29f9d575ca60a677c76b3d22ac1b2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a95c1f300e29f9d575ca60a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 22:17:54 2019 -0500 strmbase: Remove function pointers from the IEnumPinsImpl structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/enumpins.c | 39 ++++++++++++++++----------------------- dlls/strmbase/filter.c | 21 +++++++-------------- dlls/strmbase/strmbase_private.h | 4 +--- include/wine/strmbase.h | 4 +--- 4 files changed, 25 insertions(+), 43 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 65a11bd..7aa6611 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -29,9 +29,6 @@ typedef struct IEnumPinsImpl LONG refCount; ULONG uIndex; BaseFilter *base; - BaseFilter_GetPin receive_pin; - BaseFilter_GetPinCount receive_pincount; - BaseFilter_GetPinVersion receive_version; DWORD Version; } IEnumPinsImpl; @@ -42,7 +39,7 @@ static inline IEnumPinsImpl *impl_from_IEnumPins(IEnumPins *iface) static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; -HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_pin, BaseFilter_GetPinCount receive_pincount, BaseFilter_GetPinVersion receive_version, IEnumPins ** ppEnum) +HRESULT enum_pins_create(BaseFilter *base, IEnumPins **ppEnum) { IEnumPinsImpl * pEnumPins; @@ -58,13 +55,10 @@ HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_p pEnumPins->IEnumPins_iface.lpVtbl = &IEnumPinsImpl_Vtbl; pEnumPins->refCount = 1; pEnumPins->uIndex = 0; - pEnumPins->receive_pin = receive_pin; - pEnumPins->receive_pincount = receive_pincount; - pEnumPins->receive_version = receive_version; pEnumPins->base = base; IBaseFilter_AddRef(&base->IBaseFilter_iface); *ppEnum = &pEnumPins->IEnumPins_iface; - pEnumPins->Version = receive_version(base); + pEnumPins->Version = base->pin_version; TRACE("Created new enumerator (%p)\n", *ppEnum); return S_OK; @@ -134,13 +128,13 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** if (pcFetched) *pcFetched = 0; - if (This->Version != This->receive_version(This->base)) + if (This->Version != This->base->pin_version) return VFW_E_ENUM_OUT_OF_SYNC; while (i < cPins) { IPin *pin; - pin = This->receive_pin(This->base, This->uIndex + i); + pin = This->base->pFuncsTable->pfnGetPin(This->base, This->uIndex + i); if (!pin) break; @@ -164,39 +158,38 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins *iface, ULONG count) TRACE("enum_pins %p, count %u.\n", enum_pins, count); - if (enum_pins->Version != enum_pins->receive_version(enum_pins->base)) + if (enum_pins->Version != enum_pins->base->pin_version) return VFW_E_ENUM_OUT_OF_SYNC; - if (enum_pins->uIndex + count > enum_pins->receive_pincount(enum_pins->base)) + if (enum_pins->uIndex + count > enum_pins->base->pFuncsTable->pfnGetPinCount(enum_pins->base)) return S_FALSE; enum_pins->uIndex += count; return S_OK; } -static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) +static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins *iface) { - IEnumPinsImpl *This = impl_from_IEnumPins(iface); + IEnumPinsImpl *enum_pins = impl_from_IEnumPins(iface); - TRACE("(%p)->()\n", iface); + TRACE("iface %p.\n", iface); - This->Version = This->receive_version(This->base); + enum_pins->Version = enum_pins->base->pin_version; + enum_pins->uIndex = 0; - This->uIndex = 0; return S_OK; } -static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins * iface, IEnumPins ** ppEnum) +static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins *iface, IEnumPins **out) { + IEnumPinsImpl *enum_pins = impl_from_IEnumPins(iface); HRESULT hr; - IEnumPinsImpl *This = impl_from_IEnumPins(iface); - TRACE("(%p)->(%p)\n", iface, ppEnum); + TRACE("iface %p, out %p.\n", iface, out); - hr = EnumPins_Construct(This->base, This->receive_pin, This->receive_pincount, This->receive_version, ppEnum); - if (FAILED(hr)) + if (FAILED(hr = enum_pins_create(enum_pins->base, out))) return hr; - return IEnumPins_Skip(*ppEnum, This->uIndex); + return IEnumPins_Skip(*out, enum_pins->uIndex); } static const IEnumPinsVtbl IEnumPinsImpl_Vtbl = diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 50340cd..ed0039f 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -125,13 +125,13 @@ HRESULT WINAPI BaseFilterImpl_GetSyncSource(IBaseFilter * iface, IReferenceClock return S_OK; } -HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) +HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter *iface, IEnumPins **enum_pins) { - BaseFilter *This = impl_from_IBaseFilter(iface); + BaseFilter *filter = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p)\n", iface, ppEnum); + TRACE("iface %p, enum_pins %p.\n", iface, enum_pins); - return EnumPins_Construct(This, This->pFuncsTable->pfnGetPin, This->pFuncsTable->pfnGetPinCount, BaseFilterImpl_GetPinVersion, ppEnum); + return enum_pins_create(filter, enum_pins); } HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **ret) @@ -206,16 +206,9 @@ HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVend return E_NOTIMPL; } -LONG WINAPI BaseFilterImpl_GetPinVersion(BaseFilter * This) -{ - TRACE("(%p)\n", This); - return This->pinVersion; -} - -VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter * This) +VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter *filter) { - InterlockedIncrement(&This->pinVersion); - TRACE("(%p) -> New pinVersion %i\n", This,This->pinVersion); + InterlockedIncrement(&filter->pin_version); } HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable) @@ -229,7 +222,7 @@ HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, c ZeroMemory(&This->filterInfo, sizeof(FILTER_INFO)); This->clsid = *pClsid; This->csFilter.DebugInfo->Spare[0] = DebugInfo; - This->pinVersion = 1; + This->pin_version = 1; This->pFuncsTable = pBaseFuncsTable; diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index f3367f8..de13a53 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -63,9 +63,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv); void QualityControlRender_BeginRender(QualityControlImpl *This); void QualityControlRender_EndRender(QualityControlImpl *This); -HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin pfn_get_pin, - BaseFilter_GetPinCount pfn_get_pin_count, BaseFilter_GetPinVersion pfn_get_pin_version, - IEnumPins **enum_pins); +HRESULT enum_pins_create(BaseFilter *base, IEnumPins **enum_pins); HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 120642c..477f162 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -163,14 +163,13 @@ typedef struct BaseFilter IReferenceClock * pClock; FILTER_INFO filterInfo; CLSID clsid; - LONG pinVersion; + LONG pin_version; const struct BaseFilterFuncTable* pFuncsTable; } BaseFilter; typedef IPin* (WINAPI *BaseFilter_GetPin)(BaseFilter* iface, int iPosition); typedef LONG (WINAPI *BaseFilter_GetPinCount)(BaseFilter* iface); -typedef LONG (WINAPI *BaseFilter_GetPinVersion)(BaseFilter* iface); typedef struct BaseFilterFuncTable { /* Required */ @@ -191,7 +190,6 @@ HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO * HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName ); HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo); -LONG WINAPI BaseFilterImpl_GetPinVersion(BaseFilter* This); VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This); HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable);

1 0

Zebediah Figura : wineqtdecoder: Fix implementation of QT_GetPin().
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 42b6b85ec01756105a0027451e5b8b160677e793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42b6b85ec01756105a002745… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 22:17:55 2019 -0500 wineqtdecoder: Fix implementation of QT_GetPin(). strmbase assumes that pins are consecutive. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 44 +++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 4855069..614b891 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -202,29 +202,35 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) * Base Filter */ -static IPin* WINAPI QT_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI QT_GetPin(BaseFilter *base, int index) { - QTSplitter *This = impl_from_BaseFilter(iface); - TRACE("Asking for pos %x\n", pos); + QTSplitter *filter = impl_from_BaseFilter(base); - if (pos > 2 || pos < 0) - return NULL; - switch (pos) + if (index == 0) { - case 0: - IPin_AddRef(&This->pInputPin.pin.IPin_iface); - return &This->pInputPin.pin.IPin_iface; - case 1: - if (This->pVideo_Pin) - IPin_AddRef(&This->pVideo_Pin->pin.pin.IPin_iface); - return &This->pVideo_Pin->pin.pin.IPin_iface; - case 2: - if (This->pAudio_Pin) - IPin_AddRef(&This->pAudio_Pin->pin.pin.IPin_iface); - return &This->pAudio_Pin->pin.pin.IPin_iface; - default: - return NULL; + IPin_AddRef(&filter->pInputPin.pin.IPin_iface); + return &filter->pInputPin.pin.IPin_iface; } + else if (index == 1) + { + if (filter->pVideo_Pin) + { + IPin_AddRef(&filter->pVideo_Pin->pin.pin.IPin_iface); + return &filter->pVideo_Pin->pin.pin.IPin_iface; + } + else if (filter->pAudio_Pin) + { + IPin_AddRef(&filter->pAudio_Pin->pin.pin.IPin_iface); + return &filter->pAudio_Pin->pin.pin.IPin_iface; + } + } + else if (index == 2 && filter->pVideo_Pin && filter->pAudio_Pin) + { + IPin_AddRef(&filter->pAudio_Pin->pin.pin.IPin_iface); + return &filter->pAudio_Pin->pin.pin.IPin_iface; + } + + return NULL; } static LONG WINAPI QT_GetPinCount(BaseFilter *iface)

1 0

Zebediah Figura : strmbase: Determine the pin count using the GetPin() callback.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 89242d8b9401dbd0f709a4a3602194f2a9923ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89242d8b9401dbd0f709a4a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 22:17:56 2019 -0500 strmbase: Determine the pin count using the GetPin() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/enumpins.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 7aa6611..15d6cab 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -27,7 +27,7 @@ typedef struct IEnumPinsImpl { IEnumPins IEnumPins_iface; LONG refCount; - ULONG uIndex; + unsigned int uIndex, count; BaseFilter *base; DWORD Version; } IEnumPinsImpl; @@ -42,6 +42,7 @@ static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; HRESULT enum_pins_create(BaseFilter *base, IEnumPins **ppEnum) { IEnumPinsImpl * pEnumPins; + IPin *pin; if (!ppEnum) return E_POINTER; @@ -59,6 +60,13 @@ HRESULT enum_pins_create(BaseFilter *base, IEnumPins **ppEnum) IBaseFilter_AddRef(&base->IBaseFilter_iface); *ppEnum = &pEnumPins->IEnumPins_iface; pEnumPins->Version = base->pin_version; + pEnumPins->count = 0; + + while ((pin = base->pFuncsTable->pfnGetPin(base, pEnumPins->count))) + { + IPin_Release(pin); + ++pEnumPins->count; + } TRACE("Created new enumerator (%p)\n", *ppEnum); return S_OK; @@ -161,7 +169,7 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins *iface, ULONG count) if (enum_pins->Version != enum_pins->base->pin_version) return VFW_E_ENUM_OUT_OF_SYNC; - if (enum_pins->uIndex + count > enum_pins->base->pFuncsTable->pfnGetPinCount(enum_pins->base)) + if (enum_pins->uIndex + count > enum_pins->count) return S_FALSE; enum_pins->uIndex += count; @@ -171,9 +179,20 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins *iface, ULONG count) static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins *iface) { IEnumPinsImpl *enum_pins = impl_from_IEnumPins(iface); + IPin *pin; TRACE("iface %p.\n", iface); + if (enum_pins->Version != enum_pins->base->pin_version) + { + enum_pins->count = 0; + while ((pin = enum_pins->base->pFuncsTable->pfnGetPin(enum_pins->base, enum_pins->count))) + { + IPin_Release(pin); + ++enum_pins->count; + } + } + enum_pins->Version = enum_pins->base->pin_version; enum_pins->uIndex = 0;

1 0

Zebediah Figura : strmbase: Get rid of the "pfnGetPinCount" callback.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: dad885e2b977401313493e94d86d32a56f0febfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=dad885e2b977401313493e94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 22:17:57 2019 -0500 strmbase: Get rid of the "pfnGetPinCount" callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastreamfilter.c | 8 -------- dlls/evr/evr.c | 7 ------- dlls/qcap/audiorecord.c | 8 -------- dlls/qcap/avico.c | 6 ------ dlls/qcap/avimux.c | 8 -------- dlls/qcap/smartteefilter.c | 5 ----- dlls/qcap/vfwcapture.c | 6 ------ dlls/qedit/samplegrabber.c | 6 ------ dlls/quartz/filesource.c | 13 ------------- dlls/quartz/parser.c | 10 ---------- dlls/strmbase/filter.c | 3 +-- dlls/strmbase/renderer.c | 6 ------ dlls/strmbase/transform.c | 6 ------ dlls/winegstreamer/gstdemux.c | 8 -------- dlls/wineqtdecoder/qtsplitter.c | 10 ---------- include/wine/strmbase.h | 2 -- 16 files changed, 1 insertion(+), 111 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 8636718..a61d1e7 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -321,16 +321,8 @@ static IPin* WINAPI MediaStreamFilterImpl_GetPin(BaseFilter *iface, int pos) return NULL; } -static LONG WINAPI MediaStreamFilterImpl_GetPinCount(BaseFilter *iface) -{ - IMediaStreamFilterImpl* This = (IMediaStreamFilterImpl*)iface; - - return This->nb_streams; -} - static const BaseFilterFuncTable BaseFuncTable = { MediaStreamFilterImpl_GetPin, - MediaStreamFilterImpl_GetPinCount }; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index ba5b544..5ab6572 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -194,16 +194,9 @@ static IPin* WINAPI filter_GetPin(BaseFilter *iface, int position) return NULL; } -static LONG WINAPI filter_GetPinCount(BaseFilter *iface) -{ - FIXME("(%p): stub!\n", iface); - return 0; -} - static const BaseFilterFuncTable basefilter_functable = { filter_GetPin, - filter_GetPinCount, }; HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 3674bbb..8fad7f7 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -177,16 +177,8 @@ static IPin* WINAPI AudioRecord_GetPin(BaseFilter *iface, int pos) return NULL; } -static LONG WINAPI AudioRecord_GetPinCount(BaseFilter *iface) -{ - AudioRecord *This = impl_from_BaseFilter(iface); - FIXME("(%p): stub\n", This); - return 0; -} - static const BaseFilterFuncTable AudioRecordFuncs = { AudioRecord_GetPin, - AudioRecord_GetPinCount }; static HRESULT WINAPI PPB_QueryInterface(IPersistPropertyBag *iface, REFIID riid, LPVOID *ppv) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index f8eade9..83a7804 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -266,14 +266,8 @@ static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) return ret; } -static LONG WINAPI AVICompressor_GetPinCount(BaseFilter *iface) -{ - return 2; -} - static const BaseFilterFuncTable filter_func_table = { AVICompressor_GetPin, - AVICompressor_GetPinCount }; static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index dd78d71..3a269a3 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -133,16 +133,8 @@ static IPin* WINAPI AviMux_GetPin(BaseFilter *iface, int pos) return NULL; } -static LONG WINAPI AviMux_GetPinCount(BaseFilter *iface) -{ - AviMux *This = impl_from_BaseFilter(iface); - TRACE("(%p)\n", This); - return This->input_pin_no+1; -} - static const BaseFilterFuncTable filter_func_table = { AviMux_GetPin, - AviMux_GetPinCount }; static inline AviMux* impl_from_IBaseFilter(IBaseFilter *iface) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 4e22b95..268e7a2 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -224,13 +224,8 @@ static IPin* WINAPI SmartTeeFilter_GetPin(BaseFilter *iface, int pos) return ret; } -static LONG WINAPI SmartTeeFilter_GetPinCount(BaseFilter *iface) -{ - return 3; -} static const BaseFilterFuncTable SmartTeeFilterFuncs = { SmartTeeFilter_GetPin, - SmartTeeFilter_GetPinCount }; static ULONG WINAPI SmartTeeFilterInput_AddRef(IPin *iface) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 178609a..0139dbc 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -203,14 +203,8 @@ static IPin* WINAPI VfwCapture_GetPin(BaseFilter *iface, int pos) return This->pOutputPin; } -static LONG WINAPI VfwCapture_GetPinCount(BaseFilter *iface) -{ - return 1; -} - static const BaseFilterFuncTable BaseFuncTable = { VfwCapture_GetPin, - VfwCapture_GetPinCount }; IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index e66a000..9474a58 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -354,14 +354,8 @@ static IPin *WINAPI SampleGrabber_GetPin(BaseFilter *iface, int pos) return pin; } -static LONG WINAPI SampleGrabber_GetPinCount(BaseFilter *iface) -{ - return 2; -} - static const BaseFilterFuncTable basefunc_vtbl = { SampleGrabber_GetPin, - SampleGrabber_GetPinCount }; /* Helper that buffers data and/or calls installed sample callbacks */ diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a54e948..b4afae9 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -405,21 +405,8 @@ static IPin* WINAPI AsyncReader_GetPin(BaseFilter *iface, int pos) return This->pOutputPin; } -static LONG WINAPI AsyncReader_GetPinCount(BaseFilter *iface) -{ - AsyncReader *This = impl_from_BaseFilter(iface); - - TRACE("%p->()\n", This); - - if (!This->pOutputPin) - return 0; - else - return 1; -} - static const BaseFilterFuncTable BaseFuncTable = { AsyncReader_GetPin, - AsyncReader_GetPinCount }; HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index c3b69cd..a8917d9 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -77,18 +77,8 @@ static IPin* WINAPI Parser_GetPin(BaseFilter *iface, int pos) return This->ppPins[pos]; } -static LONG WINAPI Parser_GetPinCount(BaseFilter *iface) -{ - ParserImpl *This = impl_from_BaseFilter(iface); - - TRACE("%p->()\n", This); - - return This->cStreams + 1; -} - static const BaseFilterFuncTable BaseFuncTable = { Parser_GetPin, - Parser_GetPinCount }; HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *Parser_Vtbl, diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index ed0039f..44e0188 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -144,9 +144,8 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret); - for (i = 0; i < This->pFuncsTable->pfnGetPinCount(This); ++i) + for (i = 0; (pin = This->pFuncsTable->pfnGetPin(This, i)); ++i) { - pin = This->pFuncsTable->pfnGetPin(This, i); hr = IPin_QueryPinInfo(pin, &info); if (FAILED(hr)) { diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 52e753f..c357102 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -194,11 +194,6 @@ static IPin* WINAPI BaseRenderer_GetPin(BaseFilter *iface, int pos) return &This->pInputPin->pin.IPin_iface; } -static LONG WINAPI BaseRenderer_GetPinCount(BaseFilter *iface) -{ - return 1; -} - static HRESULT WINAPI BaseRenderer_Input_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE * pmt) { BaseRenderer *This = impl_from_IBaseFilter(pin->pinInfo.pFilter); @@ -213,7 +208,6 @@ static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa static const BaseFilterFuncTable RendererBaseFilterFuncTable = { BaseRenderer_GetPin, - BaseRenderer_GetPinCount }; static const BaseInputPinFuncTable input_BaseInputFuncTable = { diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 544b77a..78796cc 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -139,14 +139,8 @@ static IPin *WINAPI TransformFilter_GetPin(BaseFilter *iface, int index) return filter->ppPins[index]; } -static LONG WINAPI TransformFilter_GetPinCount(BaseFilter *iface) -{ - return 2; -} - static const BaseFilterFuncTable tfBaseFuncTable = { TransformFilter_GetPin, - TransformFilter_GetPinCount }; static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = { diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 32b871d..fc598a4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1210,16 +1210,8 @@ static IPin* WINAPI GST_GetPin(BaseFilter *iface, int pos) return pin; } -static LONG WINAPI GST_GetPinCount(BaseFilter *iface) -{ - GSTImpl *This = (GSTImpl *)iface; - TRACE("%p -> %u\n", This, This->cStreams + 1); - return (This->cStreams + 1); -} - static const BaseFilterFuncTable BaseFuncTable = { GST_GetPin, - GST_GetPinCount }; IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 614b891..19042ed 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -233,18 +233,8 @@ static IPin * WINAPI QT_GetPin(BaseFilter *base, int index) return NULL; } -static LONG WINAPI QT_GetPinCount(BaseFilter *iface) -{ - QTSplitter *This = impl_from_BaseFilter(iface); - int c = 1; - if (This->pAudio_Pin) c++; - if (This->pVideo_Pin) c++; - return c; -} - static const BaseFilterFuncTable BaseFuncTable = { QT_GetPin, - QT_GetPinCount }; IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 477f162..4e0d190 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -169,12 +169,10 @@ typedef struct BaseFilter } BaseFilter; typedef IPin* (WINAPI *BaseFilter_GetPin)(BaseFilter* iface, int iPosition); -typedef LONG (WINAPI *BaseFilter_GetPinCount)(BaseFilter* iface); typedef struct BaseFilterFuncTable { /* Required */ BaseFilter_GetPin pfnGetPin; - BaseFilter_GetPinCount pfnGetPinCount; } BaseFilterFuncTable; HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Zebediah Figura : winegstreamer: Use CONTAINING_RECORD instead of casting.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: cade211d06898534927f62a5f528c88ca28f30ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=cade211d06898534927f62a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 22:17:58 2019 -0500 winegstreamer: Use CONTAINING_RECORD instead of casting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 98 +++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cade211d06898534927f…

1 0

Jimi Huotari : winegstreamer: Fix spelling of 'initialized' in a TRACE().
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: eca00491cd7da7d1a755152f8a9fe8f3de136538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca00491cd7da7d1a755152f… Author: Jimi Huotari <chiitoo(a)gentoo.org> Date: Tue May 14 01:14:31 2019 +0300 winegstreamer: Fix spelling of 'initialized' in a TRACE(). Signed-off-by: Jimi Huotari <chiitoo(a)gentoo.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index fa0b7e6..f11e59a 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -272,7 +272,7 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct { HINSTANCE handle; - TRACE("Inititialized, version %s. Built with %d.%d.%d.\n", gst_version_string(), + TRACE("Initialized, version %s. Built with %d.%d.%d.\n", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); /* Unloading glib is a bad idea.. it installs atexit handlers,

1 0

Alistair Leslie-Hughes : dinput: Handle setting DIPROP_CALIBRATIONMODE mode in generic implementation.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 132cf25ed6df160db9df479fb7974c00110aaa58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=132cf25ed6df160db9df479f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 14 01:10:39 2019 +0000 dinput: Handle setting DIPROP_CALIBRATIONMODE mode in generic implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47183 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 5 +++++ dlls/dinput/joystick_linuxinput.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 8b3edb2..f758092 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -405,6 +405,11 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF } break; } + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { + LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; + FIXME("DIPROP_CALIBRATIONMODE(%d)\n", pd->dwData); + break; + } default: return IDirectInputDevice2WImpl_SetProperty(iface, rguid, ph); } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 3c27f0d..e4f5db8 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -934,11 +934,6 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { - case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { - LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; - FIXME("DIPROP_CALIBRATIONMODE(%d)\n", pd->dwData); - break; - } case (DWORD_PTR)DIPROP_AUTOCENTER: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;

1 0

Alexandre Julliard : include: Move inline assembly definitions to a new wine/asm.h header.
by Alexandre Julliard 14 May '19

14 May '19

1 0

Alexandre Julliard : winecrt0: Store the appropriate longjmp() function in the exception frame.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 9177a75acc36b6d593917262fb62f42098a1fcf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9177a75acc36b6d593917262… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 13:14:35 2019 +0200 winecrt0: Store the appropriate longjmp() function in the exception frame. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 2 +- include/wine/exception.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 8a7f2a5..98132fa 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -59,7 +59,7 @@ static void DECLSPEC_NORETURN unwind_target(void) { __WINE_FRAME *wine_frame = (__WINE_FRAME *)__wine_get_frame(); __wine_pop_frame( &wine_frame->frame ); - siglongjmp( wine_frame->jmp, 1 ); + for (;;) wine_frame->longjmp( wine_frame->jmp, 1 ); } static void DECLSPEC_NORETURN unwind_frame( EXCEPTION_RECORD *record, diff --git a/include/wine/exception.h b/include/wine/exception.h index e93968f..f30807e 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -94,8 +94,8 @@ extern "C" { #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WINE_SETJMP_H) #define sigjmp_buf jmp_buf -#define sigsetjmp(buf,sigs) setjmp(buf) -#define siglongjmp(buf,val) longjmp(buf,val) +static inline int sigsetjmp( sigjmp_buf buf, int sigs ) { return setjmp( buf ); } +static inline void siglongjmp( sigjmp_buf buf, int val ) { longjmp( buf, val ); } #endif extern void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, @@ -139,6 +139,7 @@ extern DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, } else { \ __f.frame.Handler = __wine_exception_handler; \ __f.u.filter = (func); \ + __f.longjmp = siglongjmp; \ if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -151,6 +152,7 @@ extern DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, __f.frame.Handler = __wine_exception_ctx_handler; \ __f.u.filter_ctx = (func); \ __f.ctx = context; \ + __f.longjmp = siglongjmp; \ if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -162,6 +164,7 @@ extern DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, break; \ } else { \ __f.frame.Handler = __wine_exception_handler_page_fault; \ + __f.longjmp = siglongjmp; \ if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -173,6 +176,7 @@ extern DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, break; \ } else { \ __f.frame.Handler = __wine_exception_handler_all; \ + __f.longjmp = siglongjmp; \ if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -237,6 +241,7 @@ typedef struct __tagWINE_FRAME } u; void *ctx; sigjmp_buf jmp; + void (*longjmp)(sigjmp_buf,int); /* hack to make GetExceptionCode() work in handler */ DWORD ExceptionCode; const struct __tagWINE_FRAME *ExceptionRecord;

1 0