wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Rémi Bernon : mf/tests: Check H264 decoder formats after stream change.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: cd90f650df483eddd73c53319b2e1f5bddfb3f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd90f650df483eddd73c5331… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 24 09:50:36 2022 +0100 mf/tests: Check H264 decoder formats after stream 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> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e0793152d74..e61442bb512 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6550,6 +6550,80 @@ static void test_h264_decoder(void) ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1088), {0}, }; + static const MFVideoArea actual_aperture = {.Area={78, 74}}; + static const media_type_desc actual_outputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80), + /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80), + /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80), + /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80), + /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 12800), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 160), + /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + }, + }; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; @@ -6814,6 +6888,33 @@ static void test_h264_decoder(void) ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %u\n", ret); + flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + todo_wine + ok(output_info.dwFlags == flags, "got dwFlags %#x\n", output_info.dwFlags); + todo_wine + ok(output_info.cbSize == 0x3200, "got cbSize %#x\n", output_info.cbSize); + todo_wine + ok(output_info.cbAlignment == 0, "got cbAlignment %#x\n", output_info.cbAlignment); + + i = -1; + while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(transform, 0, ++i, &media_type))) + { + winetest_push_context("out %u", i); + ok(hr == S_OK, "GetOutputAvailableType returned %#x\n", hr); + check_media_type(media_type, actual_outputs[i], -1); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + winetest_pop_context(); + } + todo_wine + ok(hr == MF_E_NO_MORE_TYPES, "GetOutputAvailableType returned %#x\n", hr); + todo_wine + ok(i == 5, "%u output media types\n", i); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret); ret = IMFSample_Release(sample);

1 0

Zebediah Figura : wined3d: Allocate a heap memory buffer in wined3d_cs_map_upload_bo() if possible.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 1b893093fd079091b0bb4368fbe3bec4f7871fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b893093fd079091b0bb4368… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 25 11:17:31 2022 -0600 wined3d: Allocate a heap memory buffer in wined3d_cs_map_upload_bo() if possible. Based on patches by Matteo Bruni and Michael Müller. 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> --- dlls/wined3d/cs.c | 31 +++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7418c6ab4bb..9073716d456 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2753,6 +2753,14 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi context_release(context); wined3d_resource_release(resource); + + if (op->bo.flags & UPLOAD_BO_FREE_ON_UNMAP) + { + if (op->bo.addr.buffer_object) + FIXME("Free BO address %s.\n", debug_const_bo_address(&op->bo.addr)); + else + heap_free((void *)op->bo.addr.addr); + } } void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, @@ -3091,10 +3099,13 @@ static void wined3d_cs_st_finish(struct wined3d_device_context *context, enum wi static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags) { + struct wined3d_client_resource *client = &resource->client; + const struct wined3d_format *format = resource->format; + size_t size; + if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) { const struct wined3d_d3d_info *d3d_info = &context->device->adapter->d3d_info; - struct wined3d_client_resource *client = &resource->client; struct wined3d_device *device = context->device; struct wined3d_bo_address addr; struct wined3d_bo *bo; @@ -3184,7 +3195,23 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str return true; } - return false; + wined3d_format_calculate_pitch(format, 1, box->right - box->left, + box->bottom - box->top, &map_desc->row_pitch, &map_desc->slice_pitch); + + size = (box->back - box->front - 1) * map_desc->slice_pitch + + ((box->bottom - box->top - 1) / format->block_height) * map_desc->row_pitch + + ((box->right - box->left + format->block_width - 1) / format->block_width) * format->block_byte_count; + + if (!(map_desc->data = heap_alloc(size))) + { + WARN_(d3d_perf)("Failed to allocate a heap memory buffer.\n"); + return false; + } + client->mapped_upload.addr.buffer_object = 0; + client->mapped_upload.addr.addr = map_desc->data; + client->mapped_upload.flags = UPLOAD_BO_UPLOAD_ON_UNMAP | UPLOAD_BO_FREE_ON_UNMAP; + client->mapped_box = *box; + return true; } static bool wined3d_bo_address_is_null(struct wined3d_const_bo_address *addr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a9837911ea6..a9a71b44a0e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3382,6 +3382,7 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, #define UPLOAD_BO_UPLOAD_ON_UNMAP 0x1 #define UPLOAD_BO_RENAME_ON_UNMAP 0x2 +#define UPLOAD_BO_FREE_ON_UNMAP 0x4 struct upload_bo {

1 0

Paul Gofman : kernel32: Import RtlRestoreContext() instead of forwarding.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 81e06c61368961ec1686d41cd27459ca50f4949e URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e06c61368961ec1686d41c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 25 16:07:14 2022 +0300 kernel32: Import RtlRestoreContext() instead of forwarding. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 168cbdb531c..818e7d87a2f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1313,7 +1313,7 @@ @ stdcall RtlMoveMemory(ptr ptr long) NTDLL.RtlMoveMemory @ stdcall RtlPcToFileHeader(ptr ptr) NTDLL.RtlPcToFileHeader @ stdcall -arch=arm,arm64,x86_64 -norelay RtlRaiseException(ptr) NTDLL.RtlRaiseException -@ cdecl -arch=arm,arm64,x86_64 RtlRestoreContext(ptr ptr) NTDLL.RtlRestoreContext +@ cdecl -arch=arm,arm64,x86_64 -import RtlRestoreContext(ptr ptr) @ stdcall RtlUnwind(ptr ptr ptr long) NTDLL.RtlUnwind @ stdcall -arch=arm,arm64,x86_64 RtlUnwindEx(long long ptr long ptr) NTDLL.RtlUnwindEx @ stdcall -arch=arm,arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) NTDLL.RtlVirtualUnwind

