February 2024 - Wine-Commits

Rémi Bernon : winegstreamer: Handle sink event caps in a separate helper.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 4f349d442a14b0cec0bdd25ac8d0ddfcd3a1e71e URL: https://gitlab.winehq.org/wine/wine/-/commit/4f349d442a14b0cec0bdd25ac8d0dd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 30 17:20:07 2024 +0100 winegstreamer: Handle sink event caps in a separate helper. --- dlls/winegstreamer/wg_transform.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index dd80560016f..0c796bddf57 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -233,6 +233,19 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery return gst_pad_query_default(pad, parent, query); } +static void transform_sink_event_caps(struct wg_transform *transform, GstEvent *event) +{ + GstCaps *caps; + + gst_event_parse_caps(event, &caps); + + transform->output_caps_changed = transform->output_caps_changed + || !gst_caps_is_always_compatible(transform->output_caps, caps); + + gst_caps_unref(transform->output_caps); + transform->output_caps = gst_caps_ref(caps); +} + static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) { struct wg_transform *transform = gst_pad_get_element_private(pad); @@ -241,22 +254,12 @@ static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent switch (event->type) { - case GST_EVENT_CAPS: - { - GstCaps *caps; - - gst_event_parse_caps(event, &caps); - - transform->output_caps_changed = transform->output_caps_changed - || !gst_caps_is_always_compatible(transform->output_caps, caps); - - gst_caps_unref(transform->output_caps); - transform->output_caps = gst_caps_ref(caps); - break; - } - default: - GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); - break; + case GST_EVENT_CAPS: + transform_sink_event_caps(transform, event); + break; + default: + GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); + break; } gst_event_unref(event);

1 0

