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

Paul Gofman : server: Do not allow parenting non-empty job.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: e1c3ee6d51510824ea729237c8c41619fd5a3886 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1c3ee6d51510824ea729237… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 27 19:05:17 2021 +0300 server: Do not allow parenting non-empty job. Fixes a regression introduced by 21f5597de417575d476a00b567d972a89903b4b6 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 60 +++++++++++++++++++++++++++++++++++++++++++ server/process.c | 5 ++++ 2 files changed, 65 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9b91b6f0998..10786c52e9e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4502,6 +4502,7 @@ done: static void test_nested_jobs(void) { + BOOL ret, already_in_job = TRUE, create_succeeded = FALSE; PROCESS_INFORMATION info[2]; char buffer[MAX_PATH + 26]; STARTUPINFOA si = {0}; @@ -4514,6 +4515,65 @@ static void test_nested_jobs(void) return; } + job1 = pCreateJobObjectW(NULL, NULL); + ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, NULL); + ok(!!job2, "CreateJobObjectW failed, error %u.\n", GetLastError()); + + create_succeeded = TRUE; + sprintf(buffer, "\"%s\" process wait", selfname); + for (i = 0; i < 2; ++i) + { + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &info[i]); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + create_succeeded = FALSE; + break; + } + ok(ret, "CreateProcessA error %u\n", GetLastError()); + } + + if (create_succeeded) + { + ret = pIsProcessInJob(info[0].hProcess, NULL, &already_in_job); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + + if (!already_in_job) + { + ret = pAssignProcessToJobObject(job2, info[1].hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job1, info[0].hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job2, info[0].hProcess); + ok(!ret, "AssignProcessToJobObject succeeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + + TerminateProcess(info[1].hProcess, 0); + wait_child_process(info[1].hProcess); + CloseHandle(info[1].hProcess); + CloseHandle(info[1].hThread); + + ret = pAssignProcessToJobObject(job2, info[0].hProcess); + ok(!ret, "AssignProcessToJobObject succeeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + } + + TerminateProcess(info[0].hProcess, 0); + wait_child_process(info[0].hProcess); + CloseHandle(info[0].hProcess); + CloseHandle(info[0].hThread); + } + + if (already_in_job) + { + win_skip("Test process is already in job, can't test parenting non-empty job.\n"); + } + + CloseHandle(job1); + CloseHandle(job2); + job1 = pCreateJobObjectW(NULL, L"test_nested_jobs_0"); ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); job2 = pCreateJobObjectW(NULL, L"test_nested_jobs_1"); diff --git a/server/process.c b/server/process.c index 87ff3186bb5..5b271b12328 100644 --- a/server/process.c +++ b/server/process.c @@ -311,6 +311,11 @@ static void add_job_process( struct job *job, struct process *process ) } else { + if (job->total_processes) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } /* transfer reference. */ job->parent = process->job; list_add_tail( &job->parent->child_job_list, &job->parent_job_entry );

1 0

