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

Zebediah Figura : quartz/dsoundrender: Use BaseFilterImpl_QueryInterface() .
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: fd3c80b873aa675d7221ebec19e25a44b8cbff72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd3c80b873aa675d7221ebec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 22:59:37 2019 -0500 quartz/dsoundrender: Use BaseFilterImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 59 +++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 37 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 2b50eae..4c339f8 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -611,6 +611,23 @@ static void dsound_render_destroy(BaseRenderer *iface) CoTaskMemFree(filter); } +static HRESULT dsound_render_query_interface(BaseRenderer *iface, REFIID iid, void **out) +{ + DSoundRenderImpl *filter = impl_from_BaseRenderer(iface); + + if (IsEqualGUID(iid, &IID_IBasicAudio)) + *out = &filter->basicAudio.IBasicAudio_iface; + else if (IsEqualGUID(iid, &IID_IReferenceClock)) + *out = &filter->IReferenceClock_iface; + else if (IsEqualGUID(iid, &IID_IAMDirectSound)) + *out = &filter->IAMDirectSound_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_CheckMediaType, DSoundRender_DoRenderSample, @@ -632,6 +649,7 @@ static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_BeginFlush, DSoundRender_EndFlush, dsound_render_destroy, + dsound_render_query_interface, }; HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) @@ -705,39 +723,6 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - DSoundRenderImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%p, %p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IBasicAudio)) - *ppv = &This->basicAudio.IBasicAudio_iface; - else if (IsEqualIID(riid, &IID_IReferenceClock)) - *ppv = &This->IReferenceClock_iface; - else if (IsEqualIID(riid, &IID_IAMDirectSound)) - *ppv = &This->IAMDirectSound_iface; - else - { - HRESULT hr; - hr = BaseRendererImpl_QueryInterface(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("No interface for %s!\n", qzdebugstr_guid(riid)); - - return E_NOINTERFACE; -} - static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) { DSoundRenderImpl *This = impl_from_IBaseFilter(iface); @@ -770,7 +755,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) static const IBaseFilterVtbl DSoundRender_Vtbl = { - DSoundRender_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, @@ -795,7 +780,7 @@ static HRESULT WINAPI Basicaudio_QueryInterface(IBasicAudio *iface, TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); + return BaseFilterImpl_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); } static ULONG WINAPI Basicaudio_AddRef(IBasicAudio *iface) { @@ -989,7 +974,7 @@ static HRESULT WINAPI ReferenceClock_QueryInterface(IReferenceClock *iface, TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); + return BaseFilterImpl_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); } static ULONG WINAPI ReferenceClock_AddRef(IReferenceClock *iface) @@ -1157,7 +1142,7 @@ static HRESULT WINAPI AMDirectSound_QueryInterface(IAMDirectSound *iface, TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); + return BaseFilterImpl_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); } static ULONG WINAPI AMDirectSound_AddRef(IAMDirectSound *iface)

1 0

