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

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

Oct. 6, 2020

Module: wine Branch: master Commit: 0b8b00216fa269657f06a54803c731966e173829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b8b00216fa269657f06a548… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 14:49:00 2020 +0300 evr/mixer: Keep per-stream output rectangles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 83 +++++++++++++++++++--------- dlls/evr/tests/evr.c | 150 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 190 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b8b00216fa269657f06…

1 0

Hans Leidekker : bcrypt: Add support for importing legacy DSA public keys.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: f79ca651aeff14a7f4e3443410a89441569ea080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f79ca651aeff14a7f4e34434… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 12:27:14 2020 +0200 bcrypt: Add support for importing legacy DSA public keys. This is not supported on native but it will be useful to implement public key import in dssenh. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 28 +++++++++++++++++++++++++ dlls/bcrypt/gnutls.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index bc6ec69918..a91f31e9f0 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1329,6 +1329,34 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP *ret_key = key; return STATUS_SUCCESS; } + else if (!wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB )) /* not supported on native */ + { + BLOBHEADER *hdr = (BLOBHEADER *)input; + DSSPUBKEY *pubkey; + ULONG size; + + if (alg->id != ALG_ID_DSA) return STATUS_NOT_SUPPORTED; + if (input_len < sizeof(*hdr)) return STATUS_INVALID_PARAMETER; + + if (hdr->bType != PUBLICKEYBLOB && hdr->bVersion != 2 && hdr->aiKeyAlg != CALG_DSS_SIGN) + { + FIXME( "blob type %u version %u alg id %u not supported\n", hdr->bType, hdr->bVersion, hdr->aiKeyAlg ); + return STATUS_NOT_SUPPORTED; + } + + if (input_len < sizeof(*hdr) + sizeof(*pubkey)) return STATUS_INVALID_PARAMETER; + pubkey = (DSSPUBKEY *)(hdr + 1); + if (pubkey->magic != MAGIC_DSS1) return STATUS_NOT_SUPPORTED; + + size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); + if (input_len < size) return STATUS_INVALID_PARAMETER; + + if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, (BYTE *)hdr, size ))) return status; + key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; + + *ret_key = key; + return STATUS_SUCCESS; + } FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_SUPPORTED; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 2d80b74aac..94e375cc8c 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1336,6 +1336,54 @@ static NTSTATUS import_gnutls_pubkey_dsa( struct key *key, gnutls_pubkey_t *gnut return STATUS_SUCCESS; } +static NTSTATUS import_gnutls_pubkey_dsa_capi( struct key *key, gnutls_pubkey_t *gnutls_key ) +{ + BLOBHEADER *hdr; + DSSPUBKEY *pubkey; + gnutls_datum_t p, q, g, y; + unsigned char *data, p_data[128], q_data[20], g_data[128], y_data[128]; + int i, ret, size; + + if ((ret = pgnutls_pubkey_init( gnutls_key ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + hdr = (BLOBHEADER *)key->u.a.pubkey; + pubkey = (DSSPUBKEY *)(hdr + 1); + size = pubkey->bitlen / 8; + data = (unsigned char *)(pubkey + 1); + + p.data = p_data; + p.size = size; + for (i = 0; i < p.size; i++) p.data[i] = data[p.size - i - 1]; + data += p.size; + + q.data = q_data; + q.size = sizeof(q_data); + for (i = 0; i < q.size; i++) q.data[i] = data[q.size - i - 1]; + data += q.size; + + g.data = g_data; + g.size = size; + for (i = 0; i < g.size; i++) g.data[i] = data[g.size - i - 1]; + data += g.size; + + y.data = y_data; + y.size = sizeof(y_data); + for (i = 0; i < y.size; i++) y.data[i] = data[y.size - i - 1]; + + if ((ret = pgnutls_pubkey_import_dsa_raw( *gnutls_key, &p, &q, &g, &y ))) + { + pgnutls_perror( ret ); + pgnutls_pubkey_deinit( *gnutls_key ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_key ) { switch (key->alg_id) @@ -1349,7 +1397,10 @@ static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_k return import_gnutls_pubkey_rsa( key, gnutls_key ); case ALG_ID_DSA: - return import_gnutls_pubkey_dsa( key, gnutls_key ); + if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) + return import_gnutls_pubkey_dsa_capi( key, gnutls_key ); + else + return import_gnutls_pubkey_dsa( key, gnutls_key ); default: FIXME("algorithm %u not yet supported\n", key->alg_id );

1 0

Alistair Leslie-Hughes : include: Add more SCARD defines.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: c29f9e6ee7656aa028bb1630284e7d4873bd5b0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c29f9e6ee7656aa028bb1630… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 6 20:36:11 2020 +1100 include: Add more SCARD defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winscard.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/winscard.h b/include/winscard.h index fc729e274c..5aee1b3e54 100644 --- a/include/winscard.h +++ b/include/winscard.h @@ -66,6 +66,24 @@ DECL_WINELIB_TYPE_AW(SCARD_READERSTATE) DECL_WINELIB_TYPE_AW(PSCARD_READERSTATE) DECL_WINELIB_TYPE_AW(LPSCARD_READERSTATE) +#define SCARD_AUTOALLOCATE (DWORD)(-1) + +#define SCARD_SCOPE_USER 0 +#define SCARD_SCOPE_TERMINAL 1 +#define SCARD_SCOPE_SYSTEM 2 + +#define SCARD_STATE_UNAWARE 0x00000000 +#define SCARD_STATE_IGNORE 0x00000001 +#define SCARD_STATE_CHANGED 0x00000002 +#define SCARD_STATE_UNKNOWN 0x00000004 +#define SCARD_STATE_UNAVAILABLE 0x00000008 +#define SCARD_STATE_EMPTY 0x00000010 +#define SCARD_STATE_PRESENT 0x00000020 +#define SCARD_STATE_ATRMATCH 0x00000040 +#define SCARD_STATE_EXCLUSIVE 0x00000080 +#define SCARD_STATE_INUSE 0x00000100 +#define SCARD_STATE_MUTE 0x00000200 +#define SCARD_STATE_UNPOWERED 0x00000400 #ifdef __cplusplus extern "C" {

1 0

Biswapriyo Nath : include: Fix CancelObjectCreation name in IMFSourceResolver interface.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 4aab4355edcc35bb148d0846e55c328fe29e76bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aab4355edcc35bb148d0846… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Oct 3 15:13:33 2020 +0530 include: Fix CancelObjectCreation name in IMFSourceResolver interface. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mfidl.idl b/include/mfidl.idl index d7041eead4..b4aa122781 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -428,7 +428,7 @@ interface IMFSourceResolver : IUnknown [out] IUnknown **object); [call_as(EndCreateObjectFromByteStream)] HRESULT RemoteEndCreateObjectFromByteStream([in] IUnknown *result, [out] MF_OBJECT_TYPE *obj_type, [out] IUnknown **object); - [local] HRESULT CanceObjectCreation([in] IUnknown *cancel_cookie); + [local] HRESULT CancelObjectCreation([in] IUnknown *cancel_cookie); } [

1 0

Andrew Eikum : mmdevapi: Implement ActivateAudioInterfaceAsync.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 2b69540e741b80def8bce7ae01f562c84f390f56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b69540e741b80def8bce7ae… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 6 07:23:26 2020 -0500 mmdevapi: Implement ActivateAudioInterfaceAsync. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/main.c | 165 ++++++++++++++++++++++++++++++++++ dlls/mmdevapi/mmdevapi.spec | 2 + dlls/mmdevapi/tests/mmdevenum.c | 190 ++++++++++++++++++++++++++++++++++++++++ include/mmdeviceapi.idl | 36 ++++++++ 4 files changed, 393 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b69540e741b80def8bc…

1 0

Andrew Eikum : include: Add a few more stream categories.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: d58919968d86cbd3f42012e47a87280fa19a1298 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d58919968d86cbd3f42012e4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 6 07:23:17 2020 -0500 include: Add a few more stream categories. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audiosessiontypes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/audiosessiontypes.h b/include/audiosessiontypes.h index 81c6526575..8138319901 100644 --- a/include/audiosessiontypes.h +++ b/include/audiosessiontypes.h @@ -56,7 +56,11 @@ typedef enum _AUDIO_STREAM_CATEGORY AudioCategory_Alerts, AudioCategory_SoundEffects, AudioCategory_GameEffects, - AudioCategory_GameMedia + AudioCategory_GameMedia, + AudioCategory_GameChat, + AudioCategory_Speech, + AudioCategory_Movie, + AudioCategory_Media, } AUDIO_STREAM_CATEGORY; #endif

1 0

Paul Gofman : server: Check reply size when copying key full name.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 886acfad379b653e4370e8172c5f7fae257b627c URL: https://source.winehq.org/git/wine.git/?a=commit;h=886acfad379b653e4370e817… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 6 15:05:18 2020 +0300 server: Check reply size when copying key full name. Fixes segfault in wineserver during ntdll reg test. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index 3b2d59fc72..a84a747174 100644 --- a/server/registry.c +++ b/server/registry.c @@ -978,7 +978,7 @@ static void enum_key( struct key *key, int index, int info_class, struct enum_ke else if (info_class == KeyNameInformation) { reply->namelen = namelen; - memcpy( data, fullname, namelen ); + memcpy( data, fullname, len ); } else {

1 0

Nikolay Sivov : evr/presenter: Validate passed handle on SetVideoWindow().
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: adc4dd674a28b71586511d466ac505aea86680fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc4dd674a28b71586511d46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 14:48:59 2020 +0300 evr/presenter: Validate passed handle on SetVideoWindow(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 3 +++ dlls/evr/tests/evr.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 9acbead728..15ebcd80ac 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -603,6 +603,9 @@ static HRESULT WINAPI video_presenter_control_SetVideoWindow(IMFVideoDisplayCont TRACE("%p, %p.\n", iface, window); + if (!IsWindow(window)) + return E_INVALIDARG; + EnterCriticalSection(&presenter->cs); presenter->video_window = window; LeaveCriticalSection(&presenter->cs); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 53f1b02724..79020e1ec4 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1073,6 +1073,12 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hwnd2 == NULL, "Unexpected window %p.\n", hwnd2); + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, (HWND)0x1); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/presenter: Return default flags for GetRenderingPrefs().
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 9b1bd73188ca47b718a46718ae8f269f9d0e212d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b1bd73188ca47b718a46718… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 14:48:57 2020 +0300 evr/presenter: Return default flags for GetRenderingPrefs(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 14 ++++++++++++-- dlls/evr/tests/evr.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index eceabfd381..8c455778d7 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -61,6 +61,7 @@ struct video_presenter HWND video_window; MFVideoNormalizedRect src_rect; RECT dst_rect; + DWORD rendering_prefs; unsigned int state; CRITICAL_SECTION cs; }; @@ -658,9 +659,18 @@ static HRESULT WINAPI video_presenter_control_SetRenderingPrefs(IMFVideoDisplayC static HRESULT WINAPI video_presenter_control_GetRenderingPrefs(IMFVideoDisplayControl *iface, DWORD *flags) { - FIXME("%p, %p.\n", iface, flags); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, flags); + + if (!flags) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); + *flags = presenter->rendering_prefs; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_SetFullscreen(IMFVideoDisplayControl *iface, BOOL fullscreen) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index db9546a945..85eedbe664 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -979,6 +979,7 @@ static void test_default_presenter(void) HWND hwnd, hwnd2; HANDLE handle; IUnknown *unk; + DWORD flags; float rate; HRESULT hr; GUID iid; @@ -1016,6 +1017,15 @@ static void test_default_presenter(void) hr = IMFGetService_GetService(gs, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetRenderingPrefs(display_control, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + flags = 123; + hr = IMFVideoDisplayControl_GetRenderingPrefs(display_control, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!flags, "Unexpected rendering flags %#x.\n", flags); + IMFVideoDisplayControl_Release(display_control); hr = IMFGetService_GetService(gs, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm);

1 0

Hans Leidekker : bcrypt: Add support for exporting legacy DSA public keys.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 2a91b0bead7e5c6d08e3a6b79a6feda242e66652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a91b0bead7e5c6d08e3a6b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 12:27:13 2020 +0200 bcrypt: Add support for exporting legacy DSA public keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 4 ++ dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/gnutls.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 5edc9e6c9c..13d6ba8d6c 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -27,6 +27,7 @@ #include "wincrypt.h" #include "bcrypt.h" +#define MAGIC_DSS1 ('D' | ('S' << 8) | ('S' << 16) | ('1' << 24)) #define MAGIC_DSS2 ('D' | ('S' << 8) | ('S' << 16) | ('2' << 24)) typedef struct @@ -164,9 +165,12 @@ struct key_symmetric ULONG secret_len; }; +#define KEY_FLAG_LEGACY_DSA_V2 0x00000001 + struct key_asymmetric { ULONG bitlen; /* ignored for ECC keys */ + ULONG flags; UCHAR *pubkey; ULONG pubkey_len; DSSSEED dss_seed; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 7f8b08869d..bc6ec69918 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -991,7 +991,7 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) || - !wcscmp( type, BCRYPT_ECCPUBLIC_BLOB )) + !wcscmp( type, BCRYPT_ECCPUBLIC_BLOB ) || !wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB )) { *size = key->u.a.pubkey_len; if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index ed632dfd4c..2d80b74aac 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -804,6 +804,89 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_SUCCESS; } +static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, ULONG bitlen, + UCHAR **pubkey, ULONG *pubkey_len ) +{ + BLOBHEADER *hdr; + DSSPUBKEY *dsskey; + gnutls_datum_t p, q, g, y; + UCHAR *dst, *src; + int i, ret, size = sizeof(*hdr) + sizeof(*dsskey) + sizeof(*seed); + + if (bitlen > 1024) + { + FIXME( "bitlen > 1024 not supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + if ((ret = pgnutls_privkey_export_dsa_raw( gnutls_key, &p, &q, &g, &y, NULL ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (!(hdr = RtlAllocateHeap( GetProcessHeap(), 0, size + p.size + q.size + g.size + y.size ))) + { + pgnutls_perror( ret ); + free( p.data ); free( q.data ); free( g.data ); free( y.data ); + return STATUS_NO_MEMORY; + } + + hdr->bType = PUBLICKEYBLOB; + hdr->bVersion = 2; + hdr->reserved = 0; + hdr->aiKeyAlg = CALG_DSS_SIGN; + + dsskey = (DSSPUBKEY *)(hdr + 1); + dsskey->magic = MAGIC_DSS1; + dsskey->bitlen = bitlen; + + dst = (UCHAR *)(dsskey + 1); + if (p.size % 2) + { + src = p.data + 1; + p.size--; + } + else src = p.data; + for (i = 0; i < p.size; i++) dst[i] = src[p.size - i - 1]; + + dst += p.size; + if (q.size % 2) + { + src = q.data + 1; + q.size--; + } + else src = q.data; + for (i = 0; i < q.size; i++) dst[i] = src[q.size - i - 1]; + + dst += q.size; + if (g.size % 2) + { + src = g.data + 1; + g.size--; + } + else src = g.data; + for (i = 0; i < g.size; i++) dst[i] = src[g.size - i - 1]; + + dst += g.size; + if (y.size % 2) + { + src = y.data + 1; + y.size--; + } + else src = y.data; + for (i = 0; i < y.size; i++) dst[i] = src[y.size - i - 1]; + + dst += y.size; + memcpy( dst, seed, sizeof(*seed) ); + + *pubkey = (UCHAR *)hdr; + *pubkey_len = size + p.size + q.size + g.size + y.size; + + free( p.data ); free( q.data ); free( g.data ); free( y.data ); + return STATUS_SUCCESS; +} + static NTSTATUS CDECL key_asymmetric_generate( struct key *key ) { gnutls_pk_algorithm_t pk_alg; @@ -1069,6 +1152,7 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le unsigned char dummy[128]; unsigned char *data, p_data[128], q_data[20], g_data[128], x_data[20]; int i, ret, size; + NTSTATUS status; if ((ret = pgnutls_privkey_init( &handle ))) { @@ -1118,9 +1202,18 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le return STATUS_INTERNAL_ERROR; } + if ((status = export_gnutls_pubkey_dsa_capi( handle, &key->u.a.dss_seed, key->u.a.bitlen, &key->u.a.pubkey, + &key->u.a.pubkey_len ))) + { + pgnutls_privkey_deinit( handle ); + return status; + } + memcpy( &key->u.a.dss_seed, data, sizeof(key->u.a.dss_seed) ); + key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; key_data(key)->privkey = handle; + return STATUS_SUCCESS; }

1 0

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

Oct. 6, 2020

Module: wine Branch: master Commit: b6b32b995ccdec981415fbccb851f1ada2c2da16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b32b995ccdec981415fbcc… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Oct 3 15:13:12 2020 +0530 include: Add IMFMetadata 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 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index b4aa122781..d9e6d07c0c 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -541,6 +541,36 @@ interface IMFPresentationDescriptor : IMFAttributes [out] IMFPresentationDescriptor **descriptor ); } +[ + object, + uuid(f88cfb8c-ef16-4991-b450-cb8c69e51704) +] +interface IMFMetadata : IUnknown +{ + HRESULT SetLanguage( + [in] const WCHAR *lang); + + HRESULT GetLanguage( + [out] WCHAR **lang); + + HRESULT GetAllLanguages( + [out] PROPVARIANT *languages); + + HRESULT SetProperty( + [in] const WCHAR *name, + [in] const PROPVARIANT *values); + + HRESULT GetProperty( + [in] const WCHAR *name, + [out] PROPVARIANT *values); + + HRESULT DeleteProperty( + [in] const WCHAR *name); + + HRESULT GetAllPropertyNames( + [out] PROPVARIANT *names); +} + [ object, uuid(197cd219-19cb-4de1-a64c-acf2edcbe59e),

1 0

Kevin Puetz : vbscript: Implement redim preserve.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 335cfefbb6626d74886cdf4be98fa6642f5aeb66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=335cfefbb6626d74886cdf4b… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Sep 30 10:27:38 2020 -0500 vbscript: Implement redim preserve. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 14 ++++++----- dlls/vbscript/interp.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 56 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 164c2d15cf..2e991b0c0a 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1128,16 +1128,18 @@ static HRESULT compile_redim_statement(compile_ctx_t *ctx, redim_statement_t *st unsigned arg_cnt; HRESULT hres; - if(stat->preserve) { - FIXME("Preserving redim not supported\n"); - return E_NOTIMPL; - } - hres = compile_args(ctx, stat->dims, &arg_cnt); if(FAILED(hres)) return hres; - return push_instr_bstr_uint(ctx, OP_redim, stat->identifier, arg_cnt); + hres = push_instr_bstr_uint(ctx, stat->preserve ? OP_redim_preserve : OP_redim, stat->identifier, arg_cnt); + if(FAILED(hres)) + return hres; + + if(!emit_catch(ctx, 0)) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT compile_const_statement(compile_ctx_t *ctx, const_statement_t *stat) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f050b23c1c..d58e89b7db 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1291,6 +1291,63 @@ static HRESULT interp_redim(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_redim_preserve(exec_ctx_t *ctx) +{ + BSTR identifier = ctx->instr->arg1.bstr; + const unsigned dim_cnt = ctx->instr->arg2.uint; + unsigned i; + SAFEARRAYBOUND *bounds; + SAFEARRAY *array; + ref_t ref; + HRESULT hres; + + TRACE("%s %u\n", debugstr_w(identifier), dim_cnt); + + hres = lookup_identifier(ctx, identifier, VBDISP_LET, &ref); + if(FAILED(hres)) { + FIXME("lookup %s failed: %08x\n", debugstr_w(identifier), hres); + return hres; + } + + if(ref.type != REF_VAR) { + FIXME("got ref.type = %d\n", ref.type); + return E_FAIL; + } + + if(!(V_VT(ref.u.v) & VT_ARRAY)) { + FIXME("ReDim Preserve not valid on type %d\n", V_VT(ref.u.v)); + return E_FAIL; + } + + array = V_ARRAY(ref.u.v); + + hres = array_bounds_from_stack(ctx, dim_cnt, &bounds); + if(FAILED(hres)) + return hres; + + if(array == NULL || array->cDims == 0) { + /* can initially allocate the array */ + array = SafeArrayCreate(VT_VARIANT, dim_cnt, bounds); + VariantClear(ref.u.v); + V_VT(ref.u.v) = VT_ARRAY|VT_VARIANT; + V_ARRAY(ref.u.v) = array; + return S_OK; + } else if(array->cDims != dim_cnt) { + /* can't otherwise change the number of dimensions */ + TRACE("Can't resize %s, cDims %d != %d\n", debugstr_w(identifier), array->cDims, dim_cnt); + return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + } else { + /* can resize the last dimensions (if others match */ + for(i = 0; i+1 < dim_cnt; ++i) { + if(array->rgsabound[array->cDims - 1 - i].cElements != bounds[i].cElements) { + TRACE("Can't resize %s, bound[%d] %d != %d\n", debugstr_w(identifier), i, array->rgsabound[i].cElements, bounds[i].cElements); + return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + } + } + return SafeArrayRedim(array, &bounds[dim_cnt-1]); + } +} + static HRESULT interp_step(exec_ctx_t *ctx) { const BSTR ident = ctx->instr->arg2.bstr; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dc16c50fae..fc762450a3 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1412,6 +1412,28 @@ x = 1 redim x(3) ok ubound(x) = 3, "ubound(x) = " & ubound(x) +x(0) = 1 +x(1) = 2 +x(2) = 3 +x(2) = 4 + +redim preserve x(1) +ok ubound(x) = 1, "ubound(x) = " & ubound(x) +ok x(0) = 1, "x(0) = " & x(1) +ok x(1) = 2, "x(1) = " & x(1) + +redim preserve x(2) +ok ubound(x) = 2, "ubound(x) = " & ubound(x) +ok x(0) = 1, "x(0) = " & x(0) +ok x(1) = 2, "x(1) = " & x(1) +ok x(2) = vbEmpty, "x(2) = " & x(2) + +on error resume next +redim preserve x(2,2) +e = err.number +on error goto 0 +ok e = 9, "e = " & e ' VBSE_OUT_OF_BOUNDS, cannot change cDims + x = Array(1, 2) redim x(-1) ok lbound(x) = 0, "lbound(x) = " & lbound(x) @@ -1422,6 +1444,40 @@ ok ubound(x) = 3, "ubound(x) = " & ubound(x) ok ubound(x, 1) = 3, "ubound(x, 1) = " & ubound(x, 1) ok ubound(x, 2) = 2, "ubound(x, 2) = " & ubound(x, 2) & " expected 2" +redim x(1, 3) +x(0,0) = 1.1 +x(0,1) = 1.2 +x(0,2) = 1.3 +x(0,3) = 1.4 +x(1,0) = 2.1 +x(1,1) = 2.2 +x(1,2) = 2.3 +x(1,3) = 2.4 + +redim preserve x(1,1) +ok ubound(x, 1) = 1, "ubound(x, 1) = " & ubound(x, 1) +ok ubound(x, 2) = 1, "ubound(x, 2) = " & ubound(x, 2) +ok x(0,0) = 1.1, "x(0,0) = " & x(0,0) +ok x(0,1) = 1.2, "x(0,1) = " & x(0,1) +ok x(1,0) = 2.1, "x(1,0) = " & x(1,0) +ok x(1,1) = 2.2, "x(1,1) = " & x(1,1) + +redim preserve x(1,2) +ok ubound(x, 1) = 1, "ubound(x, 1) = " & ubound(x, 1) +ok ubound(x, 2) = 2, "ubound(x, 2) = " & ubound(x, 2) +ok x(0,0) = 1.1, "x(0,0) = " & x(0,0) +ok x(0,1) = 1.2, "x(0,1) = " & x(0,1) +ok x(1,0) = 2.1, "x(1,0) = " & x(1,0) +ok x(1,1) = 2.2, "x(1,1) = " & x(1,1) +ok x(0,2) = vbEmpty, "x(0,2) = " & x(0,2) +ok x(1,2) = vbEmpty, "x(1,2) = " & x(1,1) + +on error resume next +redim preserve x(2,2) +e = err.number +on error goto 0 +ok e = 9, "e = " & e ' VBSE_OUT_OF_BOUNDS, can only change rightmost dimension + dim staticarray(4) on error resume next redim staticarray(3) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1edf7906af..869fb05b6e 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -265,6 +265,7 @@ typedef enum { X(or, 1, 0, 0) \ X(pop, 1, ARG_UINT, 0) \ X(redim, 1, ARG_BSTR, ARG_UINT) \ + X(redim_preserve, 1, ARG_BSTR, ARG_UINT) \ X(ret, 0, 0, 0) \ X(retval, 1, 0, 0) \ X(set_ident, 1, ARG_BSTR, ARG_UINT) \

1 0

Anton Baskanov : amstream: Implement AMDirectDrawStream::BeginFlush and ::EndFlush.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: b9fb8c55c45bea18078a0abe10ae98cd407594e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9fb8c55c45bea18078a0abe… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Oct 6 09:09:48 2020 +0700 amstream: Implement AMDirectDrawStream::BeginFlush and ::EndFlush. 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 | 36 ++++++++++-- dlls/amstream/tests/amstream.c | 128 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 157 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9fb8c55c45bea18078a…

1 0

Hans Leidekker : bcrypt: Convert legacy DSA key parameters to and from little-endian format.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: a729efb964bf193783d4090dcfe9864f877bb424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a729efb964bf193783d4090d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 12:27:12 2020 +0200 bcrypt: Convert legacy DSA key parameters to and from little-endian format. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 54 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index be1a28e472..ed632dfd4c 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1003,7 +1003,7 @@ static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG le DSSPUBKEY *pubkey; gnutls_datum_t p, q, g, y, x; UCHAR *src, *dst; - int ret, size; + int i, ret, size; if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, &x ))) { @@ -1033,24 +1033,24 @@ static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG le pubkey->bitlen = key->u.a.bitlen; dst = (UCHAR *)(pubkey + 1); - if (p.size == size + 1) src = p.data + 1; + if (p.size % 2) src = p.data + 1; else src = p.data; - memcpy( dst, src, size ); + for (i = 0; i < size; i++) dst[i] = src[size - i - 1]; dst += size; - if (q.size == 21) src = q.data + 1; + if (q.size % 2) src = q.data + 1; else src = q.data; - memcpy( dst, src, 20 ); + for (i = 0; i < 20; i++) dst[i] = src[20 - i - 1]; dst += 20; - if (g.size == size + 1) src = g.data + 1; + if (g.size % 2) src = g.data + 1; else src = g.data; - memcpy( dst, src, size ); + for (i = 0; i < size; i++) dst[i] = src[size - i - 1]; dst += size; - if (x.size == 21) src = x.data + 1; + if (x.size % 2) src = x.data + 1; else src = x.data; - memcpy( dst, src, 20 ); + for (i = 0; i < 20; i++) dst[i] = src[20 - i - 1]; dst += 20; memcpy( dst, &key->u.a.dss_seed, sizeof(key->u.a.dss_seed) ); @@ -1067,7 +1067,8 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le gnutls_privkey_t handle; gnutls_datum_t p, q, g, y, x; unsigned char dummy[128]; - int ret, size; + unsigned char *data, p_data[128], q_data[20], g_data[128], x_data[20]; + int i, ret, size; if ((ret = pgnutls_privkey_init( &handle ))) { @@ -1077,16 +1078,33 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le hdr = (BLOBHEADER *)buf; pubkey = (DSSPUBKEY *)(hdr + 1); - size = pubkey->bitlen / 8; + if ((size = pubkey->bitlen / 8) > sizeof(p_data)) + { + FIXME( "size %u not supported\n", size ); + pgnutls_privkey_deinit( handle ); + return STATUS_NOT_SUPPORTED; + } + data = (unsigned char *)(pubkey + 1); - p.data = (unsigned char *)(pubkey + 1); + p.data = p_data; p.size = size; - q.data = p.data + size; - q.size = 20; - g.data = q.data + 20; + for (i = 0; i < p.size; i++) p.data[i] = data[p.size - i - 1]; + data += p.size; + + q.data = q_data; + q.size = sizeof(q_data); + for (i = 0; i < q.size; i++) q.data[i] = data[q.size - i - 1]; + data += q.size; + + g.data = g_data; g.size = size; - x.data = g.data + size; - x.size = 20; + for (i = 0; i < g.size; i++) g.data[i] = data[g.size - i - 1]; + data += g.size; + + x.data = x_data; + x.size = sizeof(x_data); + for (i = 0; i < x.size; i++) x.data[i] = data[x.size - i - 1]; + data += x.size; WARN( "using dummy public key\n" ); memset( dummy, 1, sizeof(dummy) ); @@ -1100,7 +1118,7 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le return STATUS_INTERNAL_ERROR; } - memcpy( &key->u.a.dss_seed, x.data + x.size, sizeof(key->u.a.dss_seed) ); + memcpy( &key->u.a.dss_seed, data, sizeof(key->u.a.dss_seed) ); key_data(key)->privkey = handle; return STATUS_SUCCESS;

1 0

Nikolay Sivov : oleaut32: Do not forward IErrorInfo functions.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 4dff46520720bc6c7e45a838cf6a2bea32b02584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dff46520720bc6c7e45a838… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 10:23:38 2020 +0300 oleaut32: Do not forward IErrorInfo functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49946 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut32.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index cc18a04bef..21b52f1f06 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -194,9 +194,9 @@ 197 stdcall VarDecFromStr(wstr long long ptr) 198 stdcall VarDecFromDisp(ptr long ptr) 199 stdcall VarDecFromBool(long ptr) -200 stdcall GetErrorInfo(long ptr) ole32.GetErrorInfo -201 stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo -202 stdcall CreateErrorInfo(ptr) ole32.CreateErrorInfo +200 stdcall -import GetErrorInfo(long ptr) +201 stdcall -import SetErrorInfo(long ptr) +202 stdcall -import CreateErrorInfo(ptr) 203 stdcall VarDecRound(ptr long ptr) 204 stdcall VarDecCmp(ptr ptr) 205 stdcall VarI2FromI1(long ptr)

1 0