Anton Baskanov : strmbase: Defer EC_COMPLETE until the renderer is running.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 82b86d470488ae266d3ccd46ae4a6750ff3e79eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=82b86d470488ae266d3ccd46… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed May 26 23:46:43 2021 +0700 strmbase: Defer EC_COMPLETE until the renderer is running. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 14 +++++++++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 470652543ad..4ff84e77012 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1143,7 +1143,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); hr = join_thread(send_frame(input)); todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); @@ -1151,7 +1151,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + ok(ret == 1, "Expected EC_COMPLETE.\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index c7a84d65b7b..5bca91faecd 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1295,7 +1295,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); hr = join_thread(send_frame(input)); todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); @@ -1303,7 +1303,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + ok(ret == 1, "Expected EC_COMPLETE.\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index daa407ba42e..01fabfc98de 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -242,6 +242,8 @@ static HRESULT renderer_init_stream(struct strmbase_filter *iface) static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TIME start) { struct strmbase_renderer *filter = impl_from_strmbase_filter(iface); + IFilterGraph *graph = filter->filter.graph; + IMediaEventSink *event_sink; filter->stream_start = start; SetEvent(filter->state_event); @@ -250,6 +252,15 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI if (filter->sink.pin.peer && filter->ops->renderer_start_stream) filter->ops->renderer_start_stream(filter); + if (filter->eos && graph + && SUCCEEDED(IFilterGraph_QueryInterface(graph, + &IID_IMediaEventSink, (void **)&event_sink))) + { + IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter->filter.IBaseFilter_iface); + IMediaEventSink_Release(event_sink); + } + return S_OK; } @@ -437,7 +448,8 @@ static HRESULT sink_eos(struct strmbase_sink *iface) filter->eos = TRUE; - if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, + if (filter->filter.state == State_Running && graph + && SUCCEEDED(IFilterGraph_QueryInterface(graph, &IID_IMediaEventSink, (void **)&event_sink))) { IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK,

1 0

Anton Baskanov : strmbase: Don't reset EOS on renderer paused->running state transition.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: e017e33aec255e4efa74f8e598616437a2e1d816 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e017e33aec255e4efa74f8e5… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed May 26 23:46:42 2021 +0700 strmbase: Don't reset EOS on renderer paused->running state transition. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index ee8ff4c623f..daa407ba42e 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -246,8 +246,6 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI filter->stream_start = start; SetEvent(filter->state_event); SetEvent(filter->run_event); - if (filter->sink.pin.peer) - filter->eos = FALSE; reset_qos(filter); if (filter->sink.pin.peer && filter->ops->renderer_start_stream) filter->ops->renderer_start_stream(filter);

1 0

Nikolay Sivov : evr/mixer: Preserve output stream types order.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: e7ef9fe25bd4308d75f041d6f873433814e2e754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7ef9fe25bd4308d75f041d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 27 15:47:02 2021 +0300 evr/mixer: Preserve output stream types order. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 0d4bf8bc500..ba4624e0f51 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -642,13 +642,19 @@ done: return hr; } -static int __cdecl rt_formats_sort_compare(const void *left, const void *right) +static void video_mixer_append_rt_format(struct rt_format *rt_formats, unsigned int *count, + const GUID *device, D3DFORMAT format) { - const struct rt_format *format1 = left, *format2 = right; + unsigned int i; - if (format1->format < format2->format) return -1; - if (format1->format > format2->format) return 1; - return 0; + for (i = 0; i < *count; ++i) + { + if (rt_formats[i].format == format) return; + } + + rt_formats[*count].format = format; + rt_formats[*count].device = *device; + *count += 1; } static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, @@ -677,11 +683,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const rt_formats = ptr; for (j = 0; j < format_count; ++j) - { - rt_formats[count + j].format = formats[j]; - rt_formats[count + j].device = devices[i]; - } - count += format_count; + video_mixer_append_rt_format(rt_formats, &count, &devices[i], formats[j]); CoTaskMemFree(formats); } @@ -689,18 +691,6 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const if (count && !(flags & MFT_SET_TYPE_TEST_ONLY)) { - qsort(rt_formats, count, sizeof(*rt_formats), rt_formats_sort_compare); - - j = 0; - for (i = j + 1; i < count; ++i) - { - if (rt_formats[i].format != rt_formats[j].format) - { - rt_formats[++j] = rt_formats[i]; - } - } - count = j + 1; - memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); if ((mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) {

1 0

Rémi Bernon : dinput: Factor out IDirectInputDevice_BuildActionMap WtoA conversions.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 8109f8398acbc51e3a3b52491c6d8d1913e23b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8109f8398acbc51e3a3b5249… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 27 10:50:04 2021 +0200 dinput: Factor out IDirectInputDevice_BuildActionMap WtoA conversions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 105 ++++++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 2 + dlls/dinput/joystick.c | 30 ----------- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/joystick_private.h | 1 - dlls/dinput/keyboard.c | 32 +----------- dlls/dinput/mouse.c | 32 +----------- 9 files changed, 112 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8109f8398acbc51e3a3b…

1 0

Zebediah Figura : server: Pass -1 to set_fd_events() if the socket is not yet initialized or a not yet used TCP socket.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: b5e264a4a2072c515afd46f57ead663582461a51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5e264a4a2072c515afd46f5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 26 23:36:48 2021 -0500 server: Pass -1 to set_fd_events() if the socket is not yet initialized or a not yet used TCP socket. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/server/sock.c b/server/sock.c index 6e9ef3d9d97..549cde17296 100644 --- a/server/sock.c +++ b/server/sock.c @@ -151,7 +151,6 @@ struct sock * any event once until it is reset.) */ unsigned int reported_events; unsigned int flags; /* socket flags */ - int polling; /* is socket being polled? */ int wr_shutdown_pending; /* is a write shutdown pending? */ unsigned short proto; /* socket protocol */ unsigned short type; /* socket type */ @@ -410,14 +409,6 @@ static int sock_reselect( struct sock *sock ) if (debug_level) fprintf(stderr,"sock_reselect(%p): new mask %x\n", sock, ev); - if (!sock->polling) /* FIXME: should find a better way to do this */ - { - /* previously unconnected socket, is this reselect supposed to connect it? */ - if (!(sock->state & ~FD_WINE_NONBLOCKING)) return 0; - /* ok, it is, attach it to the wineserver's main poll loop */ - sock->polling = 1; - } - /* update condition mask */ set_fd_events( sock->fd, ev ); return ev; } @@ -986,6 +977,15 @@ static int sock_get_poll_events( struct fd *fd ) assert( sock->obj.ops == &sock_ops ); + if (!sock->type) /* not initialized yet */ + return -1; + + /* A connection-mode Windows socket which has never been connected does not + * return any events, but Linux returns POLLOUT | POLLHUP. Hence we need to + * return -1 here, to prevent the socket from being polled on at all. */ + if (sock->type == WS_SOCK_STREAM && !(sock->state & (FD_CONNECT | FD_WINE_CONNECTED | FD_WINE_LISTENING))) + return -1; + if (sock->state & FD_CONNECT) /* connecting, wait for writable */ return POLLOUT; @@ -1169,7 +1169,6 @@ static struct sock *create_socket(void) sock->mask = 0; sock->pending_events = 0; sock->reported_events = 0; - sock->polling = 0; sock->wr_shutdown_pending = 0; sock->flags = 0; sock->proto = 0; @@ -1464,7 +1463,6 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; acceptsock->pending_events = 0; acceptsock->reported_events = 0; - acceptsock->polling = 0; acceptsock->proto = sock->proto; acceptsock->type = sock->type; acceptsock->family = sock->family;