Zebediah Figura : winegstreamer/gstdemux: Use BaseFilterImpl_QueryInterface().
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: c15b457379d35fb891a6b07306ffc5852ca7d2f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c15b457379d35fb891a6b073… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 22:59:35 2019 -0500 winegstreamer/gstdemux: Use BaseFilterImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 64b8dcf..81c6168 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1307,34 +1307,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) return obj; } -static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv) -{ - GSTImpl *This = impl_from_IBaseFilter(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IPersist) || - IsEqualIID(riid, &IID_IMediaFilter) || - IsEqualIID(riid, &IID_IBaseFilter)) - { - *ppv = &This->filter.IBaseFilter_iface; - } - - if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) && - !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - static HRESULT WINAPI GST_Stop(IBaseFilter *iface) { GSTImpl *This = impl_from_IBaseFilter(iface); @@ -1456,7 +1428,7 @@ static HRESULT WINAPI GST_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, } static const IBaseFilterVtbl GST_Vtbl = { - GST_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID,

1 0

Jactry Zeng : msscript: Return S_OK in IScriptControl::put_SitehWnd().
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 984d586d57c9a36d414bfa83f5a6eb789889cea7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=984d586d57c9a36d414bfa83… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri May 31 21:11:20 2019 +0800 msscript: Return S_OK in IScriptControl::put_SitehWnd(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 9044c49..459c35a 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -792,8 +792,10 @@ static HRESULT WINAPI ScriptControl_put_State(IScriptControl *iface, ScriptContr static HRESULT WINAPI ScriptControl_put_SitehWnd(IScriptControl *iface, LONG hwnd) { ScriptControl *This = impl_from_IScriptControl(iface); + FIXME("(%p)->(%x)\n", This, hwnd); - return E_NOTIMPL; + + return S_OK; } static HRESULT WINAPI ScriptControl_get_SitehWnd(IScriptControl *iface, LONG *p)

1 0

Nikolay Sivov : mf: Forward GetTime() calls to time source.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: f8537c5acd0a656f72d96bce16e34bc6f9a8e81c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8537c5acd0a656f72d96bce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 13:11:32 2019 +0300 mf: Forward GetTime() calls to time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 27 +++++++++++++++++++-------- dlls/mf/tests/mf.c | 28 +++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 14aac77..be5ea64 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -842,15 +842,13 @@ static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface) static HRESULT WINAPI present_clock_GetClockCharacteristics(IMFPresentationClock *iface, DWORD *flags) { struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); - HRESULT hr; + HRESULT hr = MF_E_CLOCK_NO_TIME_SOURCE; TRACE("%p, %p.\n", iface, flags); EnterCriticalSection(&clock->cs); if (clock->time_source) hr = IMFPresentationTimeSource_GetClockCharacteristics(clock->time_source, flags); - else - hr = MF_E_CLOCK_NO_TIME_SOURCE; LeaveCriticalSection(&clock->cs); return hr; @@ -889,15 +887,13 @@ static HRESULT WINAPI present_clock_GetState(IMFPresentationClock *iface, DWORD static HRESULT WINAPI present_clock_GetProperties(IMFPresentationClock *iface, MFCLOCK_PROPERTIES *props) { struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); - HRESULT hr; + HRESULT hr = MF_E_CLOCK_NO_TIME_SOURCE; TRACE("%p, %p.\n", iface, props); EnterCriticalSection(&clock->cs); if (clock->time_source) hr = IMFPresentationTimeSource_GetProperties(clock->time_source, props); - else - hr = MF_E_CLOCK_NO_TIME_SOURCE; LeaveCriticalSection(&clock->cs); return hr; @@ -939,6 +935,9 @@ static HRESULT WINAPI present_clock_GetTimeSource(IMFPresentationClock *iface, TRACE("%p, %p.\n", iface, time_source); + if (!time_source) + return E_INVALIDARG; + EnterCriticalSection(&clock->cs); if (clock->time_source) { @@ -954,9 +953,21 @@ static HRESULT WINAPI present_clock_GetTimeSource(IMFPresentationClock *iface, static HRESULT WINAPI present_clock_GetTime(IMFPresentationClock *iface, MFTIME *time) { - FIXME("%p, %p.\n", iface, time); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr = MF_E_CLOCK_NO_TIME_SOURCE; + MFTIME systime; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, time); + + if (!time) + return E_POINTER; + + EnterCriticalSection(&clock->cs); + if (clock->time_source) + hr = IMFPresentationTimeSource_GetCorrelatedTime(clock->time_source, 0, time, &systime); + LeaveCriticalSection(&clock->cs); + + return hr; } static HRESULT WINAPI present_clock_AddClockStateSink(IMFPresentationClock *iface, IMFClockStateSink *state_sink) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b710d0a..dc58dc1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1431,10 +1431,10 @@ static void test_presentation_clock(void) IMFRateControl *rate_control; IMFPresentationClock *clock; IMFShutdown *shutdown; + MFTIME systime, time; LONGLONG clock_time; MFCLOCK_STATE state; IMFTimer *timer; - MFTIME systime; unsigned int i; DWORD value; HRESULT hr; @@ -1448,9 +1448,21 @@ static void test_presentation_clock(void) hr = IMFPresentationClock_GetTimeSource(clock, &time_source); ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + hr = IMFPresentationClock_GetTimeSource(clock, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMFPresentationClock_GetClockCharacteristics(clock, &value); ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + hr = IMFPresentationClock_GetClockCharacteristics(clock, NULL); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_GetTime(clock, &time); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_GetTime(clock, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + value = 1; hr = IMFPresentationClock_GetContinuityKey(clock, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1538,6 +1550,20 @@ todo_wine ok(state == clock_state_change[i].clock_state, "%u: unexpected state %d.\n", i, state); } + /* Clock time stamps. */ + hr = IMFPresentationClock_Start(clock, 10); + ok(hr == S_OK, "Failed to start presentation clock, hr %#x.\n", hr); + + hr = IMFPresentationClock_Pause(clock); + ok(hr == S_OK, "Failed to pause presentation clock, hr %#x.\n", hr); + + hr = IMFPresentationClock_GetTime(clock, &time); + ok(hr == S_OK, "Failed to get clock time, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &clock_time, &systime); + ok(hr == S_OK, "Failed to get time source time, hr %#x.\n", hr); + ok(time == clock_time, "Unexpected clock time.\n"); + IMFPresentationTimeSource_Release(time_source); hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control);

1 0

Nikolay Sivov : mf: Raise event on session close.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 0efb33c2da27c4f8281bd2fd639bce652aa9637e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0efb33c2da27c4f8281bd2fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 13:11:29 2019 +0300 mf: Raise event on session close. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 55 +++++++++++++++++++++++++++++++++++++++++++++--------- dlls/mf/tests/mf.c | 11 +++++++++++ 2 files changed, 57 insertions(+), 9 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 0c283c4..76573c9 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -35,7 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); enum session_command { - SESSION_CLEAR_TOPOLOGIES, + SESSION_CMD_CLEAR_TOPOLOGIES, + SESSION_CMD_CLOSE, }; struct session_op @@ -51,6 +52,13 @@ struct queued_topology IMFTopology *topology; }; +enum session_state +{ + SESSION_STATE_STOPPED = 0, + SESSION_STATE_CLOSED, + SESSION_STATE_SHUT_DOWN, +}; + struct media_session { IMFMediaSession IMFMediaSession_iface; @@ -62,7 +70,7 @@ struct media_session IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; struct list topologies; - BOOL is_shut_down; + enum session_state state; CRITICAL_SECTION cs; }; @@ -362,7 +370,16 @@ static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, static HRESULT session_submit_command(struct media_session *session, IUnknown *op) { - return MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, op); + HRESULT hr; + + EnterCriticalSection(&session->cs); + if (session->state == SESSION_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, op); + LeaveCriticalSection(&session->cs); + + return hr; } static HRESULT WINAPI mfsession_ClearTopologies(IMFMediaSession *iface) @@ -373,7 +390,7 @@ static HRESULT WINAPI mfsession_ClearTopologies(IMFMediaSession *iface) TRACE("%p.\n", iface); - if (FAILED(hr = create_session_op(SESSION_CLEAR_TOPOLOGIES, &op))) + if (FAILED(hr = create_session_op(SESSION_CMD_CLEAR_TOPOLOGIES, &op))) return hr; hr = session_submit_command(session, op); @@ -405,9 +422,19 @@ static HRESULT WINAPI mfsession_Stop(IMFMediaSession *iface) static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) { - FIXME("(%p)\n", iface); + struct media_session *session = impl_from_IMFMediaSession(iface); + IUnknown *op; + HRESULT hr; - return S_OK; + TRACE("(%p)\n", iface); + + if (FAILED(hr = create_session_op(SESSION_CMD_CLOSE, &op))) + return hr; + + hr = session_submit_command(session, op); + IUnknown_Release(op); + + return hr; } static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) @@ -418,11 +445,11 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) FIXME("(%p)\n", iface); EnterCriticalSection(&session->cs); - if (session->is_shut_down) + if (session->state == SESSION_STATE_SHUT_DOWN) hr = MF_E_SHUTDOWN; else { - session->is_shut_down = TRUE; + session->state = SESSION_STATE_SHUT_DOWN; IMFMediaEventQueue_Shutdown(session->event_queue); } LeaveCriticalSection(&session->cs); @@ -572,7 +599,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, switch (op->command) { - case SESSION_CLEAR_TOPOLOGIES: + case SESSION_CMD_CLEAR_TOPOLOGIES: EnterCriticalSection(&session->cs); session_clear_topologies(session); LeaveCriticalSection(&session->cs); @@ -580,6 +607,16 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologiesCleared, &GUID_NULL, S_OK, NULL); break; + case SESSION_CMD_CLOSE: + EnterCriticalSection(&session->cs); + if (session->state != SESSION_STATE_CLOSED) + { + /* FIXME: actually do something to presentation objects */ + session->state = SESSION_STATE_CLOSED; + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionClosed, &GUID_NULL, S_OK, NULL); + } + LeaveCriticalSection(&session->cs); + break; default: ; } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index bae8020..39a0490 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1000,6 +1000,17 @@ static void test_media_session(void) IMFMediaSession_Release(session); + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + + hr = IMFMediaSession_Shutdown(session); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = IMFMediaSession_Close(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + IMFMediaSession_Release(session); + hr = MFShutdown(); ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); }

