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

Nikolay Sivov : comctl32/tests: Remove skips from DPA tests.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 81727e1953f2ae32573e8e36504413419c4924b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81727e1953f2ae32573e8e36… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 10:41:18 2020 +0300 comctl32/tests: Remove skips from DPA tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/dpa.c | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 2a5eb503d9..cbe3ab7fb2 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -356,12 +356,6 @@ static void test_DPA_Merge(void) DWORD dw; BOOL rc; - if(!pDPA_Merge) - { - win_skip("DPA_Merge() not available\n"); - return; - } - dpa = pDPA_Create(0); dpa2 = pDPA_Create(0); dpa3 = pDPA_Create(0); @@ -485,12 +479,6 @@ static void test_DPA_EnumCallback(void) DWORD dw; INT i, ret; - if(!pDPA_EnumCallback) - { - win_skip("DPA_EnumCallback() not available\n"); - return; - } - dpa = pDPA_Create(0); for (i = 0; i < 6; i++) @@ -517,12 +505,6 @@ static void test_DPA_DestroyCallback(void) HDPA dpa; INT i, ret; - if(!pDPA_DestroyCallback) - { - win_skip("DPA_DestroyCallback() not available\n"); - return; - } - dpa = pDPA_Create(0); for (i = 0; i < 3; i++) @@ -548,18 +530,8 @@ static void test_DPA_LoadStream(void) ULONG written, ret; HDPA dpa; - if(!pDPA_LoadStream) - { - win_skip("DPA_LoadStream() not available. Skipping stream tests.\n"); - return; - } - hRes = CoInitialize(NULL); - if (hRes != S_OK) - { - ok(0, "hResult: %d\n", hRes); - return; - } + ok(hRes == S_OK, "Failed to initialize COM, hr %#x.\n", hRes); dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg); @@ -666,18 +638,8 @@ static void test_DPA_SaveStream(void) BOOL rc; LARGE_INTEGER liZero; - if(!pDPA_SaveStream) - { - win_skip("DPA_SaveStream() not available. Skipping stream tests.\n"); - return; - } - hRes = CoInitialize(NULL); - if (hRes != S_OK) - { - ok(0, "hResult: %d\n", hRes); - return; - } + ok(hRes == S_OK, "Failed to initialize COM, hr %#x.\n", hRes); dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg);

1 0

Nikolay Sivov : ucrtbase: Add wcstold()/_wcstold_l().
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 5abeff59dfc2680cc3e4890f1b5d78c501a37857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5abeff59dfc2680cc3e4890f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 10:18:23 2020 +0300 ucrtbase: Add wcstold()/_wcstold_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- .../api-ms-win-crt-private-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index d662921d02..ab5128e500 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -56,7 +56,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) ucrtbase._wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) ucrtbase._wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) ucrtbase._wcstold_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) ucrtbase._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) ucrtbase._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._wcstombs_s_l @@ -109,7 +109,7 @@ @ cdecl wcstof(ptr ptr) ucrtbase.wcstof @ stub wcstoimax @ cdecl wcstol(wstr ptr long) ucrtbase.wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) ucrtbase.wcstold @ cdecl -ret64 wcstoll(wstr ptr long) ucrtbase.wcstoll @ cdecl wcstombs(ptr ptr long) ucrtbase.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) ucrtbase.wcstombs_s diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 4dd07406db..1a31ac536c 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -799,7 +799,7 @@ @ cdecl -ret64 _o__wcstoi64(wstr ptr long) ucrtbase._o__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) ucrtbase._o__wcstoi64_l @ cdecl _o__wcstol_l(wstr ptr long ptr) ucrtbase._o__wcstol_l -@ stub _o__wcstold_l +@ cdecl _o__wcstold_l(wstr ptr ptr) ucrtbase._o__wcstold_l @ cdecl -ret64 _o__wcstoll_l(wstr ptr long ptr) ucrtbase._o__wcstoll_l @ cdecl _o__wcstombs_l(ptr ptr long ptr) ucrtbase._o__wcstombs_l @ cdecl _o__wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._o__wcstombs_s_l @@ -1163,7 +1163,7 @@ @ cdecl _o_wcstok(wstr wstr ptr) ucrtbase._o_wcstok @ cdecl _o_wcstok_s(ptr wstr ptr) ucrtbase._o_wcstok_s @ cdecl _o_wcstol(wstr ptr long) ucrtbase._o_wcstol -@ stub _o_wcstold +@ cdecl _o_wcstold(wstr ptr ptr) ucrtbase._o_wcstold @ cdecl -ret64 _o_wcstoll(wstr ptr long) ucrtbase._o_wcstoll @ cdecl _o_wcstombs(ptr ptr long) ucrtbase._o_wcstombs @ cdecl _o_wcstombs_s(ptr ptr long wstr long) ucrtbase._o_wcstombs_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4c944a9d21..fda4bb6903 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1893,7 +1893,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -2475,7 +2475,7 @@ @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) MSVCRT_wcstod @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9d292ccef5..d0d5da6306 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1586,7 +1586,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcr120._wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) msvcr120._wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) msvcr120._wcstold_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) msvcr120._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcr120._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcr120._wcstombs_s_l @@ -2137,7 +2137,7 @@ @ cdecl wcstok(wstr wstr) msvcr120.wcstok @ cdecl wcstok_s(ptr wstr ptr) msvcr120.wcstok_s @ cdecl wcstol(wstr ptr long) msvcr120.wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) msvcr120.wcstold @ cdecl -ret64 wcstoll(wstr ptr long) msvcr120.wcstoll @ cdecl wcstombs(ptr ptr long) msvcr120.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcr120.wcstombs_s diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 468d8dbb5a..16409de9f7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1463,7 +1463,7 @@ @ cdecl -ret64 _o__wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _o__wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _o__wcstold_l +@ cdecl _o__wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _o__wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _o__wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _o__wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -1828,7 +1828,7 @@ @ cdecl _o_wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl _o_wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl _o_wcstol(wstr ptr long) MSVCRT_wcstol -@ stub _o_wcstold +@ cdecl _o_wcstold(wstr ptr ptr) MSVCRT_wcstod @ cdecl -ret64 _o_wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl _o_wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl _o_wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @@ -2042,7 +2042,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -2582,7 +2582,7 @@ @ cdecl wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) MSVCRT_wcstod @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s