1 0

Zebediah Figura : server: Mark the socket as cacheable when it is connected, marked listening, or created as connectionless.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 89f77a93a6c96896d90c943bc3e82139114cf58c URL: https://source.winehq.org/git/wine.git/?a=commit;h=89f77a93a6c96896d90c943b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 26 23:36:47 2021 -0500 server: Mark the socket as cacheable when it is connected, marked listening, or created as connectionless. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 3925018c7a5..6e9ef3d9d97 100644 --- a/server/sock.c +++ b/server/sock.c @@ -416,7 +416,6 @@ static int sock_reselect( struct sock *sock ) if (!(sock->state & ~FD_WINE_NONBLOCKING)) return 0; /* ok, it is, attach it to the wineserver's main poll loop */ sock->polling = 1; - allow_fd_caching( sock->fd ); } /* update condition mask */ set_fd_events( sock->fd, ev ); @@ -1358,7 +1357,11 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u { return -1; } - sock_reselect( sock ); + + /* We can't immediately allow caching for a connection-mode socket, since it + * might be accepted into (changing the underlying fd object.) */ + if (sock->type != WS_SOCK_STREAM) allow_fd_caching( sock->fd ); + return 0; } @@ -1750,6 +1753,9 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->state |= FD_WINE_LISTENING; sock->state &= ~(FD_CONNECT | FD_WINE_CONNECTED); + /* a listening socket can no longer be accepted into */ + allow_fd_caching( sock->fd ); + /* we may already be selecting for FD_ACCEPT */ sock_reselect( sock ); return 0; @@ -1790,6 +1796,9 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + /* a connected or connecting socket can no longer be accepted into */ + allow_fd_caching( sock->fd ); + sock->pending_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); sock->reported_events &= ~(FD_CONNECT | FD_READ | FD_WRITE);

