February 2024 - Wine-commits

Alexandre Julliard : png: Import upstream release 1.6.42.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 1e5cc509a70068c302daf585f5e6e4a57629c7eb URL: https://gitlab.winehq.org/wine/wine/-/commit/1e5cc509a70068c302daf585f5e6e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 18:24:51 2024 +0100 png: Import upstream release 1.6.42. --- libs/png/AUTHORS | 30 ++++--- libs/png/LICENSE | 4 +- libs/png/png.c | 73 +++------------ libs/png/png.h | 50 ++++++----- libs/png/pngconf.h | 4 +- libs/png/pngerror.c | 34 +++---- libs/png/pngget.c | 245 ++++++++++++++++++++++++++------------------------ libs/png/pnglibconf.h | 11 ++- libs/png/pngpriv.h | 118 +++++++++++++++++++----- libs/png/pngread.c | 8 +- libs/png/pngrtran.c | 6 +- libs/png/pngrutil.c | 19 ++-- libs/png/pngset.c | 22 +++-- libs/png/pngtrans.c | 14 +-- libs/png/pngwrite.c | 19 ++-- libs/png/pngwutil.c | 10 +-- 16 files changed, 371 insertions(+), 296 deletions(-)

1 0

Alexandre Julliard : jpeg: Import upstream release 9f.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 73a8c068047ca766493903b1d4924beb6f69c653 URL: https://gitlab.winehq.org/wine/wine/-/commit/73a8c068047ca766493903b1d4924b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 18:33:56 2024 +0100 jpeg: Import upstream release 9f. --- libs/jpeg/jccoefct.c | 8 +- libs/jpeg/jccolor.c | 35 +++---- libs/jpeg/jchuff.c | 272 +++++++++++++++++++++++++++------------------------ libs/jpeg/jdcolor.c | 93 ++++++++---------- libs/jpeg/jdct.h | 4 +- libs/jpeg/jdmerge.c | 31 +++--- libs/jpeg/jinclude.h | 66 ++++++++++++- libs/jpeg/jmorecfg.h | 31 ++++-- libs/jpeg/jpeglib.h | 4 +- libs/jpeg/jversion.h | 6 +- 10 files changed, 312 insertions(+), 238 deletions(-)

1 0

Alexandre Julliard : zlib: Import upstream release 1.3.1.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 041167b20a7aa831fe535322ee9f221a59e65ce2 URL: https://gitlab.winehq.org/wine/wine/-/commit/041167b20a7aa831fe535322ee9f22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 18:36:41 2024 +0100 zlib: Import upstream release 1.3.1. --- libs/zlib/deflate.c | 47 ++++++++++++++++++++++++++++++++++++----------- libs/zlib/deflate.h | 35 +++++++++++++++++++++++++++++++++-- libs/zlib/inflate.c | 2 +- libs/zlib/inftrees.c | 6 +++--- libs/zlib/inftrees.h | 4 ++-- libs/zlib/trees.c | 20 +++++++++++++++++--- libs/zlib/zconf.h | 10 +--------- libs/zlib/zlib.h | 22 +++++++++++----------- libs/zlib/zutil.h | 27 +++------------------------ 9 files changed, 107 insertions(+), 66 deletions(-)

1 0

Alexandre Julliard : lcms2: Import upstream release 2.16.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: b15d0120cfebed320da99ee383b39629f70d7ecc URL: https://gitlab.winehq.org/wine/wine/-/commit/b15d0120cfebed320da99ee383b396… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 18:42:10 2024 +0100 lcms2: Import upstream release 2.16. --- libs/lcms2/AUTHORS | 1 + libs/lcms2/include/lcms2.h | 53 +++++++- libs/lcms2/include/lcms2_plugin.h | 8 +- libs/lcms2/src/cmsalpha.c | 30 +++-- libs/lcms2/src/cmscnvrt.c | 44 +++--- libs/lcms2/src/cmserr.c | 7 +- libs/lcms2/src/cmsgamma.c | 27 ++-- libs/lcms2/src/cmsgmt.c | 5 +- libs/lcms2/src/cmsio0.c | 31 +++-- libs/lcms2/src/cmsio1.c | 12 +- libs/lcms2/src/cmslut.c | 13 +- libs/lcms2/src/cmsnamed.c | 250 +++++++++++++++++++++++++++++++--- libs/lcms2/src/cmsopt.c | 17 ++- libs/lcms2/src/cmspack.c | 186 +++++++++++++++++++++++++- libs/lcms2/src/cmsplugin.c | 21 +-- libs/lcms2/src/cmssamp.c | 2 +- libs/lcms2/src/cmstypes.c | 274 +++++++++++++++++++++++++++++++++++--- libs/lcms2/src/cmsvirt.c | 137 ++++++++++++++++++- libs/lcms2/src/cmsxform.c | 15 ++- libs/lcms2/src/lcms2_internal.h | 7 +- 20 files changed, 992 insertions(+), 148 deletions(-)

