November 2020 - Wine-commits

Zebediah Figura : winegstreamer: Return the seeking start time from IMediaSeeking::GetCurrentPosition().
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 1bb7ef1c1a47ec18b1d4b4124667f6ca93388274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb7ef1c1a47ec18b1d4b412… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:24:59 2020 -0600 winegstreamer: Return the seeking start time from IMediaSeeking::GetCurrentPosition(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 7 +++---- dlls/quartz/tests/mpegsplit.c | 7 +++---- dlls/winegstreamer/gstdemux.c | 29 +---------------------------- 3 files changed, 7 insertions(+), 36 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 4ebc3d5df9a..7ded1773637 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -931,8 +931,7 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample IPin_QueryInterface(iface->pin.peer, &IID_IMediaSeeking, (void **)&seeking); hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine_if (start != filter->seek_start) - ok(start == filter->seek_start, "Expected start position %I64u, got %I64u.\n", filter->seek_start, start); + ok(start == filter->seek_start, "Expected start position %I64u, got %I64u.\n", filter->seek_start, start); ok(end == filter->seek_end, "Expected end position %I64u, got %I64u.\n", filter->seek_end, end); IMediaSeeking_Release(seeking); @@ -1696,7 +1695,7 @@ static void test_streaming(void) start = end = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); + ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); testsink.sample_count = testsink.eos_count = 0; @@ -1712,7 +1711,7 @@ static void test_streaming(void) start = end = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); + ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); IMediaSeeking_Release(seeking); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index a334467ad70..be971897f99 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1220,8 +1220,7 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample IPin_QueryInterface(iface->pin.peer, &IID_IMediaSeeking, (void **)&seeking); hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine_if (start != filter->seek_start) - ok(start == filter->seek_start, "Expected start position %I64u, got %I64u.\n", filter->seek_start, start); + ok(start == filter->seek_start, "Expected start position %I64u, got %I64u.\n", filter->seek_start, start); ok(end == filter->seek_end, "Expected end position %I64u, got %I64u.\n", filter->seek_end, end); IMediaSeeking_Release(seeking); @@ -1863,7 +1862,7 @@ static void test_streaming(void) start = end = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); + ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); testsink.sample_count = testsink.eos_count = 0; @@ -1879,7 +1878,7 @@ static void test_streaming(void) start = end = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &start, &end); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); + ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); IMediaSeeking_Release(seeking); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 215e2704a27..6d66ddcb167 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1897,33 +1897,6 @@ static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) return IPin_Release(&This->pin.pin.IPin_iface); } -static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFERENCE_TIME *pos) -{ - struct gstdemux_source *This = impl_from_IMediaSeeking(iface); - - TRACE("(%p)->(%p)\n", This, pos); - - if (!pos) - return E_POINTER; - - mark_wine_thread(); - - if (This->pin.pin.filter->state == State_Stopped) - { - *pos = This->seek.llCurrent; - TRACE("Cached value\n"); - return S_OK; - } - - if (!gst_pad_query_position(This->their_src, GST_FORMAT_TIME, pos)) { - WARN("Could not query position\n"); - return E_NOTIMPL; - } - *pos /= 100; - This->seek.llCurrent = *pos; - return S_OK; -} - static GstSeekType type_from_flags(DWORD flags) { switch (flags & AM_SEEKING_PositioningBitsMask) { @@ -1997,7 +1970,7 @@ static const IMediaSeekingVtbl GST_Seeking_Vtbl = SourceSeekingImpl_SetTimeFormat, SourceSeekingImpl_GetDuration, SourceSeekingImpl_GetStopPosition, - GST_Seeking_GetCurrentPosition, + SourceSeekingImpl_GetCurrentPosition, SourceSeekingImpl_ConvertTimeFormat, GST_Seeking_SetPositions, SourceSeekingImpl_GetPositions,

1 0

Zebediah Figura : winegstreamer: Don't query the pad position in IMediaSeeking::SetPositions().
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 54d74a053b6540f3f3aeb4242f09dd02bc4e3ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d74a053b6540f3f3aeb424… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:25:00 2020 -0600 winegstreamer: Don't query the pad position in IMediaSeeking::SetPositions(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 80 ++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 50 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6d66ddcb167..e227ed9331d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1897,63 +1897,43 @@ static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) return IPin_Release(&This->pin.pin.IPin_iface); } -static GstSeekType type_from_flags(DWORD flags) -{ - switch (flags & AM_SEEKING_PositioningBitsMask) { - case AM_SEEKING_NoPositioning: - return GST_SEEK_TYPE_NONE; - case AM_SEEKING_AbsolutePositioning: - case AM_SEEKING_RelativePositioning: - return GST_SEEK_TYPE_SET; - case AM_SEEKING_IncrementalPositioning: - return GST_SEEK_TYPE_END; - } - return GST_SEEK_TYPE_NONE; -} - static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, - REFERENCE_TIME *pCur, DWORD curflags, REFERENCE_TIME *pStop, - DWORD stopflags) + LONGLONG *current, DWORD current_flags, LONGLONG *stop, DWORD stop_flags) { - HRESULT hr; - struct gstdemux_source *This = impl_from_IMediaSeeking(iface); - GstSeekFlags f = 0; - GstSeekType curtype, stoptype; - GstEvent *e; - gint64 stop_pos = 0, curr_pos = 0; + GstSeekType current_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; + struct gstdemux_source *pin = impl_from_IMediaSeeking(iface); + GstSeekFlags flags = 0; - TRACE("(%p)->(%p, 0x%x, %p, 0x%x)\n", This, pCur, curflags, pStop, stopflags); + TRACE("pin %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", + pin, current ? debugstr_time(*current) : "<null>", current_flags, + stop ? debugstr_time(*stop) : "<null>", stop_flags); mark_wine_thread(); - hr = SourceSeekingImpl_SetPositions(iface, pCur, curflags, pStop, stopflags); - if (This->pin.pin.filter->state == State_Stopped) - return hr; - - curtype = type_from_flags(curflags); - stoptype = type_from_flags(stopflags); - if (curflags & AM_SEEKING_SeekToKeyFrame) - f |= GST_SEEK_FLAG_KEY_UNIT; - if (curflags & AM_SEEKING_Segment) - f |= GST_SEEK_FLAG_SEGMENT; - if (!(curflags & AM_SEEKING_NoFlush)) - f |= GST_SEEK_FLAG_FLUSH; - - if (((curflags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_RelativePositioning) || - ((stopflags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_RelativePositioning)) { - gint64 tmp_pos; - gst_pad_query_position (This->my_sink, GST_FORMAT_TIME, &tmp_pos); - if ((curflags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_RelativePositioning) - curr_pos = tmp_pos; - if ((stopflags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_RelativePositioning) - stop_pos = tmp_pos; - } - - e = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, f, curtype, pCur ? curr_pos + *pCur * 100 : -1, stoptype, pStop ? stop_pos + *pStop * 100 : -1); - if (gst_pad_push_event(This->my_sink, e)) + SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); + if (pin->pin.pin.filter->state == State_Stopped) return S_OK; - else - return E_NOTIMPL; + + if (current_flags & AM_SEEKING_SeekToKeyFrame) + flags |= GST_SEEK_FLAG_KEY_UNIT; + if (current_flags & AM_SEEKING_Segment) + flags |= GST_SEEK_FLAG_SEGMENT; + if (!(current_flags & AM_SEEKING_NoFlush)) + flags |= GST_SEEK_FLAG_FLUSH; + + if ((current_flags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_NoPositioning) + current_type = GST_SEEK_TYPE_NONE; + if ((stop_flags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_NoPositioning) + stop_type = GST_SEEK_TYPE_NONE; + + if (!gst_pad_push_event(pin->my_sink, gst_event_new_seek(pin->seek.dRate, GST_FORMAT_TIME, flags, + current_type, pin->seek.llCurrent * 100, stop_type, pin->seek.llStop * 100))) + { + ERR("Failed to seek (current %s, stop %s).\n", + debugstr_time(pin->seek.llCurrent), debugstr_time(pin->seek.llStop)); + return E_FAIL; + } + return S_OK; } static const IMediaSeekingVtbl GST_Seeking_Vtbl =

1 0

Zebediah Figura : quartz/tests: Add some more tests for IMediaSeeking return value handling.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: ec4feafcc04bdb7c04ef8c0e8d31436e30f38526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec4feafcc04bdb7c04ef8c0e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:25:01 2020 -0600 quartz/tests: Add some more tests for IMediaSeeking return value handling. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e7ee4e5c446..853155ab100 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1623,7 +1623,7 @@ static HRESULT WINAPI testseek_GetDuration(IMediaSeeking *iface, LONGLONG *durat struct testfilter *filter = impl_from_IMediaSeeking(iface); if (winetest_debug > 1) trace("%p->GetDuration()\n", iface); *duration = filter->seek_duration; - return S_OK; + return filter->seek_hr; } static HRESULT WINAPI testseek_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) @@ -4399,6 +4399,26 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); + filter1.seek_hr = filter2.seek_hr = 0xbeef; + hr = IMediaSeeking_GetDuration(seeking, &time); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); + + filter1.seek_hr = E_NOTIMPL; + filter2.seek_hr = S_OK; + hr = IMediaSeeking_GetDuration(seeking, &time); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0x12345, "Got time %s.\n", wine_dbgstr_longlong(time)); + + filter1.seek_hr = 0xdeadbeef; + hr = IMediaSeeking_GetDuration(seeking, &time); + ok(hr == 0xdeadbeef, "Got hr %#x.\n", hr); + + filter1.seek_hr = filter2.seek_hr = E_NOTIMPL; + hr = IMediaSeeking_GetDuration(seeking, &time); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + filter1.seek_hr = filter2.seek_hr = S_OK; + flush_cached_seeking(graph, &filter1); flush_cached_seeking(graph, &filter2); @@ -4420,6 +4440,7 @@ static void test_graph_seeking(void) ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = E_NOTIMPL; + filter2.seek_hr = S_OK; hr = IMediaSeeking_GetStopPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x54321, "Got time %s.\n", wine_dbgstr_longlong(time)); @@ -4470,6 +4491,7 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); filter1.seek_hr = E_NOTIMPL; + filter2.seek_hr = S_OK; hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, &stop, AM_SEEKING_AbsolutePositioning); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz: Correct return value handling in IMediaSeeking::GetDuration().
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 627b6b29cd083208ccf0c4f8403a450432e523ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=627b6b29cd083208ccf0c4f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:25:02 2020 -0600 quartz: Correct return value handling in IMediaSeeking::GetDuration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 53 ++++++++++++++++++++++++----------------- dlls/quartz/tests/filtergraph.c | 4 ++-- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b3aebabbdad..fb0890fda1f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2237,36 +2237,45 @@ static HRESULT WINAPI MediaSeeking_SetTimeFormat(IMediaSeeking *iface, const GUI return S_OK; } -static HRESULT WINAPI FoundDuration(struct filter_graph *This, IMediaSeeking *seek, DWORD_PTR pduration) +static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *duration) { - HRESULT hr; - LONGLONG duration = 0, *pdur = (LONGLONG*)pduration; + struct filter_graph *graph = impl_from_IMediaSeeking(iface); + HRESULT hr = E_NOTIMPL, filter_hr; + LONGLONG filter_duration; + struct filter *filter; - hr = IMediaSeeking_GetDuration(seek, &duration); - if (FAILED(hr)) - return hr; + TRACE("graph %p, duration %p.\n", graph, duration); - if (*pdur < duration) - *pdur = duration; - return hr; -} + if (!duration) + return E_POINTER; -static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *pDuration) -{ - struct filter_graph *This = impl_from_IMediaSeeking(iface); - HRESULT hr; + *duration = 0; - TRACE("(%p/%p)->(%p)\n", This, iface, pDuration); + EnterCriticalSection(&graph->cs); - if (!pDuration) - return E_POINTER; + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) + { + update_seeking(filter); + if (!filter->seeking) + continue; - EnterCriticalSection(&This->cs); - *pDuration = 0; - hr = all_renderers_seek(This, FoundDuration, (DWORD_PTR)pDuration); - LeaveCriticalSection(&This->cs); + filter_hr = IMediaSeeking_GetDuration(filter->seeking, &filter_duration); + if (SUCCEEDED(filter_hr)) + { + hr = S_OK; + *duration = max(*duration, filter_duration); + } + else if (filter_hr != E_NOTIMPL) + { + LeaveCriticalSection(&graph->cs); + return filter_hr; + } + } + + LeaveCriticalSection(&graph->cs); - TRACE("--->%08x\n", hr); + TRACE("Returning hr %#x, duration %s (%s seconds).\n", hr, + wine_dbgstr_longlong(*duration), debugstr_time(*duration)); return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 853155ab100..b6e68f3f6b9 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4401,13 +4401,13 @@ static void test_graph_seeking(void) filter1.seek_hr = filter2.seek_hr = 0xbeef; hr = IMediaSeeking_GetDuration(seeking, &time); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = E_NOTIMPL; filter2.seek_hr = S_OK; hr = IMediaSeeking_GetDuration(seeking, &time); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x12345, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = 0xdeadbeef;