1 0

Sven Baars : vbscript: Avoid double frees on error path (Coverity).
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: da6a18ecb5e37f0397d69d0f57f23c07050a19cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=da6a18ecb5e37f0397d69d0f… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Oct 4 22:35:31 2020 +0200 vbscript: Avoid double frees on error path (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4b1c23b838..18504a43b9 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2423,7 +2423,6 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, } hres = SafeArrayAccessData(sa, (void**)&data); if(FAILED(hres)) { - SafeArrayDestroy(sa); goto error; } @@ -2440,7 +2439,6 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, hres = VariantCopyInd(data+i, &var); if(FAILED(hres)) { SafeArrayUnaccessData(sa); - SafeArrayDestroy(sa); goto error; } start = indices[i]+delimiterlen; @@ -2452,7 +2450,7 @@ error: V_VT(res) = VT_ARRAY|VT_VARIANT; V_ARRAY(res) = sa; }else { - if (sa) SafeArrayDestroy(sa); + SafeArrayDestroy(sa); } heap_free(indices);

1 0

Martin Storsjo : ntdll: Fix nested exceptions on arm64.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 0a6e46e4367e10caa0b13156d89807c45a5bc3ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a6e46e4367e10caa0b13156… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Oct 6 11:49:43 2020 +0300 ntdll: Fix nested exceptions on arm64. This mirrors ae07938ba661dc0515673835878710a25c99eec8 (from x86_64) to arm64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index cc620eb1b4..c31eb51038 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -315,10 +315,10 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) return ExceptionContinueSearch; + if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + rec->ExceptionFlags |= EH_NESTED_CALL; - /* FIXME */ - return ExceptionNestedException; + return ExceptionContinueSearch; }

1 0

Nikolay Sivov : msxml3/tests: Use wide string literals in tests.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: e5c87396b1c6fe32bbcb6d3129b21adb22621b55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5c87396b1c6fe32bbcb6d31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 10:25:18 2020 +0300 msxml3/tests: Use wide string literals in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 263 ++++++++++++++++----------------------------- 1 file changed, 90 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e5c87396b1c6fe32bbcb…

1 0

Hans Leidekker : bcrypt: Fix buffer size query in BCryptSignHash.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: ab0a7d2a1b31160134d9205236fade162f0bc1dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab0a7d2a1b31160134d92052… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 12:27:10 2020 +0200 bcrypt: Fix buffer size query in BCryptSignHash. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 21520bb4a8..be1a28e472 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1415,9 +1415,9 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat case ALG_ID_RSA: case ALG_ID_RSA_SIGN: { - if (output_len < signature.size) return STATUS_BUFFER_TOO_SMALL; - memcpy( output, signature.data, signature.size ); *ret_len = signature.size; + if (output_len < signature.size) return STATUS_BUFFER_TOO_SMALL; + if (output) memcpy( output, signature.data, signature.size ); return STATUS_SUCCESS; } case ALG_ID_ECDSA_P256: @@ -1435,6 +1435,7 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat return STATUS_INTERNAL_ERROR; } + *ret_len = sig_len; if (output_len < sig_len) return STATUS_BUFFER_TOO_SMALL; if (r.size % 2) /* remove prepended zero byte */ @@ -1457,14 +1458,16 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat return STATUS_INTERNAL_ERROR; } - pad_size_r = (sig_len / 2) - r.size; - pad_size_s = (sig_len / 2) - s.size; - memset( output, 0, sig_len ); + if (output) + { + pad_size_r = (sig_len / 2) - r.size; + pad_size_s = (sig_len / 2) - s.size; + memset( output, 0, sig_len ); - memcpy( output + pad_size_r, r_data, r.size ); - memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); + memcpy( output + pad_size_r, r_data, r.size ); + memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); + } - *ret_len = sig_len; free( r.data ); free( s.data ); return STATUS_SUCCESS; }

1 0

Nikolay Sivov : msvcrt: Correct spec entries for _wcstod_l().
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: d29f424416b32baa66da1bd88cebf58a18973301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d29f424416b32baa66da1bd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 10:18:24 2020 +0300 msvcrt: Correct spec entries for _wcstod_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index ab5128e500..4f8d597fb6 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -50,7 +50,7 @@ @ cdecl _ultoa_s(long ptr long long) ucrtbase._ultoa_s @ cdecl _ultow(long ptr long) ucrtbase._ultow @ cdecl _ultow_s(long ptr long long) ucrtbase._ultow_s -@ cdecl _wcstod_l(wstr ptr long) ucrtbase._wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) ucrtbase._wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) ucrtbase._wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) ucrtbase._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) ucrtbase._wcstoi64_l diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 1a31ac536c..6fcbab0f10 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -794,7 +794,7 @@ @ cdecl _o__wcsnset_s(wstr long long long) ucrtbase._o__wcsnset_s @ cdecl _o__wcsset(wstr long) ucrtbase._o__wcsset @ cdecl _o__wcsset_s(wstr long long) ucrtbase._o__wcsset_s -@ cdecl _o__wcstod_l(wstr ptr long) ucrtbase._o__wcstod_l +@ cdecl _o__wcstod_l(wstr ptr ptr) ucrtbase._o__wcstod_l @ cdecl _o__wcstof_l(wstr ptr ptr) ucrtbase._o__wcstof_l @ cdecl -ret64 _o__wcstoi64(wstr ptr long) ucrtbase._o__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) ucrtbase._o__wcstoi64_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9f8755c6e8..780c86ee71 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1511,7 +1511,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 64205b704c..425bdfdc21 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1869,7 +1869,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index fda4bb6903..368f376939 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1887,7 +1887,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d0d5da6306..54a02bb0a9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1580,7 +1580,7 @@ @ cdecl _wcsrev(wstr) msvcr120._wcsrev @ cdecl _wcsset(wstr long) msvcr120._wcsset @ cdecl _wcsset_s(wstr long long) msvcr120._wcsset_s -@ cdecl _wcstod_l(wstr ptr long) msvcr120._wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) msvcr120._wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) msvcr120._wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) msvcr120._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcr120._wcstoi64_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f83637038b..97e30c5563 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1191,7 +1191,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ba75c3452e..5ea0226b3b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1166,7 +1166,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 204dfe62e5..f6eead8a51 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1120,7 +1120,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 16409de9f7..5f65b97a98 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1458,7 +1458,7 @@ @ cdecl _o__wcsnset_s(wstr long long long) MSVCRT__wcsnset_s @ cdecl _o__wcsset(wstr long) MSVCRT__wcsset @ cdecl _o__wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _o__wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _o__wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl _o__wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _o__wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @@ -2036,7 +2036,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l