1 0

Alexandre Julliard : ldap: Import upstream release 2.5.17.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 72b7866950f5d75bd98fb81d0fb28d9eeb64c554 URL: https://gitlab.winehq.org/wine/wine/-/commit/72b7866950f5d75bd98fb81d0fb28d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 18:50:25 2024 +0100 ldap: Import upstream release 2.5.17. --- libs/ldap/include/ac/string.h | 6 +- libs/ldap/libldap/getdn.c | 8 ++ libs/ldap/libldap/open.c | 1 + libs/ldap/libldap/url.c | 4 + libs/ldap/libldap/util-int.c | 176 +++++++++++++----------------------------- 5 files changed, 68 insertions(+), 127 deletions(-) diff --git a/libs/ldap/include/ac/string.h b/libs/ldap/include/ac/string.h index c4c135410e6..20a68d76bcb 100644 --- a/libs/ldap/include/ac/string.h +++ b/libs/ldap/include/ac/string.h @@ -58,7 +58,7 @@ LDAP_F(char *) ldap_pvt_strtok LDAP_P(( char *str, #elif !defined(_WIN32) /* some systems fail to declare strdup */ /* Windows does not require this declaration */ - LDAP_LIBC_F(char *) (strdup)(); + LDAP_LIBC_F(char *) (strdup) LDAP_P((const char *s)); #endif /* @@ -68,8 +68,8 @@ LDAP_F(char *) ldap_pvt_strtok LDAP_P(( char *str, /* we don't want these declared for Windows or Mingw */ #ifndef _WIN32 -int (strcasecmp)(); -int (strncasecmp)(); +LDAP_LIBC_F(int) (strcasecmp) LDAP_P((const char *s1, const char *s2)); +LDAP_LIBC_F(int) (strncasecmp) LDAP_P((const char *s1, const char *s2, size_t n)); #endif #ifndef SAFEMEMCPY diff --git a/libs/ldap/libldap/getdn.c b/libs/ldap/libldap/getdn.c index 671371f86f2..478cfad666c 100644 --- a/libs/ldap/libldap/getdn.c +++ b/libs/ldap/libldap/getdn.c @@ -2562,6 +2562,8 @@ rdn2strlen( LDAPRDN rdn, unsigned flags, ber_len_t *len, l += vl; } } + if ( !iAVA ) + return( -1 ); /* RDN ::= SET SIZE (1..MAX) OF AVA */ *len = l; @@ -2635,6 +2637,8 @@ rdn2DCEstrlen( LDAPRDN rdn, unsigned flags, ber_len_t *len ) l += vl; } } + if ( !iAVA ) + return( -1 ); /* RDN ::= SET SIZE (1..MAX) OF AVA */ *len = l; @@ -2716,6 +2720,8 @@ rdn2UFNstrlen( LDAPRDN rdn, unsigned flags, ber_len_t *len ) l += vl; } } + if ( !iAVA ) + return( -1 ); /* RDN ::= SET SIZE (1..MAX) OF AVA */ *len = l; @@ -2794,6 +2800,8 @@ rdn2ADstrlen( LDAPRDN rdn, unsigned flags, ber_len_t *len ) l += vl; } } + if ( !iAVA ) + return( -1 ); /* RDN ::= SET SIZE (1..MAX) OF AVA */ *len = l; diff --git a/libs/ldap/libldap/open.c b/libs/ldap/libldap/open.c index 6656325a460..dbbb27fbed3 100644 --- a/libs/ldap/libldap/open.c +++ b/libs/ldap/libldap/open.c @@ -543,6 +543,7 @@ ldap_int_open_connection( LDAP_MUTEX_UNLOCK( &lo->ldo_mutex ); } ber_int_sb_close( conn->lconn_sb ); + ber_int_sb_destroy( conn->lconn_sb ); return -1; } } diff --git a/libs/ldap/libldap/url.c b/libs/ldap/libldap/url.c index 06eb675c2aa..c3431eeb7ba 100644 --- a/libs/ldap/libldap/url.c +++ b/libs/ldap/libldap/url.c @@ -867,6 +867,10 @@ ldap_url_parse_ext( LDAP_CONST char *url_in, LDAPURLDesc **ludpp, unsigned flags } if ( enclosed ) { + if ( ! *url ) { + LDAP_FREE( url ); + return LDAP_URL_ERR_BADENCLOSURE; + } p = &url[strlen(url)-1]; if( *p != '>' ) { diff --git a/libs/ldap/libldap/util-int.c b/libs/ldap/libldap/util-int.c index 07a6f423463..d519aef6c67 100644 --- a/libs/ldap/libldap/util-int.c +++ b/libs/ldap/libldap/util-int.c @@ -182,116 +182,65 @@ static int _ldap_pvt_gt_subs; * This is pretty clunky. */ static LARGE_INTEGER _ldap_pvt_gt_freq; -static LARGE_INTEGER _ldap_pvt_gt_prev; -static int _ldap_pvt_gt_offset; +static LARGE_INTEGER _ldap_pvt_gt_start_count; +static long _ldap_pvt_gt_start_sec; +static long _ldap_pvt_gt_start_nsec; +static double _ldap_pvt_gt_nanoticks; #define SEC_TO_UNIX_EPOCH 11644473600LL #define TICKS_PER_SECOND 10000000 -#define BILLION 1000000000LL +#define BILLION 1000000000L static int -ldap_pvt_gettimensec(int *sec) +ldap_pvt_gettimensec(long *sec) { LARGE_INTEGER count; + LARGE_INTEGER freq; + int nsec; - QueryPerformanceCounter( &count ); - - /* It shouldn't ever go backwards, but multiple CPUs might - * be able to hit in the same tick. - */ - LDAP_MUTEX_LOCK( &ldap_int_gettime_mutex ); + QueryPerformanceFrequency( &freq ); /* We assume Windows has at least a vague idea of * when a second begins. So we align our nanosecond count - * with the Windows millisecond count using this offset. - * We retain the submillisecond portion of our own count. - * - * Note - this also assumes that the relationship between - * the PerformanceCounter and SystemTime stays constant; - * that assumption breaks if the SystemTime is adjusted by - * an external action. + * with the Windows millisecond count. */ - if ( !_ldap_pvt_gt_freq.QuadPart ) { - LARGE_INTEGER c2; + if ( freq.QuadPart != _ldap_pvt_gt_freq.QuadPart ) { ULARGE_INTEGER ut; FILETIME ft0, ft1; - long long t; - int nsec; - - /* Initialize our offset */ - QueryPerformanceFrequency( &_ldap_pvt_gt_freq ); - + /* initialize */ + LDAP_MUTEX_LOCK( &ldap_int_gettime_mutex ); /* Wait for a tick of the system time: 10-15ms */ GetSystemTimeAsFileTime( &ft0 ); do { GetSystemTimeAsFileTime( &ft1 ); } while ( ft1.dwLowDateTime == ft0.dwLowDateTime ); + QueryPerformanceCounter( &_ldap_pvt_gt_start_count ); ut.LowPart = ft1.dwLowDateTime; ut.HighPart = ft1.dwHighDateTime; - QueryPerformanceCounter( &c2 ); - - /* get second and fraction portion of counter */ - t = c2.QuadPart % (_ldap_pvt_gt_freq.QuadPart*10); - - /* convert to nanoseconds */ - t *= BILLION; - nsec = t / _ldap_pvt_gt_freq.QuadPart; - - ut.QuadPart /= 10; - ut.QuadPart %= (10 * BILLION); - _ldap_pvt_gt_offset = nsec - ut.QuadPart; - count = c2; + _ldap_pvt_gt_start_nsec = ut.QuadPart % TICKS_PER_SECOND * 100; + _ldap_pvt_gt_start_sec = ut.QuadPart / TICKS_PER_SECOND - SEC_TO_UNIX_EPOCH; + _ldap_pvt_gt_freq = freq; + _ldap_pvt_gt_nanoticks = (double)BILLION / freq.QuadPart; + LDAP_MUTEX_UNLOCK( &ldap_int_gettime_mutex ); } - if ( count.QuadPart <= _ldap_pvt_gt_prev.QuadPart ) { - _ldap_pvt_gt_subs++; - } else { - _ldap_pvt_gt_subs = 0; - _ldap_pvt_gt_prev = count; + QueryPerformanceCounter( &count ); + count.QuadPart -= _ldap_pvt_gt_start_count.QuadPart; + *sec = _ldap_pvt_gt_start_sec + count.QuadPart / freq.QuadPart; + nsec = _ldap_pvt_gt_start_nsec + (double)(count.QuadPart % freq.QuadPart) * _ldap_pvt_gt_nanoticks; + if ( nsec > BILLION) { + nsec -= BILLION; + (*sec)++; } - LDAP_MUTEX_UNLOCK( &ldap_int_gettime_mutex ); - - /* convert to nanoseconds */ - count.QuadPart %= _ldap_pvt_gt_freq.QuadPart*10; - count.QuadPart *= BILLION; - count.QuadPart /= _ldap_pvt_gt_freq.QuadPart; - count.QuadPart -= _ldap_pvt_gt_offset; - - /* We've extracted the 1s and nanoseconds. - * The 1sec digit is used to detect wraparound in nanosecnds. - */ - if (count.QuadPart < 0) - count.QuadPart += (10 * BILLION); - else if (count.QuadPart >= (10 * BILLION)) - count.QuadPart -= (10 * BILLION); - - *sec = count.QuadPart / BILLION; - return count.QuadPart % BILLION; + return nsec; } - /* emulate POSIX clock_gettime */ int ldap_pvt_clock_gettime( int clk_id, struct timespec *tv ) { - FILETIME ft; - ULARGE_INTEGER ut; - int sec, sec0; - - GetSystemTimeAsFileTime( &ft ); - ut.LowPart = ft.dwLowDateTime; - ut.HighPart = ft.dwHighDateTime; - - /* convert to sec */ - ut.QuadPart /= TICKS_PER_SECOND; - - tv->tv_nsec = ldap_pvt_gettimensec(&sec); - tv->tv_sec = ut.QuadPart - SEC_TO_UNIX_EPOCH; - - /* check for carry from microseconds */ - sec0 = tv->tv_sec % 10; - if (sec0 < sec || (sec0 == 9 && !sec)) - tv->tv_sec++; - + long sec; + tv->tv_nsec = ldap_pvt_gettimensec( &sec ); + tv->tv_sec = sec; return 0; } @@ -306,6 +255,8 @@ ldap_pvt_gettimeofday( struct timeval *tv, void *unused ) return 0; } +static long _ldap_pvt_gt_prevsec; +static int _ldap_pvt_gt_prevnsec; /* return a broken out time, with nanoseconds */ @@ -313,17 +264,18 @@ void ldap_pvt_gettime( struct lutil_tm *tm ) { SYSTEMTIME st; - int sec, sec0; - static const char daysPerMonth[] = { - 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + LARGE_INTEGER ft; + long sec; - GetSystemTime( &st ); + /* Convert sec/nsec to Windows FILETIME, + * then turn that into broken out SYSTEMTIME */ tm->tm_nsec = ldap_pvt_gettimensec(&sec); - tm->tm_usub = _ldap_pvt_gt_subs; + ft.QuadPart = sec; + ft.QuadPart += SEC_TO_UNIX_EPOCH; + ft.QuadPart *= TICKS_PER_SECOND; + ft.QuadPart += tm->tm_nsec / 100; + FileTimeToSystemTime( (FILETIME *)&ft, &st ); - /* any difference larger than nanoseconds is - * already reflected in st - */ tm->tm_sec = st.wSecond; tm->tm_min = st.wMinute; tm->tm_hour = st.wHour; @@ -331,42 +283,18 @@ ldap_pvt_gettime( struct lutil_tm *tm ) tm->tm_mon = st.wMonth - 1; tm->tm_year = st.wYear - 1900; - /* check for carry from nanoseconds */ - sec0 = tm->tm_sec % 10; - if (sec0 < sec || (sec0 == 9 && !sec)) { - tm->tm_sec++; - /* FIXME: we don't handle leap seconds */ - if (tm->tm_sec > 59) { - tm->tm_sec = 0; - tm->tm_min++; - if (tm->tm_min > 59) { - tm->tm_min = 0; - tm->tm_hour++; - if (tm->tm_hour > 23) { - int days = daysPerMonth[tm->tm_mon]; - tm->tm_hour = 0; - tm->tm_mday++; - - /* if it's February of a leap year, - * add 1 day to this month - */ - if (tm->tm_mon == 1 && - ((!(st.wYear % 4) && (st.wYear % 100)) || - !(st.wYear % 400))) - days++; - - if (tm->tm_mday > days) { - tm->tm_mday = 1; - tm->tm_mon++; - if (tm->tm_mon > 11) { - tm->tm_mon = 0; - tm->tm_year++; - } - } - } - } - } + LDAP_MUTEX_LOCK( &ldap_int_gettime_mutex ); + if ( tm->tm_sec < _ldap_pvt_gt_prevsec + || ( tm->tm_sec == _ldap_pvt_gt_prevsec + && tm->tm_nsec <= _ldap_pvt_gt_prevnsec )) { + _ldap_pvt_gt_subs++; + } else { + _ldap_pvt_gt_subs = 0; + _ldap_pvt_gt_prevsec = sec; + _ldap_pvt_gt_prevnsec = tm->tm_nsec; } + LDAP_MUTEX_UNLOCK( &ldap_int_gettime_mutex ); + tm->tm_usub = _ldap_pvt_gt_subs; } #else