1 0

Paul Gofman : kernel32: Import RtlCaptureContext() instead of forwarding.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 40590b7a97412836cf04bb32bbd18b849820bcfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=40590b7a97412836cf04bb32… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 25 16:07:13 2022 +0300 kernel32: Import RtlCaptureContext() instead of forwarding. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3cf85be10fd..168cbdb531c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1302,7 +1302,7 @@ @ stdcall RestoreLastError(long) NTDLL.RtlRestoreLastWin32Error @ stdcall -import ResumeThread(long) @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) NTDLL.RtlAddFunctionTable -@ stdcall -norelay RtlCaptureContext(ptr) NTDLL.RtlCaptureContext +@ stdcall -norelay -import RtlCaptureContext(ptr) @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) NTDLL.RtlCaptureStackBackTrace @ stdcall -arch=arm,arm64,x86_64 RtlCompareMemory(ptr ptr long) NTDLL.RtlCompareMemory @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) NTDLL.RtlCopyMemory

1 0

Rémi Bernon : winegstreamer: Send stream-start, caps, and segment events on creation.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 227a1275b14a2ffd71a4d0c621cb655e3576ad02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=227a1275b14a2ffd71a4d0c6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 25 11:43:01 2022 -0600 winegstreamer: Send stream-start, caps, and segment events on creation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index c5aa4acb2cc..45f8588b9f1 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -47,6 +47,7 @@ struct wg_transform GstElement *container; GstPad *my_src, *my_sink; GstPad *their_sink, *their_src; + GstSegment segment; }; static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) @@ -154,6 +155,7 @@ NTSTATUS wg_transform_create(void *args) GstPadTemplate *template = NULL; struct wg_transform *transform; const gchar *media_type; + GstEvent *event; if (!init_gstreamer()) return STATUS_UNSUCCESSFUL; @@ -257,6 +259,22 @@ NTSTATUS wg_transform_create(void *args) if (!gst_element_get_state(transform->container, NULL, NULL, -1)) goto out; + if (!(event = gst_event_new_stream_start("stream")) + || !gst_pad_push_event(transform->my_src, event)) + goto out; + if (!(event = gst_event_new_caps(src_caps)) + || !gst_pad_push_event(transform->my_src, event)) + goto out; + + /* We need to use GST_FORMAT_TIME here because it's the only format + * some elements such avdec_wmav2 correctly support. */ + gst_segment_init(&transform->segment, GST_FORMAT_TIME); + transform->segment.start = 0; + transform->segment.stop = -1; + if (!(event = gst_event_new_segment(&transform->segment)) + || !gst_pad_push_event(transform->my_src, event)) + goto out; + gst_caps_unref(sink_caps); gst_caps_unref(src_caps); @@ -278,7 +296,10 @@ out: if (src_caps) gst_caps_unref(src_caps); if (transform->container) + { + gst_element_set_state(transform->container, GST_STATE_NULL); gst_object_unref(transform->container); + } free(transform); GST_ERROR("Failed to create winegstreamer transform."); return status;