Rémi Bernon : winegstreamer: Use GST_PTR_FORMAT to trace GStreamer objects.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 62955f22295e69539f14d808adf179afd9583e5a URL: https://gitlab.winehq.org/wine/wine/-/commit/62955f22295e69539f14d808adf179… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 30 17:24:49 2024 +0100 winegstreamer: Use GST_PTR_FORMAT to trace GStreamer objects. --- dlls/winegstreamer/wg_transform.c | 53 ++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 0c796bddf57..56523c7606a 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -87,7 +87,7 @@ static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, Gst struct wg_transform *transform = gst_pad_get_element_private(pad); GstSample *sample; - GST_LOG("transform %p, buffer %p.", transform, buffer); + GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, buffer); if (!(sample = gst_sample_new(buffer, transform->output_caps, NULL, NULL))) { @@ -107,7 +107,7 @@ static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, Gst static gboolean transform_src_query_latency(struct wg_transform *transform, GstQuery *query) { - GST_LOG("transform %p, query %p", transform, query); + GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, query); gst_query_set_latency(query, transform->attrs.low_latency, 0, 0); return true; } @@ -121,6 +121,7 @@ static gboolean transform_src_query_cb(GstPad *pad, GstObject *parent, GstQuery case GST_QUERY_LATENCY: return transform_src_query_latency(transform, query); default: + GST_TRACE("transform %p, ignoring %"GST_PTR_FORMAT, transform, query); return gst_pad_query_default(pad, parent, query); } } @@ -135,6 +136,8 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform, GstVideoInfo info; GstCaps *caps; + GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, query); + gst_query_parse_allocation(query, &caps, &needs_pool); if (stream_type_from_caps(caps) != GST_STREAM_TYPE_VIDEO || !needs_pool) return false; @@ -157,7 +160,7 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform, } if (!(config = gst_buffer_pool_get_config(pool))) - GST_ERROR("Failed to get pool %p config.", pool); + GST_ERROR("Failed to get %"GST_PTR_FORMAT" config.", pool); else { gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_META); @@ -168,17 +171,17 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform, info.size, 0, 0); gst_buffer_pool_config_set_allocator(config, transform->allocator, NULL); if (!gst_buffer_pool_set_config(pool, config)) - GST_ERROR("Failed to set pool %p config.", pool); + GST_ERROR("Failed to set %"GST_PTR_FORMAT" 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_ERROR("%"GST_PTR_FORMAT" failed to activate.", pool); gst_query_add_allocation_pool(query, pool, info.size, 0, 0); gst_query_add_allocation_param(query, transform->allocator, NULL); - GST_INFO("Proposing pool %p, buffer size %#zx, allocator %p, for query %p.", + GST_INFO("Proposing %"GST_PTR_FORMAT", buffer size %#zx, %"GST_PTR_FORMAT", for %"GST_PTR_FORMAT, pool, info.size, transform->allocator, query); g_object_unref(pool); @@ -189,7 +192,7 @@ static gboolean transform_sink_query_caps(struct wg_transform *transform, GstQue { GstCaps *caps, *filter, *temp; - GST_LOG("transform %p, query %"GST_PTR_FORMAT, transform, query); + GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, query); gst_query_parse_caps(query, &filter); if (!(caps = wg_format_to_caps(&transform->output_format))) @@ -213,23 +216,21 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery { 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: - if (transform_sink_query_allocation(transform, query)) - return true; - break; - case GST_QUERY_CAPS: - if (transform_sink_query_caps(transform, query)) - return true; - break; - default: - GST_WARNING("Ignoring \"%s\" query.", gst_query_type_get_name(query->type)); - break; + case GST_QUERY_ALLOCATION: + if (transform_sink_query_allocation(transform, query)) + return true; + break; + case GST_QUERY_CAPS: + if (transform_sink_query_caps(transform, query)) + return true; + break; + default: + break; } + GST_TRACE("transform %p, ignoring %"GST_PTR_FORMAT, transform, query); return gst_pad_query_default(pad, parent, query); } @@ -237,6 +238,8 @@ static void transform_sink_event_caps(struct wg_transform *transform, GstEvent * { GstCaps *caps; + GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, event); + gst_event_parse_caps(event, &caps); transform->output_caps_changed = transform->output_caps_changed @@ -250,15 +253,13 @@ static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent { struct wg_transform *transform = gst_pad_get_element_private(pad); - GST_LOG("transform %p, type \"%s\".", transform, GST_EVENT_TYPE_NAME(event)); - switch (event->type) { case GST_EVENT_CAPS: transform_sink_event_caps(transform, event); break; default: - GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); + GST_TRACE("transform %p, ignoring %"GST_PTR_FORMAT, transform, event); break; } @@ -601,7 +602,7 @@ NTSTATUS wg_transform_push_data(void *args) else { InterlockedIncrement(&sample->refcount); - GST_INFO("Wrapped %u/%u bytes from sample %p to buffer %p", sample->size, sample->max_size, sample, buffer); + GST_INFO("Wrapped %u/%u bytes from sample %p to %"GST_PTR_FORMAT, sample->size, sample->max_size, sample, buffer); } if (sample->flags & WG_SAMPLE_FLAG_HAS_PTS) @@ -708,7 +709,7 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) { - GST_ERROR("Failed to map buffer %p", buffer); + GST_ERROR("Failed to map buffer %"GST_PTR_FORMAT, buffer); sample->size = 0; return STATUS_UNSUCCESSFUL; } @@ -725,7 +726,7 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi if (status) { - GST_ERROR("Failed to copy buffer %p", buffer); + GST_ERROR("Failed to copy buffer %"GST_PTR_FORMAT, buffer); sample->size = 0; return status; }

1 0