1 0

Alexandre Julliard : xslt: Import upstream release 1.1.39.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: f1454777a8ea7bf9d0ee3a36135ccdfd91fcdc58 URL: https://gitlab.winehq.org/wine/wine/-/commit/f1454777a8ea7bf9d0ee3a36135ccd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 20:52:21 2024 +0100 xslt: Import upstream release 1.1.39. --- libs/xslt/libxslt/extensions.c | 54 ++++++++++++++++++------------------- libs/xslt/libxslt/imports.c | 61 +++++++++++++++++++++++++----------------- libs/xslt/libxslt/security.c | 3 +-- libs/xslt/libxslt/transform.c | 14 ++++++++++ libs/xslt/libxslt/xsltconfig.h | 6 ++--- libs/xslt/libxslt/xsltlocale.c | 1 + libs/xslt/libxslt/xsltlocale.h | 8 ++++++ libs/xslt/libxslt/xsltutils.h | 4 +-- 8 files changed, 92 insertions(+), 59 deletions(-)

1 0

Alexandre Julliard : xml2: Import upstream release 2.11.7.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: da62790584aecd00ec7b1b9a5154b72887064e39 URL: https://gitlab.winehq.org/wine/wine/-/commit/da62790584aecd00ec7b1b9a5154b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 21:00:22 2024 +0100 xml2: Import upstream release 2.11.7. --- libs/xml2/error.c | 13 ++++++------- libs/xml2/globals.c | 9 ++++----- libs/xml2/include/libxml/parser.h | 6 +++--- libs/xml2/include/libxml/relaxng.h | 4 ++-- libs/xml2/include/libxml/valid.h | 4 ++-- libs/xml2/include/libxml/xmlerror.h | 10 +++++----- libs/xml2/include/libxml/xmlexports.h | 4 +--- libs/xml2/include/libxml/xmlschemas.h | 6 +++--- libs/xml2/include/libxml/xmlstring.h | 2 +- libs/xml2/include/libxml/xmlversion.h | 8 ++++---- libs/xml2/include/private/error.h | 4 ++-- libs/xml2/parser.c | 11 ++++++++--- libs/xml2/save.h | 36 ----------------------------------- libs/xml2/valid.c | 2 +- libs/xml2/xinclude.c | 3 ++- libs/xml2/xmlreader.c | 23 +++++++++++----------- libs/xml2/xmlschemas.c | 12 ++++++------ libs/xml2/xmlstring.c | 3 +-- 18 files changed, 63 insertions(+), 97 deletions(-)