1 0

Rémi Bernon : winegstreamer: Link the container pads and activate ours.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 9196fee58349558593fd7edf4768b189c25f6293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9196fee58349558593fd7edf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 25 11:43:00 2022 -0600 winegstreamer: Link the container pads and activate ours. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 0772915e46f..c5aa4acb2cc 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -46,6 +46,7 @@ struct wg_transform { GstElement *container; GstPad *my_src, *my_sink; + GstPad *their_sink, *their_src; }; static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) @@ -64,6 +65,8 @@ NTSTATUS wg_transform_destroy(void *args) struct wg_transform *transform = args; gst_element_set_state(transform->container, GST_STATE_NULL); + g_object_unref(transform->their_sink); + g_object_unref(transform->their_src); g_object_unref(transform->container); g_object_unref(transform->my_sink); g_object_unref(transform->my_src); @@ -237,6 +240,19 @@ NTSTATUS wg_transform_create(void *args) goto out; } + if (!(transform->their_sink = gst_element_get_static_pad(first, "sink"))) + goto out; + if (!(transform->their_src = gst_element_get_static_pad(last, "src"))) + goto out; + if (gst_pad_link(transform->my_src, transform->their_sink) < 0) + goto out; + if (gst_pad_link(transform->their_src, transform->my_sink) < 0) + goto out; + if (!gst_pad_set_active(transform->my_sink, 1)) + goto out; + if (!gst_pad_set_active(transform->my_src, 1)) + goto out; + gst_element_set_state(transform->container, GST_STATE_PAUSED); if (!gst_element_get_state(transform->container, NULL, NULL, -1)) goto out; @@ -249,6 +265,10 @@ NTSTATUS wg_transform_create(void *args) return STATUS_SUCCESS; out: + if (transform->their_sink) + gst_object_unref(transform->their_sink); + if (transform->their_src) + gst_object_unref(transform->their_src); if (transform->my_sink) gst_object_unref(transform->my_sink); if (sink_caps)

1 0