Rémi Bernon : winegstreamer: Handle sink caps query in a separate helper.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: f39156ee6a0950cb71fabd4f50a768510f7e2366 URL: https://gitlab.winehq.org/wine/wine/-/commit/f39156ee6a0950cb71fabd4f50a768… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 30 17:17:25 2024 +0100 winegstreamer: Handle sink caps query in a separate helper. --- dlls/winegstreamer/wg_transform.c | 48 ++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 7ab798244b8..dd80560016f 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -185,6 +185,30 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform, return true; } +static gboolean transform_sink_query_caps(struct wg_transform *transform, GstQuery *query) +{ + GstCaps *caps, *filter, *temp; + + GST_LOG("transform %p, query %"GST_PTR_FORMAT, transform, query); + + gst_query_parse_caps(query, &filter); + if (!(caps = wg_format_to_caps(&transform->output_format))) + return false; + + if (filter) + { + temp = gst_caps_intersect(caps, filter); + gst_caps_unref(caps); + caps = temp; + } + + GST_INFO("Returning caps %" GST_PTR_FORMAT, caps); + + gst_query_set_caps_result(query, caps); + gst_caps_unref(caps); + return true; +} + static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) { struct wg_transform *transform = gst_pad_get_element_private(pad); @@ -198,27 +222,9 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery return true; break; case GST_QUERY_CAPS: - { - GstCaps *caps, *filter, *temp; - - gst_query_parse_caps(query, &filter); - if (!(caps = wg_format_to_caps(&transform->output_format))) - break; - - if (filter) - { - temp = gst_caps_intersect(caps, filter); - gst_caps_unref(caps); - caps = temp; - } - - GST_INFO("Returning caps %" GST_PTR_FORMAT, caps); - - gst_query_set_caps_result(query, caps); - gst_caps_unref(caps); - return true; - } - + if (transform_sink_query_caps(transform, query)) + return true; + break; default: GST_WARNING("Ignoring \"%s\" query.", gst_query_type_get_name(query->type)); break;

1 0

Rémi Bernon : winegstreamer: Handle allocation query in a separate helper.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: ec759079a58599da90a23c83e879e33b74a4b7cf URL: https://gitlab.winehq.org/wine/wine/-/commit/ec759079a58599da90a23c83e879e3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 30 17:16:10 2024 +0100 winegstreamer: Handle allocation query in a separate helper. --- dlls/winegstreamer/wg_transform.c | 114 ++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 55 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 525a4a0426d..7ab798244b8 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -125,74 +125,78 @@ static gboolean transform_src_query_cb(GstPad *pad, GstObject *parent, GstQuery } } -static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) +static gboolean transform_sink_query_allocation(struct wg_transform *transform, GstQuery *query) { - struct wg_transform *transform = gst_pad_get_element_private(pad); + gsize plane_align = transform->attrs.output_plane_align; + GstStructure *config, *params; + GstVideoAlignment align; + gboolean needs_pool; + GstBufferPool *pool; + GstVideoInfo info; + GstCaps *caps; - GST_LOG("transform %p, type \"%s\".", transform, gst_query_type_get_name(query->type)); + gst_query_parse_allocation(query, &caps, &needs_pool); + if (stream_type_from_caps(caps) != GST_STREAM_TYPE_VIDEO || !needs_pool) + return false; - switch (query->type) - { - case GST_QUERY_ALLOCATION: - { - gsize plane_align = transform->attrs.output_plane_align; - GstStructure *config, *params; - GstVideoAlignment align; - gboolean needs_pool; - GstBufferPool *pool; - GstVideoInfo info; - GstCaps *caps; + if (!gst_video_info_from_caps(&info, caps) + || !(pool = gst_video_buffer_pool_new())) + return false; - gst_query_parse_allocation(query, &caps, &needs_pool); - if (stream_type_from_caps(caps) != GST_STREAM_TYPE_VIDEO || !needs_pool) - break; + align_video_info_planes(plane_align, &info, &align); - if (!gst_video_info_from_caps(&info, caps) - || !(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); + gst_structure_free(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); - align_video_info_planes(plane_align, &info, &align); + gst_buffer_pool_config_set_params(config, caps, + info.size, 0, 0); + gst_buffer_pool_config_set_allocator(config, transform->allocator, NULL); + if (!gst_buffer_pool_set_config(pool, config)) + GST_ERROR("Failed to set pool %p config.", pool); + } - 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); - gst_structure_free(params); - } + /* 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); - 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); - gst_buffer_pool_config_set_allocator(config, transform->allocator, NULL); - 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_query_add_allocation_param(query, transform->allocator, NULL); - /* 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_INFO("Proposing pool %p, buffer size %#zx, allocator %p, for query %p.", + pool, info.size, transform->allocator, query); - gst_query_add_allocation_pool(query, pool, info.size, 0, 0); - gst_query_add_allocation_param(query, transform->allocator, NULL); + g_object_unref(pool); + return true; +} - GST_INFO("Proposing pool %p, buffer size %#zx, allocator %p, for query %p.", - pool, info.size, transform->allocator, query); +static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) +{ + struct wg_transform *transform = gst_pad_get_element_private(pad); - g_object_unref(pool); - return true; - } + GST_LOG("transform %p, type \"%s\".", transform, gst_query_type_get_name(query->type)); + switch (query->type) + { + case GST_QUERY_ALLOCATION: + if (transform_sink_query_allocation(transform, query)) + return true; + break; case GST_QUERY_CAPS: { GstCaps *caps, *filter, *temp;