1 0

Alexandre Julliard : gdi32: Store the face filename as a DOS path.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: f51fe9ead3f8322a6bba7984b4c0583d78d01c0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51fe9ead3f8322a6bba7984… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 15:12:09 2020 +0200 gdi32: Store the face filename as a DOS path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 138 ++++++++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f51fe9ead3f8322a6bba…

1 0

Martin Storsjo : ntdll: Clear ExceptionFlags on arm64 after running an exception handler.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: b09acd526d0093962131ff900445cc2dae1f33c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b09acd526d0093962131ff90… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Oct 6 11:49:42 2020 +0300 ntdll: Clear ExceptionFlags on arm64 after running an exception handler. This applies the beahviour from a69762541a18107fbd8e9fb8362c3af8ddf1d90b (on x86_64) to arm64 as well. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c9f44e92d3..cc620eb1b4 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -341,6 +341,7 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); + rec->ExceptionFlags &= EH_NONCONTINUABLE; __wine_pop_frame( &frame ); return res; }

1 0

Zebediah Figura : ws2_32/tests: Avoid ok(0, ...) where the condition can be checked directly.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: ecc790ad479958d0c9a5af105463cfc3da3c3126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecc790ad479958d0c9a5af10… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 5 22:22:36 2020 -0500 ws2_32/tests: Avoid ok(0, ...) where the condition can be checked directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 383 ++++++++++++----------------------------------- 1 file changed, 95 insertions(+), 288 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecc790ad479958d0c9a5…

1 0

Zebediah Figura : ws2_32/tests: Link directly to more functions.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 94ea4252cf3fd3613c8fe78b9af3f36609a3d8c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94ea4252cf3fd3613c8fe78b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 5 22:22:35 2020 -0500 ws2_32/tests: Link directly to more functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/Makefile.in | 2 +- dlls/ws2_32/tests/sock.c | 325 +++++++++++++++++------------------------- 2 files changed, 129 insertions(+), 198 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94ea4252cf3fd3613c8f…

1 0

Zebediah Figura : ws2_32/tests: Make the tests less verbose by default.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: ee38e167d1280777c92c757f60d1609bca9e105a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee38e167d1280777c92c757f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 5 22:22:34 2020 -0500 ws2_32/tests: Make the tests less verbose by default. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 124 +++++++++-------------------------------------- 1 file changed, 24 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee38e167d1280777c92c…

1 0

Zebediah Figura : ws2_32/tests: Avoid using skip() or trace() for tests that should not fail.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: f65340704f72d44ba64a6c7b430ca73076456086 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65340704f72d44ba64a6c7b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 5 22:22:33 2020 -0500 ws2_32/tests: Avoid using skip() or trace() for tests that should not fail. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 805 +++++++++-------------------------------------- 1 file changed, 154 insertions(+), 651 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f65340704f72d44ba64a…

1 0