1 0

Alistair Leslie-Hughes : msctf: Accept ITfActiveLanguageProfileNotifySink in ThreadMgr AdviseSink.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 5d70611f305b52d75af7fca6c0614dcc25af7ebe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d70611f305b52d75af7fca6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 22 17:13:31 2020 +0100 msctf: Accept ITfActiveLanguageProfileNotifySink in ThreadMgr AdviseSink. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44502 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/threadmgr.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 584bb1044ed..9d60e18e6f3 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -34,6 +34,7 @@ #define COOKIE_MAGIC_KEYTRACESINK 0x0090 #define COOKIE_MAGIC_UIELEMENTSINK 0x00a0 #define COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK 0x00b0 +#define COOKIE_MAGIC_ACTIVELANGSINK 0x00c0 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 77cf47ca4f6..0e054d4e654 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -621,6 +621,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, return advise_sink(&This->ThreadFocusSink, &IID_ITfThreadFocusSink, COOKIE_MAGIC_THREADFOCUSSINK, punk, pdwCookie); } + if (IsEqualIID(riid, &IID_ITfActiveLanguageProfileNotifySink)) + { + WARN("semi-stub for ITfActiveLanguageProfileNotifySink: sink won't be used.\n"); + return advise_sink(&This->ActiveLanguageProfileNotifySink, &IID_ITfActiveLanguageProfileNotifySink, + COOKIE_MAGIC_ACTIVELANGSINK, punk, pdwCookie); + } + if (IsEqualIID(riid, &IID_ITfKeyTraceEventSink)) { WARN("semi-stub for ITfKeyTraceEventSink: sink won't be used.\n"); @@ -656,7 +663,8 @@ static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCo magic = get_Cookie_magic(pdwCookie); if (magic != COOKIE_MAGIC_TMSINK && magic != COOKIE_MAGIC_THREADFOCUSSINK && magic != COOKIE_MAGIC_KEYTRACESINK && magic != COOKIE_MAGIC_UIELEMENTSINK - && magic != COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK) + && magic != COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK + && magic != COOKIE_MAGIC_ACTIVELANGSINK) return E_INVALIDARG; return unadvise_sink(pdwCookie);