1 0

Rémi Bernon : winegstreamer: Trace wg_transform input and output caps.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 6dae92cfb916847f7cf1160e74d1c97553d3bced URL: https://gitlab.winehq.org/wine/wine/-/commit/6dae92cfb916847f7cf1160e74d1c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 30 17:05:11 2024 +0100 winegstreamer: Trace wg_transform input and output caps. --- dlls/winegstreamer/wg_transform.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index db2a5037476..525a4a0426d 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -324,6 +324,8 @@ NTSTATUS wg_transform_create(void *args) if (!transform->my_src) goto out; + GST_INFO("transform %p input caps %"GST_PTR_FORMAT, transform, src_caps); + gst_pad_set_element_private(transform->my_src, transform); gst_pad_set_query_function(transform->my_src, transform_src_query_cb); @@ -336,6 +338,8 @@ NTSTATUS wg_transform_create(void *args) if (!transform->my_sink) goto out; + GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, transform->output_caps); + 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); @@ -505,6 +509,8 @@ NTSTATUS wg_transform_set_output_format(void *args) } transform->output_format = *format; + GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, caps); + if (gst_caps_is_always_compatible(transform->output_caps, caps)) { gst_caps_unref(caps); @@ -795,6 +801,8 @@ NTSTATUS wg_transform_read_data(void *args) { GST_MINI_OBJECT_FLAG_UNSET(transform->output_sample, GST_SAMPLE_FLAG_WG_CAPS_CHANGED); + GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, output_caps); + if (format) { gsize plane_align = transform->attrs.output_plane_align;

1 0

Esme Povirk : mscoree: Update Wine Mono to 9.0.0.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: e891073c9eacc391cfa1bdb65e734922742c2c17 URL: https://gitlab.winehq.org/wine/wine/-/commit/e891073c9eacc391cfa1bdb65e7349… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 2 17:55:27 2024 +0000 mscoree: Update Wine Mono to 9.0.0. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- tools/gitlab/test.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 88f871be53b..6133737c3ec 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -56,10 +56,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "8.1.0" +#define MONO_VERSION "9.0.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "0ed3ec533aef79b2f312155931cf7b1080009ac0c5b4c2bcfeb678ac948e0810" +#define MONO_SHA "79f6c43100675566c112f4199b9ea7b944d338164b34bd91fa11b0b0a414e1c4" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 06db53136e1..f27ff95be2d 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version); extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count); extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func); -#define WINE_MONO_VERSION "8.1.0" +#define WINE_MONO_VERSION "9.0.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 92c14d83996..aaad7b31c36 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -7,7 +7,7 @@ variables: GIT_STRATEGY: none GECKO_VER: 2.47.4 - MONO_VER: 8.1.0 + MONO_VER: 9.0.0 cache: - key: wine-gecko-$GECKO_VER paths:

1 0