1 0

Nikolay Sivov : mf: Partially implement Shutdown() for media session.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 33a4151bbe13d012131270b69876a5863bdbd2ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=33a4151bbe13d012131270b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 13:11:28 2019 +0300 mf: Partially implement Shutdown() for media session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 14 ++++++++++++-- dlls/mf/tests/mf.c | 1 - 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e92ae40..0c283c4 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -62,6 +62,7 @@ struct media_session IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; struct list topologies; + BOOL is_shut_down; CRITICAL_SECTION cs; }; @@ -412,12 +413,21 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) { struct media_session *session = impl_from_IMFMediaSession(iface); + HRESULT hr = S_OK; FIXME("(%p)\n", iface); - IMFMediaEventQueue_Shutdown(session->event_queue); + EnterCriticalSection(&session->cs); + if (session->is_shut_down) + hr = MF_E_SHUTDOWN; + else + { + session->is_shut_down = TRUE; + IMFMediaEventQueue_Shutdown(session->event_queue); + } + LeaveCriticalSection(&session->cs); - return E_NOTIMPL; + return hr; } static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **clock) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f37ac7c..bae8020 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -944,7 +944,6 @@ static void test_session_events(IMFMediaSession *session) /* Shutdown behavior. */ hr = IMFMediaSession_Shutdown(session); -todo_wine ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); }

