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

Jacek Caban : gdi32: Use NtGdiPolyPolyDraw for Polyline implementation.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 77a6beb4f1f784e3cd386d9b234be4be8b9dcf38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77a6beb4f1f784e3cd386d9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:26:36 2021 +0200 gdi32: Use NtGdiPolyPolyDraw for Polyline implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 6 +++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 35 +++++++++++------------------------ 10 files changed, 37 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77a6beb4f1f784e3cd38…

1 0

Alexandre Julliard : wow64: Add thunks for the atom syscalls.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: de9f285ee5fae8eb7046dc4385daebb3ff243032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de9f285ee5fae8eb7046dc43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 18:09:12 2021 +0200 wow64: Add thunks for the atom syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 4 ++++ 2 files changed, 57 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 10abe7a8b38..5c9bc8d4f27 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -78,6 +78,19 @@ void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *fun } +/********************************************************************** + * wow64_NtAddAtom + */ +NTSTATUS WINAPI wow64_NtAddAtom( UINT *args ) +{ + const WCHAR *name = get_ptr( &args ); + ULONG len = get_ulong( &args ); + RTL_ATOM *atom = get_ptr( &args ); + + return NtAddAtom( name, len, atom ); +} + + /********************************************************************** * wow64_NtAllocateLocallyUniqueId */ @@ -114,6 +127,30 @@ NTSTATUS WINAPI wow64_NtClose( UINT *args ) } +/********************************************************************** + * wow64_NtDeleteAtom + */ +NTSTATUS WINAPI wow64_NtDeleteAtom( UINT *args ) +{ + RTL_ATOM atom = get_ulong( &args ); + + return NtDeleteAtom( atom ); +} + + +/********************************************************************** + * wow64_NtFindAtom + */ +NTSTATUS WINAPI wow64_NtFindAtom( UINT *args ) +{ + const WCHAR *name = get_ptr( &args ); + ULONG len = get_ulong( &args ); + RTL_ATOM *atom = get_ptr( &args ); + + return NtFindAtom( name, len, atom ); +} + + /********************************************************************** * wow64_NtGetCurrentProcessorNumber */ @@ -146,6 +183,22 @@ NTSTATUS WINAPI wow64_NtQueryDefaultUILanguage( UINT *args ) } +/********************************************************************** + * wow64_NtQueryInformationAtom + */ +NTSTATUS WINAPI wow64_NtQueryInformationAtom( UINT *args ) +{ + RTL_ATOM atom = get_ulong( &args ); + ATOM_INFORMATION_CLASS class = get_ulong( &args ); + void *info = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG *retlen = get_ptr( &args ); + + if (class != AtomBasicInformation) FIXME( "class %u not supported\n", class ); + return NtQueryInformationAtom( atom, class, info, len, retlen ); +} + + /********************************************************************** * wow64_NtQueryInstallUILanguage */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 33e1670a391..583af0db476 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -22,12 +22,16 @@ #define __WOW64_SYSCALL_H #define ALL_SYSCALLS \ + SYSCALL_ENTRY( NtAddAtom ) \ SYSCALL_ENTRY( NtAllocateLocallyUniqueId ) \ SYSCALL_ENTRY( NtAllocateUuids ) \ SYSCALL_ENTRY( NtClose ) \ + SYSCALL_ENTRY( NtDeleteAtom ) \ + SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ + SYSCALL_ENTRY( NtQueryInformationAtom ) \ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage )

1 0

Ziqing Hui : include: Add D2D13DPerspectiveTransform definitions.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: e1ad3757dd0a2690cd358b66b13776af1d35b877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1ad3757dd0a2690cd358b66… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 22 08:44:21 2021 +0800 include: Add D2D13DPerspectiveTransform definitions. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effects.idl | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index ee1dbe94728..5dde46cbb6a 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") +cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") +cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") typedef enum D2D1_BORDER_MODE { @@ -44,3 +45,26 @@ typedef enum D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = 0x5, D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff } D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE; + +typedef enum D2D1_3DPERSPECTIVETRANSFORM_PROP +{ + D2D1_3DPERSPECTIVETRANSFORM_PROP_INTERPOLATION_MODE = 0x0, + D2D1_3DPERSPECTIVETRANSFORM_PROP_BORDER_MODE = 0x1, + D2D1_3DPERSPECTIVETRANSFORM_PROP_DEPTH = 0x2, + D2D1_3DPERSPECTIVETRANSFORM_PROP_PERSPECTIVE_ORIGIN = 0x3, + D2D1_3DPERSPECTIVETRANSFORM_PROP_LOCAL_OFFSET = 0x4, + D2D1_3DPERSPECTIVETRANSFORM_PROP_GLOBAL_OFFSET = 0x5, + D2D1_3DPERSPECTIVETRANSFORM_PROP_ROTATION_ORIGIN = 0x6, + D2D1_3DPERSPECTIVETRANSFORM_PROP_ROTATION = 0x7, + D2D1_3DPERSPECTIVETRANSFORM_PROP_FORCE_DWORD = 0xffffffff +} D2D1_3DPERSPECTIVETRANSFORM_PROP; + +typedef enum D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE +{ + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0x0, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_LINEAR = 0x1, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_CUBIC = 0x2, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 0x3, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC = 0x4, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff +} D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE;

