wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Isabella Bosia : build: Stop ignoring the vkd3d-compiler directory.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: vkd3d Branch: master Commit: ff7a7bf411639e4573e5180d68955899a4dc8a64 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ff7a7bf411639e4573e5180… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Fri Sep 4 10:41:34 2020 +0100 build: Stop ignoring the vkd3d-compiler directory. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 51cba31..63a9ffc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ libtool Makefile Makefile.in test-suite.log -vkd3d-compiler +/vkd3d-compiler vkd3d-*.tar.xz

1 0

Paul Gofman : ntdll/tests: Fix virtual test failures on win10pro.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 7ec069d85f5235db98e57291825b9d602ae47ed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec069d85f5235db98e57291… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 7 16:31:20 2020 +0300 ntdll/tests: Fix virtual test failures on win10pro. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 47eb784cbb..7049f234a9 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -612,7 +612,9 @@ static void test_user_shared_data(void) for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i) { - ok(xstate.AllFeatures[i] == feature_sizes[i], "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, + ok(xstate.AllFeatures[i] == feature_sizes[i] + || broken(!xstate.AllFeatures[i]) /* win10pro */, + "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, xstate.AllFeatures[i], feature_sizes[i]); ok(xstate.Features[i].Size == feature_sizes[i], "Got unexpected Features[%u].Size %u, expected %u.\n", i, xstate.Features[i].Size, feature_sizes[i]);

1 0

Paul Gofman : ntdll/tests: Fix exception test failures on win10pro.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 0c857e92cb424bd7189b76b4035926f1688ab1e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c857e92cb424bd7189b76b4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 7 16:31:19 2020 +0300 ntdll/tests: Fix exception test failures on win10pro. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 465c123e67..c26cfb4a11 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -6962,12 +6962,14 @@ static void test_extended_context(void) length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 0); - ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT)) + || broken(!ret && length == expected_length_xstate) /* win10pro */, "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 3); - ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT)) + || broken(!ret && length == expected_length_xstate) /* win10pro */, "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); length = 0xdeadbeef; @@ -7149,7 +7151,9 @@ static void test_extended_context(void) length2 = 0xdeadbeef; p = pRtlLocateExtendedFeature(context_ex, 2, &length2); - ok(!p && length2 == sizeof(YMMCONTEXT), "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok((!p && length2 == sizeof(YMMCONTEXT)) + || broken(p && length2 == sizeof(YMMCONTEXT)) /* win10pro */, + "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); length2 = 0xdeadbeef; p = pLocateXStateFeature(context, 2, &length2); @@ -7171,7 +7175,8 @@ static void test_extended_context(void) - context_arch[test].context_length; ok(context_ex->XState.Offset == expected_offset, "Got unexpected Offset %d, flags %#x.\n", context_ex->XState.Offset, flags); - ok(context_ex->XState.Length == sizeof(XSTATE) - sizeof(YMMCONTEXT), + ok(context_ex->XState.Length == sizeof(XSTATE) - sizeof(YMMCONTEXT) + || broken(context_ex->XState.Length == sizeof(XSTATE)) /* win10pro */, "Got unexpected Length %#x, flags %#x.\n", context_ex->XState.Length, flags); ok(context_ex->All.Offset == -(int)context_arch[test].context_length, @@ -7267,7 +7272,8 @@ static void test_extended_context(void) context->ContextFlags); expected_compaction = compaction_enabled ? (ULONG64)1 << 63 : 0; - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(!xs->Mask || broken(xs->Mask == 4) /* win10pro */, + "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); @@ -7275,7 +7281,7 @@ static void test_extended_context(void) ok(data[i] == test_extended_context_data[i], "Got unexpected data %#x, i %u.\n", data[i], i); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask == 4 ? test_extended_context_data[i + 4] : 0xcccccccc), "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0; @@ -7292,7 +7298,8 @@ static void test_extended_context(void) ok(xs->CompactionMask == 4, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */, "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); xs->CompactionMask = 4; @@ -7307,7 +7314,8 @@ static void test_extended_context(void) ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */, "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); context_ex->XState.Length = sizeof(XSTATE);

1 0

Martin Storsjo : ntdll: Fix more corner cases for arm64 packed info unwinding.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 3395ee3631fe7088d33d5fd53f0e788741157e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3395ee3631fe7088d33d5fd5… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Sep 7 13:14:57 2020 +0300 ntdll: Fix more corner cases for arm64 packed info unwinding. Make sure to restore sp from fp for CR == 3. Fix unwinding of partial prologues/epilogues - the previous logic had an off-by-one for the pos/skip handling; fix a few more corner cases with odd number of saved registers. Functions with the H flag set (saving x0-x7 on the stack) should be considred having 4 nops (for the instructions saving the registers) in the prologue for unwind purposes. When unwinding through a partial epilogue, the same 4 nops should also be considered to be there (even though no sane epilogue would restore the registers there) based on how windows handles partial epilogue unwinding in those cases. Uncomment prologue/epilogue cases in an existing test and add tests for many more cases. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 41 +++--- dlls/ntdll/tests/exception.c | 322 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 340 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3395ee3631fe7088d33d…

1 0

Eric Wheeler : comctl32/listview: Add Get/SetSelectedColumn() support.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 578aae071b070519c0a1c6836c67954a5114ef96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=578aae071b070519c0a1c683… Author: Eric Wheeler <wine(a)linux.ewheeler.net> Date: Mon Sep 7 13:04:40 2020 +0300 comctl32/listview: Add Get/SetSelectedColumn() support. Selected column should be using different background color, this patch does not implement this. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 10 +++++++--- dlls/comctl32/tests/listview.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index dba16d13a4..e31c787c4a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -99,7 +99,6 @@ * -- LVM_GETINSERTMARKRECT * -- LVM_GETNUMBEROFWORKAREAS * -- LVM_GETOUTLINECOLOR, LVM_SETOUTLINECOLOR - * -- LVM_GETSELECTEDCOLUMN, LVM_SETSELECTEDCOLUMN * -- LVM_GETISEARCHSTRINGW, LVM_GETISEARCHSTRINGA * -- LVM_GETTILEINFO, LVM_SETTILEINFO * -- LVM_GETTILEVIEWINFO, LVM_SETTILEVIEWINFO @@ -248,6 +247,7 @@ typedef struct tagLISTVIEW_INFO /* columns */ HDPA hdpaColumns; /* array of COLUMN_INFO pointers */ BOOL colRectsDirty; /* trigger column rectangles requery from header */ + INT selected_column; /* index for LVM_SETSELECTEDCOLUMN/LVM_GETSELECTEDCOLUMN */ /* item metrics */ BOOL bNoItemMetrics; /* flags if item metrics are not yet computed */ @@ -9506,6 +9506,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->itemEdit.fEnabled = FALSE; infoPtr->iVersion = COMCTL32_VERSION; infoPtr->colRectsDirty = FALSE; + infoPtr->selected_column = -1; /* get default font (icon title) */ SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); @@ -11465,7 +11466,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_GETOUTLINECOLOR: */ - /* case LVM_GETSELECTEDCOLUMN: */ + case LVM_GETSELECTEDCOLUMN: + return infoPtr->selected_column; case LVM_GETSELECTEDCOUNT: return LISTVIEW_GetSelectedCount(infoPtr); @@ -11638,7 +11640,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_SETOUTLINECOLOR: */ - /* case LVM_SETSELECTEDCOLUMN: */ + case LVM_SETSELECTEDCOLUMN: + infoPtr->selected_column = (INT)wParam; + return TRUE; case LVM_SETSELECTIONMARK: return LISTVIEW_SetSelectionMark(infoPtr, (INT)lParam); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a9b853eda8..500cc363c2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6659,6 +6659,42 @@ static void test_item_state_change(void) } } +static void test_selected_column(void) +{ + static const DWORD styles[] = { LVS_ICON, LVS_LIST, LVS_REPORT, LVS_SMALLICON }; + int ret, i; + HWND hwnd; + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + hwnd = create_listview_control(styles[i]); + + /* Initial value */ + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == -1, "Unexpected column %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_SETSELECTEDCOLUMN, -100, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == -100, "Unexpected column %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_SETSELECTEDCOLUMN, 100, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == 100, "Unexpected column %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_SETSELECTEDCOLUMN, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == -1, "Unexpected column %d.\n", ret); + + DestroyWindow(hwnd); + } +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6766,6 +6802,7 @@ START_TEST(listview) test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); + test_selected_column(); unload_v6_module(ctx_cookie, hCtx);

1 0

Nikolay Sivov : mf/session: Add support for MR_VIDEO_RENDER_SERVICE service.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 2ff7160cb7fc2f566237e0cb755d4b76a6882d46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff7160cb7fc2f566237e0cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:37 2020 +0300 mf/session: Add support for MR_VIDEO_RENDER_SERVICE service. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e2a6b868ca..a1b54b7080 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "mfidl.h" +#include "evr.h" #include "wine/debug.h" #include "wine/heap.h" @@ -1794,6 +1795,57 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { return IMFLocalMFTRegistration_QueryInterface(&local_mft_registration, riid, obj); } + else if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) + { + IMFStreamSink *stream_sink; + IMFTopologyNode *node; + IUnknown *vr, *object; + IMFCollection *nodes; + IMFMediaSink *sink; + unsigned int i = 0; + HRESULT hr; + + EnterCriticalSection(&session->cs); + + /* Use first sink to support IMFVideoRenderer. */ + if (session->presentation.current_topology) + { + if (SUCCEEDED(IMFTopology_GetOutputNodeCollection(session->presentation.current_topology, + &nodes))) + { + while (IMFCollection_GetElement(nodes, i++, (IUnknown **)&node) == S_OK) + { + if (SUCCEEDED(IMFTopologyNode_GetObject(node, &object))) + { + if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink))) + { + if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) + { + if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) + { + if (FAILED(hr = MFGetService(vr, service, riid, obj))) + WARN("Failed to get service from video renderer %#x.\n", hr); + IUnknown_Release(vr); + } + } + IMFStreamSink_Release(stream_sink); + } + + IUnknown_Release(object); + } + + IMFTopologyNode_Release(node); + + if (*obj) + break; + } + + IMFCollection_Release(nodes); + } + } + + LeaveCriticalSection(&session->cs); + } else FIXME("Unsupported service %s.\n", debugstr_guid(service));

1 0

Nikolay Sivov : mf/evr: Add events support for video stream sinks.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 951240cb138af421610fc96a349ed89713368677 URL: https://source.winehq.org/git/wine.git/?a=commit;h=951240cb138af421610fc96a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:36 2020 +0300 mf/evr: Add events support for video stream sinks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 86242611a4..93ad06b949 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -40,6 +40,7 @@ struct video_stream LONG refcount; unsigned int id; struct video_renderer *parent; + IMFMediaEventQueue *event_queue; }; struct video_renderer @@ -167,6 +168,8 @@ static ULONG WINAPI video_stream_sink_Release(IMFStreamSink *iface) if (!refcount) { + if (stream->event_queue) + IMFMediaEventQueue_Release(stream->event_queue); heap_free(stream); } @@ -175,32 +178,40 @@ static ULONG WINAPI video_stream_sink_Release(IMFStreamSink *iface) static HRESULT WINAPI video_stream_sink_GetEvent(IMFStreamSink *iface, DWORD flags, IMFMediaEvent **event) { - FIXME("%p, %#x, %p.\n", iface, flags, event); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %#x, %p.\n", iface, flags, event); + + return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } static HRESULT WINAPI video_stream_sink_BeginGetEvent(IMFStreamSink *iface, IMFAsyncCallback *callback, IUnknown *state) { - FIXME("%p, %p, %p.\n", iface, callback, state); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); } static HRESULT WINAPI video_stream_sink_EndGetEvent(IMFStreamSink *iface, IMFAsyncResult *result, IMFMediaEvent **event) { - FIXME("%p, %p, %p.\n", iface, result, event); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, result, event); + + return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); } static HRESULT WINAPI video_stream_sink_QueueEvent(IMFStreamSink *iface, MediaEventType event_type, - REFGUID exttype, HRESULT hr_status, const PROPVARIANT *value) + REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) { - FIXME("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(exttype), hr_status, value); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } static HRESULT WINAPI video_stream_sink_GetMediaSink(IMFStreamSink *iface, IMFMediaSink **sink) @@ -289,12 +300,17 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns struct video_stream **ret) { struct video_stream *stream; + HRESULT hr; if (!(stream = heap_alloc_zero(sizeof(*stream)))) return E_OUTOFMEMORY; stream->IMFStreamSink_iface.lpVtbl = &video_stream_sink_vtbl; stream->refcount = 1; + + if (FAILED(hr = MFCreateEventQueue(&stream->event_queue))) + return hr; + stream->parent = renderer; IMFMediaSink_AddRef(&stream->parent->IMFMediaSink_iface); stream->id = id; @@ -628,6 +644,7 @@ static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) { IMFMediaSink_Release(&renderer->streams[i]->parent->IMFMediaSink_iface); renderer->streams[i]->parent = NULL; + IMFMediaEventQueue_Shutdown(renderer->streams[i]->event_queue); IMFStreamSink_Release(&renderer->streams[i]->IMFStreamSink_iface); renderer->streams[i] = NULL; }

1 0

Nikolay Sivov : mf/evr: Implement stream sinks management functionality.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 629882e161846b8a8fa59a7f76b18186ac44e56d URL: https://source.winehq.org/git/wine.git/?a=commit;h=629882e161846b8a8fa59a7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:35 2020 +0300 mf/evr: Implement stream sinks management functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 347 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 334 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=629882e161846b8a8fa5…

1 0

Nikolay Sivov : mf/evr: Actually use custom mixer when available.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: c1c4856205c78a9c8c153cbec2907e8b392b9838 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c4856205c78a9c8c153cbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:34 2020 +0300 mf/evr: Actually use custom mixer when available. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 8a4aa3c350..fe73f6a4a0 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -734,7 +734,7 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA CLSID clsid; HRESULT hr; - if (SUCCEEDED(IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, + if (SUCCEEDED(hr = IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, &IID_IMFActivate, (void **)&activate))) { IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS, &flags); @@ -744,23 +744,31 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA return hr; } - if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid))) - memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid)); + /* Activation object failed, use class activation. */ + if (FAILED(hr)) + { + if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid))) + memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid)); + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); + } - if (SUCCEEDED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out))) + if (FAILED(hr)) { - if (SUCCEEDED(hr = IMFTransform_QueryInterface(*out, &IID_IMFTopologyServiceLookupClient, - (void **)&lookup_client))) + WARN("Failed to create a mixer object, hr %#x.\n", hr); + return hr; + } + + if (SUCCEEDED(hr = IMFTransform_QueryInterface(*out, &IID_IMFTopologyServiceLookupClient, + (void **)&lookup_client))) + { + renderer->flags |= EVR_INIT_SERVICES; + if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, + &renderer->IMFTopologyServiceLookup_iface))) { - renderer->flags |= EVR_INIT_SERVICES; - if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, - &renderer->IMFTopologyServiceLookup_iface))) - { - renderer->flags |= EVR_MIXER_INITED_SERVICES; - } - renderer->flags &= ~EVR_INIT_SERVICES; - IMFTopologyServiceLookupClient_Release(lookup_client); + renderer->flags |= EVR_MIXER_INITED_SERVICES; } + renderer->flags &= ~EVR_INIT_SERVICES; + IMFTopologyServiceLookupClient_Release(lookup_client); } return hr;

1 0

Nikolay Sivov : evr/mixer: Use same max input count symbol for GetStreamLimits().
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: cc66d5de6ad78fff756dd254c0482773f5f005bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc66d5de6ad78fff756dd254… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:33 2020 +0300 evr/mixer: Use same max input count symbol for GetStreamLimits(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index d9f86a7fc9..7e08beae35 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -284,7 +284,7 @@ static HRESULT WINAPI video_mixer_transform_GetStreamLimits(IMFTransform *iface, TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); *input_minimum = 1; - *input_maximum = 16; + *input_maximum = MAX_MIXER_INPUT_STREAMS; *output_minimum = 1; *output_maximum = 1;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2020