1 0

Alexandre Julliard : zydis: Import upstream release 4.1.0.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 7914be3ca5b6d0fb6baff98b7796decee5d4f261 URL: https://gitlab.winehq.org/wine/wine/-/commit/7914be3ca5b6d0fb6baff98b7796de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 21:09:18 2024 +0100 zydis: Import upstream release 4.1.0. With headers from Zycore version 1.5.0. --- libs/zydis/LICENSE | 5 +- libs/zydis/include/Zycore/Defines.h | 21 +- libs/zydis/include/Zycore/LibC.h | 1 + libs/zydis/include/Zycore/Types.h | 208 +- libs/zydis/include/Zydis/Decoder.h | 23 +- libs/zydis/include/Zydis/Encoder.h | 13 +- libs/zydis/include/Zydis/Formatter.h | 46 +- libs/zydis/include/Zydis/Generated/EnumISAExt.h | 14 + libs/zydis/include/Zydis/Generated/EnumISASet.h | 15 + .../Zydis/Generated/EnumInstructionCategory.h | 6 + libs/zydis/include/Zydis/Generated/EnumMnemonic.h | 38 + libs/zydis/include/Zydis/Internal/DecoderData.h | 10 +- libs/zydis/include/Zydis/Internal/SharedData.h | 5 + libs/zydis/include/Zydis/Register.h | 2 +- libs/zydis/include/Zydis/SharedTypes.h | 4 + libs/zydis/include/Zydis/ShortString.h | 4 +- libs/zydis/include/Zydis/Zydis.h | 4 +- libs/zydis/src/Decoder.c | 69 +- libs/zydis/src/DecoderData.c | 6 + libs/zydis/src/Formatter.c | 9 +- libs/zydis/src/FormatterBase.c | 9 +- libs/zydis/src/FormatterIntel.c | 3 +- libs/zydis/src/Generated/DecoderTables.inc | 5216 +++++---- libs/zydis/src/Generated/EnumMnemonic.inc | 38 + .../zydis/src/Generated/InstructionDefinitions.inc | 11471 ++++++++++--------- libs/zydis/src/Generated/OperandDefinitions.inc | 276 +- libs/zydis/src/Register.c | 68 +- libs/zydis/src/SharedData.c | 7 +- libs/zydis/src/String.c | 14 +- 29 files changed, 9198 insertions(+), 8407 deletions(-)

