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

Tim Schumacher : dbgstr: Initialize hex list using an explicit char array.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 062db7222600e6b3eb73f9f638a2be1e181f870c URL: https://source.winehq.org/git/wine.git/?a=commit;h=062db7222600e6b3eb73f9f6… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun May 19 23:19:19 2019 +0200 dbgstr: Initialize hex list using an explicit char array. Some compilers (or rather, compiler settings) are unhappy with the terminating null-char, which is one byte beyond the 16 char limit. Initialize the array without the null char to circumvent this issue. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index aa4dc0d..1c312e9 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -220,7 +220,7 @@ static inline int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls, static inline const char *wine_dbgstr_an( const char *str, int n ) { - static const char hex[16] = "0123456789abcdef"; + static const char hex[16] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; char buffer[300], *dst = buffer; if (!str) return "(null)"; @@ -262,7 +262,7 @@ static inline const char *wine_dbgstr_an( const char *str, int n ) static inline const char *wine_dbgstr_wn( const WCHAR *str, int n ) { - static const char hex[16] = "0123456789abcdef"; + static const char hex[16] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; char buffer[300], *dst = buffer; if (!str) return "(null)";

1 0

John Found : winex11.drv: Allow the drop target to be a transparent window.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 05d76e7cfeb3361beb6259fb389e96bd46c015e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05d76e7cfeb3361beb6259fb… Author: John Found <johnfound(a)asm32.info> Date: Sat May 25 01:52:11 2019 +0300 winex11.drv: Allow the drop target to be a transparent window. Signed-off-by: John Found <johnfound(a)asm32.info> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 54 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 2ab28e4..1f7f0d9 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -254,6 +254,38 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) XFree(xdndtypes); } +/* Recursively searches for a window on given coordinates in a drag&drop specific manner. + * + * Don't use WindowFromPoint instead, because it omits the STATIC and transparent + * windows, but they can be a valid drop targets if have WS_EX_ACCEPTFILES set. + */ +static HWND window_from_point_dnd(HWND hwnd, POINT point) +{ + HWND child; + ScreenToClient(hwnd, &point); + while ((child = ChildWindowFromPointEx(hwnd, point, CWP_SKIPDISABLED | CWP_SKIPINVISIBLE)) && child != hwnd) + { + MapWindowPoints(hwnd, child, &point, 1); + hwnd = child; + } + + return hwnd; +} + +/* Returns the first window down the hierarchy that has WS_EX_ACCEPTFILES set or + * returns NULL, if such window does not exists. + */ +static HWND window_accepting_files(HWND hwnd) +{ + while (hwnd && !(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)) + /* MUST to be GetParent, not GetAncestor, because the owner window + * (with WS_EX_ACCEPTFILES) of a window with WS_POPUP is a valid + * drop target. GetParent works exactly this way! + */ + hwnd = GetParent(hwnd); + return hwnd; +} + /************************************************************************** * X11DRV_XDND_PositionEvent * @@ -270,7 +302,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) HRESULT hr; XDNDxy = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF ); - targetWindow = WindowFromPoint(XDNDxy); + targetWindow = window_from_point_dnd(hWnd, XDNDxy); pointl.x = XDNDxy.x; pointl.y = XDNDxy.y; @@ -334,11 +366,15 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + else { - accept = 1; - effect = DROPEFFECT_COPY; + /* fallback search for window able to accept these files. */ + + if (window_accepting_files(targetWindow) && X11DRV_XDND_HasHDROP()) + { + accept = 1; + effect = DROPEFFECT_COPY; + } } TRACE("actionRequested(%ld) accept(%d) chosen(0x%x) at x(%d),y(%d)\n", @@ -423,10 +459,12 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. * Doing both causes winamp to duplicate the dropped files (#29081) */ - if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + + HWND hwnd_drop = window_accepting_files(window_from_point_dnd(hWnd, XDNDxy)); + + if (hwnd_drop && X11DRV_XDND_HasHDROP()) { - HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd ); + HRESULT hr = X11DRV_XDND_SendDropFiles(hwnd_drop); if (SUCCEEDED(hr)) { accept = 1;

1 0

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

31 May '19

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

Nikolay Sivov : mf: Raise event on session close.
by Alexandre Julliard 31 May '19

31 May '19

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: Get presentation clock flags from current time source.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 34ffec67a79114a13c928bb87f5fbe605816ed39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34ffec67a79114a13c928bb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 13:11:30 2019 +0300 mf: Get presentation clock flags from current time source. 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 | 11 ++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 76573c9..9c2826f 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -841,9 +841,19 @@ static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface) static HRESULT WINAPI present_clock_GetClockCharacteristics(IMFPresentationClock *iface, DWORD *flags) { - FIXME("%p, %p.\n", iface, flags); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr; - return E_NOTIMPL; + 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; } static HRESULT WINAPI present_clock_GetCorrelatedTime(IMFPresentationClock *iface, DWORD reserved, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 39a0490..e07c824 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1449,7 +1449,6 @@ static void test_presentation_clock(void) ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); hr = IMFPresentationClock_GetClockCharacteristics(clock, &value); -todo_wine ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); value = 1; @@ -1491,9 +1490,19 @@ todo_wine hr = MFCreateSystemTimeSource(&time_source); ok(hr == S_OK, "Failed to create time source, hr %#x.\n", hr); + hr = IMFPresentationTimeSource_GetClockCharacteristics(time_source, &value); + ok(hr == S_OK, "Failed to get time source flags, hr %#x.\n", hr); + ok(value == (MFCLOCK_CHARACTERISTICS_FLAG_FREQUENCY_10MHZ | MFCLOCK_CHARACTERISTICS_FLAG_IS_SYSTEM_CLOCK), + "Unexpected clock flags %#x.\n", value); + hr = IMFPresentationClock_SetTimeSource(clock, time_source); ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); + hr = IMFPresentationClock_GetClockCharacteristics(clock, &value); + ok(hr == S_OK, "Failed to get clock flags, hr %#x.\n", hr); + ok(value == (MFCLOCK_CHARACTERISTICS_FLAG_FREQUENCY_10MHZ | MFCLOCK_CHARACTERISTICS_FLAG_IS_SYSTEM_CLOCK), + "Unexpected clock flags %#x.\n", value); + /* State changes. */ for (i = 0; i < ARRAY_SIZE(clock_state_change); ++i) {

1 0

Nikolay Sivov : mf: Return presentation clock properties.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: bd2e2141b0031ca5d0dc11f95effac3cc40b9c23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2e2141b0031ca5d0dc11f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 13:11:31 2019 +0300 mf: Return presentation clock properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 7 +------ dlls/mf/tests/mf.c | 9 ++++++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 9c2826f..14aac77 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -894,15 +894,10 @@ static HRESULT WINAPI present_clock_GetProperties(IMFPresentationClock *iface, M TRACE("%p, %p.\n", iface, props); EnterCriticalSection(&clock->cs); - if (clock->time_source) - { - FIXME("%p, %p.\n", iface, props); - hr = E_NOTIMPL; - } + hr = IMFPresentationTimeSource_GetProperties(clock->time_source, props); else hr = MF_E_CLOCK_NO_TIME_SOURCE; - LeaveCriticalSection(&clock->cs); return hr; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e07c824..b710d0a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1427,9 +1427,9 @@ static void test_presentation_clock(void) }; IMFClockStateSink test_sink = { &test_clock_sink_vtbl }; IMFPresentationTimeSource *time_source; + MFCLOCK_PROPERTIES props, props2; IMFRateControl *rate_control; IMFPresentationClock *clock; - MFCLOCK_PROPERTIES props; IMFShutdown *shutdown; LONGLONG clock_time; MFCLOCK_STATE state; @@ -1498,11 +1498,18 @@ todo_wine hr = IMFPresentationClock_SetTimeSource(clock, time_source); ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); + hr = IMFPresentationTimeSource_GetProperties(time_source, &props2); + ok(hr == S_OK, "Failed to get time source properties, hr %#x.\n", hr); + hr = IMFPresentationClock_GetClockCharacteristics(clock, &value); ok(hr == S_OK, "Failed to get clock flags, hr %#x.\n", hr); ok(value == (MFCLOCK_CHARACTERISTICS_FLAG_FREQUENCY_10MHZ | MFCLOCK_CHARACTERISTICS_FLAG_IS_SYSTEM_CLOCK), "Unexpected clock flags %#x.\n", value); + hr = IMFPresentationClock_GetProperties(clock, &props); + ok(hr == S_OK, "Failed to get clock properties, hr %#x.\n", hr); + ok(!memcmp(&props, &props2, sizeof(props)), "Unexpected clock properties.\n"); + /* State changes. */ for (i = 0; i < ARRAY_SIZE(clock_state_change); ++i) {

1 0

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

31 May '19

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: Forward GetCorrelatedTime() to time source.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 2bc81c53a76cbc4f218e6e8c02703da2132934cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bc81c53a76cbc4f218e6e8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 13:11:33 2019 +0300 mf: Forward GetCorrelatedTime() 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 | 12 ++++++++++-- dlls/mf/tests/mf.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index be5ea64..8e41942 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -857,9 +857,17 @@ static HRESULT WINAPI present_clock_GetClockCharacteristics(IMFPresentationClock static HRESULT WINAPI present_clock_GetCorrelatedTime(IMFPresentationClock *iface, DWORD reserved, LONGLONG *clock_time, MFTIME *system_time) { - FIXME("%p, %#x, %p, %p.\n", iface, reserved, clock_time, system_time); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr = MF_E_CLOCK_NO_TIME_SOURCE; - return E_NOTIMPL; + TRACE("%p, %#x, %p, %p.\n", iface, reserved, clock_time, system_time); + + EnterCriticalSection(&clock->cs); + if (clock->time_source) + hr = IMFPresentationTimeSource_GetCorrelatedTime(clock->time_source, reserved, clock_time, system_time); + LeaveCriticalSection(&clock->cs); + + return hr; } static HRESULT WINAPI present_clock_GetContinuityKey(IMFPresentationClock *iface, DWORD *key) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dc58dc1..8f9a97d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1476,7 +1476,12 @@ static void test_presentation_clock(void) ok(state == MFCLOCK_STATE_INVALID, "Unexpected state %d.\n", state); hr = IMFPresentationClock_GetCorrelatedTime(clock, 0, &clock_time, &systime); -todo_wine + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_GetCorrelatedTime(clock, 0, NULL, &systime); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_GetCorrelatedTime(clock, 0, &time, NULL); ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); /* Sinks. */ @@ -1564,6 +1569,10 @@ todo_wine ok(hr == S_OK, "Failed to get time source time, hr %#x.\n", hr); ok(time == clock_time, "Unexpected clock time.\n"); + hr = IMFPresentationClock_GetCorrelatedTime(clock, 0, &time, &systime); + ok(hr == S_OK, "Failed to get clock 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

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

31 May '19

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

Aric Stewart : mshtml: Handle NULL aNode in nsContextMenuListener_OnShowContextMenu.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 307f163f447d46c281c50100b900344f8d16f9db URL: https://source.winehq.org/git/wine.git/?a=commit;h=307f163f447d46c281c50100… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 31 09:53:48 2019 -0500 mshtml: Handle NULL aNode in nsContextMenuListener_OnShowContextMenu. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 702bc9b..6215500 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1601,6 +1601,9 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList TRACE("(%p)->(%08x %p %p)\n", This, aContextFlags, aEvent, aNode); + if (!aNode) + return NS_ERROR_FAILURE; + hres = get_node(aNode, TRUE, &node); if(FAILED(hres)) return NS_ERROR_FAILURE;

1 0