1 0

Jacek Caban : gdi32: Use NtGdiPolyPolyDraw for PolyBezierTo implementation.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 82d59861a08cc50a2d886cb48518dc21b445d3e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82d59861a08cc50a2d886cb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:27:36 2021 +0200 gdi32: Use NtGdiPolyPolyDraw for PolyBezierTo implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 14 +---------- dlls/gdi32/enhmfdrv/graphics.c | 53 ++++++++++++++++++++++++------------------ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 14 +++++++++++ dlls/gdi32/painting.c | 48 ++++++++------------------------------ 5 files changed, 56 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82d59861a08cc50a2d88…

1 0

Jacek Caban : gdi32: Use NtGdiPolyPolyDraw for PolylineTo implementation.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: d69a6ab731ebe60db7ba486a5c63a0cbf44e95f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d69a6ab731ebe60db7ba486a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:27:20 2021 +0200 gdi32: Use NtGdiPolyPolyDraw for PolylineTo implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/graphics.c | 11 ++++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 14 ++++++++++++++ dlls/gdi32/painting.c | 35 ++++++++++------------------------- 5 files changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index d387d4810ab..e1566ab8e69 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -695,18 +695,6 @@ static BOOL CDECL emfpathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE next->funcs->pPolyDraw( next, pts, types, count )); } -/*********************************************************************** - * emfpathdrv_PolylineTo - */ -static BOOL CDECL emfpathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT count ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolylineTo ); - - return (emfdev->funcs->pPolylineTo( emfdev, pts, count ) && - next->funcs->pPolylineTo( next, pts, count )); -} - static const struct gdi_dc_funcs emfpath_driver = { @@ -784,7 +772,7 @@ static const struct gdi_dc_funcs emfpath_driver = emfpathdrv_PolyDraw, /* pPolyDraw */ NULL, /* pPolyPolygon */ NULL, /* pPolyPolyline */ - emfpathdrv_PolylineTo, /* pPolylineTo */ + NULL, /* pPolylineTo */ NULL, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 082432fa079..563698b9920 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -591,12 +591,21 @@ BOOL EMFDC_Polyline( DC_ATTR *dc_attr, const POINT *points, INT count ) return EMFDRV_Polylinegon( dc_attr->emf, points, count, EMR_POLYLINE ); } +/********************************************************************** + * EMFDC_PolylineTo + */ +BOOL EMFDC_PolylineTo( DC_ATTR *dc_attr, const POINT *pt, INT count ) +{ + return EMFDRV_Polylinegon( dc_attr->emf, pt, count, EMR_POLYLINETO ); +} + /********************************************************************** * EMFDRV_PolylineTo */ BOOL CDECL EMFDRV_PolylineTo( PHYSDEV dev, const POINT* pt, INT count ) { - return EMFDRV_Polylinegon( dev, pt, count, EMR_POLYLINETO ); + /* FIXME: update bounding rect */ + return TRUE; } /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index fcb7195b302..0fc83e3b6f7 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -76,6 +76,7 @@ extern BOOL EMFDC_PolyPolygon( DC_ATTR *dc_attr, const POINT *points, const INT UINT polys ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Polygon( DC_ATTR *dc_attr, const POINT *points, INT count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Polyline( DC_ATTR *dc_attr, const POINT *points, INT count) DECLSPEC_HIDDEN; +extern BOOL EMFDC_PolylineTo( DC_ATTR *dc_attr, const POINT *points, INT count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index d7cd6a45f14..21e74768aec 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -309,3 +309,17 @@ BOOL WINAPI PolyBezier( HDC hdc, const POINT *points, DWORD count ) if (dc_attr->emf && !EMFDC_PolyBezier( dc_attr, points, count )) return FALSE; return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolyBezier ); } + +/********************************************************************** + * PolylineTo (GDI32.@) + */ +BOOL WINAPI PolylineTo( HDC hdc, const POINT *points, DWORD count ) +{ + DC_ATTR *dc_attr; + + TRACE( "%p, %p, %u\n", hdc, points, count ); + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_PolylineTo( dc_attr, points, count )) return FALSE; + return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolylineTo ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index ea353aaca9e..4896400b568 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -575,31 +575,6 @@ BOOL WINAPI InvertRgn( HDC hdc, HRGN hrgn ) } -/********************************************************************** - * PolylineTo (GDI32.@) - */ -BOOL WINAPI PolylineTo( HDC hdc, const POINT* pt, DWORD cCount ) -{ - DC * dc = get_dc_ptr( hdc ); - PHYSDEV physdev; - BOOL ret; - - TRACE( "%p, %p, %u\n", hdc, pt, cCount ); - - if(!dc) return FALSE; - - update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pPolylineTo ); - ret = physdev->funcs->pPolylineTo( physdev, pt, cCount ); - - if (ret && cCount) - dc->attr->cur_pos = pt[cCount - 1]; - - release_dc_ptr( dc ); - return ret; -} - - /********************************************************************** * NtGdiPolyPolyDraw (win32u.@) */ @@ -636,6 +611,16 @@ ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts else ret = FALSE; break; + case NtGdiPolylineTo: + if (count == 1) + { + physdev = GET_DC_PHYSDEV( dc, pPolylineTo ); + ret = physdev->funcs->pPolylineTo( physdev, points, *counts ); + if (ret && *counts) dc->attr->cur_pos = points[*counts - 1]; + } + else ret = FALSE; + break; + default: WARN( "invalid function %u\n", function ); ret = FALSE;

