June 2022 - Wine-Commits - list.winehq.org

Bernhard Kölbl : windows.media.speech: Remove some empty lines.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: f5e63aaee9473fac65fa034ff7c6339d56710ed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e63aaee9473fac65fa034f… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 15:51:34 2022 +0200 windows.media.speech: Remove some empty lines. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 4b158d7e8e4..7a1a43be889 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -188,9 +188,7 @@ static ULONG WINAPI synthesizer_AddRef( ISpeechSynthesizer *iface ) { struct synthesizer *impl = impl_from_ISpeechSynthesizer(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %lu.\n", iface, ref); - return ref; } @@ -210,21 +208,18 @@ static ULONG WINAPI synthesizer_Release( ISpeechSynthesizer *iface ) static HRESULT WINAPI synthesizer_GetIids( ISpeechSynthesizer *iface, ULONG *iid_count, IID **iids ) { FIXME("iface %p, iid_count %p, iids %p stub.\n", iface, iid_count, iids); - return E_NOTIMPL; } static HRESULT WINAPI synthesizer_GetRuntimeClassName( ISpeechSynthesizer *iface, HSTRING *class_name ) { FIXME("iface %p, class_name %p stub.\n", iface, class_name); - return E_NOTIMPL; } static HRESULT WINAPI synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, TrustLevel *trust_level ) { FIXME("iface %p, trust_level %p stub.\n", iface, trust_level); - return E_NOTIMPL; } @@ -232,7 +227,6 @@ static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesize IAsyncOperation_SpeechSynthesisStream **operation ) { FIXME("iface %p, text %p, operation %p stub.\n", iface, text, operation); - return E_NOTIMPL; } @@ -240,21 +234,18 @@ static HRESULT WINAPI synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesize IAsyncOperation_SpeechSynthesisStream **operation ) { FIXME("iface %p, text %p, operation %p stub.\n", iface, ssml, operation); - return E_NOTIMPL; } static HRESULT WINAPI synthesizer_put_Voice( ISpeechSynthesizer *iface, IVoiceInformation *value ) { FIXME("iface %p, value %p stub.\n", iface, value); - return E_NOTIMPL; } static HRESULT WINAPI synthesizer_get_Voice( ISpeechSynthesizer *iface, IVoiceInformation **value ) { FIXME("iface %p, value %p stub.\n", iface, value); - return E_NOTIMPL; } @@ -280,7 +271,6 @@ DEFINE_IINSPECTABLE(synthesizer2, ISpeechSynthesizer2, struct synthesizer, ISpee static HRESULT WINAPI synthesizer2_get_Options( ISpeechSynthesizer2 *iface, ISpeechSynthesizerOptions **value ) { FIXME("iface %p, value %p stub.\n", iface, value); - return E_NOTIMPL; }

1 0

Bernhard Kölbl : windows.media.speech: Rename variable out to impl in factory_ActivateInstance.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 7090d6c2160565e8294ccad4ab0c1fc0978e556d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7090d6c2160565e8294ccad4… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 15:59:55 2022 +0200 windows.media.speech: Rename variable out to impl in factory_ActivateInstance. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 7a1a43be889..3aa04ed9fbd 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -384,21 +384,22 @@ static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLev static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { - struct synthesizer *obj; + struct synthesizer *impl; TRACE("iface %p, instance %p.\n", iface, instance); - if (!(obj = calloc(1, sizeof(*obj)))) + if (!(impl = calloc(1, sizeof(*impl)))) { *instance = NULL; return E_OUTOFMEMORY; } - obj->ISpeechSynthesizer_iface.lpVtbl = &synthesizer_vtbl; - obj->ISpeechSynthesizer2_iface.lpVtbl = &synthesizer2_vtbl; - obj->IClosable_iface.lpVtbl = &closable_vtbl; - obj->ref = 1; - *instance = (IInspectable *)&obj->ISpeechSynthesizer_iface; + impl->ISpeechSynthesizer_iface.lpVtbl = &synthesizer_vtbl; + impl->ISpeechSynthesizer2_iface.lpVtbl = &synthesizer2_vtbl; + impl->IClosable_iface.lpVtbl = &closable_vtbl; + impl->ref = 1; + + *instance = (IInspectable *)&impl->ISpeechSynthesizer_iface; return S_OK; }

1 0

Rémi Bernon : winegstreamer: Request native buffer alignment using video pool meta.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 24266121f1396a3b6ef4d40a7b35a0a31931539c URL: https://source.winehq.org/git/wine.git/?a=commit;h=24266121f1396a3b6ef4d40a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 2 08:16:27 2022 +0200 winegstreamer: Request native buffer alignment using video pool meta. To support VA-API plugins we need to implement video frame copy as well, as the plugins simply ignore downstream buffer alignment requirements. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 3 - dlls/winegstreamer/wg_transform.c | 129 +++++++++++++++++++++++++++++++++++--- 2 files changed, 120 insertions(+), 12 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 3fe819ba23d..81bfafbda04 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -7284,9 +7284,7 @@ static void test_h264_decoder(void) ok(hr == S_OK, "ConvertToContiguousBuffer returned %#lx\n", hr); hr = IMFMediaBuffer_Lock(media_buffer, &data, NULL, &length); ok(hr == S_OK, "Lock returned %#lx\n", hr); - todo_wine ok(length == nv12_frame_len, "got length %lu\n", length); - if (length != nv12_frame_len) goto skip_nv12_tests; for (i = 0; i < actual_aperture.Area.cy; ++i) { @@ -7302,7 +7300,6 @@ static void test_h264_decoder(void) check_sample(output.pSample, nv12_frame_data, output_file); -skip_nv12_tests: ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %lu\n", ret); diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 0c1654567e5..e0824b21491 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -52,6 +52,7 @@ struct wg_transform GstSegment segment; GstBufferList *input; guint input_max_length; + guint output_plane_align; GstAtomicQueue *output_queue; GstSample *output_sample; bool output_caps_changed; @@ -69,6 +70,20 @@ static bool is_caps_video(GstCaps *caps) return g_str_has_prefix(media_type, "video/"); } +static bool align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVideoAlignment *align) +{ + gst_video_alignment_reset(align); + + align->padding_right = ((plane_align + 1) - (info->width & plane_align)) & plane_align; + align->padding_bottom = ((plane_align + 1) - (info->height & plane_align)) & plane_align; + align->stride_align[0] = plane_align; + align->stride_align[1] = plane_align; + align->stride_align[2] = plane_align; + align->stride_align[3] = plane_align; + + return gst_video_info_align(info, align); +} + static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct wg_transform *transform = gst_pad_get_element_private(pad); @@ -102,7 +117,9 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery { case GST_QUERY_ALLOCATION: { - GstStructure *config; + gsize plane_align = transform->output_plane_align; + GstStructure *config, *params; + GstVideoAlignment align; gboolean needs_pool; GstBufferPool *pool; GstVideoInfo info; @@ -113,19 +130,36 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery break; if (!gst_video_info_from_caps(&info, caps) + || !align_video_info_planes(plane_align, &info, &align) || !(pool = gst_video_buffer_pool_new())) break; + if ((params = gst_structure_new("video-meta", + "padding-top", G_TYPE_UINT, align.padding_top, + "padding-bottom", G_TYPE_UINT, align.padding_bottom, + "padding-left", G_TYPE_UINT, align.padding_left, + "padding-right", G_TYPE_UINT, align.padding_right, + NULL))) + gst_query_add_allocation_meta(query, GST_VIDEO_META_API_TYPE, params); + if (!(config = gst_buffer_pool_get_config(pool))) GST_ERROR("Failed to get pool %p config.", pool); else { + gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_META); + gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT); + gst_buffer_pool_config_set_video_alignment(config, &align); + gst_buffer_pool_config_set_params(config, caps, info.size, 0, 0); if (!gst_buffer_pool_set_config(pool, config)) GST_ERROR("Failed to set pool %p config.", pool); } + /* Prevent pool reconfiguration, we don't want another alignment. */ + if (!gst_buffer_pool_set_active(pool, true)) + GST_ERROR("Pool %p failed to activate.", pool); + gst_query_add_allocation_pool(query, pool, info.size, 0, 0); GST_INFO("Proposing pool %p, buffer size %#zx, for query %p.", @@ -292,6 +326,7 @@ NTSTATUS wg_transform_create(void *args) if (!(transform->output_queue = gst_atomic_queue_new(8))) goto out; transform->input_max_length = 1; + transform->output_plane_align = 0; if (!(src_caps = wg_format_to_caps(&input_format))) goto out; @@ -333,6 +368,7 @@ NTSTATUS wg_transform_create(void *args) * to match its expectations. */ transform->input_max_length = 16; + transform->output_plane_align = 15; if (!(element = create_element("h264parse", "base")) || !transform_append_element(transform, element, &first, &last)) goto out; @@ -494,17 +530,69 @@ NTSTATUS wg_transform_push_data(void *args) return STATUS_SUCCESS; } -static NTSTATUS read_transform_output_data(GstBuffer *buffer, struct wg_sample *sample) +static bool copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_align, + struct wg_sample *sample, gsize *total_size) { - GstMapInfo info; + GstVideoFrame src_frame, dst_frame; + GstVideoInfo src_info, dst_info; + GstVideoAlignment align; + GstBuffer *dst_buffer; + bool ret = false; - if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) + if (!gst_video_info_from_caps(&src_info, caps)) { - GST_ERROR("Failed to map buffer %p", buffer); - sample->size = 0; - return STATUS_UNSUCCESSFUL; + GST_ERROR("Failed to get video info from caps."); + return false; } + dst_info = src_info; + if (!align_video_info_planes(plane_align, &dst_info, &align)) + { + GST_ERROR("Failed to align video info."); + return false; + } + if (sample->max_size < dst_info.size) + { + GST_ERROR("Output buffer is too small."); + return false; + } + + if (!(dst_buffer = gst_buffer_new_wrapped_full(0, sample->data, sample->max_size, + 0, sample->max_size, 0, NULL))) + { + GST_ERROR("Failed to wrap wg_sample into GstBuffer"); + return false; + } + gst_buffer_set_size(dst_buffer, dst_info.size); + *total_size = sample->size = dst_info.size; + + if (!gst_video_frame_map(&src_frame, &src_info, buffer, GST_MAP_READ)) + GST_ERROR("Failed to map source frame."); + else + { + if (!gst_video_frame_map(&dst_frame, &dst_info, dst_buffer, GST_MAP_WRITE)) + GST_ERROR("Failed to map destination frame."); + else + { + if (!(ret = gst_video_frame_copy(&dst_frame, &src_frame))) + GST_ERROR("Failed to copy video frame."); + gst_video_frame_unmap(&dst_frame); + } + gst_video_frame_unmap(&src_frame); + } + + gst_buffer_unref(dst_buffer); + return ret; +} + +static bool copy_buffer(GstBuffer *buffer, GstCaps *caps, struct wg_sample *sample, + gsize *total_size) +{ + GstMapInfo info; + + if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) + return false; + if (sample->max_size >= info.size) sample->size = info.size; else @@ -519,6 +607,28 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, struct wg_sample * if (sample->flags & WG_SAMPLE_FLAG_INCOMPLETE) gst_buffer_resize(buffer, sample->size, -1); + *total_size = info.size; + return true; +} + +static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsize plane_align, + struct wg_sample *sample) +{ + gsize total_size; + bool ret; + + if (is_caps_video(caps)) + ret = copy_video_buffer(buffer, caps, plane_align, sample, &total_size); + else + ret = copy_buffer(buffer, caps, sample, &total_size); + + if (!ret) + { + GST_ERROR("Failed to copy buffer %p", buffer); + sample->size = 0; + return STATUS_UNSUCCESSFUL; + } + if (GST_BUFFER_PTS_IS_VALID(buffer)) { sample->flags |= WG_SAMPLE_FLAG_HAS_PTS; @@ -528,7 +638,7 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, struct wg_sample * { GstClockTime duration = GST_BUFFER_DURATION(buffer) / 100; - duration = (duration * sample->size) / info.size; + duration = (duration * sample->size) / total_size; GST_BUFFER_DURATION(buffer) -= duration * 100; if (GST_BUFFER_PTS_IS_VALID(buffer)) GST_BUFFER_PTS(buffer) += duration * 100; @@ -592,7 +702,8 @@ NTSTATUS wg_transform_read_data(void *args) return STATUS_SUCCESS; } - if ((status = read_transform_output_data(output_buffer, sample))) + if ((status = read_transform_output_data(output_buffer, output_caps, + transform->output_plane_align, sample))) return status; if (!(sample->flags & WG_SAMPLE_FLAG_INCOMPLETE))

1 0

Rémi Bernon : winegstreamer: Use a custom flag instead of sample info for caps change.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: c4c3912bad1c67bb70fd009eee18e0a58cdfe929 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4c3912bad1c67bb70fd009e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 28 18:38:17 2022 +0200 winegstreamer: Use a custom flag instead of sample info for caps change. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_transform.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 946268ee353..93fe0039a63 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -42,6 +42,8 @@ GST_DEBUG_CATEGORY_EXTERN(wine); #define GST_CAT_DEFAULT wine +#define GST_SAMPLE_FLAG_WG_CAPS_CHANGED (GST_MINI_OBJECT_FLAG_LAST << 0) + struct wg_transform { GstElement *container; @@ -59,26 +61,21 @@ struct wg_transform static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct wg_transform *transform = gst_pad_get_element_private(pad); - GstStructure *info = NULL; GstSample *sample; GST_LOG("transform %p, buffer %p.", transform, buffer); - if (transform->output_caps_changed && !(info = gst_structure_new_empty("format-changed"))) - { - GST_ERROR("Failed to allocate transform %p output sample info.", transform); - gst_buffer_unref(buffer); - return GST_FLOW_ERROR; - } - transform->output_caps_changed = false; - - if (!(sample = gst_sample_new(buffer, transform->output_caps, NULL, info))) + if (!(sample = gst_sample_new(buffer, transform->output_caps, NULL, NULL))) { GST_ERROR("Failed to allocate transform %p output sample.", transform); gst_buffer_unref(buffer); return GST_FLOW_ERROR; } + if (transform->output_caps_changed) + GST_MINI_OBJECT_FLAG_SET(sample, GST_SAMPLE_FLAG_WG_CAPS_CHANGED); + transform->output_caps_changed = false; + gst_atomic_queue_push(transform->output_queue, sample); gst_buffer_unref(buffer); return GST_FLOW_OK; @@ -521,9 +518,9 @@ NTSTATUS wg_transform_read_data(void *args) output_buffer = gst_sample_get_buffer(transform->output_sample); output_caps = gst_sample_get_caps(transform->output_sample); - if (gst_sample_get_info(transform->output_sample)) + if (GST_MINI_OBJECT_FLAG_IS_SET(transform->output_sample, GST_SAMPLE_FLAG_WG_CAPS_CHANGED)) { - gst_sample_set_info(transform->output_sample, NULL); + GST_MINI_OBJECT_FLAG_UNSET(transform->output_sample, GST_SAMPLE_FLAG_WG_CAPS_CHANGED); if (format) wg_format_from_caps(format, output_caps);

1 0

Nikolay Sivov : secur32: Update output buffer offset on return from schan_send() call.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 0a62c7bd40b42108fe85f325c70e8d1b2ab668a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a62c7bd40b42108fe85f325… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 09:20:07 2022 +0300 secur32: Update output buffer offset on return from schan_send() call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 8 +++++++- dlls/secur32/schannel_gnutls.c | 3 ++- dlls/secur32/secur32_priv.h | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 1f4a1005550..289802c5b32 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1299,7 +1299,8 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle SIZE_T data_size; SIZE_T length; char *data; - int idx; + int idx, output_buffer_idx = -1; + ULONG output_offset = 0; TRACE("context_handle %p, quality %ld, message %p, message_seq_no %ld\n", context_handle, quality, message, message_seq_no); @@ -1326,8 +1327,13 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle params.output = message; params.buffer = data; params.length = &length; + params.output_buffer_idx = &output_buffer_idx; + params.output_offset = &output_offset; status = GNUTLS_CALL( send, &params ); + if (!status && output_buffer_idx != -1) + message->pBuffers[output_buffer_idx].cbBuffer = output_offset; + TRACE("Sent %Id bytes.\n", length); if (length != data_size) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 82437207982..ebce6bacde0 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -878,7 +878,8 @@ static NTSTATUS schan_send( void *args ) } } - t->out.desc->pBuffers[t->out.current_buffer_idx].cbBuffer = t->out.offset; + *params->output_buffer_idx = t->out.current_buffer_idx; + *params->output_offset = t->out.offset; return SEC_E_OK; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 574d3d51cb5..8a494309710 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -167,6 +167,8 @@ struct send_params SecBufferDesc *output; const void *buffer; SIZE_T *length; + int *output_buffer_idx; + ULONG *output_offset; }; struct set_application_protocols_params