Zebediah Figura : winegstreamer: Do not use multiple cleanup labels in wg_transform_create().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: aa867c6cfba48a63179088ec6381c73488853659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa867c6cfba48a63179088ec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 25 11:42:59 2022 -0600 winegstreamer: Do not use multiple cleanup labels in wg_transform_create(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 50 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index d316071cf60..0772915e46f 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -158,25 +158,25 @@ NTSTATUS wg_transform_create(void *args) if (!(transform = calloc(1, sizeof(*transform)))) return STATUS_NO_MEMORY; if (!(transform->container = gst_bin_new("wg_transform"))) - goto out_free_transform; + goto out; if (!(src_caps = wg_format_to_caps(&input_format))) - goto out_free_container; + goto out; if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps))) - goto out_free_src_caps; + goto out; transform->my_src = gst_pad_new_from_template(template, "src"); g_object_unref(template); if (!transform->my_src) - goto out_free_src_caps; + goto out; if (!(sink_caps = wg_format_to_caps(&output_format))) - goto out_free_src_pad; + goto out; if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps))) - goto out_free_sink_caps; + goto out; transform->my_sink = gst_pad_new_from_template(template, "sink"); g_object_unref(template); if (!transform->my_sink) - goto out_free_sink_caps; + goto out; gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); @@ -187,7 +187,7 @@ NTSTATUS wg_transform_create(void *args) */ media_type = gst_structure_get_name(gst_caps_get_structure(sink_caps, 0)); if (!(raw_caps = gst_caps_new_empty_simple(media_type))) - goto out_free_sink_pad; + goto out; switch (input_format.major_type) { @@ -196,7 +196,7 @@ NTSTATUS wg_transform_create(void *args) || !transform_append_element(transform, element, &first, &last)) { gst_caps_unref(raw_caps); - goto out_free_sink_pad; + goto out; } break; @@ -205,7 +205,7 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_UNKNOWN: GST_FIXME("Format %u not implemented!", input_format.major_type); gst_caps_unref(raw_caps); - goto out_free_sink_pad; + goto out; } gst_caps_unref(raw_caps); @@ -224,22 +224,22 @@ NTSTATUS wg_transform_create(void *args) */ if (!(element = create_element("audioconvert", "base")) || !transform_append_element(transform, element, &first, &last)) - goto out_free_sink_pad; + goto out; if (!(element = create_element("audioresample", "base")) || !transform_append_element(transform, element, &first, &last)) - goto out_free_sink_pad; + goto out; break; case WG_MAJOR_TYPE_VIDEO: case WG_MAJOR_TYPE_WMA: case WG_MAJOR_TYPE_UNKNOWN: GST_FIXME("Format %u not implemented!", output_format.major_type); - goto out_free_sink_pad; + goto out; } gst_element_set_state(transform->container, GST_STATE_PAUSED); if (!gst_element_get_state(transform->container, NULL, NULL, -1)) - goto out_free_sink_pad; + goto out; gst_caps_unref(sink_caps); gst_caps_unref(src_caps); @@ -248,17 +248,17 @@ NTSTATUS wg_transform_create(void *args) params->transform = transform; return STATUS_SUCCESS; -out_free_sink_pad: - gst_object_unref(transform->my_sink); -out_free_sink_caps: - gst_caps_unref(sink_caps); -out_free_src_pad: - gst_object_unref(transform->my_src); -out_free_src_caps: - gst_caps_unref(src_caps); -out_free_container: - gst_object_unref(transform->container); -out_free_transform: +out: + if (transform->my_sink) + gst_object_unref(transform->my_sink); + if (sink_caps) + gst_caps_unref(sink_caps); + if (transform->my_src) + gst_object_unref(transform->my_src); + if (src_caps) + gst_caps_unref(src_caps); + if (transform->container) + gst_object_unref(transform->container); free(transform); GST_ERROR("Failed to create winegstreamer transform."); return status;

1 0

Zebediah Figura : winegstreamer: Don't unlink pads before dereferencing them.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: d2f653a854ccd17688813d6b7f585acbfb45b9ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f653a854ccd17688813d6b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 25 11:42:58 2022 -0600 winegstreamer: Don't unlink pads before dereferencing them. GStreamer pads are automatically unlinked when destroyed. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f36feead9c6..46a298f13c1 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -683,14 +683,10 @@ static void free_stream(struct wg_parser_stream *stream) { if (stream->post_sink) { - gst_pad_unlink(stream->their_src, stream->post_sink); - gst_pad_unlink(stream->post_src, stream->my_sink); gst_object_unref(stream->post_src); gst_object_unref(stream->post_sink); stream->post_src = stream->post_sink = NULL; } - else - gst_pad_unlink(stream->their_src, stream->my_sink); gst_object_unref(stream->their_src); } gst_object_unref(stream->my_sink); @@ -1286,7 +1282,6 @@ out: gst_element_set_state(parser->container, GST_STATE_NULL); if (parser->their_sink) { - gst_pad_unlink(parser->my_src, parser->their_sink); gst_object_unref(parser->their_sink); parser->my_src = parser->their_sink = NULL; } @@ -1327,7 +1322,6 @@ static NTSTATUS wg_parser_disconnect(void *args) pthread_mutex_unlock(&parser->mutex); gst_element_set_state(parser->container, GST_STATE_NULL); - gst_pad_unlink(parser->my_src, parser->their_sink); gst_object_unref(parser->my_src); gst_object_unref(parser->their_sink); parser->my_src = parser->their_sink = NULL;

1 0