1 0

Zebediah Figura : cryptnet: Respect the timeout also if CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG is not set.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 3a9d51bf36d9ced4792d4b5f731a2de6a370da7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a9d51bf36d9ced4792d4b5f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 22 00:21:05 2021 -0500 cryptnet: Respect the timeout also if CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG is not set. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 565302957d6..f4088021a0e 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1547,8 +1547,7 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; - if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && pRevPara - && pRevPara->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout)) + if (pRevPara && pRevPara->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout)) timeout = pRevPara->dwUrlRetrievalTimeout; /* Yes, this is a weird algorithm, but the documentation for @@ -1577,7 +1576,7 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * /* We don't check the current time here. This may result in * less accurate timeouts, but this too seems to be true of * Windows. */ - if (GetLastError() == ERROR_TIMEOUT) + if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && GetLastError() == ERROR_TIMEOUT) timeout /= 2; error = CRYPT_E_REVOCATION_OFFLINE; }

1 0

Anton Baskanov : winegstreamer: Continue polling if duration is unavailable after duration-changed.
by Alexandre Julliard July 22, 2021

July 22, 2021

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

Anton Baskanov : winegstreamer: Inline query_duration() into wg_parser_connect().
by Alexandre Julliard July 22, 2021

July 22, 2021

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

Zebediah Figura : ws2_32: Do not translate STATUS_INVALID_PARAMETER to WSAEFAULT.
by Alexandre Julliard July 22, 2021

July 22, 2021

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

Francois Gouget : oleaut32: VarParseNumFromStr() does not allow leading thousands separators.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: de70f7289e23e895956927e7e3ce2ed23a188e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de70f7289e23e895956927e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 22 00:03:47 2021 +0200 oleaut32: VarParseNumFromStr() does not allow leading thousands separators. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 4 ++-- dlls/oleaut32/variant.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 50af05e47cc..47dfbefc081 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1606,7 +1606,7 @@ static void test_VarParseNumFromStrEn(void) /* With flag, but leading thousands separators are not allowed */ CONVERT(",1,000", NUMPRS_THOUSANDS); - todo_wine EXPECTFAIL; + EXPECTFAIL; /* With flag, thousands separator not needed but still reported */ CONVERT("1,", NUMPRS_THOUSANDS); @@ -1983,7 +1983,7 @@ static void test_VarParseNumFromStrFr(void) /* With flag, but leading thousands separators are not allowed */ CONVERT(" 1 000", NUMPRS_THOUSANDS); - todo_wine EXPECTFAIL; + EXPECTFAIL; /* With flag, thousands separator not needed but still reported */ CONVERT("1 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index fbcc8ce693f..35e4539c2ef 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1652,6 +1652,12 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla lpszStr++; } while (iswspace(*lpszStr)); } + else if (pNumprs->dwInFlags & NUMPRS_THOUSANDS && + ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || + (cDigitSeparator2 && *lpszStr == cDigitSeparator2))) + { + return DISP_E_TYPEMISMATCH; /* Not allowed before the first digit */ + } else if (pNumprs->dwInFlags & NUMPRS_LEADING_PLUS && *lpszStr == chars.cPositiveSymbol && !(pNumprs->dwOutFlags & NUMPRS_LEADING_PLUS))

1 0