1 0

Nikolay Sivov : secur32: Simplify input buffer handling for schan_recv() call.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 1c894ec973dcc5ff2cee32d239e171f61a48e3ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c894ec973dcc5ff2cee32d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 09:12:05 2022 +0300 secur32: Simplify input buffer handling for schan_recv() call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 6 +++++- dlls/secur32/schannel_gnutls.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6a8d667a32f..1f4a1005550 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1409,6 +1409,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle SIZE_T received = 0; int idx; unsigned char *buf_ptr; + SecBufferDesc input_desc = { 0 }; TRACE("context_handle %p, message %p, message_seq_no %ld, quality %p\n", context_handle, message, message_seq_no, quality); @@ -1446,8 +1447,11 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle received = data_size; + input_desc.cBuffers = 1; + input_desc.pBuffers = &message->pBuffers[idx]; + params.session = ctx->session; - params.input = message; + params.input = &input_desc; params.input_size = expected_size; params.buffer = data; params.length = &received; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 696790f44dc..82437207982 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -307,7 +307,7 @@ static int recv_message_get_next_buffer(struct schan_buffers *s) { if (s->current_buffer_idx != -1) return -1; - return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA); + return s->desc->cBuffers ? 0 : -1; } static char *get_buffer(struct schan_buffers *s, SIZE_T *count)