1 0

Gijs Vermeulen : msctf/tests: Add ITfSource::[Un]AdviseSink() test with ITfActiveLanguageProfileNotifySink.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 4a103ea9612997ffb04be2c721a25b487d63ada3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a103ea9612997ffb04be2c7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Nov 22 17:13:32 2020 +0100 msctf/tests: Add ITfSource::[Un]AdviseSink() test with ITfActiveLanguageProfileNotifySink. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 48 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f21042a794c..1c97d2c5d1c 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -63,7 +63,7 @@ static BOOL test_ShouldDeactivate = FALSE; static DWORD tmSinkCookie; static DWORD dmSinkCookie; static DWORD documentStatus; -static DWORD key_trace_sink_cookie, ui_element_sink_cookie, profile_activation_sink_cookie; +static DWORD key_trace_sink_cookie, ui_element_sink_cookie, profile_activation_sink_cookie, active_lang_sink_cookie; static DWORD fake_service_onactivated_flags = 0; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; @@ -801,6 +801,45 @@ static const ITfTransitoryExtensionSinkVtbl TfTransitoryExtensionSinkVtbl = { static ITfTransitoryExtensionSink TfTransitoryExtensionSink = { &TfTransitoryExtensionSinkVtbl }; +static HRESULT WINAPI TfActiveLanguageProfileNotifySink_QueryInterface(ITfActiveLanguageProfileNotifySink *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfActiveLanguageProfileNotifySink, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TfActiveLanguageProfileNotifySink_AddRef(ITfActiveLanguageProfileNotifySink *iface) +{ + return 2; +} + +static ULONG WINAPI TfActiveLanguageProfileNotifySink_Release(ITfActiveLanguageProfileNotifySink *iface) +{ + return 1; +} + +static HRESULT WINAPI TfActiveLanguageProfileNotifySink_OnActivated(ITfActiveLanguageProfileNotifySink *iface, REFCLSID clsid, + REFGUID guidProfile, BOOL activated) +{ + trace("Got OnActivated: {clsid %s, guidProfile %s, activated %d}\n", wine_dbgstr_guid(clsid), + wine_dbgstr_guid(guidProfile), activated); + + return S_OK; +} + +static const ITfActiveLanguageProfileNotifySinkVtbl TfActiveLanguageProfileNotifySinkVtbl = { + TfActiveLanguageProfileNotifySink_QueryInterface, + TfActiveLanguageProfileNotifySink_AddRef, + TfActiveLanguageProfileNotifySink_Release, + TfActiveLanguageProfileNotifySink_OnActivated +}; + +static ITfActiveLanguageProfileNotifySink TfActiveLanguageProfileNotifySink = { &TfActiveLanguageProfileNotifySinkVtbl }; + /******************************************************************************************** * Stub text service for testing ********************************************************************************************/ @@ -1231,6 +1270,10 @@ static void test_ThreadMgrAdviseSinks(void) &profile_activation_sink_cookie); ok(hr == S_OK, "Failed to Advise ITfInputProcessorProfileActivationSink\n"); + hr = ITfSource_AdviseSink(source, &IID_ITfActiveLanguageProfileNotifySink, (IUnknown*)&TfActiveLanguageProfileNotifySink, + &active_lang_sink_cookie); + ok(hr == S_OK, "Failed to Advise ITfActiveLanguageProfileNotifySink\n"); + ITfSource_Release(source); } @@ -1258,6 +1301,9 @@ static void test_ThreadMgrUnadviseSinks(void) hr = ITfSource_UnadviseSink(source, profile_activation_sink_cookie); ok(hr == S_OK, "Failed to unadvise ITfInputProcessorProfileActivationSink\n"); + hr = ITfSource_UnadviseSink(source, active_lang_sink_cookie); + ok(hr == S_OK, "Failed to unadvise ITfActiveLanguageProfileNotifySink\n"); + ITfSource_Release(source); }

