July 2021 - Wine-commits - list.winehq.org

Michael Stefaniuc : dinput: Use SUCCEEDED instead of !FAILED.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: e35ea310a69e6e8bed0bdeff49c833cc8b5897ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=e35ea310a69e6e8bed0bdeff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 22 00:30:14 2021 +0200 dinput: Use SUCCEEDED instead of !FAILED. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 390b2f56581..cbc9dbc9733 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -174,7 +174,7 @@ static HRESULT diactionformat_atow( const DIACTIONFORMATA *in, DIACTIONFORMATW * out->dwDataSize = in->dwDataSize; out->dwNumActions = in->dwNumActions; - for (i = 0; i < out->dwNumActions && !FAILED(hr); ++i) + for (i = 0; i < out->dwNumActions && SUCCEEDED(hr); ++i) { out->rgoAction[i].uAppData = in->rgoAction[i].uAppData; out->rgoAction[i].dwSemantic = in->rgoAction[i].dwSemantic;

1 0

Zebediah Figura : ws2_32/tests: Add more tests for bind() and getsockname().
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 2e0cb6d4dec0914d95d40853ea1876f734fa6c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e0cb6d4dec0914d95d40853… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 21 20:34:50 2021 -0500 ws2_32/tests: Add more tests for bind() and getsockname(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 149 ++++++++++++++++++++++++++++++++++++++++------- dlls/ws2_32/tests/sock.c | 84 ++++++++++++++++++++++++++ 2 files changed, 211 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e0cb6d4dec0914d95d4…

1 0

Zebediah Figura : ws2_32: Validate address length in bind().
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: cd34be062c057f24771c48ce59a6c54a2f2e31b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd34be062c057f24771c48ce… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 21 20:34:51 2021 -0500 ws2_32: Validate address length in bind(). bind() returns WSAEFAULT for short length, but IOCTL_AFD_BIND returns STATUS_INVALID_ADDRESS, which translates to WSAEADDRNOTAVAIL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 42 +++++++++++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 10 ++++------ 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fac19355705..88d30cb2802 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1775,12 +1775,52 @@ int WINAPI WS_bind( SOCKET s, const struct WS_sockaddr *addr, int len ) TRACE( "socket %#lx, addr %s\n", s, debugstr_sockaddr(addr) ); - if (!addr || (addr->sa_family && !supported_pf( addr->sa_family ))) + if (!addr) { SetLastError( WSAEAFNOSUPPORT ); return -1; } + switch (addr->sa_family) + { + case WS_AF_INET: + if (len < sizeof(struct WS_sockaddr_in)) + { + SetLastError( WSAEFAULT ); + return -1; + } + break; + + case WS_AF_INET6: + if (len < sizeof(struct WS_sockaddr_in6)) + { + SetLastError( WSAEFAULT ); + return -1; + } + break; + + case WS_AF_IPX: + if (len < sizeof(struct WS_sockaddr_ipx)) + { + SetLastError( WSAEFAULT ); + return -1; + } + break; + + case WS_AF_IRDA: + if (len < sizeof(SOCKADDR_IRDA)) + { + SetLastError( WSAEFAULT ); + return -1; + } + break; + + default: + FIXME( "unknown protocol %u\n", addr->sa_family ); + SetLastError( WSAEAFNOSUPPORT ); + return -1; + } + if (!(sync_event = get_sync_event())) return -1; params = HeapAlloc( GetProcessHeap(), 0, sizeof(int) + len ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f5c5acf161e..dd880531047 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10668,15 +10668,13 @@ static void test_bind(void) ok(s != -1, "failed to create socket, error %u\n", WSAGetLastError()); ret = bind(s, unicast_addr->Address.lpSockaddr, sizeof(struct sockaddr_in6_old)); - todo_wine_if (!addr6.sin6_scope_id) - { - ok(ret == -1, "expected failure\n"); - ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); - } + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); addr6.sin6_scope_id = 0xabacab; ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); - ok(ret == -1, "expected failure\n"); + todo_wine_if (!((const struct sockaddr_in6 *)unicast_addr->Address.lpSockaddr)->sin6_scope_id) + ok(ret == -1, "expected failure\n"); todo_wine ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); addr6.sin6_scope_id = 0;