Michael Stefaniuc : vbscript/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 4ca80c2f9e439a1e7a515398170920609184e70d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ca80c2f9e439a1e7a515398… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:26 2020 +0200 vbscript/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/createobj.c | 4 +--- dlls/vbscript/tests/run.c | 28 +++++++++------------------- dlls/vbscript/tests/vbscript.c | 5 +---- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 34a9def89d..c0a653fb1e 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -88,8 +88,6 @@ DEFINE_EXPECT(Caller_QS_SecMgr); DEFINE_EXPECT(QI_IObjectWithSite); DEFINE_EXPECT(SetSite); -static const WCHAR testW[] = {'t','e','s','t',0}; - static HRESULT QS_SecMgr_hres; static HRESULT ProcessUrlAction_hres; static DWORD ProcessUrlAction_policy; @@ -753,7 +751,7 @@ static IActiveScriptParse *create_script(BOOL use_sec_mgr) hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(script, testW, + hres = IActiveScript_AddNamedItem(script, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6dcd13bf75..bb33e6576e 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -155,9 +155,6 @@ DEFINE_EXPECT(OnLeaveScript); #define FACILITY_VBS 0xa #define MAKE_VBSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_VBS, code) -static const WCHAR testW[] = {'t','e','s','t',0}; -static const WCHAR emptyW[] = {0}; - static BOOL strict_dispid_check, is_english, allow_ui; static int first_day_of_week; static const char *test_name = "(null)"; @@ -1957,7 +1954,7 @@ static IActiveScript *create_and_init_script(DWORD flags, BOOL start) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|flags); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -2046,9 +2043,6 @@ static void test_parse_context(void) BSTR str; HRESULT hres; - static const WCHAR xW[] = {'x',0}; - static const WCHAR yW[] = {'y',0}; - global_ref = 1; engine = create_and_init_script(0, TRUE); if(!engine) @@ -2063,7 +2057,7 @@ static void test_parse_context(void) /* unknown identifier context is not a valid argument */ str = a2bstr("Call reportSuccess()\n"); - hres = IActiveScriptParse_ParseScriptText(parser, str, yW, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"y", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == E_INVALIDARG, "ParseScriptText failed: %08x\n", hres); SysFreeString(str); @@ -2080,14 +2074,14 @@ static void test_parse_context(void) /* known global variable is not a valid context */ str = a2bstr("Call reportSuccess()\n"); - hres = IActiveScriptParse_ParseScriptText(parser, str, xW, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"x", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == E_INVALIDARG, "ParseScriptText failed: %08x\n", hres); SysFreeString(str); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); str = a2bstr("Call reportSuccess()\n"); - hres = IActiveScriptParse_ParseScriptText(parser, str, testW, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"test", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); SysFreeString(str); CHECK_CALLED(global_success_d); @@ -2109,10 +2103,8 @@ static void _parse_htmlscript_a(unsigned line, const char *src) BSTR tmp; HRESULT hres; - static const WCHAR script_delimW[] = {'<','/','S','C','R','I','P','T','>',0}; - tmp = a2bstr(src); - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, script_delimW); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, L"</SCRIPT>"); SysFreeString(tmp); ok_(__FILE__,line)(hres == S_OK, "parse_script failed: %08x\n", hres); } @@ -2124,10 +2116,8 @@ static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, co BSTR str; HRESULT hres; - static const WCHAR delimiterW[] = {'\"',0}; - str = a2bstr(src); - hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, str, NULL, emptyW, NULL, NULL, delimiterW, 0, 0, + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, str, NULL, L"", NULL, NULL, L"\"", 0, 0, SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS|flags, &disp); SysFreeString(str); ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); @@ -2158,7 +2148,7 @@ static void test_procedures(void) hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); - hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, NULL, NULL, emptyW, NULL, NULL, NULL, 0, 0, 0, &disp); + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, NULL, NULL, L"", NULL, NULL, NULL, 0, 0, 0, &disp); ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); IDispatch_Release(disp); @@ -2385,7 +2375,7 @@ static void test_gc(void) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -2643,7 +2633,7 @@ static HRESULT test_global_vars_ref(BOOL use_close) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 04e7545da2..8e6f0995c5 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1500,9 +1500,6 @@ static void test_vbscript_uninitializing(void) ULONG ref; HRESULT hres; - static const WCHAR script_textW[] = - {'F','u','n','c','t','i','o','n',' ','f','\n','E','n','d',' ','F','u','n','c','t','i','o','n','\n',0}; - script = create_vbscript(); hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parse); @@ -1529,7 +1526,7 @@ static void test_vbscript_uninitializing(void) test_state(script, SCRIPTSTATE_INITIALIZED); - hres = IActiveScriptParse_ParseScriptText(parse, script_textW, NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parse, L"Function f\nEnd Function\n", NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite);

1 0

Alexandre Julliard : gdi32: Store face data as a single binary value in the registry cache.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: b6c099cda6c7d7694956758ec121562e781c97fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c099cda6c7d7694956758e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 19:58:11 2020 +0200 gdi32: Store face data as a single binary value in the registry cache. This is faster than a bunch of separate string values. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 260 ++++++++++++++++++++------------------------------ 1 file changed, 102 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6c099cda6c7d7694956…

1 0

Alexandre Julliard : gdi32: Compare DOS filenames instead of Unix stat information for font files.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 14395c85354ca90f2f37b1ed3ac6d2077e3d1f0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=14395c85354ca90f2f37b1ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 15:40:25 2020 +0200 gdi32: Compare DOS filenames instead of Unix stat information for font files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 64 ++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cb23173915..23edd1b0c3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -272,8 +272,6 @@ typedef struct tagFace { WCHAR *style_name; WCHAR *full_name; WCHAR *file; - dev_t dev; - ino_t ino; void *font_data_ptr; DWORD font_data_size; FT_Long face_index; @@ -1573,7 +1571,7 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) debugstr_w(face->full_name), debugstr_w(family->family_name), cursor->font_version, face->font_version ); - if (face->file && face->dev == cursor->dev && face->ino == cursor->ino) + if (face->file && !strcmpiW( face->file, cursor->file )) { cursor->refcount++; TRACE("Font %s already in list, refcount now %d\n", @@ -2100,10 +2098,9 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } } -static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_name, const char *unix_name, +static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *filename, void *font_data_ptr, DWORD font_data_size, DWORD flags ) { - struct stat st; Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); face->refcount = 1; @@ -2111,18 +2108,11 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_ face->full_name = ft_face_get_full_name( ft_face, GetSystemDefaultLangID() ); if (flags & ADDFONT_VERTICAL_FONT) face->full_name = get_vertical_name( face->full_name ); - face->dev = 0; - face->ino = 0; - if (unix_name) + if (filename) { - face->file = dos_name ? strdupW( dos_name ) : wine_get_dos_file_name( unix_name ); + face->file = strdupW( filename ); face->font_data_ptr = NULL; face->font_data_size = 0; - if (!stat( unix_name, &st )) - { - face->dev = st.st_dev; - face->ino = st.st_ino; - } } else { @@ -2160,13 +2150,13 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_ return face; } -static void AddFaceToList(FT_Face ft_face, const WCHAR *dos_name, const char *unix_name, - void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags ) +static void AddFaceToList(FT_Face ft_face, const WCHAR *file, void *font_data_ptr, DWORD font_data_size, + FT_Long face_index, DWORD flags ) { Face *face; Family *family; - face = create_face( ft_face, face_index, dos_name, unix_name, font_data_ptr, font_data_size, flags ); + face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags ); family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (insert_face_in_family_list( face, family )) @@ -2261,6 +2251,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon FT_Face ft_face; FT_Long face_index = 0, num_faces; INT ret = 0; + WCHAR *filename = NULL; /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */ assert(unix_name || !(flags & ADDFONT_EXTERNAL_FONT)); @@ -2286,26 +2277,28 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon } #endif /* HAVE_CARBON_CARBON_H */ + if (!dos_name && unix_name) dos_name = filename = wine_get_dos_file_name( unix_name ); + do { FONTSIGNATURE fs; ft_face = new_ft_face( unix_name, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); - if (!ft_face) return 0; + if (!ft_face) break; if(ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ { TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); pFT_Done_Face(ft_face); - return 0; + break; } - AddFaceToList(ft_face, dos_name, unix_name, font_data_ptr, font_data_size, face_index, flags); + AddFaceToList(ft_face, dos_name, font_data_ptr, font_data_size, face_index, flags); ++ret; get_fontsig(ft_face, &fs); if (fs.fsCsb[0] & FS_DBCS_MASK) { - AddFaceToList(ft_face, dos_name, unix_name, font_data_ptr, font_data_size, face_index, + AddFaceToList(ft_face, dos_name, font_data_ptr, font_data_size, face_index, flags | ADDFONT_VERTICAL_FONT); ++ret; } @@ -2313,6 +2306,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon num_faces = ft_face->num_faces; pFT_Done_Face(ft_face); } while(num_faces > ++face_index); + HeapFree( GetProcessHeap(), 0, filename ); return ret; } @@ -2333,12 +2327,8 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) { Family *family, *family_next; Face *face, *face_next; - struct stat st; int count = 0; - char *unixname; - if (!(unixname = wine_get_unix_file_name( file ))) return 0; - if (stat( unixname, &st ) == -1) goto done; LIST_FOR_EACH_ENTRY_SAFE( family, family_next, &font_list, Family, entry ) { family->refcount++; @@ -2346,7 +2336,7 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) { if (!face->file) continue; if (LOWORD(face->flags) != LOWORD(flags)) continue; - if (st.st_dev == face->dev && st.st_ino == face->ino) + if (!strcmpiW( face->file, file )) { TRACE( "removing matching face %s refcount %d\n", debugstr_w(face->file), face->refcount ); release_face( face ); @@ -2355,8 +2345,6 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) } release_family( family ); } -done: - HeapFree( GetProcessHeap(), 0, unixname ); return count; } @@ -3500,19 +3488,17 @@ static BOOL get_fontdir( const WCHAR *dos_name, struct fontdir *fd ) if (!(unix_name = wine_get_unix_file_name( dos_name ))) return FALSE; ft_face = new_ft_face( unix_name, NULL, 0, 0, FALSE ); - if (ft_face) + HeapFree( GetProcessHeap(), 0, unix_name ); + if (!ft_face) return FALSE; + face = create_face( ft_face, 0, dos_name, NULL, 0, 0 ); + if (face) { - face = create_face( ft_face, 0, dos_name, unix_name, NULL, 0, 0 ); - if (face) - { - family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); - GetEnumStructs( face, family_name, &elf, &ntm, &type ); - release_face( face ); - HeapFree( GetProcessHeap(), 0, family_name ); - } - pFT_Done_Face( ft_face ); + family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); + GetEnumStructs( face, family_name, &elf, &ntm, &type ); + release_face( face ); + HeapFree( GetProcessHeap(), 0, family_name ); } - HeapFree( GetProcessHeap(), 0, unix_name ); + pFT_Done_Face( ft_face ); if (!face) return FALSE; if ((type & TRUETYPE_FONTTYPE) == 0) return FALSE;