Zebediah Figura : wined3d: Rename state.c to ffp_gl.c.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 4a30ab299ae60f891ef7498245a97c4099dd337d URL: https://gitlab.winehq.org/wine/wine/-/commit/4a30ab299ae60f891ef7498245a97c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 28 14:05:25 2023 -0500 wined3d: Rename state.c to ffp_gl.c. Better reflect its contents. There is still a small amount of code in this file not directly related to the FFP: - compile_state_table(), which should eventually go away; - states like state_so() and indexbuffer(), which should eventually be moved to context_gl.c with the rest of the resource loading/binding code. --- dlls/wined3d/Makefile.in | 2 +- dlls/wined3d/{state.c => ffp_gl.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 35de4aec8da..9223ecd77c9 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -15,6 +15,7 @@ SOURCES = \ cs.c \ device.c \ directx.c \ + ffp_gl.c \ gl_compat.c \ glsl_shader.c \ nvidia_texture_shader.c \ @@ -26,7 +27,6 @@ SOURCES = \ shader_sm1.c \ shader_sm4.c \ shader_spirv.c \ - state.c \ stateblock.c \ surface.c \ swapchain.c \ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/ffp_gl.c similarity index 99% rename from dlls/wined3d/state.c rename to dlls/wined3d/ffp_gl.c index 4183de6e638..de350241b05 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/ffp_gl.c @@ -1,5 +1,5 @@ /* - * Direct3D state management + * GL fixed-function pipeline * * Copyright 2002 Lionel Ulmer * Copyright 2002-2005 Jason Edmeades

1 0

Zebediah Figura : wined3d: Move sampler_texdim() and texture_activate_dimensions() to ffp_gl.c.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 0b4ad32c164e6474c689094d8f98825aee225b30 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b4ad32c164e6474c689094d8f9882… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 27 16:34:35 2023 -0500 wined3d: Move sampler_texdim() and texture_activate_dimensions() to ffp_gl.c. --- dlls/wined3d/ffp_gl.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 112 ------------------------------------------------ 2 files changed, 115 insertions(+), 112 deletions(-)

1 0