1 0

Zebediah Figura : ws2_32: Do not translate STATUS_INVALID_PARAMETER to WSAEFAULT.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 2c582b683d3fad478c437b54f648fdffc3d00b80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c582b683d3fad478c437b54… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 21 20:34:52 2021 -0500 ws2_32: Do not translate STATUS_INVALID_PARAMETER to WSAEFAULT. This fixes a regression introduced by 5c009c17b3a212c3f5b0034c465077c0c593daae. WeMod WXDrive calls bind() on every local address, but with a zero sin6_scope_id, and gets confused when this returns WSAEFAULT. Actually this is supposed to succeed on Windows, but prior to the aforementioned commit we would return WSAEINVAL, and the program seems to be happy with that. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51493 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 88d30cb2802..b4786e54b38 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1847,7 +1847,7 @@ int WINAPI WS_bind( SOCKET s, const struct WS_sockaddr *addr, int len ) HeapFree( GetProcessHeap(), 0, params ); HeapFree( GetProcessHeap(), 0, ret_addr ); - SetLastError( status == STATUS_INVALID_PARAMETER ? WSAEFAULT : NtStatusToWSAError( status ) ); + SetLastError( NtStatusToWSAError( status ) ); return status ? -1 : 0; }

1 0

Zebediah Figura : server: Avoid leaking the ifaddrs structure in bind_to_interface().
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: d3b64637a0505379d74c3b7899fd1db3563517ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3b64637a0505379d74c3b78… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 21 20:34:53 2021 -0500 server: Avoid leaking the ifaddrs structure in bind_to_interface(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sock.c b/server/sock.c index 3f0526016f9..6a8cb328df2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1844,6 +1844,8 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr return 1; } } + + freeifaddrs( ifaddrs ); return 0; }

1 0