1 0

Rémi Bernon : ntdll: Use a fixed block tail size.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 1b23283396ad21f09deccc85b156d6b65f4dca34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b23283396ad21f09deccc85… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 23:39:44 2022 +0200 ntdll: Use a fixed block tail size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index aec7bdc420c..8c50b41cd54 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -349,14 +349,15 @@ static inline void mark_block_free( void *ptr, SIZE_T size, DWORD flags ) } /* mark a block of memory as a tail block */ -static inline void mark_block_tail( void *ptr, SIZE_T size, DWORD flags ) +static inline void mark_block_tail( struct block *block, DWORD flags ) { + char *tail = (char *)block + block_get_size( block ) - block->unused_bytes; if (flags & HEAP_TAIL_CHECKING_ENABLED) { - valgrind_make_writable( ptr, size ); - memset( ptr, ARENA_TAIL_FILLER, size ); + valgrind_make_writable( tail, ALIGNMENT ); + memset( tail, ARENA_TAIL_FILLER, ALIGNMENT ); } - valgrind_make_noaccess( ptr, size ); + valgrind_make_noaccess( tail, ALIGNMENT ); } /* initialize contents of a newly created block of memory */ @@ -1161,7 +1162,7 @@ static BOOL validate_used_block( const SUBHEAP *subheap, const struct block *blo else if (!err && (flags & HEAP_TAIL_CHECKING_ENABLED)) { const unsigned char *tail = (unsigned char *)block + block_get_size( block ) - block->unused_bytes; - for (i = 0; !err && i < block->unused_bytes; i++) if (tail[i] != ARENA_TAIL_FILLER) err = "invalid block tail"; + for (i = 0; !err && i < ALIGNMENT; i++) if (tail[i] != ARENA_TAIL_FILLER) err = "invalid block tail"; } if (err) @@ -1328,7 +1329,7 @@ static void heap_set_debug_flags( HANDLE handle ) else { if (block_get_type( block ) == ARENA_PENDING_MAGIC) mark_block_free( block + 1, block_get_size( block ) - sizeof(*block), flags ); - else mark_block_tail( (char *)block + block_get_size( block ) - block->unused_bytes, block->unused_bytes, flags ); + else mark_block_tail( block, flags ); } } } @@ -1493,7 +1494,7 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret block_set_type( block, ARENA_INUSE_MAGIC ); shrink_used_block( subheap, block, 0, old_block_size, block_size, size ); initialize_block( block + 1, size, flags ); - mark_block_tail( (char *)(block + 1) + size, block->unused_bytes, flags ); + mark_block_tail( block, flags ); *ret = block + 1; return STATUS_SUCCESS; @@ -1614,7 +1615,7 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); if (size > old_size) initialize_block( (char *)(block + 1) + old_size, size - old_size, flags ); - mark_block_tail( (char *)(block + 1) + size, block->unused_bytes, flags ); + mark_block_tail( block, flags ); /* Return the new arena */