1 0

Alexandre Julliard : fluidsynth: Import upstream release 2.3.4.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 839fb09bf01bb7e131ec994621e55125313a4705 URL: https://gitlab.winehq.org/wine/wine/-/commit/839fb09bf01bb7e131ec994621e551… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 22:37:28 2024 +0100 fluidsynth: Import upstream release 2.3.4. --- libs/fluidsynth/include/fluidsynth/version.h | 4 +-- libs/fluidsynth/src/midi/fluid_midi.c | 24 +++++++++++++++ libs/fluidsynth/src/utils/fluid_sys.c | 46 ++++++++++++++++------------ 3 files changed, 53 insertions(+), 21 deletions(-) diff --git a/libs/fluidsynth/include/fluidsynth/version.h b/libs/fluidsynth/include/fluidsynth/version.h index 2de6e9fbf4d..96ee8183bd3 100644 --- a/libs/fluidsynth/include/fluidsynth/version.h +++ b/libs/fluidsynth/include/fluidsynth/version.h @@ -31,10 +31,10 @@ extern "C" { * * @{ */ -#define FLUIDSYNTH_VERSION "2.3.3" /**< String constant of libfluidsynth version. */ +#define FLUIDSYNTH_VERSION "2.3.4" /**< String constant of libfluidsynth version. */ #define FLUIDSYNTH_VERSION_MAJOR 2 /**< libfluidsynth major version integer constant. */ #define FLUIDSYNTH_VERSION_MINOR 3 /**< libfluidsynth minor version integer constant. */ -#define FLUIDSYNTH_VERSION_MICRO 3 /**< libfluidsynth micro version integer constant. */ +#define FLUIDSYNTH_VERSION_MICRO 4 /**< libfluidsynth micro version integer constant. */ FLUIDSYNTH_API void fluid_version(int *major, int *minor, int *micro); FLUIDSYNTH_API char* fluid_version_str(void); diff --git a/libs/fluidsynth/src/midi/fluid_midi.c b/libs/fluidsynth/src/midi/fluid_midi.c index 6ea0216cfb3..dc6f0b865f3 100644 --- a/libs/fluidsynth/src/midi/fluid_midi.c +++ b/libs/fluidsynth/src/midi/fluid_midi.c @@ -1641,6 +1641,23 @@ fluid_player_handle_reset_synth(void *data, const char *name, int value) player->reset_synth_between_songs = value; } +static int check_for_on_notes(fluid_synth_t *synth) +{ + fluid_voice_t* v[1024]; + int i, res=FALSE; + fluid_synth_get_voicelist(synth, v, FLUID_N_ELEMENTS(v), -1); + for(i=0; i<FLUID_N_ELEMENTS(v) && v[i] != NULL; i++) + { + fluid_voice_t *vv = v[i]; + if(vv != NULL && fluid_voice_is_on(vv)) + { + res = TRUE; + FLUID_LOG(FLUID_DBG, "Voice is on! channel %d, key %d", fluid_voice_get_channel(vv), fluid_voice_get_key(vv)); + } + } + return res; +} + /** * Create a new MIDI player. * @param synth Fluid synthesizer instance to create player for @@ -2197,10 +2214,16 @@ fluid_player_callback(void *data, unsigned int msec) /* The first time we notice we've run out of MIDI events but there are still active voices, disable all hold pedals */ if(!player->end_pedals_disabled) { + if(check_for_on_notes(synth)) + { + FLUID_LOG(FLUID_WARN, "End of the MIDI file reached, but not all notes have received a note off event! OFFing them now! Run with --verbose to spot pending voices."); + } + for(i = 0; i < synth->midi_channels; i++) { fluid_synth_cc(player->synth, i, SUSTAIN_SWITCH, 0); fluid_synth_cc(player->synth, i, SOSTENUTO_SWITCH, 0); + fluid_synth_cc(player->synth, i, ALL_NOTES_OFF, 0); } player->end_pedals_disabled = 1; @@ -2268,6 +2291,7 @@ fluid_player_play(fluid_player_t *player) if(!player->use_system_timer) { fluid_sample_timer_reset(player->synth, player->sample_timer); + player->cur_msec = 0; } /* If we're at the end of the playlist and there are no loops left, loop once */ diff --git a/libs/fluidsynth/src/utils/fluid_sys.c b/libs/fluidsynth/src/utils/fluid_sys.c index 0f8e6a608fc..8fc14cd5f5e 100644 --- a/libs/fluidsynth/src/utils/fluid_sys.c +++ b/libs/fluidsynth/src/utils/fluid_sys.c @@ -1606,12 +1606,12 @@ fluid_server_socket_t * new_fluid_server_socket(int port, fluid_server_func_t func, void *data) { fluid_server_socket_t *server_socket; + struct sockaddr_in addr4; #ifdef IPV6_SUPPORT - struct sockaddr_in6 addr; -#else - struct sockaddr_in addr; + struct sockaddr_in6 addr6; #endif - + const struct sockaddr *addr; + size_t addr_size; fluid_socket_t sock; fluid_return_val_if_fail(func != NULL, NULL); @@ -1621,23 +1621,37 @@ new_fluid_server_socket(int port, fluid_server_func_t func, void *data) return NULL; } + FLUID_MEMSET(&addr4, 0, sizeof(addr4)); + addr4.sin_family = AF_INET; + addr4.sin_port = htons((uint16_t)port); + addr4.sin_addr.s_addr = htonl(INADDR_ANY); + +#ifdef IPV6_SUPPORT + FLUID_MEMSET(&addr6, 0, sizeof(addr6)); + addr6.sin6_family = AF_INET6; + addr6.sin6_port = htons((uint16_t)port); + addr6.sin6_addr = in6addr_any; +#endif + #ifdef IPV6_SUPPORT sock = socket(AF_INET6, SOCK_STREAM, 0); + addr = (const struct sockaddr *) &addr6; + addr_size = sizeof(addr6); if(sock == INVALID_SOCKET) { - FLUID_LOG(FLUID_ERR, "Failed to create server socket: %d", fluid_socket_get_error()); - fluid_socket_cleanup(); - return NULL; + FLUID_LOG(FLUID_WARN, "Failed to create IPv6 server socket: %d (will try with IPv4)", fluid_socket_get_error()); + + sock = socket(AF_INET, SOCK_STREAM, 0); + addr = (const struct sockaddr *) &addr4; + addr_size = sizeof(addr4); } - FLUID_MEMSET(&addr, 0, sizeof(addr)); - addr.sin6_family = AF_INET6; - addr.sin6_port = htons((uint16_t)port); - addr.sin6_addr = in6addr_any; #else - sock = socket(AF_INET, SOCK_STREAM, 0); + addr = (const struct sockaddr *) &addr4; + addr_size = sizeof(addr4); +#endif if(sock == INVALID_SOCKET) { @@ -1646,13 +1660,7 @@ new_fluid_server_socket(int port, fluid_server_func_t func, void *data) return NULL; } - FLUID_MEMSET(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons((uint16_t)port); - addr.sin_addr.s_addr = htonl(INADDR_ANY); -#endif - - if(bind(sock, (const struct sockaddr *) &addr, sizeof(addr)) == SOCKET_ERROR) + if(bind(sock, addr, addr_size) == SOCKET_ERROR) { FLUID_LOG(FLUID_ERR, "Failed to bind server socket: %d", fluid_socket_get_error()); fluid_socket_close(sock);