1 0

Tim Schumacher : dinput: Check for wheel axes/ buttons when finding joysticks.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 66462cb7dcff05df68edf398e42641b24c940d99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66462cb7dcff05df68edf398… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Fri May 31 16:42:00 2019 +0200 dinput: Check for wheel axes/buttons when finding joysticks. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e4f5db8..8d80b34 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -234,10 +234,16 @@ static void find_joydevs(void) /* A true joystick has at least axis X and Y, and at least 1 * button. copied from linux/drivers/input/joydev.c */ - if (!test_bit(joydev.absbits, ABS_X) || !test_bit(joydev.absbits, ABS_Y) || + if (((!test_bit(joydev.absbits, ABS_X) || !test_bit(joydev.absbits, ABS_Y)) && + !test_bit(joydev.absbits, ABS_WHEEL) && + !test_bit(joydev.absbits, ABS_GAS) && + !test_bit(joydev.absbits, ABS_BRAKE)) || !(test_bit(joydev.keybits, BTN_TRIGGER) || test_bit(joydev.keybits, BTN_A) || - test_bit(joydev.keybits, BTN_1))) + test_bit(joydev.keybits, BTN_1) || + test_bit(joydev.keybits, BTN_BASE) || + test_bit(joydev.keybits, BTN_GEAR_UP) || + test_bit(joydev.keybits, BTN_GEAR_DOWN))) { close(fd); continue; @@ -259,6 +265,8 @@ static void find_joydevs(void) test_bit(joydev.keybits, BTN_BASE4) || test_bit(joydev.keybits, BTN_BASE5) || test_bit(joydev.keybits, BTN_BASE6) || + test_bit(joydev.keybits, BTN_GEAR_UP) || + test_bit(joydev.keybits, BTN_GEAR_DOWN) || test_bit(joydev.keybits, BTN_DEAD); if (!(joydev.device = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1)))