1 0

Hans Leidekker : bcrypt: Fix buffer size query in BCryptExportKey.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 7d54f9a87f337276fb5c328872951e485cdc37af URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d54f9a87f337276fb5c3288… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 12:27:11 2020 +0200 bcrypt: Fix buffer size query in BCryptExportKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 16c68ed691..7f8b08869d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -968,11 +968,13 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U *size = req_size; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; - - header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; - header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; - header->cbKeyData = key->u.s.secret_len; - memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); + if (output) + { + header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; + header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; + header->cbKeyData = key->u.s.secret_len; + memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); + } return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_OPAQUE_KEY_BLOB )) @@ -981,9 +983,11 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U *size = req_size; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; - - *(ULONG *)output = key->u.s.secret_len; - memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + if (output) + { + *(ULONG *)output = key->u.s.secret_len; + memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + } return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) || @@ -991,8 +995,7 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U { *size = key->u.a.pubkey_len; if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; - - memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); + if (output) memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB ))

1 0

Michael Stefaniuc : schtasks: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 26be243d1668dbf47a42bb670e16f323a2ffd4a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26be243d1668dbf47a42bb67… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:54 2020 +0200 schtasks: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 2ffc241153..79f2555522 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -25,16 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(schtasks); -static const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; -static const WCHAR create_optW[] = {'/','c','r','e','a','t','e',0}; -static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; -static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; -static const WCHAR f_optW[] = {'/','f',0}; -static const WCHAR ru_optW[] = {'/','r','u',0}; -static const WCHAR tn_optW[] = {'/','t','n',0}; -static const WCHAR tr_optW[] = {'/','t','r',0}; -static const WCHAR xml_optW[] = {'/','x','m','l',0}; - static ITaskFolder *get_tasks_root_folder(void) { ITaskService *service; @@ -140,7 +130,7 @@ static int change_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if(!wcsicmp(argv[0], tn_optW)) { + if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -154,12 +144,12 @@ static int change_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; - }else if (!wcsicmp(argv[0], enable_optW)) { + } else if (!wcsicmp(argv[0], L"/enable")) { enable = TRUE; have_option = TRUE; argc--; argv++; - }else if (!wcsicmp(argv[0], tr_optW)) { + } else if (!wcsicmp(argv[0], L"/tr")) { if (argc < 2) { FIXME("Missing /tr value\n"); return 1; @@ -213,7 +203,7 @@ static int create_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if (!wcsicmp(argv[0], xml_optW)) { + if (!wcsicmp(argv[0], L"/xml")) { if (argc < 2) { FIXME("Missing /xml value\n"); return 1; @@ -227,7 +217,7 @@ static int create_command(int argc, WCHAR *argv[]) xml_file = argv[1]; argc -= 2; argv += 2; - }else if(!wcsicmp(argv[0], tn_optW)) { + } else if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -241,11 +231,11 @@ static int create_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; - }else if(!wcsicmp(argv[0], f_optW)) { + } else if (!wcsicmp(argv[0], L"/f")) { flags = TASK_CREATE_OR_UPDATE; argc--; argv++; - }else if (!wcsicmp(argv[0], ru_optW)) { + } else if (!wcsicmp(argv[0], L"/ru")) { if (argc < 2) { FIXME("Missing /ru value\n"); return 1; @@ -302,11 +292,11 @@ static int delete_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if (!wcsicmp(argv[0], f_optW)) { + if (!wcsicmp(argv[0], L"/f")) { TRACE("force opt\n"); argc--; argv++; - }else if(!wcsicmp(argv[0], tn_optW)) { + } else if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -357,11 +347,11 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (argc < 2) FIXME("Print current tasks state\n"); - else if (!wcsicmp(argv[1], change_optW)) + else if (!wcsicmp(argv[1], L"/change")) ret = change_command(argc - 2, argv + 2); - else if (!wcsicmp(argv[1], create_optW)) + else if (!wcsicmp(argv[1], L"/create")) ret = create_command(argc - 2, argv + 2); - else if (!wcsicmp(argv[1], delete_optW)) + else if (!wcsicmp(argv[1], L"/delete")) ret = delete_command(argc - 2, argv + 2); else FIXME("Unsupported command %s\n", debugstr_w(argv[1]));

1 0

Michael Stefaniuc : control: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 80912728f1fdd95d03a7c57bede85ab9e94edebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=80912728f1fdd95d03a7c57b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:49 2020 +0200 control: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/control/control.c | 52 ++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/programs/control/control.c b/programs/control/control.c index 9f9005f748..b72416893c 100644 --- a/programs/control/control.c +++ b/programs/control/control.c @@ -26,26 +26,6 @@ #include <windows.h> #include <shellapi.h> -/* alphabetical list of recognized optional command line parameters */ -static const WCHAR szP_COLOR[] = {'C','O','L','O','R',0}; -static const WCHAR szP_DATETIME[] = {'D','A','T','E','/','T','I','M','E',0}; -static const WCHAR szP_DESKTOP[] = {'D','E','S','K','T','O','P',0}; -static const WCHAR szP_INTERNATIONAL[] = {'I','N','T','E','R','N','A','T','I','O','N','A','L',0}; -static const WCHAR szP_KEYBOARD[] = {'K','E','Y','B','O','A','R','D',0}; -static const WCHAR szP_MOUSE[] = {'M','O','U','S','E',0}; -static const WCHAR szP_PORTS[] = {'P','O','R','T','S',0}; -static const WCHAR szP_PRINTERS [] = {'P','R','I','N','T','E','R','S',0}; - -/* alphabetical list of appropriate commands to execute */ -static const WCHAR szC_COLOR[] = {'d','e','s','k','.','c','p','l',',',',','2',0}; -static const WCHAR szC_DATETIME[] = {'t','i','m','e','d','a','t','e','.','c','p','l',0}; -static const WCHAR szC_DESKTOP[] = {'d','e','s','k','.','c','p','l',0}; -static const WCHAR szC_INTERNATIONAL[] = {'i','n','t','l','.','c','p','l',0}; -static const WCHAR szC_KEYBOARD[] = {'m','a','i','n','.','c','p','l',' ','@','1',0}; -static const WCHAR szC_MOUSE[] = {'m','a','i','n','.','c','p','l',0}; -static const WCHAR szC_PORTS[] = {'s','y','s','d','m','.','c','p','l',',',',','1',0}; -static const WCHAR szC_PRINTERS[] = {'m','a','i','n','.','c','p','l',' ','@','2',0}; - extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); @@ -63,22 +43,22 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpszCmdLine, INT nC } /* check for optional parameter */ - if (!lstrcmpiW(lpszCmdLine,szP_COLOR)) - launch(szC_COLOR); - if (!lstrcmpiW(lpszCmdLine,szP_DATETIME)) - launch(szC_DATETIME); - if (!lstrcmpiW(lpszCmdLine,szP_DESKTOP)) - launch(szC_DESKTOP); - if (!lstrcmpiW(lpszCmdLine,szP_INTERNATIONAL)) - launch(szC_INTERNATIONAL); - if (!lstrcmpiW(lpszCmdLine,szP_KEYBOARD)) - launch(szC_KEYBOARD); - if (!lstrcmpiW(lpszCmdLine,szP_MOUSE)) - launch(szC_MOUSE); - if (!lstrcmpiW(lpszCmdLine,szP_PORTS)) - launch(szC_PORTS); - if (!lstrcmpiW(lpszCmdLine,szP_PRINTERS)) - launch(szC_PRINTERS); + if (!lstrcmpiW(lpszCmdLine, L"COLOR")) + launch(L"desk.cpl,,2"); + if (!lstrcmpiW(lpszCmdLine, L"DATE/TIME")) + launch(L"timedate.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"DESKTOP")) + launch(L"desk.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"INTERNATIONAL")) + launch(L"intl.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"KEYBOARD")) + launch(L"main.cpl @1"); + if (!lstrcmpiW(lpszCmdLine, L"MOUSE")) + launch(L"main.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"PORTS")) + launch(L"sysdm.cpl,,1"); + if (!lstrcmpiW(lpszCmdLine, L"PRINTERS")) + launch(L"main.cpl @2"); /* try to launch if a .cpl file is given directly */ launch(lpszCmdLine);

1 0

Michael Stefaniuc : clock: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 53e04ef328290bf3584c38e78dd4a229a949b147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e04ef328290bf3584c38e7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:48 2020 +0200 clock: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/clock/main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/programs/clock/main.c b/programs/clock/main.c index 3ad636be43..43364745ea 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -104,10 +104,9 @@ static BOOL CLOCK_ResetTimer(void) period = 1000; if (!SetTimer (Globals.hMainWnd, TIMER_ID, period, NULL)) { - static const WCHAR notimersW[] = {'N','o',' ','a','v','a','i','l','a','b','l','e',' ','t','i','m','e','r','s',0}; WCHAR szApp[MAX_STRING_LEN]; LoadStringW(Globals.hInstance, IDS_CLOCK, szApp, MAX_STRING_LEN); - MessageBoxW(0, notimersW, szApp, MB_ICONEXCLAMATION | MB_OK); + MessageBoxW(0, L"No available timers", szApp, MB_ICONEXCLAMATION | MB_OK); return FALSE; } return TRUE; @@ -390,9 +389,6 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show MSG msg; WNDCLASSW class; - static const WCHAR szClassName[] = {'C','L','C','l','a','s','s',0}; - static const WCHAR szWinName[] = {'C','l','o','c','k',0}; - /* Setup Globals */ memset(&Globals.hFont, 0, sizeof (Globals.hFont)); Globals.bAnalog = TRUE; @@ -408,13 +404,13 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = 0; class.lpszMenuName = 0; - class.lpszClassName = szClassName; + class.lpszClassName = L"CLClass"; } - + if (!RegisterClassW(&class)) return FALSE; - + Globals.MaxX = Globals.MaxY = INITIAL_WINDOW_SIZE; - Globals.hMainWnd = CreateWindowW(szClassName, szWinName, WS_OVERLAPPEDWINDOW, + Globals.hMainWnd = CreateWindowW(L"CLClass", L"Clock", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, Globals.MaxX, Globals.MaxY, 0, 0, hInstance, 0);

1 0

Michael Stefaniuc : hostname: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 0df592b7d5121862231b8224175f59bed160c5f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0df592b7d5121862231b8224… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:52 2020 +0200 hostname: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/hostname/hostname.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index 0738e718e1..e6c2ed76cd 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -91,18 +91,15 @@ static int WINAPIV hostname_message_printfW(int msg, ...) static int hostname_message(int msg) { - static const WCHAR formatW[] = {'%','s',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - return hostname_printfW(formatW, msg_buffer); + return hostname_printfW(L"%s", msg_buffer); } static int display_computer_name(void) { - static const WCHAR fmtW[] = {'%','s','\r','\n',0}; - WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD size = ARRAY_SIZE(name); BOOL ret; @@ -114,7 +111,7 @@ static int display_computer_name(void) return 1; } - hostname_printfW(fmtW, name); + hostname_printfW(L"%s\r\n", name); return 0; } @@ -122,11 +119,9 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { if (argc > 1) { - static const WCHAR slashHelpW[] = {'/','?',0}; - unsigned int i; - if (!wcsncmp(argv[1], slashHelpW, ARRAY_SIZE(slashHelpW) - 1)) + if (!wcsncmp(argv[1], L"/?", ARRAY_SIZE(L"/?") - 1)) { hostname_message(STRING_USAGE); return 1;

1 0

Michael Stefaniuc : net: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: e14b2d486d833875fe0142129eaa878a5f413e08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e14b2d486d833875fe014212… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:53 2020 +0200 net: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/net/net.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 0f43e8a973..dbc4bf2bfc 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -155,7 +155,6 @@ static BOOL net_use(int argc, const WCHAR* argv[]) static BOOL net_enum_services(void) { - static const WCHAR runningW[]={' ',' ',' ',' ','%','1','\n',0}; SC_HANDLE SCManager; LPENUM_SERVICE_STATUS_PROCESSW services; DWORD size, i, count, resume; @@ -184,7 +183,7 @@ static BOOL net_enum_services(void) output_string(STRING_RUNNING_HEADER); for(i = 0; i < count; i++) { - output_printf(runningW, services[i].lpDisplayName); + output_printf(L" %1\n", services[i].lpDisplayName); WINE_TRACE("service=%s state=%d controls=%x\n", wine_dbgstr_w(services[i].lpServiceName), services[i].ServiceStatusProcess.dwCurrentState, @@ -295,19 +294,13 @@ static BOOL arg_is(const WCHAR* str1, const WCHAR* str2) int __cdecl wmain(int argc, const WCHAR* argv[]) { - static const WCHAR helpW[]={'h','e','l','p',0}; - static const WCHAR shelpW[]={'/','h','e','l','p',0}; - static const WCHAR startW[]={'s','t','a','r','t',0}; - static const WCHAR stopW[]={'s','t','o','p',0}; - static const WCHAR useW[]={'u','s','e',0}; - if (argc < 2) { output_string(STRING_USAGE); return 1; } - if(arg_is(argv[1], helpW)) + if(arg_is(argv[1], L"help")) { if(argc > 3) { @@ -316,14 +309,14 @@ int __cdecl wmain(int argc, const WCHAR* argv[]) } if(argc == 2) output_string(STRING_USAGE); - else if(arg_is(argv[2], startW)) + else if(arg_is(argv[2], L"start")) output_string(STRING_START_USAGE); - else if(arg_is(argv[2], stopW)) + else if(arg_is(argv[2], L"stop")) output_string(STRING_STOP_USAGE); else output_string(STRING_USAGE); } - else if(arg_is(argv[1], startW)) + else if(arg_is(argv[1], L"start")) { if(argc > 3) { @@ -335,24 +328,24 @@ int __cdecl wmain(int argc, const WCHAR* argv[]) if (!net_enum_services()) return 1; } - else if(arg_is(argv[2], shelpW)) + else if(arg_is(argv[2], L"/help")) output_string(STRING_START_USAGE); else if(!net_service(NET_START, argv[2])) return 1; } - else if(arg_is(argv[1], stopW)) + else if(arg_is(argv[1], L"stop")) { if(argc != 3) { output_string(STRING_STOP_USAGE); return 1; } - if(arg_is(argv[2], shelpW)) + if(arg_is(argv[2], L"/help")) output_string(STRING_STOP_USAGE); else if(!net_service(NET_STOP, argv[2])) return 1; } - else if(arg_is(argv[1], useW)) + else if(arg_is(argv[1], L"use")) { if(!net_use(argc, argv)) return 1; }

1 0

Michael Stefaniuc : conhost: Correct whitespace placement in a TRACE().
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 8bfdc84a1994274e5d7ee44c4ee3892666f4cdc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bfdc84a1994274e5d7ee44c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:44 2020 +0200 conhost: Correct whitespace placement in a TRACE(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index ac0e22b4c4..a54238c80f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2477,7 +2477,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_PEEK: { void *result; - TRACE( "peek\n "); + TRACE( "peek\n" ); if (in_size) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); *out_size = min( *out_size, console->record_count * sizeof(INPUT_RECORD) );

1 0

Michael Stefaniuc : packager: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: cc8adf7db1838b2f841b069217b0d925dbbbb324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc8adf7db1838b2f841b0692… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:45 2020 +0200 packager: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/packager/packager_main.c | 11 +++-------- dlls/packager/tests/oleobj.c | 8 ++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 0a0790e903..de07e5ca26 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -181,8 +181,7 @@ static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwRese static HRESULT do_activate_object(struct Package *This, HWND parent) { - static const WCHAR openW[] = {'o','p','e','n',0}; - ShellExecuteW(parent, openW, This->filename, NULL, NULL, SW_SHOW); + ShellExecuteW(parent, L"open", This->filename, NULL, NULL, SW_SHOW); return S_OK; } @@ -396,11 +395,9 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, WCHAR *stream_filename; WCHAR *base_end, extension[MAX_PATH]; - static const WCHAR ole10nativeW[] = {0x0001,'O','l','e','1','0','N','a','t','i','v','e',0}; - TRACE("(%p)->(%p)\n", This, pStg); - hr = IStorage_OpenStream(pStg, ole10nativeW, NULL, + hr = IStorage_OpenStream(pStg, L"\1Ole10Native", NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); if(FAILED(hr)){ TRACE("OpenStream gave: %08x\n", hr); @@ -489,8 +486,6 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, file = CreateFileW(This->filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); while(file == INVALID_HANDLE_VALUE){ - static const WCHAR fmtW[] = {' ','(','%','u',')',0}; - if(GetLastError() != ERROR_FILE_EXISTS){ WARN("CreateFile failed: %u\n", GetLastError()); hr = E_FAIL; @@ -499,7 +494,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, /* file exists, so increment file name and try again */ ++i; - wsprintfW(base_end, fmtW, i); + wsprintfW(base_end, L" (%u)", i); lstrcatW(base_end, extension); file = CreateFileW(This->filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 1ce54eda7e..6287558493 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -210,9 +210,7 @@ static HRESULT WINAPI stg_CreateStream(IStorage* This, LPCOLESTR pwcsName, static HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm) { - static const WCHAR ole10NativeW[] = {1,'O','l','e','1','0','N','a','t','i','v','e',0}; - - if(lstrcmpW(pwcsName, ole10NativeW)) + if(lstrcmpW(pwcsName, L"\1Ole10Native")) return STG_E_FILENOTFOUND; *ppstm = &ole10native_stream; @@ -417,8 +415,6 @@ static void test_packager(void) char contents[11]; BOOL br, extended = FALSE; - static const WCHAR filename3W[] = {'f','i','l','e','n','a','m','e','3','.','t','x','t',0}; - hr = CoCreateInstance(&CLSID_Package, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&oleobj); ok(hr == S_OK || @@ -458,7 +454,7 @@ static void test_packager(void) if(extended){ len = GetTempPathW(ARRAY_SIZE(filename), filename); - lstrcpyW(filename + len, filename3W); + lstrcpyW(filename + len, L"filename3.txt"); file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Michael Stefaniuc : attrib: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 283dfa0f278c32ed615773d668a79a0beea43864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=283dfa0f278c32ed615773d6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:46 2020 +0200 attrib: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 558a393253..53f6302097 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -24,8 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(attrib); -static const WCHAR starW[] = {'*','\0'}; - /* ========================================================================= * Load a string from the resource file, handling any error * Returns string retrieved from resource file @@ -33,11 +31,10 @@ static const WCHAR starW[] = {'*','\0'}; static WCHAR *ATTRIB_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; - const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); - lstrcpyW(msg, failedMsg); + lstrcpyW(msg, L"Failed!"); } return msg; } @@ -144,8 +141,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, WCHAR buffer[MAX_PATH]; HANDLE hff; WIN32_FIND_DATAW fd; - WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; - static const WCHAR slashW[] = {'\\','\0'}; + WCHAR flags[] = L" "; WINE_TRACE("Processing dir '%s', spec '%s', %d,%x,%x\n", wine_dbgstr_w(rootdir), wine_dbgstr_w(filespec), @@ -155,25 +151,22 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, /* Build spec to search for */ lstrcpyW(buffer, rootdir); - lstrcatW(buffer, starW); + lstrcatW(buffer, L"*"); /* Search for directories in the location and recurse if necessary */ WINE_TRACE("Searching for directories with '%s'\n", wine_dbgstr_w(buffer)); hff = FindFirstFileW(buffer, &fd); if (hff != INVALID_HANDLE_VALUE) { do { - const WCHAR dot[] = {'.', 0}; - const WCHAR dotdot[] = {'.', '.', 0}; - /* Only interested in directories, and not . nor .. */ if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) + !lstrcmpW(fd.cFileName, L".") || !lstrcmpW(fd.cFileName, L"..")) continue; /* Build new root dir to go searching in */ lstrcpyW(buffer, rootdir); lstrcatW(buffer, fd.cFileName); - lstrcatW(buffer, slashW); + lstrcatW(buffer, L"\\"); ATTRIB_processdirectory(buffer, filespec, recurse, includedirs, attrib_set, attrib_clear); @@ -191,12 +184,10 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, hff = FindFirstFileW(buffer, &fd); if (hff != INVALID_HANDLE_VALUE) { do { - const WCHAR dot[] = {'.', 0}; - const WCHAR dotdot[] = {'.', '.', 0}; DWORD count; WINE_TRACE("Found '%s'\n", wine_dbgstr_w(fd.cFileName)); - if (!lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) + if (!lstrcmpW(fd.cFileName, L".") || !lstrcmpW(fd.cFileName, L"..")) continue; if (!includedirs && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) @@ -212,7 +203,6 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, SetFileAttributesW(buffer, fd.dwFileAttributes); found = TRUE; } else { - static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'}; if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) { flags[4] = 'H'; } @@ -233,7 +223,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, } lstrcpyW(buffer, rootdir); lstrcatW(buffer, fd.cFileName); - ATTRIB_wprintf(fmt, flags, buffer); + ATTRIB_wprintf(L"%1 %2\n", flags, buffer); for (count = 0; count < (ARRAY_SIZE(flags) - 1); count++) flags[count] = ' '; found = TRUE; } @@ -253,18 +243,16 @@ int __cdecl wmain(int argc, WCHAR *argv[]) DWORD attrib_clear = 0; BOOL attrib_recurse = FALSE; BOOL attrib_includedirs = FALSE; - static const WCHAR help_option[] = {'/','?','\0'}; - static const WCHAR wildcardsW[] = {'*','?','\0'}; int i = 1; BOOL found = FALSE; - if ((argc >= 2) && !lstrcmpW(argv[1], help_option)) { + if ((argc >= 2) && !lstrcmpW(argv[1], L"/?")) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_HELP)); return 0; } /* By default all files from current directory are taken into account */ - lstrcpyW(name, starW); + lstrcpyW(name, L"*"); while (i < argc) { WCHAR *param = argv[i++]; @@ -311,7 +299,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) /* If a directory is explicitly supplied on the command line, and no wildcards are in the name, then allow it to be changed/displayed */ - if (wcspbrk(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; + if (wcspbrk(originalname, L"*?") == NULL) attrib_includedirs = TRUE; /* Do all the processing based on the filename arg */ found = ATTRIB_processdirectory(curdir, name, attrib_recurse,

1 0