Rémi Bernon : dinput/tests: Test rawinput with the virtual HID touchscreen.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 303717f45fddfc21d54f52e85cb4d381c3552a53 URL: https://gitlab.winehq.org/wine/wine/-/commit/303717f45fddfc21d54f52e85cb4d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 28 09:34:36 2024 +0100 dinput/tests: Test rawinput with the virtual HID touchscreen. --- dlls/dinput/tests/device8.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index e5ae8fcb13b..fa5b800b74f 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1909,7 +1909,11 @@ static void test_hid_touch_screen(void) .todo = TRUE, }; + RAWINPUTDEVICE rawdevice = {.usUsagePage = HID_USAGE_PAGE_DIGITIZER, .usUsage = HID_USAGE_DIGITIZER_TOUCH_SCREEN}; + UINT rawbuffer_count, rawbuffer_size; WCHAR device_path[MAX_PATH]; + char rawbuffer[1024]; + RAWINPUT *rawinput; HANDLE file; DWORD res; HWND hwnd; @@ -1987,6 +1991,77 @@ static void test_hid_touch_screen(void) ok( pointer_up_count == 1, "got pointer_up_count %u\n", pointer_up_count ); + /* test that we receive HID rawinput type with the touchscreen */ + + rawdevice.dwFlags = RIDEV_INPUTSINK; + rawdevice.hwndTarget = hwnd; + ret = RegisterRawInputDevices( &rawdevice, 1, sizeof(RAWINPUTDEVICE) ); + ok( ret, "RegisterRawInputDevices failed, error %lu\n", GetLastError() ); + + bus_send_hid_input( file, &desc, &touch_multiple, sizeof(touch_multiple) ); + bus_wait_hid_input( file, &desc, 5000 ); + bus_send_hid_input( file, &desc, &touch_release, sizeof(touch_release) ); + bus_wait_hid_input( file, &desc, 5000 ); + + res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + todo_wine + ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); + + memset( rawbuffer, 0, sizeof(rawbuffer) ); + rawinput = (RAWINPUT *)rawbuffer; + rawbuffer_size = sizeof(rawbuffer); + rawbuffer_count = GetRawInputBuffer( rawinput, &rawbuffer_size, sizeof(RAWINPUTHEADER) ); + ok( rawbuffer_count == 2, "got rawbuffer_count %u\n", rawbuffer_count ); + ok( rawbuffer_size == sizeof(rawbuffer), "got rawbuffer_size %u\n", rawbuffer_size ); + + rawinput = (RAWINPUT *)rawbuffer; + ok( rawinput->header.dwType == RIM_TYPEHID, "got dwType %lu\n", rawinput->header.dwType ); + ok( rawinput->header.dwSize == offsetof(RAWINPUT, data.hid.bRawData[desc.caps.InputReportByteLength * rawinput->data.hid.dwCount]), + "got header.dwSize %lu\n", rawinput->header.dwSize ); + ok( rawinput->header.hDevice != 0, "got hDevice %p\n", rawinput->header.hDevice ); + ok( rawinput->header.wParam == 0, "got wParam %#Ix\n", rawinput->header.wParam ); + ok( rawinput->data.hid.dwSizeHid == desc.caps.InputReportByteLength, "got dwSizeHid %lu\n", rawinput->data.hid.dwSizeHid ); + ok( rawinput->data.hid.dwCount == 1, "got dwCount %lu\n", rawinput->data.hid.dwCount ); + ok( !memcmp( rawinput->data.hid.bRawData, touch_multiple.report_buf, desc.caps.InputReportByteLength ), + "got unexpected report data\n" ); + + rawdevice.dwFlags = RIDEV_REMOVE; + rawdevice.hwndTarget = 0; + ret = RegisterRawInputDevices( &rawdevice, 1, sizeof(RAWINPUTDEVICE) ); + ok( ret, "RegisterRawInputDevices failed, error %lu\n", GetLastError() ); + + + /* test that we don't receive mouse rawinput type with the touchscreen */ + + memset( rawbuffer, 0, sizeof(rawbuffer) ); + rawdevice.usUsagePage = HID_USAGE_PAGE_GENERIC; + rawdevice.usUsage = HID_USAGE_GENERIC_MOUSE; + rawdevice.dwFlags = RIDEV_INPUTSINK; + rawdevice.hwndTarget = hwnd; + ret = RegisterRawInputDevices( &rawdevice, 1, sizeof(RAWINPUTDEVICE) ); + ok( ret, "RegisterRawInputDevices failed, error %lu\n", GetLastError() ); + + bus_send_hid_input( file, &desc, &touch_multiple, sizeof(touch_multiple) ); + res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + todo_wine + ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); + bus_send_hid_input( file, &desc, &touch_release, sizeof(touch_release) ); + res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + todo_wine + ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); + + rawinput = (RAWINPUT *)rawbuffer; + rawbuffer_size = sizeof(rawbuffer); + rawbuffer_count = GetRawInputBuffer( rawinput, &rawbuffer_size, sizeof(RAWINPUTHEADER) ); + ok( rawbuffer_count == 0, "got rawbuffer_count %u\n", rawbuffer_count ); + ok( rawbuffer_size == 0, "got rawbuffer_size %u\n", rawbuffer_size ); + + rawdevice.dwFlags = RIDEV_REMOVE; + rawdevice.hwndTarget = 0; + ret = RegisterRawInputDevices( &rawdevice, 1, sizeof(RAWINPUTDEVICE) ); + ok( ret, "RegisterRawInputDevices failed, error %lu\n", GetLastError() ); + + DestroyWindow( hwnd ); CloseHandle( file );

1 0

Zebediah Figura : wined3d: Move state objects from state.c to device.c.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 7181ef4052c99a8ce294dbbedfb34c3daff6f102 URL: https://gitlab.winehq.org/wine/wine/-/commit/7181ef4052c99a8ce294dbbedfb34c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 28 14:01:10 2023 -0500 wined3d: Move state objects from state.c to device.c. The entire rest of state.c is concerned with the GL fixed-function pipeline. device.c seems the most fitting place for these, since they're associated with the device and stored in the device. device.c is also one of the few files that contains client-side code, which these functions are. --- dlls/wined3d/device.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 226 ------------------------------------------------- 2 files changed, 228 insertions(+), 226 deletions(-)

1 0