Zebediah Figura : server: Support passing to bind a zero sin6_scope_id.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 9b257ed63f44067e9c7bbe3abd731b2f212a325c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b257ed63f44067e9c7bbe3a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 21 20:34:54 2021 -0500 server: Support passing to bind a zero sin6_scope_id. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 19 ++++++++----------- server/sock.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dd880531047..ed7d5121332 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10679,27 +10679,24 @@ static void test_bind(void) addr6.sin6_scope_id = 0; ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); - todo_wine ok(!ret, "got error %u\n", WSAGetLastError()); + todo_wine_if (!((const struct sockaddr_in6 *)unicast_addr->Address.lpSockaddr)->sin6_scope_id) + ok(!ret, "got error %u\n", WSAGetLastError()); memcpy(&addr6, unicast_addr->Address.lpSockaddr, sizeof(addr6)); len = sizeof(struct sockaddr_in6_old); ret = getsockname(s, (struct sockaddr *)&ret_addr6, &len); ok(ret == -1, "expected failure\n"); - todo_wine_if (addr6.sin6_scope_id) - ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); len = sizeof(ret_addr6); memset(&ret_addr6, 0, sizeof(ret_addr6)); ret = getsockname(s, (struct sockaddr *)&ret_addr6, &len); - todo_wine_if (addr6.sin6_scope_id) - { - ok(!ret, "got error %u\n", WSAGetLastError()); - ok(ret_addr6.sin6_family == AF_INET6, "got family %u\n", ret_addr6.sin6_family); - ok(ret_addr6.sin6_port != 0, "expected nonzero port\n"); - ok(!memcmp(&ret_addr6.sin6_addr, &addr6.sin6_addr, sizeof(addr6.sin6_addr)), "address didn't match\n"); - ok(ret_addr6.sin6_scope_id == addr6.sin6_scope_id, "got scope %u\n", ret_addr6.sin6_scope_id); - } + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(ret_addr6.sin6_family == AF_INET6, "got family %u\n", ret_addr6.sin6_family); + ok(ret_addr6.sin6_port != 0, "expected nonzero port\n"); + ok(!memcmp(&ret_addr6.sin6_addr, &addr6.sin6_addr, sizeof(addr6.sin6_addr)), "address didn't match\n"); + ok(ret_addr6.sin6_scope_id == addr6.sin6_scope_id, "got scope %u\n", ret_addr6.sin6_scope_id); closesocket(s); } diff --git a/server/sock.c b/server/sock.c index 6a8cb328df2..e28b0349027 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1849,6 +1849,38 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr return 0; } +#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID +static unsigned int get_ipv6_interface_index( const struct in6_addr *addr ) +{ + struct ifaddrs *ifaddrs, *ifaddr; + + if (getifaddrs( &ifaddrs ) < 0) return 0; + + for (ifaddr = ifaddrs; ifaddr != NULL; ifaddr = ifaddr->ifa_next) + { + if (ifaddr->ifa_addr && ifaddr->ifa_addr->sa_family == AF_INET6 + && !memcmp( &((struct sockaddr_in6 *)ifaddr->ifa_addr)->sin6_addr, addr, sizeof(*addr) )) + { + unsigned int index = if_nametoindex( ifaddr->ifa_name ); + + if (!index) + { + if (debug_level) + fprintf( stderr, "Unable to look up interface index for %s: %s\n", + ifaddr->ifa_name, strerror( errno ) ); + continue; + } + + freeifaddrs( ifaddrs ); + return index; + } + } + + freeifaddrs( ifaddrs ); + return 0; +} +#endif + /* return an errno value mapped to a WSA error */ static unsigned int sock_get_error( int err ) { @@ -2477,12 +2509,22 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } bind_addr = unix_addr; - if (unix_addr.addr.sa_family == WS_AF_INET) + if (unix_addr.addr.sa_family == AF_INET) { if (!memcmp( &unix_addr.in.sin_addr, magic_loopback_addr, 4 ) || bind_to_interface( sock, &unix_addr.in )) bind_addr.in.sin_addr.s_addr = htonl( INADDR_ANY ); } + else if (unix_addr.addr.sa_family == AF_INET6) + { +#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID + /* Windows allows specifying zero to use the default scope. Linux + * interprets it as an interface index and requires that it be + * nonzero. */ + if (!unix_addr.in6.sin6_scope_id) + bind_addr.in6.sin6_scope_id = get_ipv6_interface_index( &unix_addr.in6.sin6_addr ); +#endif + } if (bind( unix_fd, &bind_addr.addr, unix_len ) < 0) {

1 0

Zebediah Figura : server: Map ENODEV to STATUS_INVALID_ADDRESS_COMPONENT.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 06dd08ee44b140ca5182120926506e26f21a7c1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=06dd08ee44b140ca51821209… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 21 20:34:55 2021 -0500 server: Map ENODEV to STATUS_INVALID_ADDRESS_COMPONENT. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 +++- server/sock.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ed7d5121332..41fcb5d9248 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10674,8 +10674,10 @@ static void test_bind(void) addr6.sin6_scope_id = 0xabacab; ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); todo_wine_if (!((const struct sockaddr_in6 *)unicast_addr->Address.lpSockaddr)->sin6_scope_id) + { ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); + } addr6.sin6_scope_id = 0; ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); diff --git a/server/sock.c b/server/sock.c index e28b0349027..f730bb31c55 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1976,6 +1976,9 @@ static int sock_get_ntstatus( int err ) case ENOPROTOOPT: return STATUS_INVALID_PARAMETER; case EOPNOTSUPP: return STATUS_NOT_SUPPORTED; case EADDRINUSE: return STATUS_SHARING_VIOLATION; + /* Linux returns ENODEV when specifying an invalid sin6_scope_id; + * Windows returns STATUS_INVALID_ADDRESS_COMPONENT */ + case ENODEV: case EADDRNOTAVAIL: return STATUS_INVALID_ADDRESS_COMPONENT; case ECONNREFUSED: return STATUS_CONNECTION_REFUSED; case ESHUTDOWN: return STATUS_PIPE_DISCONNECTED;