1 0

Alistair Leslie-Hughes : include: Add some DB_S_ defines.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 6b17d4d90b6648a782356036958a9a9ac2b64703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b17d4d90b6648a782356036… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 23 19:32:46 2020 +1100 include: Add some DB_S_ defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oledberr.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/oledberr.h b/include/oledberr.h index 61093ea1491..c0eccba1e97 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -83,6 +83,9 @@ #define DB_E_MISMATCHEDPROVIDER 0x80040e75 +#define DB_S_BOOKMARKSKIPPED 0x00040ec3 +#define DB_S_NONEXTROWSET 0x00040ec5 +#define DB_S_ENDOFROWSET 0x00040ec6 #define DB_S_ERRORSOCCURRED 0x00040eda #endif /* __WINE_OLEDBERR_H */

1 0

Piotr Caban : msvcrt: Update lc_category.wrefcount in __get_current_locale.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: aa8891783046459508f91f47cc588b35ee8dea4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa8891783046459508f91f47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 23 11:11:49 2020 +0100 msvcrt: Update lc_category.wrefcount in __get_current_locale. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50163 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index f557d10db1b..5971882229c 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1155,7 +1155,11 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) InterlockedIncrement(&locale->locinfo->refcount); for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) + { InterlockedIncrement(locale->locinfo->lc_category[i].refcount); + if(locale->locinfo->lc_category[i].wrefcount) + InterlockedIncrement(locale->locinfo->lc_category[i].wrefcount); + } if(locale->locinfo->lconv_intl_refcount) InterlockedIncrement(locale->locinfo->lconv_intl_refcount); if(locale->locinfo->lconv_num_refcount)

