October 2020 - Wine-Commits

Henri Verbeet : vkd3d-compiler: Do not validate the target type if --print-target-types is specified.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: vkd3d Branch: master Commit: e075ec59143b81f48bbb0fab8446acf73a35d9ba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e075ec59143b81f48bbb0fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 18:54:42 2020 +0330 vkd3d-compiler: Do not validate the target type if --print-target-types is specified. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 8b9d7c2..da09ce3 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -474,6 +474,9 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } + if (options->print_target_types) + return true; + if (!validate_target_type(options->source_type, options->target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", @@ -482,9 +485,6 @@ static bool parse_command_line(int argc, char **argv, struct options *options) return false; } - if (options->print_target_types) - return true; - if (optind < argc) options->filename = argv[argc - 1];

1 0

Biswapriyo Nath : include: Add the ID3D12InfoQueue interface.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: vkd3d Branch: master Commit: 1210dac8e122c654f186c5cf0c68f003ac27d80c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1210dac8e122c654f186c5c… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Oct 7 18:54:43 2020 +0330 include: Add the ID3D12InfoQueue interface. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12sdklayers.idl | 943 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 943 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=1210dac8e122c654f18…

1 0

Zebediah Figura : vkd3d-compiler: Use the correct array count in validate_target_type().
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: vkd3d Branch: master Commit: 4eadd917c7cdbbcdf802a3475cdbc05aab7eaf77 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4eadd917c7cdbbcdf802a34… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 5 19:45:23 2020 -0500 vkd3d-compiler: Use the correct array count in validate_target_type(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index da09ce3..7a1a5b0 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -365,7 +365,7 @@ static bool validate_target_type( const enum vkd3d_shader_target_type *supported_types = vkd3d_shader_get_supported_target_types(source_type, &count); - for (i = 0; i < ARRAY_SIZE(target_type_info); ++i) + for (i = 0; i < count; ++i) { if (target_type == supported_types[i]) return true;

1 0

Biswapriyo Nath : include: Add the D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE enumeration.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: vkd3d Branch: master Commit: 55feaae8153d0c893b0395a527e4e265ffa962d6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=55feaae8153d0c893b0395a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Oct 7 18:54:44 2020 +0330 include: Add the D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE enumeration. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12sdklayers.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/vkd3d_d3d12sdklayers.idl b/include/vkd3d_d3d12sdklayers.idl index 31187f7..027eeaa 100644 --- a/include/vkd3d_d3d12sdklayers.idl +++ b/include/vkd3d_d3d12sdklayers.idl @@ -890,6 +890,15 @@ typedef enum D3D12_MESSAGE_ID D3D12_MESSAGE_ID_D3D12_MESSAGES_END } D3D12_MESSAGE_ID; +typedef enum D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE +{ + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_NONE = 0x0, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_STATE_TRACKING_ONLY = 0x1, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_UNGUARDED_VALIDATION = 0x2, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_GUARDED_VALIDATION = 0x3, + NUM_D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODES = 0x4, +} D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE; + typedef struct D3D12_MESSAGE { D3D12_MESSAGE_CATEGORY Category;

1 0

Anton Baskanov : amstream: Implement AMDirectDrawStream::NewSegment.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 6bfa705e3cf9cab2bb5025bc6f218195e79a20aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bfa705e3cf9cab2bb5025bc… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Oct 6 09:09:49 2020 +0700 amstream: Implement AMDirectDrawStream::NewSegment. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 24 +++++++-- dlls/amstream/tests/amstream.c | 120 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index befdd093b0..6ea99d4915 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -58,6 +58,7 @@ struct ddraw_stream AM_MEDIA_TYPE mt; struct format format; FILTER_STATE state; + REFERENCE_TIME segment_start; BOOL eos; BOOL flushing; CONDITION_VARIABLE update_queued_cv; @@ -1192,9 +1193,18 @@ static HRESULT WINAPI ddraw_sink_EndFlush(IPin *iface) static HRESULT WINAPI ddraw_sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - FIXME("iface %p, start %s, stop %s, rate %0.16e, stub!\n", - iface, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate); - return E_NOTIMPL; + struct ddraw_stream *stream = impl_from_IPin(iface); + + TRACE("stream %p, start %s, stop %s, rate %0.16e\n", + stream, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate); + + EnterCriticalSection(&stream->cs); + + stream->segment_start = start; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static const IPinVtbl ddraw_sink_vtbl = @@ -1288,6 +1298,8 @@ static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample * BITMAPINFOHEADER *bitmap_info; REFERENCE_TIME start_time = 0; REFERENCE_TIME end_time = 0; + STREAM_TIME start_stream_time; + STREAM_TIME end_stream_time; BYTE *top_down_pointer; int top_down_stride; BYTE *pointer; @@ -1313,6 +1325,9 @@ static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample * top_down_stride = top_down ? stride : -stride; top_down_pointer = top_down ? pointer : pointer + stride * (bitmap_info->biHeight - 1); + start_stream_time = start_time + stream->segment_start; + end_stream_time = end_time + stream->segment_start; + for (;;) { if (stream->state == State_Stopped) @@ -1329,7 +1344,8 @@ static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample * { struct ddraw_sample *sample = LIST_ENTRY(list_head(&stream->update_queue), struct ddraw_sample, entry); - sample->update_hr = process_update(sample, top_down_stride, top_down_pointer, start_time, end_time); + sample->update_hr = process_update(sample, top_down_stride, top_down_pointer, + start_stream_time, end_stream_time); remove_queued_update(sample); LeaveCriticalSection(&stream->cs); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 88f98a8b19..285dc0f054 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5315,6 +5315,125 @@ static void test_ddrawstream_begin_flush_end_flush(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_new_segment(void) +{ + static const BYTE test_data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawStreamSample *stream_sample; + IDirectDrawMediaStream *ddraw_stream; + IMemInputPin *mem_input_pin; + IMediaSample *media_sample; + IMediaFilter *media_filter; + struct testfilter source; + STREAM_TIME start_time; + STREAM_TIME end_time; + IGraphBuilder *graph; + IMediaStream *stream; + VIDEOINFO video_info; + AM_MEDIA_TYPE mt; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IMemInputPin, (void **)&mem_input_pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaFilter, (void **)&media_filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testfilter_init(&source); + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaFilter_SetSyncSource(media_filter, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.bmiHeader.biWidth = 3; + video_info.bmiHeader.biHeight = 1; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &stream_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_NewSegment(pin, 11111111, 22222222, 1.0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + start_time = 12345678; + end_time = 23456789; + hr = IMediaSample_SetTime(media_sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(mem_input_pin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(media_sample); + + start_time = 0xdeadbeefdeadbeef; + end_time = 0xdeadbeefdeadbeef; + hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 34567900, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + hr = IPin_NewSegment(pin, 11111111, 22222222, 2.0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + start_time = 12345678; + end_time = 23456789; + hr = IMediaSample_SetTime(media_sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(mem_input_pin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(media_sample); + + start_time = 0xdeadbeefdeadbeef; + end_time = 0xdeadbeefdeadbeef; + hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 34567900, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + ref = IDirectDrawStreamSample_Release(stream_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaFilter_Release(media_filter); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IMemInputPin_Release(mem_input_pin); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void check_ammediastream_join_am_multi_media_stream(const CLSID *clsid) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -7838,6 +7957,7 @@ START_TEST(amstream) test_ddrawstream_set_format(); test_ddrawstream_receive(); test_ddrawstream_begin_flush_end_flush(); + test_ddrawstream_new_segment(); test_ddrawstreamsample_get_media_stream(); test_ddrawstreamsample_update();

1 0

Nikolay Sivov : evr/mixer: Keep per-stream zorder configuration.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 9cb5077096b72c2668fdf6d8f7e59179f6bf39a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb5077096b72c2668fdf6d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 14:49:01 2020 +0300 evr/mixer: Keep per-stream zorder configuration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 59 ++++++++++++++++++++++++++--- dlls/evr/tests/evr.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 6 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index da0bcb0a2d..107438b1f1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -42,6 +42,7 @@ struct input_stream IMFAttributes *attributes; IMFVideoMediaType *media_type; MFVideoNormalizedRect rect; + unsigned int zorder; }; struct output_stream @@ -510,6 +511,8 @@ static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, if (SUCCEEDED(hr)) { + unsigned int zorder = mixer->input_count; + for (i = 0; i < count; ++i) { if ((input = bsearch(&ids[i], inputs, len, sizeof(*inputs), video_mixer_compare_input_id))) @@ -518,6 +521,13 @@ static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, memcpy(&mixer->input_ids[mixer->input_count], ids, count * sizeof(*ids)); memcpy(mixer->inputs, inputs, len * sizeof(*inputs)); mixer->input_count += count; + + for (i = 0; i < count; ++i) + { + if (SUCCEEDED(video_mixer_get_input(mixer, ids[i], &input))) + input->zorder = zorder; + zorder++; + } } } LeaveCriticalSection(&mixer->cs); @@ -1016,18 +1026,55 @@ static ULONG WINAPI video_mixer_control_Release(IMFVideoMixerControl2 *iface) return IMFTransform_Release(&mixer->IMFTransform_iface); } -static HRESULT WINAPI video_mixer_control_SetStreamZOrder(IMFVideoMixerControl2 *iface, DWORD stream_id, DWORD zorder) +static HRESULT WINAPI video_mixer_control_SetStreamZOrder(IMFVideoMixerControl2 *iface, DWORD id, DWORD zorder) { - FIXME("%p, %u, %u.\n", iface, stream_id, zorder); + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); + struct input_stream *stream; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %u.\n", iface, id, zorder); + + /* Can't change reference stream. */ + if (!id && zorder) + return E_INVALIDARG; + + EnterCriticalSection(&mixer->cs); + + if (zorder >= mixer->input_count) + hr = E_INVALIDARG; + else if (SUCCEEDED(hr = video_mixer_get_input(mixer, id, &stream))) + { + /* Lowest zorder only applies to reference stream. */ + if (id && !zorder) + hr = MF_E_INVALIDREQUEST; + else + stream->zorder = zorder; + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } -static HRESULT WINAPI video_mixer_control_GetStreamZOrder(IMFVideoMixerControl2 *iface, DWORD stream_id, DWORD *zorder) +static HRESULT WINAPI video_mixer_control_GetStreamZOrder(IMFVideoMixerControl2 *iface, DWORD id, DWORD *zorder) { - FIXME("%p, %u, %p.\n", iface, stream_id, zorder); + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); + struct input_stream *stream; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, id, zorder); + + if (!zorder) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + + if (SUCCEEDED(hr = video_mixer_get_input(mixer, id, &stream))) + *zorder = stream->zorder; + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_control_SetStreamOutputRect(IMFVideoMixerControl2 *iface, DWORD id, diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index fbefe5e02f..70c7053efd 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1669,6 +1669,110 @@ static void test_mixer_output_rectangle(void) IMFTransform_Release(mixer); } +static void test_mixer_zorder(void) +{ + IMFVideoMixerControl *mixer_control; + IMFTransform *mixer; + DWORD ids[2]; + DWORD value; + HRESULT hr; + + hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); + ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + + hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoMixerControl, (void **)&mixer_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 0, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 1, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + value = 1; + hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 0, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!value, "Unexpected value %u.\n", value); + + value = 1; + hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 1, &value); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 0, 1); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 1, 1); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Exceeds maximum stream number. */ + hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 0, 20); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + value = 1; + hr = IMFTransform_AddInputStreams(mixer, 1, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + value = 0; + hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 1, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 1, "Unexpected zorder %u.\n", value); + + hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 1, 0); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 1, 2); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 0, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + value = 2; + hr = IMFTransform_AddInputStreams(mixer, 1, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + value = 0; + hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 2, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 2, "Unexpected zorder %u.\n", value); + + hr = IMFVideoMixerControl_SetStreamZOrder(mixer_control, 2, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + value = 3; + hr = IMFTransform_AddInputStreams(mixer, 1, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + value = 0; + hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 3, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 3, "Unexpected zorder %u.\n", value); + + hr = IMFTransform_DeleteInputStream(mixer, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_DeleteInputStream(mixer, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_DeleteInputStream(mixer, 3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ids[0] = 2; + ids[1] = 1; + hr = IMFTransform_AddInputStreams(mixer, 2, ids); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + value = 0; + hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 1, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 2, "Unexpected zorder %u.\n", value); + + value = 0; + hr = IMFVideoMixerControl_GetStreamZOrder(mixer_control, 2, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 1, "Unexpected zorder %u.\n", value); + + IMFVideoMixerControl_Release(mixer_control); + IMFTransform_Release(mixer); +} + START_TEST(evr) { CoInitialize(NULL); @@ -1689,6 +1793,7 @@ START_TEST(evr) test_presenter_video_position(); test_presenter_native_video_size(); test_mixer_output_rectangle(); + test_mixer_zorder(); CoUninitialize(); }

1 0

Paul Gofman : server: Remove leftover dump in key_get_full_name().
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: a692d49039a584e28fa72689411f1ba71033abb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a692d49039a584e28fa72689… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 6 15:52:49 2020 +0300 server: Remove leftover dump in key_get_full_name(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 1 - 1 file changed, 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index a84a747174..c937e05159 100644 --- a/server/registry.c +++ b/server/registry.c @@ -410,7 +410,6 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) for (key = (struct key *)obj; key != root_key; key = key->parent) { memcpy( ret + len - key->namelen, key->name, key->namelen ); - dump_strW( (WCHAR *)(ret + len - key->namelen), key->namelen, stderr, "" ); len -= key->namelen + sizeof(WCHAR); memcpy( ret + len, &backslash, sizeof(WCHAR) ); }

1 0

Biswapriyo Nath : include: Add IMFMetadataProvider interface in mfidl.idl.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 9bb018b60bee0c5c452f7f68dc55a88749187d7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bb018b60bee0c5c452f7f68… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Oct 3 15:13:39 2020 +0530 include: Add IMFMetadataProvider interface in mfidl.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index d9e6d07c0c..9f2d825bd5 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -571,6 +571,19 @@ interface IMFMetadata : IUnknown [out] PROPVARIANT *names); } +[ + object, + uuid(56181d2d-e221-4adb-b1c8-3cee6a53f76f) +] +interface IMFMetadataProvider : IUnknown +{ + HRESULT GetMFMetadata( + [in] IMFPresentationDescriptor *descriptor, + [in] DWORD identifier, + [in] DWORD flags, + [out] IMFMetadata **metadata); +} + [ object, uuid(197cd219-19cb-4de1-a64c-acf2edcbe59e),

1 0

Nikolay Sivov : evr/presenter: Check for null argument in GetVideoWindow().
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: c01a9bae61618eca9a551108994b374b05e865ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c01a9bae61618eca9a551108… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 14:48:58 2020 +0300 evr/presenter: Check for null argument in GetVideoWindow(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 5 +++++ dlls/evr/tests/evr.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 8c455778d7..9acbead728 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -616,7 +616,12 @@ static HRESULT WINAPI video_presenter_control_GetVideoWindow(IMFVideoDisplayCont TRACE("%p, %p.\n", iface, window); + if (!window) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); *window = presenter->video_window; + LeaveCriticalSection(&presenter->cs); return S_OK; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 85eedbe664..53f1b02724 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1065,6 +1065,9 @@ static void test_default_presenter(void) hwnd = create_window(); ok(!!hwnd, "Failed to create a test window.\n"); + hr = IMFVideoDisplayControl_GetVideoWindow(display_control, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hwnd2 = hwnd; hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Biswapriyo Nath : include: Add MFPMPSESSION_CREATION_FLAGS enumeration in mfidl.idl.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: e997f6a45291895336bb5a818f85e5ae5f04bad1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e997f6a45291895336bb5a81… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Oct 3 15:13:45 2020 +0530 include: Add MFPMPSESSION_CREATION_FLAGS enumeration in mfidl.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 4ceeb707bd..d7041eead4 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -82,6 +82,12 @@ typedef enum MFSESSION_GETFULLTOPOLOGY_FLAGS MFSESSION_GETFULLTOPOLOGY_CURRENT = 0x00000001, } MFSESSION_GETFULLTOPOLOGY_FLAGS; +typedef enum MFPMPSESSION_CREATION_FLAGS +{ + MFPMPSESSION_UNPROTECTED_PROCESS = 0x1, + MFPMPSESSION_IN_PROCESS = 0x2, +} MFPMPSESSION_CREATION_FLAGS; + typedef enum _MF_CONNECT_METHOD { MF_CONNECT_DIRECT = 0x00000000,

1 0