1 0

Rémi Bernon : ntdll: Round free block size to block size alignment.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: ff12dc1247f501d93b260586c4e702bff529e4d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff12dc1247f501d93b260586… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 14:19:16 2022 +0200 ntdll: Round free block size to block size alignment. Block sizes are now always rounded to ALIGNMENT multiple, except for the last free block in a region. This makes it consistent and will let us use a more compact block layout. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0a6228217ff..3f14de39a1d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -892,6 +892,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, SIZE_T commitSize, SIZE_T totalSize ) { struct entry *pEntry; + SIZE_T block_size; SUBHEAP *subheap; unsigned int i; @@ -991,9 +992,9 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, } } - /* Create the first free block */ - - create_free_block( subheap, first_block( subheap ), subheap_size( subheap ) - subheap_overhead( subheap ) ); + block_size = subheap_size( subheap ) - subheap_overhead( subheap ); + block_size &= ~(ALIGNMENT - 1); + create_free_block( subheap, first_block( subheap ), block_size ); return subheap; }

1 0

Jacek Caban : winemac: Use unixlib for query_drag_exited.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: dd3d988e43b2eae421dc2e75fa94dd03217736ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd3d988e43b2eae421dc2e75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 1 00:30:21 2022 +0200 winemac: Use unixlib for query_drag_exited. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/dllmain.c | 1 + dlls/winemac.drv/dragdrop.c | 9 +++++---- dlls/winemac.drv/event.c | 11 +++++++++++ dlls/winemac.drv/macdrv.h | 3 ++- dlls/winemac.drv/unixlib.h | 9 ++++++++- 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index d38e7cf9164..493062521ad 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -29,6 +29,7 @@ HMODULE macdrv_module = 0; typedef NTSTATUS (WINAPI *kernel_callback)(void *params, ULONG size); static const kernel_callback kernel_callbacks[] = { + macdrv_dnd_query_exited, macdrv_ime_query_char_rect, macdrv_ime_set_text, }; diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index a07b66ac14a..d5de2abb37a 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -482,14 +482,15 @@ BOOL query_drag_drop(macdrv_query* query) /************************************************************************** - * query_drag_exited + * macdrv_dnd_query_exited */ -BOOL query_drag_exited(macdrv_query* query) +NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size) { - HWND hwnd = macdrv_get_window_hwnd(query->window); + struct dnd_query_exited_params *params = arg; + HWND hwnd = params->hwnd; IDropTarget *droptarget; - TRACE("win %p/%p\n", hwnd, query->window); + TRACE("win %p\n", hwnd); droptarget = get_droptarget_pointer(last_droptarget_hwnd); if (droptarget) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 43cd3f85bcd..361709010c9 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -179,6 +179,17 @@ static void macdrv_sent_text_input(const macdrv_event *event) } +/************************************************************************** + * query_drag_exited + */ +static BOOL query_drag_exited(macdrv_query *query) +{ + struct dnd_query_exited_params params; + params.hwnd = macdrv_get_window_hwnd(query->window); + return macdrv_client_func(client_func_dnd_query_exited, &params, sizeof(params)); +} + + /************************************************************************** * query_ime_char_rect */ diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index e125bb03b4d..c0f2811c5f5 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -261,7 +261,6 @@ extern BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_form extern UINT* macdrv_get_pasteboard_formats(CFTypeRef pasteboard, UINT* num_formats) DECLSPEC_HIDDEN; extern BOOL query_drag_operation(macdrv_query* query) DECLSPEC_HIDDEN; -extern BOOL query_drag_exited(macdrv_query* query) DECLSPEC_HIDDEN; extern BOOL query_drag_drop(macdrv_query* query) DECLSPEC_HIDDEN; extern struct opengl_funcs *macdrv_wine_get_wgl_driver(UINT version) DECLSPEC_HIDDEN; @@ -298,6 +297,8 @@ extern NTSTATUS macdrv_notify_icon(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *params, ULONG size) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size) DECLSPEC_HIDDEN; + /* user helpers */ static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index d0950e63c3c..067f46c8f5d 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -67,11 +67,18 @@ struct notify_icon_params /* driver client callbacks exposed with KernelCallbackTable interface */ enum macdrv_client_funcs { - client_func_ime_query_char_rect = NtUserDriverCallbackFirst, + client_func_dnd_query_exited = NtUserDriverCallbackFirst, + client_func_ime_query_char_rect, client_func_ime_set_text, client_func_last }; +/* macdrv_dnd_query_exited params */ +struct dnd_query_exited_params +{ + HWND hwnd; +}; + /* macdrv_ime_query_char_rect result */ struct ime_query_char_rect_result {

1 0

Jacek Caban : include: Provide iswspace, wcstol and wcstoul in unixlib.h.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: b49dd456fafae254d79f59d141eb10011ba21005 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b49dd456fafae254d79f59d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 2 14:25:38 2022 +0200 include: Provide iswspace, wcstol and wcstoul in unixlib.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/win32u_private.h | 95 ---------------------------------------- dlls/winex11.drv/x11drv.h | 50 --------------------- include/wine/unixlib.h | 101 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+), 145 deletions(-) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 2d69cbef78e..053fb25fe36 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -525,99 +525,6 @@ static inline WCHAR win32u_towupper( WCHAR ch ) return RtlUpcaseUnicodeChar( ch ); } -static inline LONG win32u_wcstol( LPCWSTR s, LPWSTR *end, INT base ) -{ - BOOL negative = FALSE, empty = TRUE; - LONG ret = 0; - - if (base < 0 || base == 1 || base > 36) return 0; - if (end) *end = (WCHAR *)s; - while (*s == ' ' || *s == '\t') s++; - - if (*s == '-') - { - negative = TRUE; - s++; - } - else if (*s == '+') s++; - - if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) - { - base = 16; - s += 2; - } - if (base == 0) base = s[0] != '0' ? 10 : 8; - - while (*s) - { - int v; - - if ('0' <= *s && *s <= '9') v = *s - '0'; - else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; - else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; - else break; - if (v >= base) break; - if (negative) v = -v; - s++; - empty = FALSE; - - if (!negative && (ret > MAXLONG / base || ret * base > MAXLONG - v)) - ret = MAXLONG; - else if (negative && (ret < (LONG)MINLONG / base || ret * base < (LONG)(MINLONG - v))) - ret = MINLONG; - else - ret = ret * base + v; - } - - if (end && !empty) *end = (WCHAR *)s; - return ret; -} - -static inline ULONG win32u_wcstoul( const WCHAR *s, WCHAR **end, int base ) -{ - BOOL negative = FALSE, empty = TRUE; - ULONG ret = 0; - - if (base < 0 || base == 1 || base > 36) return 0; - if (end) *end = (WCHAR *)s; - while (*s == ' ' || *s == '\t') s++; - - if (*s == '-') - { - negative = TRUE; - s++; - } - else if (*s == '+') s++; - - if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) - { - base = 16; - s += 2; - } - if (base == 0) base = s[0] != '0' ? 10 : 8; - - while (*s) - { - int v; - - if ('0' <= *s && *s <= '9') v = *s - '0'; - else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; - else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; - else break; - if (v >= base) break; - s++; - empty = FALSE; - - if (ret > MAXDWORD / base || ret * base > MAXDWORD - v) - ret = MAXDWORD; - else - ret = ret * base + v; - } - - if (end && !empty) *end = (WCHAR *)s; - return negative ? -ret : ret; -} - extern CPTABLEINFO ansi_cp DECLSPEC_HIDDEN; DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, @@ -643,8 +550,6 @@ static inline WCHAR *towstr( const char *str ) #define towupper(c) win32u_towupper(c) #define wcsdup(s) win32u_wcsdup(s) -#define wcstol(s,e,b) win32u_wcstol(s,e,b) -#define wcstoul(s,e,b) win32u_wcstoul(s,e,b) static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 307932b0bf0..003604cd97d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -928,54 +928,4 @@ static inline UINT asciiz_to_unicode( WCHAR *dst, const char *src ) return (p - dst) * sizeof(WCHAR); } -static inline LONG x11drv_wcstol( LPCWSTR s, LPWSTR *end, INT base ) -{ - BOOL negative = FALSE, empty = TRUE; - LONG ret = 0; - - if (base < 0 || base == 1 || base > 36) return 0; - if (end) *end = (WCHAR *)s; - while (*s == ' ' || *s == '\t') s++; - - if (*s == '-') - { - negative = TRUE; - s++; - } - else if (*s == '+') s++; - - if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) - { - base = 16; - s += 2; - } - if (base == 0) base = s[0] != '0' ? 10 : 8; - - while (*s) - { - int v; - - if ('0' <= *s && *s <= '9') v = *s - '0'; - else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; - else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; - else break; - if (v >= base) break; - if (negative) v = -v; - s++; - empty = FALSE; - - if (!negative && (ret > MAXLONG / base || ret * base > MAXLONG - v)) - ret = MAXLONG; - else if (negative && (ret < (LONG)MINLONG / base || ret * base < (LONG)(MINLONG - v))) - ret = MINLONG; - else - ret = ret * base + v; - } - - if (end && !empty) *end = (WCHAR *)s; - return ret; -} - -#define wcstol x11drv_wcstol - #endif /* __WINE_X11DRV_H */ diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index a7cfb8f6cab..ef60b32184c 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -84,6 +84,11 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void /* wide char string functions */ +static inline int ntdll_iswspace( WCHAR wc ) +{ + return ('\t' <= wc && wc <= '\r') || wc == ' ' || wc == 0xa0; +} + static inline size_t ntdll_wcslen( const WCHAR *str ) { const WCHAR *s = str; @@ -150,6 +155,100 @@ static inline SIZE_T ntdll_wcscspn( const WCHAR *str, const WCHAR *reject ) return ptr - str; } +static inline LONG ntdll_wcstol( const WCHAR *s, WCHAR **end, int base ) +{ + BOOL negative = FALSE, empty = TRUE; + LONG ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (WCHAR *)s; + while (ntdll_iswspace(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = s[0] != '0' ? 10 : 8; + + while (*s) + { + int v; + + if ('0' <= *s && *s <= '9') v = *s - '0'; + else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; + else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; + else break; + if (v >= base) break; + if (negative) v = -v; + s++; + empty = FALSE; + + if (!negative && (ret > MAXLONG / base || ret * base > MAXLONG - v)) + ret = MAXLONG; + else if (negative && (ret < (LONG)MINLONG / base || ret * base < (LONG)(MINLONG - v))) + ret = MINLONG; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (WCHAR *)s; + return ret; +} + +static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) +{ + BOOL negative = FALSE, empty = TRUE; + ULONG ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (WCHAR *)s; + while (ntdll_iswspace(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = s[0] != '0' ? 10 : 8; + + while (*s) + { + int v; + + if ('0' <= *s && *s <= '9') v = *s - '0'; + else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; + else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; + else break; + if (v >= base) break; + s++; + empty = FALSE; + + if (ret > MAXDWORD / base || ret * base > MAXDWORD - v) + ret = MAXDWORD; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (WCHAR *)s; + return negative ? -ret : ret; +} + +#define iswspace(ch) ntdll_iswspace(ch) #define wcslen(str) ntdll_wcslen(str) #define wcscpy(dst,src) ntdll_wcscpy(dst,src) #define wcscat(dst,src) ntdll_wcscat(dst,src) @@ -162,6 +261,8 @@ static inline SIZE_T ntdll_wcscspn( const WCHAR *str, const WCHAR *reject ) #define wcscspn(str,rej) ntdll_wcscspn(str,rej) #define wcsicmp(s1, s2) ntdll_wcsicmp(s1,s2) #define wcsnicmp(s1, s2,n) ntdll_wcsnicmp(s1,s2,n) +#define wcstol(str,e,b) ntdll_wcstol(str,e,b) +#define wcstoul(str,e,b) ntdll_wcstoul(str,e,b) #endif /* WINE_UNIX_LIB */

1 0