1 0

Anton Baskanov : winegstreamer: Inline query_duration() into wg_parser_connect().
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 08041f9cb4f1189285b2c556cf7965b9a60d78d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08041f9cb4f1189285b2c556… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 22 00:19:00 2021 -0500 winegstreamer: Inline query_duration() into wg_parser_connect(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 45 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 92e4fae034a..7f6109e47a4 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1489,26 +1489,6 @@ static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) return ret; } -static LONGLONG query_duration(GstPad *pad) -{ - gint64 duration, byte_length; - - if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) - return duration / 100; - - GST_INFO("Failed to query time duration; trying to convert from byte length.\n"); - - /* To accurately get a duration for the stream, we want to only consider the - * length of that stream. Hence, query for the pad duration, instead of - * using the file duration. */ - if (gst_pad_query_duration(pad, GST_FORMAT_BYTES, &byte_length) - && gst_pad_query_convert(pad, GST_FORMAT_BYTES, byte_length, GST_FORMAT_TIME, &duration)) - return duration / 100; - - GST_WARNING("Failed to query duration.\n"); - return 0; -} - static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_size) { GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("quartz_src", @@ -1545,6 +1525,7 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s for (i = 0; i < parser->stream_count; ++i) { struct wg_parser_stream *stream = parser->streams[i]; + gint64 duration, byte_length; while (!stream->has_caps && !parser->error) pthread_cond_wait(&parser->init_cond, &parser->mutex); @@ -1558,7 +1539,29 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s * avidemux, wavparse, qtdemux) in practice record duration before * fixing caps, so as a heuristic, wait until we get caps before trying * to query for duration. */ - stream->duration = query_duration(stream->their_src); + if (gst_pad_query_duration(stream->their_src, GST_FORMAT_TIME, &duration)) + { + stream->duration = duration / 100; + } + else + { + GST_INFO("Failed to query time duration; trying to convert from byte length.\n"); + + /* To accurately get a duration for the stream, we want to only + * consider the length of that stream. Hence, query for the pad + * duration, instead of using the file duration. */ + if (gst_pad_query_duration(stream->their_src, GST_FORMAT_BYTES, &byte_length) + && gst_pad_query_convert(stream->their_src, GST_FORMAT_BYTES, byte_length, + GST_FORMAT_TIME, &duration)) + { + stream->duration = duration / 100; + } + else + { + stream->duration = 0; + GST_WARNING("Failed to query duration.\n"); + } + } } pthread_mutex_unlock(&parser->mutex);

1 0

Anton Baskanov : winegstreamer: Always wait for duration-changed when querying for duration.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 8efac25a0adc844d010ac60515500ee465f482ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=8efac25a0adc844d010ac605… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 22 00:19:01 2021 -0500 winegstreamer: Always wait for duration-changed when querying for duration. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51126 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 69 +++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 7f6109e47a4..76c096c4f68 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -61,7 +61,7 @@ struct wg_parser pthread_mutex_t mutex; pthread_cond_t init_cond; - bool no_more_pads, has_duration, error; + bool no_more_pads, error; pthread_cond_t read_cond, read_done_cond; struct @@ -1401,9 +1401,6 @@ static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer use break; case GST_MESSAGE_DURATION_CHANGED: - pthread_mutex_lock(&parser->mutex); - parser->has_duration = true; - pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); break; @@ -1529,22 +1526,44 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s while (!stream->has_caps && !parser->error) pthread_cond_wait(&parser->init_cond, &parser->mutex); - if (parser->error) - { - pthread_mutex_unlock(&parser->mutex); - return E_FAIL; - } + /* GStreamer doesn't actually provide any guarantees about when duration - * is available, even for seekable streams. However, many elements (e.g. - * avidemux, wavparse, qtdemux) in practice record duration before - * fixing caps, so as a heuristic, wait until we get caps before trying - * to query for duration. */ - if (gst_pad_query_duration(stream->their_src, GST_FORMAT_TIME, &duration)) - { - stream->duration = duration / 100; - } - else + * is available, even for seekable streams. It's basically built for + * applications that don't care, e.g. movie players that can display + * a duration once it's available, and update it visually if a better + * estimate is found. This doesn't really match well with DirectShow or + * Media Foundation, which both expect duration to be available + * immediately on connecting, so we have to use some complex heuristics + * to try to actually get a usable duration. + * + * Some elements (avidemux, wavparse, qtdemux) record duration almost + * immediately, before fixing caps. Such elements don't send + * duration-changed messages. Therefore always try querying duration + * after caps have been found. + * + * Some elements (mpegaudioparse) send duration-changed. In the case of + * a mp3 stream without seek tables it will not be sent immediately, but + * only after enough frames have been parsed to form an estimate. They + * may send it multiple times with increasingly accurate estimates, but + * unfortunately we have no way of knowing whether another estimate will + * be sent, so we always take the first one. We assume that if the + * duration is not immediately available then the element will always + * send duration-changed. + */ + + for (;;) { + if (parser->error) + { + pthread_mutex_unlock(&parser->mutex); + return E_FAIL; + } + if (gst_pad_query_duration(stream->their_src, GST_FORMAT_TIME, &duration)) + { + stream->duration = duration / 100; + break; + } + GST_INFO("Failed to query time duration; trying to convert from byte length.\n"); /* To accurately get a duration for the stream, we want to only @@ -1555,12 +1574,15 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s GST_FORMAT_TIME, &duration)) { stream->duration = duration / 100; + break; } - else + if (stream->eos) { stream->duration = 0; GST_WARNING("Failed to query duration.\n"); + break; } + pthread_cond_wait(&parser->init_cond, &parser->mutex); } } @@ -1763,15 +1785,6 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) return FALSE; } - pthread_mutex_lock(&parser->mutex); - while (!parser->has_duration && !parser->error && !stream->eos) - pthread_cond_wait(&parser->init_cond, &parser->mutex); - if (parser->error) - { - pthread_mutex_unlock(&parser->mutex); - return FALSE; - } - pthread_mutex_unlock(&parser->mutex); return TRUE; }