Jacek Caban : win32u: Move IsWindow implementation from user32.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: bde39137cf4d8d392b8ca844b70b32d8ae922124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bde39137cf4d8d392b8ca844… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 25 16:25:30 2022 +0100 win32u: Move IsWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 21 +-------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 7 +++++++ 7 files changed, 57 insertions(+), 21 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index cd36140e1aa..c580d040bf1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3063,26 +3063,7 @@ INT WINAPI GetWindowTextLengthW( HWND hwnd ) */ BOOL WINAPI IsWindow( HWND hwnd ) { - WND *ptr; - BOOL ret; - - if (!(ptr = WIN_GetPtr( hwnd ))) return FALSE; - if (ptr == WND_DESKTOP) return TRUE; - - if (ptr != WND_OTHER_PROCESS) - { - WIN_ReleasePtr( ptr ); - return TRUE; - } - - /* check other processes */ - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + return NtUserCallHwnd( hwnd, NtUserIsWindow ); } diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index fe22c1ed2fe..589143e99a6 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1150,6 +1150,7 @@ static struct unix_funcs unix_funcs = NtGdiUpdateColors, NtGdiWidenPath, NtUserActivateKeyboardLayout, + NtUserCallHwnd, NtUserCallHwndParam, NtUserCallNextHookEx, NtUserCallNoParam, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index f53c90990b5..0b63c43c6f6 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -768,7 +768,7 @@ @ stub NtUserBuildPropList @ stub NtUserCalcMenuBar @ stub NtUserCalculatePopupWindowPosition -@ stub NtUserCallHwnd +@ stdcall NtUserCallHwnd(long long) @ stub NtUserCallHwndLock @ stub NtUserCallHwndLockSafe @ stub NtUserCallHwndOpt diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 168694378d2..e6a5105dcf5 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -183,6 +183,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); HKL (WINAPI *pNtUserActivateKeyboardLayout)( HKL layout, UINT flags ); + DWORD (WINAPI *pNtUserCallHwnd)( HWND hwnd, DWORD code ); DWORD (WINAPI *pNtUserCallHwndParam)( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT (WINAPI *pNtUserCallNextHookEx)( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 985b68ff1c2..7725ba7bd53 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -247,6 +247,31 @@ HWND is_current_thread_window( HWND hwnd ) return ret; } +/* see IsWindow */ +static BOOL is_window( HWND hwnd ) +{ + WND *win; + BOOL ret; + + if (!(win = get_win_ptr( hwnd ))) return FALSE; + if (win == WND_DESKTOP) return TRUE; + + if (win != WND_OTHER_PROCESS) + { + release_win_ptr( win ); + return TRUE; + } + + /* check other processes */ + SERVER_START_REQ( get_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} + /* see GetWindowThreadProcessId */ static DWORD get_window_thread( HWND hwnd, DWORD *process ) { @@ -400,6 +425,21 @@ NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULON return STATUS_SUCCESS; } +/***************************************************************************** + * NtUserCallHwnd (win32u.@) + */ +DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) +{ + switch (code) + { + case NtUserIsWindow: + return is_window( hwnd ); + default: + FIXME( "invalid code %u\n", code ); + return 0; + } +} + /***************************************************************************** * NtUserCallHwndParam (win32u.@) */ diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 4fd01459374..06af8cab20f 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -725,6 +725,12 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); } +DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserCallHwnd( hwnd, code ); +} + DWORD WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) { if (!unix_funcs) return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 70a1df91113..a899c03e66e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -134,6 +134,12 @@ enum NtUserSetHandlePtr, }; +/* NtUserCallHwnd codes, not compatible with Windows */ +enum +{ + NtUserIsWindow, +}; + /* NtUserCallHwndParam codes, not compatible with Windows */ enum { @@ -198,6 +204,7 @@ BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULONG unk4, ULONG thread_id, ULONG count, HWND *buffer, ULONG *size ); +DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ); DWORD WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT WINAPI NtUserCallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR WINAPI NtUserCallNoParam( ULONG code );

1 0