1 0

Alexandre Julliard : packaging: Remove Fedora 31.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: tools Branch: master Commit: 3c79caef504e36dcd6b0521e0bbd5703075cea39 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3c79caef504e36dcd6b0521… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 21 13:14:15 2020 +0100 packaging: Remove Fedora 31. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 - packaging/obs/yum.conf | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index f830afa..54b38c9 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="31 32 33 buster bullseye xenial bionic focal groovy" +distros="32 33 buster bullseye xenial bionic focal groovy" dry_run= while [ $# -ge 1 ] diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 05b659e..a20a966 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,5 +1,4 @@ + /fedora -+ /fedora/31 + /fedora/32 + /fedora/33 - /fedora/* diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index 62fb350..390123d 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -4,10 +4,6 @@ debuglevel=0 logfile=/var/log/yum.log gpgcheck=1 -[fedora-31] -name = Fedora 31 -baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_31 - [fedora-32] name = Fedora 32 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/…

1 0

Alexandre Julliard : packaging: Remove Ubuntu 16.04.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: tools Branch: master Commit: 50b0c4ea8e9f69825cf9cee115627850ea4acad1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=50b0c4ea8e9f69825cf9cee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 21 13:15:31 2020 +0100 packaging: Remove Ubuntu 16.04. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ---- packaging/obs/obs-sync | 3 +-- packaging/obs/rsync-filter | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 34532bb..299a524 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -22,10 +22,6 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Deb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ -deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ - deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 54b38c9..6ddbc48 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="32 33 buster bullseye xenial bionic focal groovy" +distros="32 33 buster bullseye bionic focal groovy" dry_run= while [ $# -ge 1 ] @@ -218,7 +218,6 @@ do 3?) add_rpm $i Fedora_$i ;; buster) add_deb debian buster Debian_10 stable ;; bullseye) add_deb debian bullseye Debian_Testing_standard testing ;; - xenial) add_deb ubuntu xenial xUbuntu_16.04 ;; bionic) add_deb ubuntu bionic xUbuntu_18.04 ;; focal) add_deb ubuntu focal xUbuntu_20.04 ;; groovy) add_deb ubuntu groovy xUbuntu_20.10 ;; diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index a20a966..b9eec32 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -17,7 +17,6 @@ + /ubuntu/dists/bionic + /ubuntu/dists/focal + /ubuntu/dists/groovy -+ /ubuntu/dists/xenial - /ubuntu/dists/* - /ubuntu/*

1 0