1 0

Anton Baskanov : winegstreamer: Continue polling if duration is unavailable after duration-changed.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: e0a281102b0c60748fa94aa733e70c444f31164e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a281102b0c60748fa94aa7… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 22 00:19:02 2021 -0500 winegstreamer: Continue polling if duration is unavailable after duration-changed. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 76c096c4f68..eb53ac8efce 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -61,7 +61,7 @@ struct wg_parser pthread_mutex_t mutex; pthread_cond_t init_cond; - bool no_more_pads, error; + bool no_more_pads, has_duration, error; pthread_cond_t read_cond, read_done_cond; struct @@ -1401,6 +1401,9 @@ static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer use break; case GST_MESSAGE_DURATION_CHANGED: + pthread_mutex_lock(&parser->mutex); + parser->has_duration = true; + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); break; @@ -1582,7 +1585,22 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s GST_WARNING("Failed to query duration.\n"); break; } - pthread_cond_wait(&parser->init_cond, &parser->mutex); + + /* Elements based on GstBaseParse send duration-changed before + * actually updating the duration in GStreamer versions prior + * to 1.17.1. See <gstreamer.git:d28e0b4147fe7073b2>. So after + * receiving duration-changed we have to continue polling until + * the query succeeds. */ + if (parser->has_duration) + { + pthread_mutex_unlock(&parser->mutex); + g_usleep(10000); + pthread_mutex_lock(&parser->mutex); + } + else + { + pthread_cond_wait(&parser->init_cond, &parser->mutex); + } } }

1 0