winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2023
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
989 discussions
Start a n
N
ew thread
Alfred Agrell : winegstreamer: Implement IAMStreamSelect::Count in CLSID_MPEG1Splitter.
by Alexandre Julliard
01 Nov '23
01 Nov '23
Module: wine Branch: master Commit: fae39cf5a78d622ee825e82bafef1323b3073356 URL:
https://gitlab.winehq.org/wine/wine/-/commit/fae39cf5a78d622ee825e82bafef13…
Author: Alfred Agrell <floating(a)muncher.se> Date: Tue Sep 26 23:52:53 2023 +0200 winegstreamer: Implement IAMStreamSelect::Count in CLSID_MPEG1Splitter. --- dlls/winegstreamer/quartz_parser.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index f9d8d79b259..b1a463af531 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1511,8 +1511,15 @@ static ULONG WINAPI stream_select_Release(IAMStreamSelect *iface) static HRESULT WINAPI stream_select_Count(IAMStreamSelect *iface, DWORD *count) { - FIXME("iface %p, count %p, stub!\n", iface, count); - return E_NOTIMPL; + struct parser *filter = impl_from_IAMStreamSelect(iface); + TRACE("filter %p, count %p\n", filter, count); + EnterCriticalSection(&filter->filter.filter_cs); + if (filter->sink.pin.peer) + *count = wg_parser_get_stream_count(filter->wg_parser); + else + *count = 0; + LeaveCriticalSection(&filter->filter.filter_cs); + return S_OK; } static HRESULT WINAPI stream_select_Info(IAMStreamSelect *iface, LONG index,
1
0
0
0
Alfred Agrell : winegstreamer: Improve and clean up some debug logs.
by Alexandre Julliard
01 Nov '23
01 Nov '23
Module: wine Branch: master Commit: 7bcb6bc4d78101748cbe2351710c987516b338c3 URL:
https://gitlab.winehq.org/wine/wine/-/commit/7bcb6bc4d78101748cbe2351710c98…
Author: Alfred Agrell <floating(a)muncher.se> Date: Tue Sep 26 23:53:25 2023 +0200 winegstreamer: Improve and clean up some debug logs. --- dlls/winegstreamer/wg_format.c | 11 ++++------- dlls/winegstreamer/wg_parser.c | 27 ++++++++++----------------- dlls/winegstreamer/wg_transform.c | 10 ++-------- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 743f674bcd6..d8a580b0197 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -181,17 +181,17 @@ static void wg_format_from_caps_audio_mpeg1(struct wg_format *format, const GstC if (!gst_structure_get_int(structure, "layer", &layer)) { - GST_WARNING("Missing \"layer\" value."); + GST_WARNING("Missing \"layer\" value in %" GST_PTR_FORMAT ".", caps); return; } if (!gst_structure_get_int(structure, "channels", &channels)) { - GST_WARNING("Missing \"channels\" value."); + GST_WARNING("Missing \"channels\" value in %" GST_PTR_FORMAT ".", caps); return; } if (!gst_structure_get_int(structure, "rate", &rate)) { - GST_WARNING("Missing \"rate\" value."); + GST_WARNING("Missing \"rate\" value in %" GST_PTR_FORMAT ".", caps); return; } @@ -318,10 +318,7 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) } else { - gchar *str = gst_caps_to_string(caps); - - GST_FIXME("Unhandled caps %s.", str); - g_free(str); + GST_FIXME("Unhandled caps %" GST_PTR_FORMAT ".", caps); } } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e097325a419..e36fbb92fae 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -456,7 +456,7 @@ static NTSTATUS wg_parser_stream_seek(void *args) if (!push_event(stream->my_sink, gst_event_new_seek(params->rate, GST_FORMAT_TIME, flags, start_type, params->start_pos * 100, stop_type, params->stop_pos == stream->duration ? -1 : params->stop_pos * 100))) - GST_ERROR("Failed to seek.\n"); + GST_ERROR("Failed to seek."); return S_OK; } @@ -480,13 +480,12 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) /* This can happen legitimately if the sample falls outside of the * segment bounds. GStreamer elements shouldn't present the sample in * that case, but DirectShow doesn't care. */ - GST_LOG("Ignoring QoS event.\n"); + GST_LOG("Ignoring QoS event."); return S_OK; } - if (!(event = gst_event_new_qos(params->underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, params->proportion, diff, stream_time))) - GST_ERROR("Failed to create QOS event.\n"); + GST_ERROR("Failed to create QOS event."); push_event(stream->my_sink, event); return S_OK; @@ -679,6 +678,7 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu if (!stream->enabled) { + GST_LOG("Stream is disabled; discarding buffer."); pthread_mutex_unlock(&parser->mutex); gst_buffer_unref(buffer); return GST_FLOW_OK; @@ -695,7 +695,7 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu if (!gst_buffer_map(buffer, &stream->map_info, GST_MAP_READ)) { pthread_mutex_unlock(&parser->mutex); - GST_ERROR("Failed to map buffer.\n"); + GST_ERROR("Failed to map buffer."); gst_buffer_unref(buffer); return GST_FLOW_ERROR; } @@ -725,7 +725,6 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) case GST_QUERY_CAPS: { GstCaps *caps, *filter, *temp; - gchar *str; gsize i; gst_query_parse_caps(query, &filter); @@ -742,9 +741,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_structure_remove_fields(gst_caps_get_structure(caps, i), "framerate", "pixel-aspect-ratio", NULL); - str = gst_caps_to_string(caps); - GST_LOG("Stream caps are \"%s\".", str); - g_free(str); + GST_LOG("Stream caps are \"%" GST_PTR_FORMAT "\".", caps); if (filter) { @@ -779,12 +776,8 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) pthread_mutex_unlock(&parser->mutex); - if (!ret && gst_debug_category_get_threshold(GST_CAT_DEFAULT) >= GST_LEVEL_WARNING) - { - gchar *str = gst_caps_to_string(caps); - GST_WARNING("Rejecting caps \"%s\".", str); - g_free(str); - } + if (!ret) + GST_WARNING("Rejecting caps \"%" GST_PTR_FORMAT "\".", caps); gst_query_set_accept_caps_result(query, ret); return TRUE; } @@ -1585,7 +1578,7 @@ static NTSTATUS wg_parser_connect(void *args) ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { - GST_ERROR("Failed to play stream.\n"); + GST_ERROR("Failed to play stream."); goto out; } @@ -1648,7 +1641,7 @@ static NTSTATUS wg_parser_connect(void *args) if (stream->eos) { stream->duration = 0; - GST_WARNING("Failed to query duration.\n"); + GST_WARNING("Failed to query duration."); break; } diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index e2b14527a20..d033ff27f43 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -196,7 +196,6 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery case GST_QUERY_CAPS: { GstCaps *caps, *filter, *temp; - gchar *str; gst_query_parse_caps(query, &filter); if (!(caps = wg_format_to_caps(&transform->output_format))) @@ -209,9 +208,7 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery caps = temp; } - str = gst_caps_to_string(caps); - GST_INFO("Returning caps %s", str); - g_free(str); + GST_INFO("Returning caps %" GST_PTR_FORMAT, caps); gst_query_set_caps_result(query, caps); gst_caps_unref(caps); @@ -498,7 +495,6 @@ NTSTATUS wg_transform_set_output_format(void *args) const struct wg_format *format = params->format; GstSample *sample; GstCaps *caps; - gchar *str; if (!(caps = wg_format_to_caps(format))) { @@ -537,9 +533,7 @@ NTSTATUS wg_transform_set_output_format(void *args) return STATUS_UNSUCCESSFUL; } - str = gst_caps_to_string(caps); - GST_INFO("Configured new caps %s.", str); - g_free(str); + GST_INFO("Configured new caps %" GST_PTR_FORMAT ".", caps); /* Ideally and to be fully compatible with native transform, the queued * output buffers will need to be converted to the new output format and
1
0
0
0
Alfred Agrell : winegstreamer: Include the framerate when converting video format to GstCaps.
by Alexandre Julliard
01 Nov '23
01 Nov '23
Module: wine Branch: master Commit: 92c91c4e93a80b7d89164ab1ec70927e42ba939b URL:
https://gitlab.winehq.org/wine/wine/-/commit/92c91c4e93a80b7d89164ab1ec7092…
Author: Alfred Agrell <floating(a)muncher.se> Date: Fri Oct 20 01:39:56 2023 +0200 winegstreamer: Include the framerate when converting video format to GstCaps. --- dlls/winegstreamer/wg_format.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 9c6e49afcc7..743f674bcd6 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -477,6 +477,11 @@ static GstCaps *wg_format_to_caps_video(const struct wg_format *format) return NULL; gst_video_info_set_format(&info, video_format, format->u.video.width, abs(format->u.video.height)); + if (format->u.video.fps_d) + { + info.fps_n = format->u.video.fps_n; + info.fps_d = format->u.video.fps_d; + } if ((caps = gst_video_info_to_caps(&info))) { for (i = 0; i < gst_caps_get_size(caps); ++i)
1
0
0
0
Alfred Agrell : winegstreamer: Seek to end of stream instead of to stream duration.
by Alexandre Julliard
01 Nov '23
01 Nov '23
Module: wine Branch: master Commit: ced2b4c672bf1bd0e1ab0f6f3412df7c5edaf8c9 URL:
https://gitlab.winehq.org/wine/wine/-/commit/ced2b4c672bf1bd0e1ab0f6f3412df…
Author: Alfred Agrell <floating(a)muncher.se> Date: Fri Oct 20 02:04:24 2023 +0200 winegstreamer: Seek to end of stream instead of to stream duration. --- dlls/winegstreamer/wg_parser.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 70c25d8c0a0..e097325a419 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -436,8 +436,11 @@ static NTSTATUS wg_parser_stream_seek(void *args) const struct wg_parser_stream_seek_params *params = args; DWORD start_flags = params->start_flags; DWORD stop_flags = params->stop_flags; + const struct wg_parser_stream *stream; GstSeekFlags flags = 0; + stream = get_stream(params->stream); + if (start_flags & AM_SEEKING_SeekToKeyFrame) flags |= GST_SEEK_FLAG_KEY_UNIT; if (start_flags & AM_SEEKING_Segment) @@ -450,8 +453,9 @@ static NTSTATUS wg_parser_stream_seek(void *args) if ((stop_flags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_NoPositioning) stop_type = GST_SEEK_TYPE_NONE; - if (!push_event(get_stream(params->stream)->my_sink, gst_event_new_seek(params->rate, GST_FORMAT_TIME, - flags, start_type, params->start_pos * 100, stop_type, params->stop_pos * 100))) + if (!push_event(stream->my_sink, gst_event_new_seek(params->rate, GST_FORMAT_TIME, + flags, start_type, params->start_pos * 100, stop_type, + params->stop_pos == stream->duration ? -1 : params->stop_pos * 100))) GST_ERROR("Failed to seek.\n"); return S_OK;
1
0
0
0
Alfred Agrell : winegstreamer: Clamp QoS events to stay inside the stream's running time.
by Alexandre Julliard
01 Nov '23
01 Nov '23
Module: wine Branch: master Commit: 2c9f646602343a0bfd7b53f4b580c143d627e1be URL:
https://gitlab.winehq.org/wine/wine/-/commit/2c9f646602343a0bfd7b53f4b580c1…
Author: Alfred Agrell <floating(a)muncher.se> Date: Fri Oct 20 23:09:39 2023 +0200 winegstreamer: Clamp QoS events to stay inside the stream's running time. --- dlls/winegstreamer/wg_parser.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 2d2e3450ccb..70c25d8c0a0 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -461,6 +461,7 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) { const struct wg_parser_stream_notify_qos_params *params = args; struct wg_parser_stream *stream = get_stream(params->stream); + GstClockTimeDiff diff = params->diff * 100; GstClockTime stream_time; GstEvent *event; @@ -468,6 +469,8 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) * file (or other medium), but gst_event_new_qos() expects the timestamp in * running time. */ stream_time = gst_segment_to_running_time(&stream->segment, GST_FORMAT_TIME, params->timestamp * 100); + if (diff < (GstClockTimeDiff)-stream_time) + diff = -stream_time; if (stream_time == -1) { /* This can happen legitimately if the sample falls outside of the @@ -478,7 +481,7 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) } if (!(event = gst_event_new_qos(params->underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - params->proportion, params->diff * 100, stream_time))) + params->proportion, diff, stream_time))) GST_ERROR("Failed to create QOS event.\n"); push_event(stream->my_sink, event);
1
0
0
0
Alfred Agrell : winegstreamer: Don't read format from unparsed MPEG audio.
by Alexandre Julliard
01 Nov '23
01 Nov '23
Module: wine Branch: master Commit: c36af9e9cf423b22e7bde9db4e0370ec98e60eb5 URL:
https://gitlab.winehq.org/wine/wine/-/commit/c36af9e9cf423b22e7bde9db4e0370…
Author: Alfred Agrell <floating(a)muncher.se> Date: Fri Oct 20 01:38:55 2023 +0200 winegstreamer: Don't read format from unparsed MPEG audio. --- dlls/winegstreamer/wg_format.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 2353839bbc4..9c6e49afcc7 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -286,6 +286,7 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) { const GstStructure *structure = gst_caps_get_structure(caps, 0); const char *name = gst_structure_get_name(structure); + gboolean parsed; memset(format, 0, sizeof(*format)); @@ -303,7 +304,7 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) if (gst_video_info_from_caps(&info, caps)) wg_format_from_video_info(format, &info); } - else if (!strcmp(name, "audio/mpeg")) + else if (!strcmp(name, "audio/mpeg") && gst_structure_get_boolean(structure, "parsed", &parsed) && parsed) { wg_format_from_caps_audio_mpeg1(format, caps); }
1
0
0
0
Alexandre Julliard : makefiles: Always use the global SOURCES variable for .rc files.
by Alexandre Julliard
01 Nov '23
01 Nov '23
Module: wine Branch: master Commit: 7ccb5df0fcfbfdd052fe6032979fb731da2648a9 URL:
https://gitlab.winehq.org/wine/wine/-/commit/7ccb5df0fcfbfdd052fe6032979fb7…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 08:18:23 2023 +0100 makefiles: Always use the global SOURCES variable for .rc files. --- dlls/aclui/Makefile.in | 6 +++--- dlls/advapi32/Makefile.in | 6 ++---- dlls/advapi32/tests/Makefile.in | 5 ++--- dlls/amstream/tests/Makefile.in | 6 ++---- dlls/atl80/tests/Makefile.in | 6 ++---- dlls/bcrypt/Makefile.in | 7 +++---- dlls/cabinet/Makefile.in | 5 ++--- dlls/cards/Makefile.in | 6 ++---- dlls/comcat/Makefile.in | 2 +- dlls/comctl32/tests/Makefile.in | 5 ++--- dlls/comdlg32/tests/Makefile.in | 7 +++---- dlls/compstui/Makefile.in | 5 ++--- dlls/compstui/tests/Makefile.in | 7 +++---- dlls/crypt32/Makefile.in | 5 ++--- dlls/cryptdlg/Makefile.in | 5 ++--- dlls/cryptui/Makefile.in | 5 ++--- dlls/d2d1/Makefile.in | 5 ++--- dlls/d3d10/Makefile.in | 7 +++---- dlls/d3d10_1/Makefile.in | 7 +++---- dlls/d3d10core/Makefile.in | 7 +++---- dlls/d3d11/Makefile.in | 5 ++--- dlls/d3d8/Makefile.in | 4 ++-- dlls/d3d8thk/Makefile.in | 3 ++- dlls/d3d9/Makefile.in | 5 ++--- dlls/d3dim/Makefile.in | 3 ++- dlls/d3dim700/Makefile.in | 3 ++- dlls/d3drm/Makefile.in | 5 ++--- dlls/d3dx10_33/Makefile.in | 7 +++---- dlls/d3dx10_34/Makefile.in | 7 +++---- dlls/d3dx10_35/Makefile.in | 7 +++---- dlls/d3dx10_36/Makefile.in | 7 +++---- dlls/d3dx10_37/Makefile.in | 7 +++---- dlls/d3dx10_38/Makefile.in | 7 +++---- dlls/d3dx10_39/Makefile.in | 7 +++---- dlls/d3dx10_40/Makefile.in | 7 +++---- dlls/d3dx10_41/Makefile.in | 7 +++---- dlls/d3dx10_42/Makefile.in | 7 +++---- dlls/d3dx10_43/Makefile.in | 7 +++---- dlls/d3dx11_42/Makefile.in | 7 +++---- dlls/d3dx11_43/Makefile.in | 7 +++---- dlls/d3dx9_24/Makefile.in | 5 ++--- dlls/d3dx9_25/Makefile.in | 5 ++--- dlls/d3dx9_26/Makefile.in | 5 ++--- dlls/d3dx9_27/Makefile.in | 5 ++--- dlls/d3dx9_28/Makefile.in | 5 ++--- dlls/d3dx9_29/Makefile.in | 5 ++--- dlls/d3dx9_30/Makefile.in | 5 ++--- dlls/d3dx9_31/Makefile.in | 5 ++--- dlls/d3dx9_32/Makefile.in | 5 ++--- dlls/d3dx9_33/Makefile.in | 5 ++--- dlls/d3dx9_34/Makefile.in | 5 ++--- dlls/d3dx9_35/Makefile.in | 5 ++--- dlls/d3dx9_36/Makefile.in | 5 ++--- dlls/d3dx9_36/tests/Makefile.in | 5 ++--- dlls/d3dx9_37/Makefile.in | 5 ++--- dlls/d3dx9_38/Makefile.in | 5 ++--- dlls/d3dx9_39/Makefile.in | 5 ++--- dlls/d3dx9_40/Makefile.in | 5 ++--- dlls/d3dx9_41/Makefile.in | 5 ++--- dlls/d3dx9_42/Makefile.in | 5 ++--- dlls/d3dx9_43/Makefile.in | 5 ++--- dlls/dbghelp/Makefile.in | 7 +++---- dlls/dcomp/Makefile.in | 7 +++---- dlls/display.drv16/Makefile.in | 6 +++--- dlls/dmime/tests/Makefile.in | 7 +++---- dlls/dmusic32/Makefile.in | 7 +++---- dlls/dnsapi/Makefile.in | 6 ++---- dlls/dplay/Makefile.in | 3 ++- dlls/dpnaddr/Makefile.in | 3 ++- dlls/dpnhpast/Makefile.in | 7 +++---- dlls/dpnhupnp/Makefile.in | 7 +++---- dlls/dpnlobby/Makefile.in | 3 ++- dlls/dpwsockx/Makefile.in | 7 +++---- dlls/dssenh/Makefile.in | 7 +++---- dlls/dwmapi/Makefile.in | 7 +++---- dlls/dxgi/Makefile.in | 7 +++---- dlls/evr/tests/Makefile.in | 7 +++---- dlls/fltlib/Makefile.in | 7 +++---- dlls/fusion/Makefile.in | 7 +++---- dlls/gameux/tests/Makefile.in | 7 +++---- dlls/gdi.exe16/Makefile.in | 7 +++---- dlls/gdi32/Makefile.in | 6 ++---- dlls/gdiplus/Makefile.in | 5 ++--- dlls/gphoto2.ds/Makefile.in | 5 ++--- dlls/hal/Makefile.in | 7 +++---- dlls/hid/Makefile.in | 7 +++---- dlls/hidclass.sys/Makefile.in | 5 ++--- dlls/iccvid/Makefile.in | 7 +++---- dlls/imm32/Makefile.in | 7 +++---- dlls/iphlpapi/Makefile.in | 7 +++---- dlls/ir50_32/Makefile.in | 7 +++---- dlls/itss/tests/Makefile.in | 7 +++---- dlls/jscript/tests/Makefile.in | 5 ++--- dlls/jsproxy/Makefile.in | 7 +++---- dlls/kernel32/Makefile.in | 6 ++---- dlls/kernelbase/tests/Makefile.in | 6 ++---- dlls/krnl386.exe16/Makefile.in | 5 ++--- dlls/ksproxy.ax/Makefile.in | 3 ++- dlls/ksuser/Makefile.in | 3 ++- dlls/localspl/Makefile.in | 5 ++--- dlls/localui/Makefile.in | 7 +++---- dlls/mapi32/Makefile.in | 5 ++--- dlls/mciavi32/Makefile.in | 5 ++--- dlls/mciqtz32/Makefile.in | 6 ++---- dlls/mf/tests/Makefile.in | 5 ++--- dlls/mfmediaengine/tests/Makefile.in | 7 +++---- dlls/mfplat/tests/Makefile.in | 7 +++---- dlls/mfplay/tests/Makefile.in | 7 +++---- dlls/mfreadwrite/tests/Makefile.in | 7 +++---- dlls/mouse.drv16/Makefile.in | 6 +++--- dlls/mpr/Makefile.in | 5 ++--- dlls/msacm32/Makefile.in | 5 ++--- dlls/mscms/Makefile.in | 7 +++---- dlls/msctf/tests/Makefile.in | 6 ++---- dlls/msdmo/Makefile.in | 6 ++---- dlls/msftedit/Makefile.in | 7 +++---- dlls/msimsg/Makefile.in | 3 ++- dlls/mspatcha/Makefile.in | 7 +++---- dlls/mspatcha/tests/Makefile.in | 6 ++---- dlls/msrle32/Makefile.in | 6 +++--- dlls/msvcp90/tests/Makefile.in | 6 ++---- dlls/msvcr100/Makefile.in | 5 ++--- dlls/msvcr120/Makefile.in | 5 ++--- dlls/msvcr80/Makefile.in | 5 ++--- dlls/msvcr80/tests/Makefile.in | 6 ++---- dlls/msvcr90/Makefile.in | 5 ++--- dlls/msvcr90/tests/Makefile.in | 6 ++---- dlls/msvcrt/Makefile.in | 6 ++---- dlls/msvfw32/Makefile.in | 5 ++--- dlls/msvfw32/tests/Makefile.in | 6 ++---- dlls/msvidc32/Makefile.in | 5 ++--- dlls/mswsock/Makefile.in | 7 +++---- dlls/npmshtml/Makefile.in | 5 +++-- dlls/ntdll/Makefile.in | 5 ++--- dlls/ntprint/Makefile.in | 7 +++---- dlls/odbc32/Makefile.in | 5 ++--- dlls/odbccp32/tests/Makefile.in | 6 ++---- dlls/odbccu32/Makefile.in | 3 ++- dlls/ole2nls.dll16/Makefile.in | 6 +++--- dlls/oledlg/Makefile.in | 5 ++--- dlls/olethk32/Makefile.in | 3 ++- dlls/opengl32/Makefile.in | 5 ++--- dlls/photometadatahandler/Makefile.in | 3 ++- dlls/pidgen/Makefile.in | 7 +++---- dlls/printui/Makefile.in | 7 +++---- dlls/psapi/Makefile.in | 3 ++- dlls/pwrshplugin/Makefile.in | 3 ++- dlls/qasf/tests/Makefile.in | 7 +++---- dlls/qedit/tests/Makefile.in | 5 ++--- dlls/quartz/tests/Makefile.in | 7 ++----- dlls/riched32/Makefile.in | 7 +++---- dlls/rsabase/Makefile.in | 3 ++- dlls/rsaenh/Makefile.in | 7 +++---- dlls/sane.ds/Makefile.in | 5 ++--- dlls/schannel/Makefile.in | 7 +++---- dlls/scrobj/tests/Makefile.in | 6 ++---- dlls/serialui/Makefile.in | 7 +++---- dlls/setupapi/Makefile.in | 5 ++--- dlls/shdoclc/Makefile.in | 3 ++- dlls/shell.dll16/Makefile.in | 6 +++--- dlls/shell32/tests/Makefile.in | 5 ++--- dlls/shfolder/Makefile.in | 3 ++- dlls/shlwapi/Makefile.in | 5 ++--- dlls/strmdll/Makefile.in | 3 ++- dlls/tdh/Makefile.in | 7 +++---- dlls/twain_32/Makefile.in | 5 ++--- dlls/tzres/Makefile.in | 3 ++- dlls/ucrtbase/Makefile.in | 5 ++--- dlls/user.exe16/Makefile.in | 5 ++--- dlls/uxtheme/Makefile.in | 5 ++--- dlls/version/Makefile.in | 7 +++---- dlls/version/tests/Makefile.in | 7 +++---- dlls/vga/Makefile.in | 3 ++- dlls/vulkan-1/Makefile.in | 5 ++--- dlls/webservices/Makefile.in | 5 ++--- dlls/winebus.sys/Makefile.in | 7 +++---- dlls/wined3d/Makefile.in | 5 ++--- dlls/winehid.sys/Makefile.in | 7 +++---- dlls/wineps.drv/Makefile.in | 7 +++---- dlls/wineusb.sys/Makefile.in | 7 +++---- dlls/winevulkan/Makefile.in | 7 +++---- dlls/winex11.drv/Makefile.in | 5 ++--- dlls/winexinput.sys/Makefile.in | 7 +++---- dlls/winmm/Makefile.in | 6 ++---- dlls/winmm/tests/Makefile.in | 6 ++---- dlls/winscard/Makefile.in | 6 ++---- dlls/winspool.drv/Makefile.in | 5 ++--- dlls/wintrust/Makefile.in | 6 ++---- dlls/wldap32/Makefile.in | 7 +++---- dlls/wmp/tests/Makefile.in | 6 ++---- dlls/wmvcore/Makefile.in | 5 ++--- dlls/wmvcore/tests/Makefile.in | 6 ++---- dlls/wpcap/Makefile.in | 5 ++--- dlls/ws2_32/Makefile.in | 7 +++---- dlls/wsock32/Makefile.in | 7 +++---- dlls/wuaueng/Makefile.in | 3 ++- dlls/xinput1_1/Makefile.in | 7 +++---- dlls/xinput1_2/Makefile.in | 7 +++---- dlls/xinput1_3/Makefile.in | 7 +++---- dlls/xinput1_4/Makefile.in | 7 +++---- dlls/xinput9_1_0/Makefile.in | 7 +++---- dlls/xinputuap/Makefile.in | 7 +++---- dlls/xpsprint/Makefile.in | 3 ++- programs/attrib/Makefile.in | 6 +++---
programs/chcp.com/Makefile.in
| 5 ++--- programs/clock/Makefile.in | 5 ++--- programs/cmd/tests/Makefile.in | 7 +++---- programs/conhost/Makefile.in | 5 ++--- programs/control/Makefile.in | 6 +++--- programs/dism/Makefile.in | 6 +++--- programs/dplaysvr/Makefile.in | 7 +++---- programs/dpnsvr/Makefile.in | 7 +++---- programs/dpvsetup/Makefile.in | 7 +++---- programs/dxdiag/Makefile.in | 5 ++--- programs/explorer/Makefile.in | 5 ++--- programs/extrac32/Makefile.in | 7 +++---- programs/find/Makefile.in | 6 +++--- programs/findstr/Makefile.in | 5 ++--- programs/hostname/Makefile.in | 6 +++--- programs/ipconfig/Makefile.in | 6 +++--- programs/klist/Makefile.in | 6 ++---- programs/msinfo32/Makefile.in | 7 +++---- programs/net/Makefile.in | 6 +++--- programs/netstat/Makefile.in | 6 +++--- programs/oleview/Makefile.in | 5 ++--- programs/progman/Makefile.in | 5 ++--- programs/reg/Makefile.in | 7 +++---- programs/robocopy/Makefile.in | 7 +++---- programs/setx/Makefile.in | 6 ++---- programs/start/Makefile.in | 6 +++--- programs/taskkill/Makefile.in | 6 +++--- programs/tasklist/Makefile.in | 6 +++--- programs/uninstaller/Makefile.in | 7 +++---- programs/view/Makefile.in | 7 +++---- programs/winevdm/Makefile.in | 7 +++---- programs/winver/Makefile.in | 6 +++--- programs/wmic/Makefile.in | 7 +++---- programs/wmplayer/Makefile.in | 7 +++---- programs/write/Makefile.in | 6 +++--- programs/wscript/tests/Makefile.in | 5 ++--- programs/xcopy/Makefile.in | 7 +++---- tools/make_makefiles | 7 +------ 242 files changed, 593 insertions(+), 801 deletions(-)
1
0
0
0
Alexandre Julliard : makefiles: Always use the global SOURCES variable for .idl files.
by Alexandre Julliard
01 Nov '23
01 Nov '23
Module: wine Branch: master Commit: c432eac726cd95fca080bdf463227a7883dfbad9 URL:
https://gitlab.winehq.org/wine/wine/-/commit/c432eac726cd95fca080bdf463227a…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 08:16:49 2023 +0100 makefiles: Always use the global SOURCES variable for .idl files. --- dlls/activeds.tlb/Makefile.in | 3 ++- dlls/activeds/Makefile.in | 6 ++---- dlls/actxprxy/Makefile.in | 8 +++----- dlls/adsldp/Makefile.in | 9 +++------ dlls/amstream/Makefile.in | 10 ++++------ dlls/appxdeploymentclient/Makefile.in | 6 ++---- dlls/atl/Makefile.in | 8 +++----- dlls/atl100/Makefile.in | 5 ++--- dlls/atl110/Makefile.in | 5 ++--- dlls/atl80/Makefile.in | 8 +++----- dlls/atl90/Makefile.in | 8 +++----- dlls/avifil32/Makefile.in | 8 +++----- dlls/browseui/Makefile.in | 8 +++----- dlls/combase/Makefile.in | 8 +++----- dlls/comsvcs/Makefile.in | 8 +++----- dlls/cryptowinrt/Makefile.in | 8 +++----- dlls/d3dxof/Makefile.in | 10 ++++------ dlls/ddraw/Makefile.in | 8 +++----- dlls/ddrawex/Makefile.in | 10 ++++------ dlls/devenum/Makefile.in | 9 +++------ dlls/dhtmled.ocx/Makefile.in | 8 +++----- dlls/diasymreader/Makefile.in | 8 +++----- dlls/dinput/Makefile.in | 11 ++++------- dlls/dinput8/Makefile.in | 11 ++++------- dlls/directmanipulation/Makefile.in | 5 ++--- dlls/dispex/Makefile.in | 6 ++---- dlls/dmband/Makefile.in | 10 ++++------ dlls/dmcompos/Makefile.in | 10 ++++------ dlls/dmime/Makefile.in | 8 +++----- dlls/dmloader/Makefile.in | 10 ++++------ dlls/dmscript/Makefile.in | 8 +++----- dlls/dmstyle/Makefile.in | 10 ++++------ dlls/dmsynth/Makefile.in | 10 ++++------ dlls/dmusic/Makefile.in | 8 +++----- dlls/dplayx/Makefile.in | 10 ++++------ dlls/dpnet/Makefile.in | 10 ++++------ dlls/dpvoice/Makefile.in | 10 ++++------ dlls/dsdmo/Makefile.in | 11 ++++------- dlls/dsound/Makefile.in | 10 ++++------ dlls/dsquery/Makefile.in | 6 ++---- dlls/dsuiext/Makefile.in | 6 ++---- dlls/dswave/Makefile.in | 8 +++----- dlls/dx8vb/Makefile.in | 10 ++++------ dlls/dxdiagn/Makefile.in | 9 +++------ dlls/evr/Makefile.in | 5 ++--- dlls/explorerframe/Makefile.in | 9 +++------ dlls/gameux/Makefile.in | 10 ++++------ dlls/geolocation/Makefile.in | 5 ++--- dlls/graphicscapture/Makefile.in | 6 ++---- dlls/hlink/Makefile.in | 5 ++--- dlls/hnetcfg/Makefile.in | 8 +++----- dlls/hvsimanagementapi/Makefile.in | 6 ++---- dlls/ia2comproxy/Makefile.in | 2 +- dlls/ieproxy/Makefile.in | 2 +- dlls/inetcomm/Makefile.in | 8 +++----- dlls/infosoft/Makefile.in | 5 ++--- dlls/inseng/Makefile.in | 6 +++--- dlls/itss/Makefile.in | 8 +++----- dlls/mf/Makefile.in | 8 +++----- dlls/mfmediaengine/Makefile.in | 6 ++---- dlls/mfreadwrite/Makefile.in | 5 ++--- dlls/mfsrcsnk/Makefile.in | 5 ++--- dlls/mmcndmgr/Makefile.in | 7 +++---- dlls/mmdevapi/Makefile.in | 5 ++--- dlls/mp3dmod/Makefile.in | 6 ++---- dlls/msado15/Makefile.in | 8 +++----- dlls/mscoree/Makefile.in | 5 ++--- dlls/mscoree/tests/Makefile.in | 9 ++++----- dlls/msctf/Makefile.in | 9 +++------ dlls/msctfp/Makefile.in | 3 ++- dlls/msdaps/Makefile.in | 8 +++----- dlls/msdasql/Makefile.in | 8 +++----- dlls/mshtml.tlb/Makefile.in | 3 ++- dlls/mshtml/Makefile.in | 13 +++++-------- dlls/mshtml/tests/Makefile.in | 9 ++++----- dlls/msident/Makefile.in | 7 +++---- dlls/msimtf/Makefile.in | 7 +++---- dlls/msscript.ocx/Makefile.in | 8 ++++---- dlls/msscript.ocx/tests/Makefile.in | 7 +++---- dlls/mstask/Makefile.in | 8 +++----- dlls/msxml/Makefile.in | 6 +++--- dlls/msxml2/Makefile.in | 3 ++- dlls/msxml3/tests/Makefile.in | 8 +++----- dlls/msxml4/Makefile.in | 5 +++-- dlls/msxml6/Makefile.in | 5 +++-- dlls/netapi32/Makefile.in | 6 ++---- dlls/netcfgx/Makefile.in | 7 +++---- dlls/netprofm/Makefile.in | 7 +++---- dlls/ntoskrnl.exe/Makefile.in | 9 +++------ dlls/objsel/Makefile.in | 10 ++++------ dlls/oleacc/Makefile.in | 8 +++----- dlls/oleaut32/Makefile.in | 11 ++++------- dlls/oleaut32/tests/Makefile.in | 15 ++++++--------- dlls/oledb32/Makefile.in | 13 +++++-------- dlls/oledb32/tests/Makefile.in | 5 ++--- dlls/olepro32/Makefile.in | 9 ++++----- dlls/opcservices/Makefile.in | 6 ++---- dlls/packager/Makefile.in | 7 +++---- dlls/propsys/Makefile.in | 5 ++--- dlls/pstorec/Makefile.in | 7 +++---- dlls/qasf/Makefile.in | 11 ++++------- dlls/qcap/Makefile.in | 9 +++------ dlls/qdvd/Makefile.in | 11 ++++------- dlls/qedit/Makefile.in | 10 ++++------ dlls/qmgr/Makefile.in | 8 +++----- dlls/qmgrprxy/Makefile.in | 3 ++- dlls/quartz/Makefile.in | 11 ++++------- dlls/rpcrt4/Makefile.in | 13 +++++-------- dlls/rpcrt4/tests/Makefile.in | 8 +++----- dlls/sapi/Makefile.in | 12 ++++-------- dlls/schedsvc/Makefile.in | 8 +++----- dlls/schedsvc/tests/Makefile.in | 8 +++----- dlls/scrobj/Makefile.in | 7 +++---- dlls/scrrun/Makefile.in | 10 ++++------ dlls/scrrun/tests/Makefile.in | 7 +++---- dlls/sechost/Makefile.in | 8 +++----- dlls/shdocvw/Makefile.in | 9 +++------ dlls/stdole2.tlb/Makefile.in | 5 +++-- dlls/stdole32.tlb/Makefile.in | 5 +++-- dlls/sti/Makefile.in | 7 +++---- dlls/sxs/tests/Makefile.in | 7 +++---- dlls/taskschd/Makefile.in | 8 +++----- dlls/threadpoolwinrt/Makefile.in | 5 ++--- dlls/uianimation/Makefile.in | 6 ++---- dlls/uiautomationcore/Makefile.in | 10 ++++------ dlls/uiribbon/Makefile.in | 7 +++---- dlls/urlmon/Makefile.in | 8 +++----- dlls/vbscript/tests/Makefile.in | 10 ++++------ dlls/wbemdisp/Makefile.in | 6 ++---- dlls/wiaservc/Makefile.in | 10 ++++------ dlls/windows.applicationmodel/Makefile.in | 6 ++---- dlls/windows.devices.bluetooth/Makefile.in | 6 ++---- dlls/windows.devices.enumeration/Makefile.in | 5 ++--- dlls/windows.devices.usb/Makefile.in | 6 ++---- dlls/windows.gaming.input/Makefile.in | 8 +++----- dlls/windows.gaming.ui.gamebar/Makefile.in | 6 ++---- dlls/windows.globalization/Makefile.in | 5 ++--- dlls/windows.media.devices/Makefile.in | 5 ++--- dlls/windows.media.mediacontrol/Makefile.in | 6 ++---- dlls/windows.media.speech/Makefile.in | 5 ++--- dlls/windows.media/Makefile.in | 6 ++---- dlls/windows.networking.hostname/Makefile.in | 6 ++---- dlls/windows.perception.stub/Makefile.in | 6 ++---- .../Makefile.in | 6 ++---- dlls/windows.storage.applicationdata/Makefile.in | 6 ++---- .../Makefile.in | 6 ++---- dlls/windows.ui/Makefile.in | 6 ++---- dlls/windowscodecs/Makefile.in | 10 ++++------ dlls/winegstreamer/Makefile.in | 10 +++------- dlls/winhttp/Makefile.in | 10 ++++------ dlls/wintypes/Makefile.in | 5 ++--- dlls/wmiutils/Makefile.in | 7 +++---- dlls/wmp/Makefile.in | 9 ++++----- dlls/wmphoto/Makefile.in | 7 +++---- dlls/wpc/Makefile.in | 7 +++---- dlls/wshom.ocx/Makefile.in | 8 +++----- dlls/wshom.ocx/tests/Makefile.in | 7 +++---- dlls/wuapi/Makefile.in | 7 +++---- dlls/xactengine2_0/Makefile.in | 5 ++--- dlls/xactengine2_4/Makefile.in | 5 ++--- dlls/xactengine2_7/Makefile.in | 5 ++--- dlls/xactengine2_9/Makefile.in | 5 ++--- dlls/xactengine3_0/Makefile.in | 5 ++--- dlls/xactengine3_1/Makefile.in | 5 ++--- dlls/xactengine3_2/Makefile.in | 5 ++--- dlls/xactengine3_3/Makefile.in | 5 ++--- dlls/xactengine3_4/Makefile.in | 5 ++--- dlls/xactengine3_5/Makefile.in | 5 ++--- dlls/xactengine3_6/Makefile.in | 5 ++--- dlls/xactengine3_7/Makefile.in | 5 ++--- dlls/xapofx1_1/Makefile.in | 10 ++++------ dlls/xapofx1_2/Makefile.in | 7 +++---- dlls/xapofx1_3/Makefile.in | 10 ++++------ dlls/xapofx1_4/Makefile.in | 7 +++---- dlls/xapofx1_5/Makefile.in | 7 +++---- dlls/xaudio2_0/Makefile.in | 5 ++--- dlls/xaudio2_1/Makefile.in | 5 ++--- dlls/xaudio2_2/Makefile.in | 5 ++--- dlls/xaudio2_3/Makefile.in | 5 ++--- dlls/xaudio2_4/Makefile.in | 5 ++--- dlls/xaudio2_5/Makefile.in | 5 ++--- dlls/xaudio2_6/Makefile.in | 5 ++--- dlls/xaudio2_7/Makefile.in | 5 ++--- dlls/xaudio2_7/tests/Makefile.in | 7 +++---- dlls/xaudio2_8/Makefile.in | 5 ++--- dlls/xaudio2_8/tests/Makefile.in | 7 +++---- dlls/xaudio2_9/Makefile.in | 8 +++----- programs/cscript/Makefile.in | 5 ++--- programs/plugplay/Makefile.in | 6 ++---- programs/rpcss/Makefile.in | 10 ++++------ programs/services/Makefile.in | 5 ++--- programs/wscript/Makefile.in | 5 ++--- tools/make_makefiles | 4 ++-- 193 files changed, 547 insertions(+), 847 deletions(-)
1
0
0
0
Nikolay Sivov : vkd3d-shader: Accept 'loop' attribute, on loops.
by Alexandre Julliard
01 Nov '23
01 Nov '23
Module: vkd3d Branch: master Commit: ecdc3f39d4d8b79172cada0a2f35fdd0c6b05e59 URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/ecdc3f39d4d8b79172cada0a2f35f…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 29 01:30:13 2023 +0200 vkd3d-shader: Accept 'loop' attribute, on loops. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 7 +++++-- tests/hlsl/loop.shader_test | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9a1be71e..71c0ae46 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -563,8 +563,11 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, hlsl_warning(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "Loop unrolling is not implemented."); } } - else if (!strcmp(attr->name, "loop") - || !strcmp(attr->name, "fastopt") + else if (!strcmp(attr->name, "loop")) + { + /* TODO: this attribute will be used to disable unrolling, once it's implememented. */ + } + else if (!strcmp(attr->name, "fastopt") || !strcmp(attr->name, "allow_uav_condition")) { hlsl_fixme(ctx, loc, "Unhandled attribute '%s'.", attr->name); diff --git a/tests/hlsl/loop.shader_test b/tests/hlsl/loop.shader_test index 6a5240a7..c15e4879 100644 --- a/tests/hlsl/loop.shader_test +++ b/tests/hlsl/loop.shader_test @@ -102,7 +102,7 @@ todo(sm>=6) draw quad probe all rgba (410.1, 410.1, 410.1, 410.1) % loop attribute by itself -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float ret = 0.0; @@ -116,10 +116,10 @@ float4 main() : sv_target } [test] -todo draw quad +todo(sm>=6) draw quad probe all rgba (10.0, 10.0, 10.0, 10.0) -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float ret = 0.0; @@ -135,10 +135,10 @@ float4 main() : sv_target } [test] -todo draw quad +todo(sm>=6) draw quad probe all rgba (10.0, 10.0, 10.0, 10.0) -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float ret = 0.0; @@ -154,7 +154,7 @@ float4 main() : sv_target } [test] -todo draw quad +todo(sm>=6) draw quad probe all rgba (10.0, 10.0, 10.0, 10.0) % unroll can't be used with fastopt or loop
1
0
0
0
Nikolay Sivov : vkd3d-shader: Check loop [unroll] attribute for conflict with other attributes.
by Alexandre Julliard
01 Nov '23
01 Nov '23
Module: vkd3d Branch: master Commit: 26784672d82506c214374344ee575b6e4cd55c23 URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/26784672d82506c214374344ee575…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 28 21:30:29 2023 +0200 vkd3d-shader: Check loop [unroll] attribute for conflict with other attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 24 ++++++++++++++++++++++++ tests/hlsl/loop.shader_test | 8 ++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5fd140fb..9a1be71e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -514,6 +514,28 @@ static void resolve_loop_continue(struct hlsl_ctx *ctx, struct hlsl_block *block } } +static void check_loop_attributes(struct hlsl_ctx *ctx, const struct parse_attribute_list *attributes, + const struct vkd3d_shader_location *loc) +{ + bool has_unroll = false, has_loop = false, has_fastopt = false; + unsigned int i; + + for (i = 0; i < attributes->count; ++i) + { + const char *name = attributes->attrs[i]->name; + + has_loop |= !strcmp(name, "loop"); + has_unroll |= !strcmp(name, "unroll"); + has_fastopt |= !strcmp(name, "fastopt"); + } + + if (has_unroll && has_loop) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Unroll attribute can't be used with 'loop' attribute."); + + if (has_unroll && has_fastopt) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Unroll attribute can't be used with 'fastopt' attribute."); +} + static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const struct parse_attribute_list *attributes, struct hlsl_block *init, struct hlsl_block *cond, struct hlsl_block *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc) @@ -524,6 +546,8 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, if (attribute_list_has_duplicates(attributes)) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Found duplicate attribute."); + check_loop_attributes(ctx, attributes, loc); + /* Ignore unroll(0) attribute, and any invalid attribute. */ for (i = 0; i < attributes->count; ++i) { diff --git a/tests/hlsl/loop.shader_test b/tests/hlsl/loop.shader_test index 3d515c9d..6a5240a7 100644 --- a/tests/hlsl/loop.shader_test +++ b/tests/hlsl/loop.shader_test @@ -158,7 +158,7 @@ todo draw quad probe all rgba (10.0, 10.0, 10.0, 10.0) % unroll can't be used with fastopt or loop -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float ret = 0.0; @@ -171,7 +171,7 @@ float4 main() : sv_target return ret; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float ret = 0.0; @@ -184,7 +184,7 @@ float4 main() : sv_target return ret; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float ret = 0.0; @@ -199,7 +199,7 @@ float4 main() : sv_target return ret; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float ret = 0.0;
1
0
0
0
← Newer
1
...
95
96
97
98
99
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
Results per page:
10
25
50
100
200