Jacek Caban : win32u: Move GetWindowThreadProcessId implementation from user32.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: cb4c3b8d77d6f89e418cde3f3a4b7f9daea9d381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb4c3b8d77d6f89e418cde3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 25 16:03:05 2022 +0100 win32u: Move GetWindowThreadProcessId implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 31 +------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 +++++ include/ntuser.h | 7 ++++++ 7 files changed, 70 insertions(+), 31 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a63a650196c..cd36140e1aa 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3091,36 +3091,7 @@ BOOL WINAPI IsWindow( HWND hwnd ) */ DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process ) { - WND *ptr; - DWORD tid = 0; - - if (!(ptr = WIN_GetPtr( hwnd ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE); - return 0; - } - - if (ptr != WND_OTHER_PROCESS && ptr != WND_DESKTOP) - { - /* got a valid window */ - tid = ptr->tid; - if (process) *process = GetCurrentProcessId(); - WIN_ReleasePtr( ptr ); - return tid; - } - - /* check other processes */ - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) - { - tid = (DWORD)reply->tid; - if (process) *process = (DWORD)reply->pid; - } - } - SERVER_END_REQ; - return tid; + return NtUserCallHwndParam( hwnd, (UINT_PTR)process, NtUserGetWindowThread ); } diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 4075c202eaf..fe22c1ed2fe 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1150,6 +1150,7 @@ static struct unix_funcs unix_funcs = NtGdiUpdateColors, NtGdiWidenPath, NtUserActivateKeyboardLayout, + NtUserCallHwndParam, NtUserCallNextHookEx, NtUserCallNoParam, NtUserCallOneParam, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 1c220163d50..f53c90990b5 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -772,7 +772,7 @@ @ stub NtUserCallHwndLock @ stub NtUserCallHwndLockSafe @ stub NtUserCallHwndOpt -@ stub NtUserCallHwndParam +@ stdcall NtUserCallHwndParam(long ptr long) @ stub NtUserCallHwndParamLock @ stub NtUserCallHwndParamLockSafe @ stub NtUserCallHwndSafe diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 1447469c19d..168694378d2 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -183,6 +183,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); HKL (WINAPI *pNtUserActivateKeyboardLayout)( HKL layout, UINT flags ); + DWORD (WINAPI *pNtUserCallHwndParam)( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT (WINAPI *pNtUserCallNextHookEx)( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index ca6d270fd06..985b68ff1c2 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -31,6 +31,9 @@ #include "win32u_private.h" #include "ntuser_private.h" #include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(win); #define NB_USER_HANDLES ((LAST_USER_HANDLE - FIRST_USER_HANDLE + 1) >> 1) #define USER_HANDLE_TO_INDEX(hwnd) ((LOWORD(hwnd) - FIRST_USER_HANDLE) >> 1) @@ -244,6 +247,41 @@ HWND is_current_thread_window( HWND hwnd ) return ret; } +/* see GetWindowThreadProcessId */ +static DWORD get_window_thread( HWND hwnd, DWORD *process ) +{ + WND *ptr; + DWORD tid = 0; + + if (!(ptr = get_win_ptr( hwnd ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE); + return 0; + } + + if (ptr != WND_OTHER_PROCESS && ptr != WND_DESKTOP) + { + /* got a valid window */ + tid = ptr->tid; + if (process) *process = GetCurrentProcessId(); + release_win_ptr( ptr ); + return tid; + } + + /* check other processes */ + SERVER_START_REQ( get_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) + { + tid = (DWORD)reply->tid; + if (process) *process = (DWORD)reply->pid; + } + } + SERVER_END_REQ; + return tid; +} + /*********************************************************************** * NtUserGetProp (win32u.@) * @@ -361,3 +399,18 @@ NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULON buffer[*size - 1] = HWND_BOTTOM; return STATUS_SUCCESS; } + +/***************************************************************************** + * NtUserCallHwndParam (win32u.@) + */ +DWORD WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) +{ + switch (code) + { + case NtUserGetWindowThread: + return get_window_thread( hwnd, (DWORD *)param ); + default: + FIXME( "invalid code %u\n", code ); + return 0; + } +} diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 9ea7ed0c09b..4fd01459374 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -725,6 +725,12 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); } +DWORD WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserCallHwndParam( hwnd, param, code ); +} + LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ) { diff --git a/include/ntuser.h b/include/ntuser.h index 9eb311b3e52..70a1df91113 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -134,6 +134,12 @@ enum NtUserSetHandlePtr, }; +/* NtUserCallHwndParam codes, not compatible with Windows */ +enum +{ + NtUserGetWindowThread, +}; + /* color index used to retrieve system 55aa brush */ #define COLOR_55AA_BRUSH 0x100 @@ -192,6 +198,7 @@ BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULONG unk4, ULONG thread_id, ULONG count, HWND *buffer, ULONG *size ); +DWORD WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT WINAPI NtUserCallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ); ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code );

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
150
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022