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

Akihiro Sagawa : winemac.drv: Indicate whether the drop point is non-client area.
by Alexandre Julliard 29 Aug '19

29 Aug '19

Module: wine Branch: master Commit: e54f1cf9fba1ae8748e8e5c577530138baaf9e3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e54f1cf9fba1ae8748e8e5c5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 29 13:25:27 2019 -0500 winemac.drv: Indicate whether the drop point is non-client area. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/dragdrop.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 7de50e5..a07b66a 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -453,9 +453,12 @@ BOOL query_drag_drop(macdrv_query* query) DROPFILES *dropfiles = GlobalLock(hdrop); if (dropfiles) { + RECT rect; dropfiles->pt.x = pt.x; dropfiles->pt.y = pt.y; - dropfiles->fNC = !ScreenToClient(hwnd, &dropfiles->pt); + dropfiles->fNC = !(ScreenToClient(hwnd, &dropfiles->pt) && + GetClientRect(hwnd, &rect) && + PtInRect(&rect, dropfiles->pt)); TRACE("sending WM_DROPFILES: hwnd %p nc %d pt %s %s\n", hwnd, dropfiles->fNC, wine_dbgstr_point(&dropfiles->pt),

1 0

Alexandre Julliard : ntdll: Implement RtlVirtualUnwind() for ARM64.
by Alexandre Julliard 29 Aug '19

29 Aug '19

Module: wine Branch: master Commit: a9755d286e990704f9450773aae2092168448ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9755d286e990704f9450773… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 12:01:08 2019 +0200 ntdll: Implement RtlVirtualUnwind() for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 4 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm64.c | 414 +++++++++++++++++++++ 4 files changed, 418 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9755d286e990704f945…

1 0

Alexandre Julliard : ntdll: Add a helper function for calling RtlVirtualUnwind() on x86-64.
by Alexandre Julliard 29 Aug '19

29 Aug '19

Module: wine Branch: master Commit: 2002c22afa2a2ec0341ce5bb851be022760c99c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2002c22afa2a2ec0341ce5bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 13:08:43 2019 +0200 ntdll: Add a helper function for calling RtlVirtualUnwind() on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 246 ++++++++++++++------------------------------- 1 file changed, 73 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2002c22afa2a2ec0341c…

1 0

Alexandre Julliard : configure: Add support for using an external libunwind.
by Alexandre Julliard 29 Aug '19

29 Aug '19

Module: wine Branch: master Commit: d2e4a6fae0ddf95c7090fcb91548aa4b5242d88f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2e4a6fae0ddf95c7090fcb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 14:46:00 2019 +0200 configure: Add support for using an external libunwind. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 136 +++++++++++++++++++++++++++++++++++++++++---- configure.ac | 37 +++++++++++- dlls/ntdll/Makefile.in | 3 +- dlls/ntdll/signal_x86_64.c | 6 +- include/config.h.in | 4 +- 5 files changed, 167 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2e4a6fae0ddf95c7090…

1 0

Alexandre Julliard : ntdll: Implement stack unwinding on ARM64.
by Alexandre Julliard 29 Aug '19

29 Aug '19

Module: wine Branch: master Commit: 5e8234b3c485c7035fa2fcf813925dab5daacaa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e8234b3c485c7035fa2fcf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 15:11:47 2019 +0200 ntdll: Implement stack unwinding on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 591 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 551 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e8234b3c485c7035fa2…

1 0

Zebediah Figura : strmbase: Get rid of the BaseFilterFuncTable typedef.
by Alexandre Julliard 29 Aug '19

29 Aug '19

Module: wine Branch: master Commit: cfe3b05c83f00db87c9fcd099b6ff4ef4181c5b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfe3b05c83f00db87c9fcd09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 28 20:24:29 2019 -0500 strmbase: Get rid of the BaseFilterFuncTable typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 5 +++-- dlls/qcap/avico.c | 5 +++-- dlls/qcap/avimux.c | 5 +++-- dlls/qcap/smartteefilter.c | 5 +++-- dlls/qcap/vfwcapture.c | 5 +++-- dlls/qedit/samplegrabber.c | 5 +++-- dlls/quartz/avisplit.c | 4 ++-- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/mpegsplit.c | 4 ++-- dlls/quartz/parser.c | 2 +- dlls/quartz/parser.h | 2 +- dlls/quartz/waveparser.c | 4 ++-- dlls/strmbase/filter.c | 2 +- dlls/strmbase/renderer.c | 5 +++-- dlls/strmbase/transform.c | 5 +++-- dlls/winegstreamer/gstdemux.c | 5 +++-- dlls/wineqtdecoder/qtsplitter.c | 5 +++-- include/wine/strmbase.h | 8 ++++---- 18 files changed, 45 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cfe3b05c83f00db87c9f…

1 0

Zebediah Figura : strmbase: Get rid of the BaseFilter typedef.
by Alexandre Julliard 29 Aug '19

29 Aug '19

Module: wine Branch: master Commit: eeb7bc58aab3beb10359dfe9018e0ccee7f44464 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeb7bc58aab3beb10359dfe9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 28 20:24:30 2019 -0500 strmbase: Get rid of the BaseFilter typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 18 +++++++-------- dlls/qcap/avico.c | 20 ++++++++-------- dlls/qcap/avimux.c | 20 ++++++++-------- dlls/qcap/smartteefilter.c | 16 ++++++------- dlls/qcap/vfwcapture.c | 16 ++++++------- dlls/qedit/samplegrabber.c | 16 ++++++------- dlls/quartz/avisplit.c | 2 +- dlls/quartz/filesource.c | 16 ++++++------- dlls/quartz/mpegsplit.c | 4 ++-- dlls/quartz/parser.c | 6 ++--- dlls/quartz/parser.h | 4 ++-- dlls/quartz/waveparser.c | 2 +- dlls/strmbase/enumpins.c | 4 ++-- dlls/strmbase/filter.c | 50 ++++++++++++++++++++-------------------- dlls/strmbase/renderer.c | 14 +++++------ dlls/strmbase/strmbase_private.h | 2 +- dlls/strmbase/transform.c | 10 ++++---- dlls/strmbase/video.c | 2 +- dlls/strmbase/window.c | 4 +++- dlls/winegstreamer/gstdemux.c | 6 ++--- dlls/wineqtdecoder/qtsplitter.c | 12 +++++----- include/wine/strmbase.h | 29 ++++++++++++----------- 22 files changed, 138 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eeb7bc58aab3beb10359…

1 0

Zebediah Figura : amstream: Get rid of the IMediaStreamFilterImpl typedef.
by Alexandre Julliard 29 Aug '19

29 Aug '19

Module: wine Branch: master Commit: bbd4641bc6355a6e61fbef31d37c0eadc4ce13d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd4641bc6355a6e61fbef31… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 28 20:24:31 2019 -0500 amstream: Get rid of the IMediaStreamFilterImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastreamfilter.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 48dfc85..0614441 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -160,7 +160,8 @@ static const IEnumPinsVtbl enum_pins_vtbl = enum_pins_Clone, }; -typedef struct { +struct filter +{ IMediaStreamFilter IMediaStreamFilter_iface; LONG refcount; CRITICAL_SECTION cs; @@ -169,12 +170,12 @@ typedef struct { WCHAR name[128]; IFilterGraph *graph; ULONG nb_streams; - IAMMediaStream** streams; -} IMediaStreamFilterImpl; + IAMMediaStream **streams; +}; -static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) +static inline struct filter *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) { - return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, IMediaStreamFilter_iface); + return CONTAINING_RECORD(iface, struct filter, IMediaStreamFilter_iface); } static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, void **ret_iface) @@ -201,7 +202,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *i static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface) { - IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter(iface); + struct filter *filter = impl_from_IMediaStreamFilter(iface); ULONG refcount = InterlockedIncrement(&filter->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -211,7 +212,7 @@ static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface) static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { - IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter(iface); + struct filter *filter = impl_from_IMediaStreamFilter(iface); ULONG refcount = InterlockedDecrement(&filter->refcount); unsigned int i; @@ -271,7 +272,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_GetState(IMediaStreamFilter *iface, static HRESULT WINAPI MediaStreamFilterImpl_SetSyncSource(IMediaStreamFilter *iface, IReferenceClock *clock) { - IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter(iface); + struct filter *filter = impl_from_IMediaStreamFilter(iface); TRACE("iface %p, clock %p.\n", iface, clock); @@ -290,7 +291,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_SetSyncSource(IMediaStreamFilter *if static HRESULT WINAPI MediaStreamFilterImpl_GetSyncSource(IMediaStreamFilter *iface, IReferenceClock **clock) { - IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter(iface); + struct filter *filter = impl_from_IMediaStreamFilter(iface); TRACE("iface %p, clock %p.\n", iface, clock); @@ -307,7 +308,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_GetSyncSource(IMediaStreamFilter *if static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter *iface, IEnumPins **enum_pins) { - IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter(iface); + struct filter *filter = impl_from_IMediaStreamFilter(iface); struct enum_pins *object; unsigned int i; @@ -344,7 +345,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter *iface, static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, const WCHAR *id, IPin **out) { - IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter(iface); + struct filter *filter = impl_from_IMediaStreamFilter(iface); unsigned int i; WCHAR *ret_id; IPin *pin; @@ -382,7 +383,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, c static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter *iface, FILTER_INFO *info) { - IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter(iface); + struct filter *filter = impl_from_IMediaStreamFilter(iface); TRACE("iface %p, info %p.\n", iface, info); @@ -401,7 +402,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter * static HRESULT WINAPI MediaStreamFilterImpl_JoinFilterGraph(IMediaStreamFilter *iface, IFilterGraph *graph, const WCHAR *name) { - IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter(iface); + struct filter *filter = impl_from_IMediaStreamFilter(iface); TRACE("iface %p, graph %p, name.%s.\n", iface, graph, debugstr_w(name)); @@ -428,7 +429,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryVendorInfo(IMediaStreamFilter * static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* iface, IAMMediaStream *pAMMediaStream) { - IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + struct filter *This = impl_from_IMediaStreamFilter(iface); IAMMediaStream** streams; HRESULT hr; @@ -453,7 +454,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i static HRESULT WINAPI MediaStreamFilterImpl_GetMediaStream(IMediaStreamFilter* iface, REFMSPID idPurpose, IMediaStream **ppMediaStream) { - IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + struct filter *This = impl_from_IMediaStreamFilter(iface); MSPID purpose_id; unsigned int i; @@ -552,7 +553,7 @@ static const IMediaStreamFilterVtbl MediaStreamFilter_Vtbl = HRESULT MediaStreamFilter_create(IUnknown *outer, void **out) { - IMediaStreamFilterImpl *object; + struct filter *object; TRACE("outer %p, out %p.\n", outer, out);

1 0

Zebediah Figura : amstream: Use shorter names for IMediaStreamFilter methods.
by Alexandre Julliard 29 Aug '19

29 Aug '19

Module: wine Branch: master Commit: c8b94b63002ae3b07b52e569565b26937d1d6d0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8b94b63002ae3b07b52e569… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 28 20:24:32 2019 -0500 amstream: Use shorter names for IMediaStreamFilter methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/Makefile.in | 4 +- dlls/amstream/amstream_private.h | 2 +- dlls/amstream/{mediastreamfilter.c => filter.c} | 104 ++++++++++++------------ dlls/amstream/main.c | 2 +- 4 files changed, 56 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c8b94b63002ae3b07b52…

1 0

Zebediah Figura : amstream: Create the stream filter when the multimedia stream is created.
by Alexandre Julliard 29 Aug '19

29 Aug '19

Module: wine Branch: master Commit: 3256484a141c13442f9ae7a6feb28f38208a30b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3256484a141c13442f9ae7a6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 28 20:24:33 2019 -0500 amstream: Create the stream filter when the multimedia stream is created. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream.c | 37 +++++++++++++++++++------------------ dlls/amstream/tests/amstream.c | 20 ++------------------ 2 files changed, 21 insertions(+), 36 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 8354df8..06fa564 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -36,7 +36,7 @@ typedef struct { IGraphBuilder* pFilterGraph; IMediaSeeking* media_seeking; IMediaControl* media_control; - IMediaStreamFilter *media_stream_filter; + IMediaStreamFilter *filter; IPin* ipin; ULONG nbStreams; IAMMediaStream **pStreams; @@ -53,7 +53,8 @@ static const struct IAMMultiMediaStreamVtbl AM_Vtbl; HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) { - IAMMultiMediaStreamImpl* object; + IAMMultiMediaStreamImpl *object; + HRESULT hr; TRACE("(%p,%p)\n", pUnkOuter, ppObj); @@ -67,6 +68,14 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; object->ref = 1; + if (FAILED(hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, + CLSCTX_INPROC_SERVER, &IID_IMediaStreamFilter, (void **)&object->filter))) + { + ERR("Failed to create stream filter, hr %#x.\n", hr); + heap_free(object); + return hr; + } + *ppObj = &object->IAMMultiMediaStream_iface; return S_OK; @@ -117,8 +126,7 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) CoTaskMemFree(This->pStreams); if (This->ipin) IPin_Release(This->ipin); - if (This->media_stream_filter) - IMediaStreamFilter_Release(This->media_stream_filter); + IMediaStreamFilter_Release(This->filter); if (This->media_seeking) IMediaSeeking_Release(This->media_seeking); if (This->media_control) @@ -258,9 +266,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if if (SUCCEEDED(hr)) hr = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaControl, (void**)&This->media_control); if (SUCCEEDED(hr)) - hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaStreamFilter, (void**)&This->media_stream_filter); - if (SUCCEEDED(hr)) - hr = IGraphBuilder_AddFilter(This->pFilterGraph, (IBaseFilter*)This->media_stream_filter, filternameW); + hr = IGraphBuilder_AddFilter(This->pFilterGraph, (IBaseFilter*)This->filter, filternameW); if (SUCCEEDED(hr)) { IMediaEventEx* media_event = NULL; @@ -276,9 +282,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if if (FAILED(hr)) { - if (This->media_stream_filter) - IMediaStreamFilter_Release(This->media_stream_filter); - This->media_stream_filter = NULL; if (This->media_seeking) IMediaSeeking_Release(This->media_seeking); This->media_seeking = NULL; @@ -310,18 +313,16 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream return S_OK; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* iface, IMediaStreamFilter** ppFilter) +static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream *iface, IMediaStreamFilter **filter) { - IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); + IAMMultiMediaStreamImpl *mmstream = impl_from_IAMMultiMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, ppFilter); + TRACE("mmstream %p, filter %p.\n", mmstream, filter); - if (!ppFilter) + if (!filter) return E_POINTER; - *ppFilter = This->media_stream_filter; - if (*ppFilter) - IMediaStreamFilter_AddRef(*ppFilter); + IMediaStreamFilter_AddRef(*filter = mmstream->filter); return S_OK; } @@ -388,7 +389,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream if (SUCCEEDED(hr)) { /* Add stream to the media stream filter */ - IMediaStreamFilter_AddMediaStream(This->media_stream_filter, pStream); + IMediaStreamFilter_AddMediaStream(This->filter, pStream); } return hr; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 7215775..1089de5 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -130,10 +130,6 @@ static void test_interfaces(void) HRESULT hr; ULONG ref; - /* FIXME: This call should not be necessary. */ - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - check_interface(mmstream, &IID_IAMMultiMediaStream, TRUE); check_interface(mmstream, &IID_IMultiMediaStream, TRUE); check_interface(mmstream, &IID_IUnknown, TRUE); @@ -636,15 +632,11 @@ static void test_enum_pins(void) ULONG ref, count; HRESULT hr; - /* FIXME: This call should not be necessary. */ - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - ok(ref == 3, "Got unexpected refcount %d.\n", ref); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); hr = IMediaStreamFilter_EnumPins(filter, NULL); ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -652,7 +644,7 @@ static void test_enum_pins(void) hr = IMediaStreamFilter_EnumPins(filter, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - ok(ref == 3, "Got unexpected refcount %d.\n", ref); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -771,10 +763,6 @@ static void test_find_pin(void) HRESULT hr; ULONG ref; - /* FIXME: This call should not be necessary. */ - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -809,10 +797,6 @@ static void test_pin_info(void) WCHAR *id; IPin *pin; - /* FIXME: This call should not be necessary. */ - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0