1 0

Alexandre Julliard : kernelbase: Update timezone data to version 2024a.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 6e9d21409655207d5f83e7b31e48c07034385e2d URL: https://gitlab.winehq.org/wine/wine/-/commit/6e9d21409655207d5f83e7b31e48c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 17:53:41 2024 +0100 kernelbase: Update timezone data to version 2024a. --- dlls/kernelbase/kernelbase.rgs | 34 +++++++++++++++++++++++++++------- tools/make_unicode | 4 ++-- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index 5ae452de1e7..382cb23bfc5 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -523,7 +523,7 @@ HKLM val 'MUI_Dlt' = s '@tzres.dll,-8177' val 'MUI_Std' = s '@tzres.dll,-8176' val 'Std' = s 'Central Asia Standard Time' - val 'TZI' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val 'TZI' = b d4feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 'Dynamic DST' { val '2000' = b 98feffff00000000c4ffffff00000a0000000500030000000000000000000300000005000200000000000000 @@ -532,8 +532,28 @@ HKLM val '2003' = b 98feffff00000000c4ffffff00000a0000000500030000000000000000000300000005000200000000000000 val '2004' = b 98feffff00000000c4ffffff00000a0000000500030000000000000000000300000005000200000000000000 val '2005' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2006' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2007' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2008' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2009' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2010' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2011' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2012' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2013' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2014' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2015' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2016' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2017' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2018' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2019' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2020' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2021' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2022' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2023' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2024' = b d4feffff00000000c4ffffff0000030005000100000000000000000000000100010001000000000000000000 + val '2025' = b d4feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 val 'FirstEntry' = d 2000 - val 'LastEntry' = d 2005 + val 'LastEntry' = d 2025 } } 'Central Brazilian Standard Time' @@ -1055,7 +1075,7 @@ HKLM val 'MUI_Dlt' = s '@tzres.dll,-58097' val 'MUI_Std' = s '@tzres.dll,-58096' val 'Std' = s 'Greenland Standard Time' - val 'TZI' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 + val 'TZI' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000100020001000000000000000000 'Dynamic DST' { val '2000' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 @@ -1081,14 +1101,14 @@ HKLM val '2020' = b b400000000000000c4ffffff00000a0006000400170000000000000000000300060005001600000000000000 val '2021' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 val '2022' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2023' = b b400000000000000c4ffffff0000010000000100000000000000000000000300060005001600000000000000 + val '2023' = b b400000000000000c4ffffff00000a0000000500000000000000000000000300060005001600000000000000 val '2024' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 val '2025' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 val '2026' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 val '2027' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 val '2028' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 val '2029' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060004001700000000000000 - val '2030' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 + val '2030' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000100020001000000000000000000 val 'FirstEntry' = d 2000 val 'LastEntry' = d 2030 } @@ -3149,8 +3169,8 @@ HKLM val '2021' = b 88ffffff00000000c4ffffff00000a0005000500010000000000000000000300060004000000000000000000 val '2022' = b 88ffffff00000000c4ffffff00000a0006000500020000000000000000000300000005000000000000000000 val '2023' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000400060005000200000000000000 - val '2024' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000400060002000200000000000000 - val '2025' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000400060001000200000000000000 + val '2024' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000400060003000200000000000000 + val '2025' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000400060002000200000000000000 val '2026' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000300060004000200000000000000 val '2027' = b 88ffffff00000000c4ffffff00000a0006000500020000000000000000000300060004000200000000000000 val '2028' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000300060004000200000000000000 diff --git a/tools/make_unicode b/tools/make_unicode index 2dfef084268..5ad8251bea0 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -28,7 +28,7 @@ use Time::Local qw(timegm_modern); my $UNIVERSION = "15.1.0"; my $CLDRVERSION = "44"; my $ISO639VERSION = "20230123"; -my $TZVERSION = "2023c"; +my $TZVERSION = "2024a"; my %data_files = ( @@ -55,7 +55,7 @@ my %data_files = jis0212 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0212.TXT", sha => "477820bb3055bbcc90880d788cd95607d221dc94457bae249231adecf13c12e6" }, tzdata => { url => "https://data.iana.org/time-zones/releases/tzdata$TZVERSION.tar.gz", - sha => "3f510b5d1b4ae9bb38e485aa302a776b317fb3637bdb6404c4adf7b6cadd965c" }, + sha => "0d0434459acbd2059a7a8da1f3304a84a86591f6ed69c6248fffa502b6edffe3" }, );

1 0