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

Rémi Bernon : winegstreamer: Use a custom flag instead of sample info for caps change.
by Alexandre Julliard 02 Jun '22

02 Jun '22

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

Rémi Bernon : winegstreamer: Reply with a video buffer pool to ALLOCATION queries.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: f7ca5cfa27e433530f2725d44045ea5284fd332a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ca5cfa27e433530f2725d4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 23:59:38 2022 +0200 winegstreamer: Reply with a video buffer pool to ALLOCATION queries. 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 | 62 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 93fe0039a63..0c1654567e5 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -58,6 +58,17 @@ struct wg_transform GstCaps *output_caps; }; +static bool is_caps_video(GstCaps *caps) +{ + const gchar *media_type; + + if (!caps || !gst_caps_get_size(caps)) + return false; + + media_type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + return g_str_has_prefix(media_type, "video/"); +} + static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct wg_transform *transform = gst_pad_get_element_private(pad); @@ -81,6 +92,56 @@ static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, Gst return GST_FLOW_OK; } +static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) +{ + struct wg_transform *transform = gst_pad_get_element_private(pad); + + GST_LOG("transform %p, type \"%s\".", transform, gst_query_type_get_name(query->type)); + + switch (query->type) + { + case GST_QUERY_ALLOCATION: + { + GstStructure *config; + gboolean needs_pool; + GstBufferPool *pool; + GstVideoInfo info; + GstCaps *caps; + + gst_query_parse_allocation(query, &caps, &needs_pool); + if (!is_caps_video(caps) || !needs_pool) + break; + + if (!gst_video_info_from_caps(&info, caps) + || !(pool = gst_video_buffer_pool_new())) + break; + + if (!(config = gst_buffer_pool_get_config(pool))) + GST_ERROR("Failed to get pool %p config.", pool); + else + { + 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); + } + + gst_query_add_allocation_pool(query, pool, info.size, 0, 0); + + GST_INFO("Proposing pool %p, buffer size %#zx, for query %p.", + pool, info.size, query); + + g_object_unref(pool); + return true; + } + default: + GST_WARNING("Ignoring \"%s\" query.", gst_query_type_get_name(query->type)); + break; + } + + return gst_pad_query_default(pad, parent, query); +} + static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) { struct wg_transform *transform = gst_pad_get_element_private(pad); @@ -252,6 +313,7 @@ NTSTATUS wg_transform_create(void *args) gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_event_function(transform->my_sink, transform_sink_event_cb); + gst_pad_set_query_function(transform->my_sink, transform_sink_query_cb); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); /* Since we append conversion elements, we don't want to filter decoders

1 0

Rémi Bernon : winegstreamer: Request native buffer alignment using video pool meta.
by Alexandre Julliard 02 Jun '22

02 Jun '22

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: Support mapping of MF_MT_MINIMUM_DISPLAY_APERTURE.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 9c711ba7488d78a91e133083567e56feb446a7c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c711ba7488d78a91e133083… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 23 16:41:36 2022 +0200 winegstreamer: Support mapping of MF_MT_MINIMUM_DISPLAY_APERTURE. 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 | 40 +++++++++++++++++++-------------------- dlls/winegstreamer/h264_decoder.c | 16 ++++++++++++++++ dlls/winegstreamer/mfplat.c | 25 ++++++++++++++++++++++++ dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_format.c | 3 ++- dlls/winegstreamer/wg_transform.c | 23 ++++++++++++++++++++++ 6 files changed, 87 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c711ba7488d78a91e13…

1 0

Rémi Bernon : winegstreamer: Enforce frame size in H264 decoder SetOutputType.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 7a8254fd05a2c7c89783d65cba544f2899611c73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a8254fd05a2c7c89783d65c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 11 23:56:43 2022 +0200 winegstreamer: Enforce frame size in H264 decoder SetOutputType. 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 | 1 - dlls/winegstreamer/h264_decoder.c | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4f55a67f30b..03035aa5e9f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -7311,7 +7311,6 @@ static void test_h264_decoder(void) ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr); init_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - todo_wine ok(hr == MF_E_INVALIDMEDIATYPE, "SetOutputType returned %#lx.\n", hr); init_media_type(media_type, is_win7 ? new_output_type_desc_win7 : new_output_type_desc, -1); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index e39b9340be1..19a36a9a77a 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -433,6 +433,7 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF { struct h264_decoder *decoder = impl_from_IMFTransform(iface); GUID major, subtype; + UINT64 frame_size; HRESULT hr; ULONG i; @@ -454,6 +455,11 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF if (i == ARRAY_SIZE(h264_decoder_output_types)) return MF_E_INVALIDMEDIATYPE; + if (FAILED(hr = IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size)) + || (frame_size >> 32) != decoder->wg_format.u.video.width + || (UINT32)frame_size != decoder->wg_format.u.video.height) + return MF_E_INVALIDMEDIATYPE; + if (decoder->output_type) IMFMediaType_Release(decoder->output_type); IMFMediaType_AddRef((decoder->output_type = type));

1 0

Jacek Caban : winemac: Use unixlib interface for macdrv_clear_ime_text.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 219eb6ece23b3455252dc763634f9ae53547f21c URL: https://source.winehq.org/git/wine.git/?a=commit;h=219eb6ece23b3455252dc763… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 22:51:41 2022 +0200 winemac: Use unixlib interface for macdrv_clear_ime_text. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/ime.c | 2 +- dlls/winemac.drv/macdrv.h | 3 +-- dlls/winemac.drv/macdrv_main.c | 8 ++++++++ dlls/winemac.drv/unixlib.h | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 251c22d5005..756e880c5a3 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -853,7 +853,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) TRACE("NI_COMPOSITIONSTR: CPS_CANCEL\n"); - macdrv_clear_ime_text(); + MACDRV_CALL(ime_clear, NULL); if (lpIMC->hCompStr) ImmDestroyIMCC(lpIMC->hCompStr); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index de8384d5437..e125bb03b4d 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -287,13 +287,12 @@ extern NTSTATUS macdrv_init(void *arg) DECLSPEC_HIDDEN; * Mac IME driver */ -extern NTSTATUS macdrv_ime_process_text_input(void *arg) DECLSPEC_HIDDEN; - extern NTSTATUS WINAPI macdrv_ime_set_text(void *params, ULONG size) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI macdrv_ime_query_char_rect(void *params, ULONG size) DECLSPEC_HIDDEN; /* unixlib interface */ +extern NTSTATUS macdrv_ime_process_text_input(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_notify_icon(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *params, diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index bf06d96b407..4ef9060ea4b 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -615,6 +615,13 @@ NTSTATUS macdrv_client_func(enum macdrv_client_funcs id, const void *params, ULO } +static NTSTATUS macdrv_ime_clear(void *arg) +{ + macdrv_clear_ime_text(); + return 0; +} + + static NTSTATUS macdrv_ime_using_input_method(void *arg) { return macdrv_using_input_method(); @@ -623,6 +630,7 @@ static NTSTATUS macdrv_ime_using_input_method(void *arg) const unixlib_entry_t __wine_unix_call_funcs[] = { + macdrv_ime_clear, macdrv_ime_process_text_input, macdrv_ime_using_input_method, macdrv_init, diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index dd03cd4de95..d0950e63c3c 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -21,6 +21,7 @@ enum macdrv_funcs { + unix_ime_clear, unix_ime_process_text_input, unix_ime_using_input_method, unix_init,

1 0

Jacek Caban : winemac: Use unixlib for query_drag_exited.
by Alexandre Julliard 02 Jun '22

02 Jun '22

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 : winemac: Don't share debugstr_format between dragdrop.c and clipboard.c.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 469a2ce5cca42e1519736de3b150cb774673730d URL: https://source.winehq.org/git/wine.git/?a=commit;h=469a2ce5cca42e1519736de3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 00:41:50 2022 +0200 winemac: Don't share debugstr_format between dragdrop.c and clipboard.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 2 +- dlls/winemac.drv/dragdrop.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 - 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 16eff401a98..16c44ddfde6 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -210,7 +210,7 @@ static unsigned int nb_current_mac_formats; /************************************************************************** * debugstr_format */ -const char *debugstr_format(UINT id) +static const char *debugstr_format(UINT id) { WCHAR buffer[256]; diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index d5de2abb37a..19a5c4794b5 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -46,6 +46,46 @@ typedef struct } DragDropDataObject; +/************************************************************************** + * debugstr_format + */ +static const char *debugstr_format(UINT id) +{ + WCHAR buffer[256]; + + if (GetClipboardFormatNameW(id, buffer, 256)) + return wine_dbg_sprintf("0x%04x %s", id, debugstr_w(buffer)); + + switch (id) + { +#define BUILTIN(id) case id: return #id; + BUILTIN(CF_TEXT) + BUILTIN(CF_BITMAP) + BUILTIN(CF_METAFILEPICT) + BUILTIN(CF_SYLK) + BUILTIN(CF_DIF) + BUILTIN(CF_TIFF) + BUILTIN(CF_OEMTEXT) + BUILTIN(CF_DIB) + BUILTIN(CF_PALETTE) + BUILTIN(CF_PENDATA) + BUILTIN(CF_RIFF) + BUILTIN(CF_WAVE) + BUILTIN(CF_UNICODETEXT) + BUILTIN(CF_ENHMETAFILE) + BUILTIN(CF_HDROP) + BUILTIN(CF_LOCALE) + BUILTIN(CF_DIBV5) + BUILTIN(CF_OWNERDISPLAY) + BUILTIN(CF_DSPTEXT) + BUILTIN(CF_DSPBITMAP) + BUILTIN(CF_DSPMETAFILEPICT) + BUILTIN(CF_DSPENHMETAFILE) +#undef BUILTIN + default: return wine_dbg_sprintf("0x%04x", id); + } +} + static inline DragDropDataObject *impl_from_IDataObject(IDataObject *iface) { return CONTAINING_RECORD(iface, DragDropDataObject, IDataObject_iface); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index c0f2811c5f5..401ebab3bcc 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -255,7 +255,6 @@ extern void macdrv_displays_changed(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_UpdateClipboard(void) DECLSPEC_HIDDEN; extern BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) DECLSPEC_HIDDEN; extern void macdrv_lost_pasteboard_ownership(HWND hwnd) DECLSPEC_HIDDEN; -extern const char *debugstr_format(UINT id) DECLSPEC_HIDDEN; extern HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; extern BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; extern UINT* macdrv_get_pasteboard_formats(CFTypeRef pasteboard, UINT* num_formats) DECLSPEC_HIDDEN;

1 0

Jactry Zeng : user32/tests: Add more tests of SetClipboardData().
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: e743f02010917bbb666197d76aa272fd0741000c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e743f02010917bbb666197d7… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sun May 29 02:11:00 2022 -0500 user32/tests: Add more tests of SetClipboardData(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/user32/tests/clipboard.c | 81 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 3053de398f9..537b714a6ac 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1897,10 +1897,15 @@ static void test_data_handles(void) { BOOL r; char *ptr; - HANDLE h, text; + HANDLE h, text, metafile; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); BITMAPINFO bmi; void *bits; + PALETTEENTRY entry; + BYTE buffer[1024]; + HENHMETAFILE emf; + int result; + HDC hdc = GetDC( 0 ); ok( hwnd != 0, "window creation failed\n" ); format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); @@ -2013,6 +2018,80 @@ static void test_data_handles(void) r = CloseClipboard(); ok( r, "gle %ld\n", GetLastError() ); + r = open_clipboard( hwnd ); + ok( r, "Open clipboard failed: %#lx.\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#lx.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_BITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_BITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + result = GetDIBits( hdc, h, 0, 0, NULL, &bmi, 0 ); + todo_wine ok( !!result, "GetDIBits failed: %#lx.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_DSPBITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_DSPBITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok( !GetDIBits( hdc, h, 0, 0, 0, &bmi, 0 ), "GetDIBits returned unexpected value.\n" ); + + palette = CreatePalette( &logpalette ); + h = SetClipboardData( CF_PALETTE, palette ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + ok( !!DeleteObject( palette ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_PALETTE ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + todo_wine ok( !!GetPaletteEntries( h, 0, 1, &entry ), "GetPaletteEntries %p failed.\n", h ); + todo_wine ok( entry.peRed == 0x12 && entry.peGreen == 0x34 && entry.peBlue == 0x56, + "Got wrong color (%02x, %02x, %02x).\n", entry.peRed, entry.peGreen, entry.peBlue ); + + emf = create_emf(); + h = SetClipboardData( CF_ENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_ENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + emf = create_emf(); + h = SetClipboardData( CF_DSPENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_DSPENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + metafile = create_metafile(); + h = SetClipboardData( CF_METAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_METAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + metafile = create_metafile(); + h = SetClipboardData( CF_DSPMETAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_DSPMETAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#lx.\n", GetLastError() ); + r = CloseClipboard(); + ok( r, "CloseClipboard failed: %#lx.\n", GetLastError() ); + + ReleaseDC( 0, hdc ); DestroyWindow( hwnd ); }

1 0

Jactry Zeng : win32u/clipboard: Set handle of bitmap and palette as system object.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: f30332fe5eaa6d05ec1491702fd4424cf29bd7dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f30332fe5eaa6d05ec149170… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sun May 29 02:25:01 2022 -0500 win32u/clipboard: Set handle of bitmap and palette as system object. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/user32/tests/clipboard.c | 6 +++--- dlls/win32u/clipboard.c | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 537b714a6ac..e05de29805e 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -2032,7 +2032,7 @@ static void test_data_handles(void) memset( &bmi, 0, sizeof(bmi) ); bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); result = GetDIBits( hdc, h, 0, 0, NULL, &bmi, 0 ); - todo_wine ok( !!result, "GetDIBits failed: %#lx.\n", GetLastError() ); + ok( !!result, "GetDIBits failed: %#lx.\n", GetLastError() ); bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); h = SetClipboardData( CF_DSPBITMAP, bitmap ); @@ -2050,8 +2050,8 @@ static void test_data_handles(void) ok( !!DeleteObject( palette ), "DeleteObject failed.\n" ); h = GetClipboardData( CF_PALETTE ); ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); - todo_wine ok( !!GetPaletteEntries( h, 0, 1, &entry ), "GetPaletteEntries %p failed.\n", h ); - todo_wine ok( entry.peRed == 0x12 && entry.peGreen == 0x34 && entry.peBlue == 0x56, + ok( !!GetPaletteEntries( h, 0, 1, &entry ), "GetPaletteEntries %p failed.\n", h ); + ok( entry.peRed == 0x12 && entry.peGreen == 0x34 && entry.peBlue == 0x56, "Got wrong color (%02x, %02x, %02x).\n", entry.peRed, entry.peGreen, entry.peBlue ); emf = create_emf(); diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 67bdd0ba391..0ddbc62f444 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -31,6 +31,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "win32u_private.h" +#include "ntgdi_private.h" #include "ntuser_private.h" #include "wine/server.h" #include "wine/debug.h" @@ -112,8 +113,9 @@ static void free_cached_data( struct cached_format *cache ) switch (cache->format) { case CF_BITMAP: - case CF_DSPBITMAP: case CF_PALETTE: + make_gdi_object_system( cache->handle, FALSE ); + case CF_DSPBITMAP: NtGdiDeleteObjectApp( cache->handle ); break; @@ -595,6 +597,11 @@ NTSTATUS WINAPI NtUserSetClipboardData( UINT format, HANDLE data, struct set_cli cache->format = format; cache->handle = data; } + + if (format == CF_BITMAP || format == CF_PALETTE) + { + make_gdi_object_system( cache->handle, TRUE ); + } } pthread_mutex_lock( &clipboard_mutex );

1 0