- Wine-Commits - list.winehq.org

Piotr Caban : wininet/tests: Add initial PAC script tests.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: wine Branch: master Commit: 8314812354e8565ffbcc47be1f37e02adca2c30b URL: https://gitlab.winehq.org/wine/wine/-/commit/8314812354e8565ffbcc47be1f37e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Feb 4 20:21:33 2024 +0100 wininet/tests: Add initial PAC script tests. --- dlls/wininet/tests/http.c | 72 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 9405991c3b0..705f89f28ba 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -529,11 +529,13 @@ typedef struct { HINTERNET request; } test_request_t; -#define open_simple_request(a,b,c,d,e) _open_simple_request(__LINE__,a,b,c,d,e) +#define open_simple_request(a,b,c,d,e) _open_simple_request(__LINE__,a,b,c,d,e,FALSE) +#define open_simple_request_proxy(a,b,c,d,e) _open_simple_request(__LINE__,a,b,c,d,e,TRUE) static void _open_simple_request(unsigned line, test_request_t *req, const char *host, - int port, const char *verb, const char *url) + int port, const char *verb, const char *url, BOOL use_proxy) { - req->session = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + req->session = InternetOpenA(NULL, use_proxy ? INTERNET_OPEN_TYPE_PRECONFIG : INTERNET_OPEN_TYPE_DIRECT, + NULL, NULL, 0); ok_(__FILE__,line)(req->session != NULL, "InternetOpenA failed: %lu\n", GetLastError()); req->connection = InternetConnectA(req->session, host, port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); @@ -2445,6 +2447,11 @@ static const char ok_with_length2[] = "Content-Length: 19\r\n\r\n" "HTTP/1.1 211 OK\r\n\r\n"; +static const char proxy_pac[] = +"function FindProxyForURL(url, host) {\r\n" +" return 'PROXY localhost:%d';\r\n" +"}\r\n\r\n"; + struct server_info { HANDLE hEvent; int port; @@ -2858,6 +2865,18 @@ static DWORD CALLBACK server_thread(LPVOID param) sprintf(msg, largemsg, content_length); send(c, msg, strlen(msg), 0); } + if (strstr(buffer, "GET /proxy.pac")) + { + char script[sizeof(proxy_pac) + 16]; + sprintf(script, proxy_pac, si->port); + send(c, okmsg, sizeof(okmsg)-1, 0); + send(c, script, strlen(script), 0); + } + if (strstr(buffer, "GET http://test.winehq.org/tests/hello.html")) + { + send(c, okmsg, sizeof(okmsg)-1, 0); + send(c, page1, sizeof(page1)-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -6625,6 +6644,52 @@ static void test_header_length(int port) close_request(&req); } +static void test_pac(int port) +{ + static const WCHAR autoconf_url_fmt[] = L"http://localhost:%d/proxy.pac?ver=1"; + INTERNET_PER_CONN_OPTION_LISTW option_list; + INTERNET_PER_CONN_OPTIONW options[2]; + WCHAR autoconf_url[64]; + test_request_t req; + char buf[1000]; + DWORD len; + BOOL r; + + open_simple_request_proxy(&req, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, "GET", "/tests/hello.html"); + + swprintf(autoconf_url, ARRAY_SIZE(autoconf_url), autoconf_url_fmt, port); + memset(&option_list, 0, sizeof(option_list)); + option_list.dwSize = sizeof(option_list); + option_list.dwOptionCount = ARRAY_SIZE(options); + option_list.pOptions = options; + options[0].dwOption = INTERNET_PER_CONN_AUTOCONFIG_URL; + options[0].Value.pszValue = autoconf_url; + options[1].dwOption = INTERNET_PER_CONN_FLAGS; + options[1].Value.dwValue = PROXY_TYPE_AUTO_PROXY_URL; + r = InternetSetOptionW(req.session, INTERNET_OPTION_PER_CONNECTION_OPTION, (void*)&option_list, sizeof(option_list)); + ok(r, "InternetSetOptionW failed: %lu\n", GetLastError()); + + r = HttpSendRequestW(req.request, NULL, 0, NULL, 0); + ok(r, "HttpSendRequestW failed: %lu\n", GetLastError()); + + test_status_code(req.request, 200); + len = receive_simple_request(req.request, buf, sizeof(buf)); + todo_wine + ok(len == sizeof(page1) - 1, "unexpected buffer size\n"); + buf[len] = 0; + todo_wine + ok(!strcmp(buf, page1), "unexpected buffer content\n"); + + len = sizeof(option_list); + r = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, (void*)&option_list, &len); + ok(r, "InternetGetOptionW failed: %lu\n", GetLastError()); + r = InternetSetOptionW(req.session, INTERNET_OPTION_PER_CONNECTION_OPTION, (void*)&option_list, sizeof(option_list)); + ok(r, "InternetSetOptionW failed: %lu\n", GetLastError()); + GlobalFree(options[0].Value.pszValue); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -6692,6 +6757,7 @@ static void test_http_connection(void) test_remove_dot_segments(si.port); test_large_content(si.port); test_header_length(si.port); + test_pac(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Piotr Caban : wininet: Add support for INTERNET_OPTION_PER_CONNECTION_OPTION option on session handles.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: wine Branch: master Commit: 62027a9c4d8cc98a2420b6dd75b6b22f873620d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/62027a9c4d8cc98a2420b6dd75b6b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 16 13:48:37 2024 +0100 wininet: Add support for INTERNET_OPTION_PER_CONNECTION_OPTION option on session handles. --- dlls/wininet/internet.c | 185 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 154 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1f1f63f2671..5ee1242da1b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -110,6 +110,8 @@ static ULONG connect_timeout = 60000; static const WCHAR szInternetSettings[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; +static WCHAR *get_proxy_autoconfig_url(void); + void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t size) { UINT_PTR handle = 0, num; @@ -985,6 +987,37 @@ static VOID APPINFO_Destroy(object_header_t *hdr) free(lpwai->proxyPassword); } +static WCHAR *copy_optionW(WCHAR *value) +{ + DWORD len; + void *tmp; + + if (!value) + return NULL; + + len = (wcslen(value) + 1) * sizeof(WCHAR); + if (!(tmp = GlobalAlloc(0, len))) + return NULL; + + return memcpy(tmp, value, len); +} + +static char *copy_optionA(WCHAR *value) +{ + DWORD len; + void *tmp; + + if (!value) + return NULL; + + len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); + if (!(tmp = GlobalAlloc(0, len))) + return NULL; + + WideCharToMultiByte(CP_ACP, 0, value, -1, tmp, len, NULL, NULL); + return tmp; +} + static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { appinfo_t *ai = (appinfo_t*)hdr; @@ -1123,6 +1156,80 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(ULONG); return ERROR_SUCCESS; + + case INTERNET_OPTION_PER_CONNECTION_OPTION: { + INTERNET_PER_CONN_OPTION_LISTW *con = buffer; + INTERNET_PER_CONN_OPTION_LISTA *conA = buffer; + LONG res = ERROR_SUCCESS; + WCHAR *url = NULL; + int i; + + if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) + return ERROR_INSUFFICIENT_BUFFER; + + EnterCriticalSection(&WININET_cs); + + if (global_proxy.flags & PROXY_TYPE_AUTO_DETECT) + url = get_proxy_autoconfig_url(); + + for (i = 0; i < con->dwOptionCount; i++) { + INTERNET_PER_CONN_OPTIONW *optionW = con->pOptions + i; + INTERNET_PER_CONN_OPTIONA *optionA = conA->pOptions + i; + + switch (optionW->dwOption) { + case INTERNET_PER_CONN_FLAGS: + optionW->Value.dwValue = global_proxy.flags; + break; + + case INTERNET_PER_CONN_PROXY_SERVER: + if (unicode) + optionW->Value.pszValue = copy_optionW(global_proxy.proxy); + else + optionA->Value.pszValue = copy_optionA(global_proxy.proxy); + break; + + case INTERNET_PER_CONN_PROXY_BYPASS: + if (unicode) + optionW->Value.pszValue = copy_optionW(global_proxy.proxyBypass); + else + optionA->Value.pszValue = copy_optionA(global_proxy.proxyBypass); + break; + + case INTERNET_PER_CONN_AUTOCONFIG_URL: + if (unicode) + optionW->Value.pszValue = copy_optionW(global_proxy.autoconf_url); + else + optionA->Value.pszValue = copy_optionA(global_proxy.autoconf_url); + break; + + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + optionW->Value.dwValue = AUTO_PROXY_FLAG_ALWAYS_DETECT; + break; + + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + if (unicode) + optionW->Value.pszValue = copy_optionW(url); + else + optionA->Value.pszValue = copy_optionA(url); + break; + + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: + case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: + FIXME("Unhandled dwOption %ld\n", optionW->dwOption); + memset(&optionW->Value, 0, sizeof(optionW->Value)); + break; + + default: + FIXME("Unknown dwOption %ld\n", optionW->dwOption); + res = ERROR_INVALID_PARAMETER; + break; + } + } + + LeaveCriticalSection(&WININET_cs); + return res; + } } return INET_QueryOption(hdr, option, buffer, size, unicode); @@ -1150,6 +1257,53 @@ static DWORD APPINFO_SetOption(object_header_t *hdr, DWORD option, void *buf, DW case INTERNET_OPTION_REFRESH: FIXME("INTERNET_OPTION_REFRESH\n"); return ERROR_SUCCESS; + case INTERNET_OPTION_PER_CONNECTION_OPTION: { + INTERNET_PER_CONN_OPTION_LISTW *con = buf; + unsigned int i; + + EnterCriticalSection( &WININET_cs ); + for (i = 0; i < con->dwOptionCount; i++) { + INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i; + + switch (option->dwOption) { + case INTERNET_PER_CONN_PROXY_SERVER: + free(global_proxy.proxy); + global_proxy.proxy = wcsdup(option->Value.pszValue); + break; + + case INTERNET_PER_CONN_FLAGS: + if(option->Value.dwValue & ~(PROXY_TYPE_PROXY | PROXY_TYPE_DIRECT)) + FIXME("Unhandled flags: 0x%lx\n", option->Value.dwValue); + global_proxy.flags = option->Value.dwValue; + break; + + case INTERNET_PER_CONN_PROXY_BYPASS: + free(global_proxy.proxyBypass); + global_proxy.proxyBypass = wcsdup(option->Value.pszValue); + break; + + case INTERNET_PER_CONN_AUTOCONFIG_URL: + free(global_proxy.autoconf_url); + global_proxy.autoconf_url = wcsdup(option->Value.pszValue); + break; + + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: + case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + FIXME("Unhandled dwOption %ld\n", option->dwOption); + break; + + default: + FIXME("Unknown dwOption %ld\n", option->dwOption); + SetLastError(ERROR_INVALID_PARAMETER); + break; + } + } + LeaveCriticalSection( &WININET_cs ); + return ERROR_SUCCESS; + } } return INET_SetOption(hdr, option, buf, size); @@ -2759,37 +2913,6 @@ static WCHAR *get_proxy_autoconfig_url(void) return ret; } -static WCHAR *copy_optionW(WCHAR *value) -{ - DWORD len; - void *tmp; - - if (!value) - return NULL; - - len = (wcslen(value) + 1) * sizeof(WCHAR); - if (!(tmp = GlobalAlloc(0, len))) - return NULL; - - return memcpy(tmp, value, len); -} - -static char *copy_optionA(WCHAR *value) -{ - DWORD len; - void *tmp; - - if (!value) - return NULL; - - len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); - if (!(tmp = GlobalAlloc(0, len))) - return NULL; - - WideCharToMultiByte(CP_ACP, 0, value, -1, tmp, len, NULL, NULL); - return tmp; -} - static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode) { /* FIXME: This function currently handles more options than it should. Options requiring

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: wine Branch: master Commit: 7e0177e1e43ab150e81e76276d1be75860fe6170 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e0177e1e43ab150e81e76276d1be7… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Feb 17 17:13:34 2024 +0100 po: Update Dutch translation. --- po/nl.po | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/po/nl.po b/po/nl.po index a149c8e8625..996f8f27ec0 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-12-11 19:30+0100\n" +"PO-Revision-Date: 2024-02-17 17:00+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -4092,22 +4092,21 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kan onschrijfbare eigenschap '|' niet veranderen" #: dlls/jscript/jscript.rc:80 -#, fuzzy -#| msgid "'this' is not a | object" msgid "'this' is not a DataView object" -msgstr "'this' is geen | object" +msgstr "'this' is geen DataView object" #: dlls/jscript/jscript.rc:81 msgid "Required argument offset or value in DataView method is not specified" msgstr "" +"Vereiste argument offset of waarde in DataView methode is niet opgegeven" #: dlls/jscript/jscript.rc:82 msgid "DataView operation access beyond specified buffer length" -msgstr "" +msgstr "DataView bewerkingstoegang buiten opgegeven bufferlengte" #: dlls/jscript/jscript.rc:83 msgid "DataView constructor argument offset is invalid" -msgstr "" +msgstr "Ongeldige offset van het DataView constructor argument" #: dlls/jscript/jscript.rc:84 msgid "'this' is not a | object" @@ -4118,10 +4117,8 @@ msgid "'key' is not an object" msgstr "'key' is geen object" #: dlls/jscript/jscript.rc:86 -#, fuzzy -#| msgid "Array object expected" msgid "ArrayBuffer object expected" -msgstr "Array object verwacht" +msgstr "ArrayBuffer object verwacht" #: dlls/jscript/jscript.rc:87 msgid "Property cannot have both accessors and a value" @@ -7147,7 +7144,7 @@ msgstr "Ongeldig argument.\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Cannot assign requested address.\n" -msgstr "" +msgstr "Kan het gevraagde adres niet toewijzen.\n" #: dlls/kernelbase/winerror.mc:3783 msgid "Connection reset by peer.\n" @@ -15117,7 +15114,7 @@ msgstr "De volgende services draaien:\n" #: programs/net/net.rc:44 msgid "A command was used with conflicting switches.\n" -msgstr "" +msgstr "Er is een opdracht gebruikt met tegenstrijdige parameters.\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections"