1 0

Rémi Bernon : dinput: Factor out IDirectInputDevice_GetDeviceInfo WtoA conversions.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 27ea33baf9fd23b3ae3690bfa08625343be625e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ea33baf9fd23b3ae3690bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 27 10:50:03 2021 +0200 dinput: Factor out IDirectInputDevice_GetDeviceInfo WtoA conversions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 34 +++++++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick.c | 48 --------------------------------------- dlls/dinput/joystick_linux.c | 26 +-------------------- dlls/dinput/joystick_linuxinput.c | 27 +--------------------- dlls/dinput/joystick_osx.c | 7 +----- dlls/dinput/joystick_private.h | 3 --- dlls/dinput/keyboard.c | 14 +----------- dlls/dinput/mouse.c | 14 +----------- 9 files changed, 40 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27ea33baf9fd23b3ae36…

1 0

Paul Gofman : ntdll/tests: Don't consider zero 'AllFeatures' value in USD broken.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: eefce9dcb9aa270c3ee6933205d20f53de59bdcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=eefce9dcb9aa270c3ee69332… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 27 13:31:57 2021 +0300 ntdll/tests: Don't consider zero 'AllFeatures' value in USD broken. Both variants are observed on different computers with Win10. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 22ee7f06ac7..e657a424fcd 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -957,8 +957,7 @@ static void test_user_shared_data(void) for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i) { - ok(xstate.AllFeatures[i] == feature_sizes[i] - || broken(!xstate.AllFeatures[i]) /* win10 on Testbot VMs */, + ok(xstate.AllFeatures[i] == feature_sizes[i] || !xstate.AllFeatures[i], "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,

1 0

Nikolay Sivov : evr/mixer: Return cloned instances for output type candidates.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: d2714459770d6884b3278decef1ae4bcae9d74a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2714459770d6884b3278dec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 27 15:47:03 2021 +0300 evr/mixer: Return cloned instances for output type candidates. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 ++-- dlls/evr/tests/evr.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index ba4624e0f51..554fb0725e8 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -603,8 +603,8 @@ static HRESULT WINAPI video_mixer_transform_GetOutputAvailableType(IMFTransform hr = MF_E_NO_MORE_TYPES; else { - *type = mixer->output.rt_formats[index].media_type; - IMFMediaType_AddRef(*type); + if (SUCCEEDED(hr = MFCreateMediaType(type))) + hr = IMFMediaType_CopyAllItems(mixer->output.rt_formats[index].media_type, (IMFAttributes *)*type); } LeaveCriticalSection(&mixer->cs); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 2643f6ee92a..dd38a75ca2b 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1045,9 +1045,11 @@ static void test_default_mixer_type_negotiation(void) while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) { UINT64 frame_size; - GUID subtype; + GUID subtype, major; UINT32 value; + hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &major); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size); @@ -1059,6 +1061,15 @@ static void test_default_mixer_type_negotiation(void) } ok(index > 1, "Unexpected number of available types.\n"); + /* Cloned type is returned. */ + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type != media_type2, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type); + IMFMediaType_Release(media_type2); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0