1 0

Zebediah Figura : strmbase/renderer: Add a QueryInterface() callback.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: d930dff4a860455fef775409586e4406df5d1efa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d930dff4a860455fef775409… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 22:59:36 2019 -0500 strmbase/renderer: Add a QueryInterface() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 24 +++++++++++++++++++++++- include/wine/strmbase.h | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 7a69d98..5308cd3 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -200,10 +200,32 @@ static void renderer_destroy(BaseFilter *iface) filter->pFuncsTable->renderer_destroy(filter); } -static const BaseFilterFuncTable RendererBaseFilterFuncTable = +static HRESULT renderer_query_interface(BaseFilter *iface, REFIID iid, void **out) { + BaseRenderer *filter = impl_from_BaseFilter(iface); + HRESULT hr; + + if (filter->pFuncsTable->renderer_query_interface + && SUCCEEDED(hr = filter->pFuncsTable->renderer_query_interface(filter, iid, out))) + { + return hr; + } + + if (IsEqualIID(iid, &IID_IMediaSeeking) || IsEqualIID(iid, &IID_IMediaPosition)) + return IUnknown_QueryInterface(filter->pPosition, iid, out); + else if (IsEqualIID(iid, &IID_IQualityControl)) + { + *out = &filter->qcimpl->IQualityControl_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + return E_NOINTERFACE; +} + +static const BaseFilterFuncTable RendererBaseFilterFuncTable = { .filter_get_pin = renderer_get_pin, .filter_destroy = renderer_destroy, + .filter_query_interface = renderer_query_interface, }; static HRESULT WINAPI BaseRenderer_Input_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE * pmt) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1d36f13..e192e98 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -606,6 +606,7 @@ typedef struct BaseRendererFuncTable { BaseRenderer_BeginFlush pfnBeginFlush; BaseRenderer_EndFlush pfnEndFlush; void (*renderer_destroy)(BaseRenderer *iface); + HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); } BaseRendererFuncTable; HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Dmitry Timoshkov : mshtml: Add IMarkupServices interface stub.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: c9edd1ca73072c50eb1aa760f55313eb4bd6520d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9edd1ca73072c50eb1aa760… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 31 17:50:51 2019 +0200 mshtml: Add IMarkupServices interface stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 215 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 + 3 files changed, 218 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9edd1ca73072c50eb1a…

1 0

Dmitry Timoshkov : include/mshtml.idl: Add more interface declarations.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: aee24566816120b13d3b5087a5fed236cf39a930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aee24566816120b13d3b5087… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 31 17:50:28 2019 +0200 include/mshtml.idl: Add more interface declarations. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 32 ++++- include/mshtml.idl | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 356 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aee24566816120b13d3b…

1 0