1 0

Alexandre Julliard : xslt: Import upstream release 1.1.39.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

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 : ldap: Import upstream release 2.5.17.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

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 : fluidsynth: Import upstream release 2.3.4.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

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 : zydis: Import upstream release 4.1.0.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

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 : lcms2: Import upstream release 2.16.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

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 : xml2: Import upstream release 2.11.7.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

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 : mpg123: Import upstream release 1.32.5.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: wine Branch: master Commit: 3881edf6f308797026143908be882d871f4c718c URL: https://gitlab.winehq.org/wine/wine/-/commit/3881edf6f308797026143908be882d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 18:07:34 2024 +0100 mpg123: Import upstream release 1.32.5. --- configure | 2 +- configure.ac | 2 +- libs/mpg123/config.h | 48 +-------- libs/mpg123/src/{libmpg123 => common}/abi_align.h | 0 libs/mpg123/src/{libmpg123 => common}/debug.h | 4 +- libs/mpg123/src/{libmpg123 => common}/sample.h | 6 +- .../src/{libmpg123 => common}/swap_bytes_impl.h | 0 libs/mpg123/src/{libmpg123 => common}/true.h | 0 libs/mpg123/src/compat/compat.c | 2 +- libs/mpg123/src/compat/compat.h | 54 ++-------- libs/mpg123/src/compat/compat_str.c | 2 +- libs/mpg123/src/{libmpg123 => include}/fmt123.h | 9 +- libs/mpg123/src/{libmpg123 => include}/mpg123.h | 58 +++++------ libs/mpg123/src/libmpg123/decode.h | 17 ++- libs/mpg123/src/libmpg123/dither_impl.h | 2 +- libs/mpg123/src/libmpg123/format.c | 6 +- libs/mpg123/src/libmpg123/frame.c | 9 +- libs/mpg123/src/libmpg123/frame.h | 4 +- libs/mpg123/src/libmpg123/gapless.h | 6 +- libs/mpg123/src/libmpg123/getbits.h | 2 +- libs/mpg123/src/libmpg123/icy.h | 2 +- libs/mpg123/src/libmpg123/icy2utf8.c | 2 +- libs/mpg123/src/libmpg123/id3.c | 10 +- libs/mpg123/src/libmpg123/index.c | 4 +- libs/mpg123/src/libmpg123/index.h | 2 +- libs/mpg123/src/libmpg123/layer1.c | 2 +- libs/mpg123/src/libmpg123/layer3.c | 114 ++++++++++++++++++++- libs/mpg123/src/libmpg123/lfs_wrap.c | 28 +++-- libs/mpg123/src/libmpg123/libmpg123.c | 14 +-- libs/mpg123/src/libmpg123/mpg123lib_intern.h | 12 +-- libs/mpg123/src/libmpg123/ntom.c | 2 +- libs/mpg123/src/libmpg123/optimize.c | 56 ++-------- libs/mpg123/src/libmpg123/optimize.h | 9 +- libs/mpg123/src/libmpg123/parse.c | 2 +- libs/mpg123/src/libmpg123/readers.c | 4 +- libs/mpg123/src/libmpg123/stringbuf.c | 4 +- libs/mpg123/src/libmpg123/synth.c | 4 +- libs/mpg123/src/libmpg123/synth_8bit.c | 4 +- libs/mpg123/src/libmpg123/synth_real.c | 4 +- libs/mpg123/src/libmpg123/synth_s32.c | 4 +- libs/mpg123/src/libmpg123/tabinit.c | 2 +- libs/mpg123/src/version.h | 2 +- 42 files changed, 252 insertions(+), 268 deletions(-)

1 0