October 2023 - Wine-commits

Alexandre Julliard : tiff: Import upstream release 4.6.0.
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: wine Branch: master Commit: 673cac9e950c5703bf94d42618e4f5a2ec2b3fb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/673cac9e950c5703bf94d42618e4f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 30 13:23:03 2023 +0200 tiff: Import upstream release 4.6.0. --- libs/tiff/libtiff/tif_config.h | 55 ++++++++++++++++++---------------------- libs/tiff/libtiff/tif_dirread.c | 2 +- libs/tiff/libtiff/tif_dirwrite.c | 33 ++++++++++++++---------- libs/tiff/libtiff/tiff.h | 1 + libs/tiff/libtiff/tiffconf.h | 23 +++++++++++++++-- libs/tiff/libtiff/tiffio.h | 2 +- libs/tiff/libtiff/tiffvers.h | 14 +++++++--- 7 files changed, 78 insertions(+), 52 deletions(-)

1 0

Alexandre Julliard : zlib: Import upstream release 1.3.
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: wine Branch: master Commit: 13e02608da51b82c89815df9f0282c99e57781a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/13e02608da51b82c89815df9f0282c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 30 13:33:19 2023 +0200 zlib: Import upstream release 1.3. --- libs/zlib/adler32.c | 32 +-- libs/zlib/crc32.c | 248 ++++++++-------------- libs/zlib/deflate.c | 569 +++++++++++++++++++++------------------------------ libs/zlib/deflate.h | 16 +- libs/zlib/inffast.c | 5 +- libs/zlib/inffast.h | 2 +- libs/zlib/inflate.c | 129 +++--------- libs/zlib/inftrees.c | 17 +- libs/zlib/inftrees.h | 6 +- libs/zlib/trees.c | 528 ++++++++++++++++++++--------------------------- libs/zlib/zconf.h | 8 +- libs/zlib/zlib.h | 379 +++++++++++++++++----------------- libs/zlib/zutil.c | 60 ++---- libs/zlib/zutil.h | 20 +- 14 files changed, 820 insertions(+), 1199 deletions(-)

1 0

Alexandre Julliard : xml2: Import upstream release 2.11.5.
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: wine Branch: master Commit: b4c541b23a6131a3eb7c16ce1c484d127f8b5104 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4c541b23a6131a3eb7c16ce1c484d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 30 13:39:09 2023 +0200 xml2: Import upstream release 2.11.5. --- libs/xml2/encoding.c | 11 +++----- libs/xml2/include/libxml/xmlversion.h | 10 +++----- libs/xml2/parserInternals.c | 48 ++++++++++++++++++++++++----------- libs/xml2/valid.c | 3 +-- libs/xml2/xpath.c | 2 +- 5 files changed, 42 insertions(+), 32 deletions(-) diff --git a/libs/xml2/encoding.c b/libs/xml2/encoding.c index 52bc15aca37..19ced4e4c6f 100644 --- a/libs/xml2/encoding.c +++ b/libs/xml2/encoding.c @@ -1988,22 +1988,18 @@ xmlUconvWrapper(uconv_t *cd, int toUnicode, unsigned char *out, int *outlen, ucnv_convertEx(cd->utf8, cd->uconv, &ucv_out, ucv_out + *outlen, &ucv_in, ucv_in + *inlen, cd->pivot_buf, &cd->pivot_source, &cd->pivot_target, - cd->pivot_buf + ICU_PIVOT_BUF_SIZE, 0, flush, &err); + cd->pivot_buf + ICU_PIVOT_BUF_SIZE, 0, 0, &err); } else { /* UTF-8 => UTF-16 => encoding */ ucnv_convertEx(cd->uconv, cd->utf8, &ucv_out, ucv_out + *outlen, &ucv_in, ucv_in + *inlen, cd->pivot_buf, &cd->pivot_source, &cd->pivot_target, - cd->pivot_buf + ICU_PIVOT_BUF_SIZE, 0, flush, &err); + cd->pivot_buf + ICU_PIVOT_BUF_SIZE, 0, 0, &err); } *inlen = ucv_in - (const char*) in; *outlen = ucv_out - (char *) out; - if (U_SUCCESS(err)) { - /* reset pivot buf if this is the last call for input (flush==TRUE) */ - if (flush) - cd->pivot_source = cd->pivot_target = cd->pivot_buf; + if (U_SUCCESS(err)) return 0; - } if (err == U_BUFFER_OVERFLOW_ERROR) return -1; if (err == U_INVALID_CHAR_FOUND || err == U_ILLEGAL_CHAR_FOUND) @@ -3830,4 +3826,3 @@ static int UTF8ToISO8859_16 (unsigned char* out, int *outlen, #endif #endif - diff --git a/libs/xml2/include/libxml/xmlversion.h b/libs/xml2/include/libxml/xmlversion.h index e47c0860a87..0359ff59e43 100644 --- a/libs/xml2/include/libxml/xmlversion.h +++ b/libs/xml2/include/libxml/xmlversion.h @@ -29,21 +29,21 @@ XMLPUBFUN void xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.11.4" +#define LIBXML_DOTTED_VERSION "2.11.5" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 21104 +#define LIBXML_VERSION 21105 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "21104" +#define LIBXML_VERSION_STRING "21105" /** * LIBXML_VERSION_EXTRA: @@ -58,7 +58,7 @@ XMLPUBFUN void xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(21104); +#define LIBXML_TEST_VERSION xmlCheckVersion(21105); #ifndef VMS #if 0 @@ -522,5 +522,3 @@ XMLPUBFUN void xmlCheckVersion(int version); } #endif /* __cplusplus */ #endif - - diff --git a/libs/xml2/parserInternals.c b/libs/xml2/parserInternals.c index b92f6426553..c36bbfb62c6 100644 --- a/libs/xml2/parserInternals.c +++ b/libs/xml2/parserInternals.c @@ -1085,6 +1085,33 @@ xmlSwitchEncoding(xmlParserCtxtPtr ctxt, xmlCharEncoding enc) int ret; if (ctxt == NULL) return(-1); + + /* + * FIXME: The BOM shouldn't be skipped here, but in the parsing code. + * + * Note that we look for a decoded UTF-8 BOM when switching to UTF-16. + * This is mostly useless but Webkit/Chromium relies on this behavior. + * See https://bugs.chromium.org/p/chromium/issues/detail?id=1451026 + */ + if ((ctxt->input != NULL) && + (ctxt->input->consumed == 0) && + (ctxt->input->cur != NULL) && + (ctxt->input->cur == ctxt->input->base) && + ((enc == XML_CHAR_ENCODING_UTF8) || + (enc == XML_CHAR_ENCODING_UTF16LE) || + (enc == XML_CHAR_ENCODING_UTF16BE))) { + /* + * Errata on XML-1.0 June 20 2001 + * Specific handling of the Byte Order Mark for + * UTF-8 + */ + if ((ctxt->input->cur[0] == 0xEF) && + (ctxt->input->cur[1] == 0xBB) && + (ctxt->input->cur[2] == 0xBF)) { + ctxt->input->cur += 3; + } + } + switch (enc) { case XML_CHAR_ENCODING_ERROR: __xmlErrEncoding(ctxt, XML_ERR_UNKNOWN_ENCODING, @@ -1097,18 +1124,6 @@ xmlSwitchEncoding(xmlParserCtxtPtr ctxt, xmlCharEncoding enc) case XML_CHAR_ENCODING_UTF8: /* default encoding, no conversion should be needed */ ctxt->charset = XML_CHAR_ENCODING_UTF8; - - /* - * Errata on XML-1.0 June 20 2001 - * Specific handling of the Byte Order Mark for - * UTF-8 - */ - if ((ctxt->input != NULL) && - (ctxt->input->cur[0] == 0xEF) && - (ctxt->input->cur[1] == 0xBB) && - (ctxt->input->cur[2] == 0xBF)) { - ctxt->input->cur += 3; - } return(0); case XML_CHAR_ENCODING_EBCDIC: handler = xmlDetectEBCDIC(ctxt->input); @@ -1200,8 +1215,8 @@ xmlSwitchInputEncoding(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, /* * Switching encodings during parsing is a really bad idea, - * but WebKit/Chromium switches from ISO-8859-1 to UTF-16 as soon as - * it finds Unicode characters with code points larger than 255. + * but Chromium can switch between ISO-8859-1 and UTF-16 before + * separate calls to xmlParseChunk. * * TODO: We should check whether the "raw" input buffer is empty and * convert the old content using the old encoder. @@ -1221,6 +1236,10 @@ xmlSwitchInputEncoding(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, if (xmlBufIsEmpty(in->buffer) == 0) { size_t processed, use, consumed; + /* + * FIXME: The BOM shouldn't be skipped here, but in the parsing code. + */ + /* * Specific handling of the Byte Order Mark for * UTF-16 @@ -2228,4 +2247,3 @@ xmlKeepBlanksDefault(int val) { if (!val) xmlIndentTreeOutput = 1; return(old); } - diff --git a/libs/xml2/valid.c b/libs/xml2/valid.c index 06a7f382044..4a790d46902 100644 --- a/libs/xml2/valid.c +++ b/libs/xml2/valid.c @@ -1052,7 +1052,7 @@ xmlCopyDocElementContent(xmlDocPtr doc, xmlElementContentPtr cur) { if (cur->c1 != NULL) tmp->c1 = xmlCopyDocElementContent(doc,cur->c1); if (tmp->c1 != NULL) - tmp->c1->parent = ret; + tmp->c1->parent = tmp; prev = tmp; cur = cur->c2; } @@ -7153,4 +7153,3 @@ xmlValidGetValidElements(xmlNode *prev, xmlNode *next, const xmlChar **names, return(nb_valid_elements); } #endif /* LIBXML_VALID_ENABLED */ - diff --git a/libs/xml2/xpath.c b/libs/xml2/xpath.c index 8df7974f146..9c3a2acf6d5 100644 --- a/libs/xml2/xpath.c +++ b/libs/xml2/xpath.c @@ -3204,7 +3204,7 @@ xmlXPathFormatNumber(double number, char buffer[], int buffersize) /* Finally copy result back to caller */ size = strlen(work) + 1; if (size > buffersize) { - work[buffersize - 1] = 0; + /*work[buffersize - 1] = 0;*/ size = buffersize; } memmove(buffer, work, size);

1 0

Alexandre Julliard : ldap: Import upstream release 2.5.16.
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: wine Branch: master Commit: b6852f6bed4bbff6b7105acde04d1971256107eb URL: https://gitlab.winehq.org/wine/wine/-/commit/b6852f6bed4bbff6b7105acde04d19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 30 13:50:45 2023 +0200 ldap: Import upstream release 2.5.16. --- libs/ldap/libldap/init.c | 6 +++--- libs/ldap/libldap/open.c | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/ldap/libldap/init.c b/libs/ldap/libldap/init.c index a94744b8dcf..a289bd4b8cf 100644 --- a/libs/ldap/libldap/init.c +++ b/libs/ldap/libldap/init.c @@ -96,9 +96,9 @@ static const struct ol_attribute { {0, ATTR_OPTION, "URI", NULL, LDAP_OPT_URI}, /* replaces HOST/PORT */ {0, ATTR_OPTION, "SOCKET_BIND_ADDRESSES", NULL, LDAP_OPT_SOCKET_BIND_ADDRESSES}, {0, ATTR_BOOL, "REFERRALS", NULL, LDAP_BOOL_REFERRALS}, - {0, ATTR_INT, "KEEPALIVE_IDLE", NULL, LDAP_OPT_X_KEEPALIVE_IDLE}, - {0, ATTR_INT, "KEEPALIVE_PROBES", NULL, LDAP_OPT_X_KEEPALIVE_PROBES}, - {0, ATTR_INT, "KEEPALIVE_INTERVAL", NULL, LDAP_OPT_X_KEEPALIVE_INTERVAL}, + {0, ATTR_OPT_INT, "KEEPALIVE_IDLE", NULL, LDAP_OPT_X_KEEPALIVE_IDLE}, + {0, ATTR_OPT_INT, "KEEPALIVE_PROBES", NULL, LDAP_OPT_X_KEEPALIVE_PROBES}, + {0, ATTR_OPT_INT, "KEEPALIVE_INTERVAL", NULL, LDAP_OPT_X_KEEPALIVE_INTERVAL}, #if 0 /* This should only be allowed via ldap_set_option(3) */ diff --git a/libs/ldap/libldap/open.c b/libs/ldap/libldap/open.c index db84a74d6ce..6656325a460 100644 --- a/libs/ldap/libldap/open.c +++ b/libs/ldap/libldap/open.c @@ -501,6 +501,11 @@ ldap_int_open_connection( if( proto == LDAP_PROTO_UDP ) return 0; #endif + if ( async && rc == -2) { + /* Need to let the connect complete asynchronously before we continue */ + return -2; + } + #ifdef HAVE_TLS if ((rc == 0 || rc == -2) && ( ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD || strcmp( srv->lud_scheme, "ldaps" ) == 0 )) @@ -585,9 +590,9 @@ ldap_open_internal_connection( LDAP **ldp, ber_socket_t *fdp ) /* Attach the passed socket as the *LDAP's connection */ c = ldap_new_connection( ld, NULL, 1, 0, NULL, 0, 0 ); if( c == NULL ) { + LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex ); ldap_unbind_ext( ld, NULL, NULL ); *ldp = NULL; - LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex ); return( LDAP_NO_MEMORY ); } ber_sockbuf_ctrl( c->lconn_sb, LBER_SB_OPT_SET_FD, fdp );

1 0

Alexandre Julliard : faudio: Import upstream release 23.10.
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: wine Branch: master Commit: a084fd052885678937648886b78e579ed945831f URL: https://gitlab.winehq.org/wine/wine/-/commit/a084fd052885678937648886b78e57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 2 11:54:20 2023 +0200 faudio: Import upstream release 23.10. --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/F3DAudio.c | 8 +++++--- libs/faudio/src/FACT_internal.c | 26 +++++++++++++++++++++++--- libs/faudio/src/FAudio_internal_simd.c | 2 +- libs/faudio/src/FAudio_platform_win32.c | 8 ++++---- 5 files changed, 34 insertions(+), 12 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 009e93a7fb3..0c75809f79d 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -494,7 +494,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_ABI_VERSION 0 #define FAUDIO_MAJOR_VERSION 23 -#define FAUDIO_MINOR_VERSION 7 +#define FAUDIO_MINOR_VERSION 10 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/F3DAudio.c b/libs/faudio/src/F3DAudio.c index 068bd1facdf..877f184f130 100644 --- a/libs/faudio/src/F3DAudio.c +++ b/libs/faudio/src/F3DAudio.c @@ -1274,7 +1274,7 @@ static inline void CalculateMatrix( } } } - else + else if (curConfig != NULL) { listenerToEmitter = VectorScale(emitterToListener, -1.0f); @@ -1351,8 +1351,10 @@ static inline void CalculateMatrix( } } } - - + } + else + { + FAudio_assert(0 && "Config info not found!"); } /* TODO: add post check to validate values diff --git a/libs/faudio/src/FACT_internal.c b/libs/faudio/src/FACT_internal.c index 22a0f7c04a0..32832fd3270 100644 --- a/libs/faudio/src/FACT_internal.c +++ b/libs/faudio/src/FACT_internal.c @@ -39,6 +39,8 @@ #define FACT_CONTENT_VERSION_3_4 45 #define FACT_CONTENT_VERSION_3_1 44 #define FACT_CONTENT_VERSION_3_0 43 +#define FACT_CONTENT_VERSION_2_4 41 +#define FACT_CONTENT_VERSION_2_0 37 static inline int FACT_INTERNAL_SupportedContent(uint16_t version) { @@ -3105,7 +3107,17 @@ uint32_t FACT_INTERNAL_ParseWaveBank( #define DOSWAP_64(x) x = FAudio_swap64BE(x) fileOffset = offset; - READ(&header, sizeof(header)) + + FAudio_zero(&header, sizeof(header)); + READ(&header.dwSignature, sizeof(header.dwSignature)); + READ(&header.dwVersion, sizeof(header.dwVersion)); + if (header.dwVersion > FACT_CONTENT_VERSION_2_4) + { + READ(&header.dwHeaderVersion, sizeof(header.dwHeaderVersion)); + } + + READ(&header.Segments, sizeof(header.Segments)); + se = header.dwSignature == 0x57424E44; if (se) { @@ -3123,12 +3135,20 @@ uint32_t FACT_INTERNAL_ParseWaveBank( return -1; /* TODO: NOT XACT FILE */ } - if (!FACT_INTERNAL_SupportedContent(header.dwVersion)) + /* We support all Wavebank versions - Restore when SoundBank support them also. */ + /*if (!FACT_INTERNAL_SupportedContent(header.dwVersion)) + { + return -2; + } + */ + if ( header.dwVersion < FACT_CONTENT_VERSION_2_4 || + header.dwVersion > FACT_CONTENT_VERSION ) { return -2; } - if (!FACT_INTERNAL_SupportedWBContent(header.dwHeaderVersion)) + if ( header.dwVersion > FACT_CONTENT_VERSION_2_4 && + !FACT_INTERNAL_SupportedWBContent(header.dwHeaderVersion) ) { return -3; } diff --git a/libs/faudio/src/FAudio_internal_simd.c b/libs/faudio/src/FAudio_internal_simd.c index 21dcd143c4e..71fc281074f 100644 --- a/libs/faudio/src/FAudio_internal_simd.c +++ b/libs/faudio/src/FAudio_internal_simd.c @@ -48,7 +48,7 @@ /* AArch64 guarantees NEON. */ #define NEED_SCALAR_CONVERTER_FALLBACKS 0 -#elif __MACOSX__ +#elif __MACOSX__ && !defined(__POWERPC__) /* Some build systems may need to specify this. */ #if !defined(__SSE2__) && !defined(__ARM_NEON__) #error macOS does not have SSE2/NEON? Bad compiler? diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index 8ed9cde1c7d..d3ded665df9 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -444,8 +444,8 @@ uint32_t FAudio_PlatformGetDeviceDetails( hr = IMMDevice_GetId(device, &str); FAudio_assert(!FAILED(hr) && "Failed to get audio endpoint id!"); - lstrcpynW(details->DeviceID, str, ARRAYSIZE(details->DeviceID) - 1); - lstrcpynW(details->DisplayName, str, ARRAYSIZE(details->DisplayName) - 1); + lstrcpynW((WCHAR *)details->DeviceID, str, ARRAYSIZE(details->DeviceID) - 1); + lstrcpynW((WCHAR *)details->DisplayName, str, ARRAYSIZE(details->DisplayName) - 1); CoTaskMemFree(str); hr = IMMDevice_Activate( @@ -739,7 +739,7 @@ FAudioIOStream* FAudio_memopen(void *mem, int len) uint8_t* FAudio_memptr(FAudioIOStream *io, size_t offset) { struct FAudio_mem *memio = io->data; - return memio->mem + offset; + return (uint8_t *)memio->mem + offset; } void FAudio_close(FAudioIOStream *io) @@ -896,7 +896,7 @@ FAUDIOAPI float XNA_PlaySong(const char *name) IMFAttributes *attributes = NULL; IMFMediaType *media_type = NULL; UINT32 channels, samplerate; - UINT64 duration; + INT64 duration; PROPVARIANT var; HRESULT hr; WCHAR filename_w[MAX_PATH];

1 0

Conor McCarthy : tests: Destroy the test context in test_readback_map_stability().
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: vkd3d Branch: master Commit: 39be40ce940d997b666ddff2bebcdcdff7f98541 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/39be40ce940d997b666ddff2bebcd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Sep 29 14:40:06 2023 +1000 tests: Destroy the test context in test_readback_map_stability(). --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 86e8a8b1..d61309e9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36343,6 +36343,8 @@ static void test_readback_map_stability(void) ID3D12Resource_Unmap(buffer, 0, NULL); ID3D12Resource_Release(buffer); + + destroy_test_context(&context); } static void test_vs_ps_relative_addressing(void)

1 0

Giovanni Mascellani : ci: Compile with -Werror.
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: vkd3d Branch: master Commit: fd6c6895d6f85a4a43785249c0e9085cb7af07fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd6c6895d6f85a4a43785249c0e90… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 27 23:30:28 2023 +0200 ci: Compile with -Werror. Manually disable some warnings that are currently emitted. Eventually the warnings should be solved and -Werror should remain alone. --- gitlab/build-crosstest | 2 +- gitlab/build-linux | 2 +- gitlab/build-mac | 2 +- gitlab/build-mingw | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest index 5561bffb..15b4d031 100755 --- a/gitlab/build-crosstest +++ b/gitlab/build-crosstest @@ -14,7 +14,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure CROSSCC32="i686-w64-mingw32-gcc -Wno-array-bounds" CROSSCC64="x86_64-w64-mingw32-gcc -Wno-array-bounds" && \ +../configure CROSSCC32="i686-w64-mingw32-gcc" CROSSCC64="x86_64-w64-mingw32-gcc" CFLAGS="-g -O2 -Wno-array-bounds -Werror" && \ make -j$(nproc) crosstest || \ touch ../pipeline_failed diff --git a/gitlab/build-linux b/gitlab/build-linux index 566d772f..cc8faa5b 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,7 +11,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure --enable-demos && \ +../configure --enable-demos CFLAGS="-g -O2 -Werror" && \ make -j$(nproc) && \ make -j$(nproc) check || \ touch ../pipeline_failed diff --git a/gitlab/build-mac b/gitlab/build-mac index 23c1ea96..aeed0988 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -11,7 +11,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure && \ +../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Wno-enum-conversion -Werror" && \ make -j$(sysctl -n hw.ncpu) && \ make -j$(sysctl -n hw.ncpu) check || \ touch ../pipeline_failed diff --git a/gitlab/build-mingw b/gitlab/build-mingw index 0f9ab3a6..f06e3861 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -13,7 +13,7 @@ mkdir build cd build mkdir vulkan-headers cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers -../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds" LDFLAGS="-static-libgcc" && \ +../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Wno-missing-prototypes -Wno-discarded-qualifiers -Wno-incompatible-pointer-types -Werror" LDFLAGS="-static-libgcc" && \ make -j$(nproc) && \ make -j$(nproc) install DESTDIR="$PWD/destdir" || \ touch ../pipeline_failed

1 0

Giovanni Mascellani : ci: Store config.log as a build artifact.
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: vkd3d Branch: master Commit: ef77d78a397f695bcac66ef1d52bfc5625a4a72e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ef77d78a397f695bcac66ef1d52bf… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Sep 28 10:15:30 2023 +0200 ci: Store config.log as a build artifact. --- gitlab/build-crosstest | 2 +- gitlab/build-linux | 2 +- gitlab/build-mac | 2 +- gitlab/build-mingw | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest index 15b4d031..38eb3e11 100755 --- a/gitlab/build-crosstest +++ b/gitlab/build-crosstest @@ -19,6 +19,6 @@ cd build touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr tests/*.exe ../artifacts/$COMMIT +rsync -Rr config.log tests/*.exe ../artifacts/$COMMIT git reset --hard diff --git a/gitlab/build-linux b/gitlab/build-linux index cc8faa5b..661180f5 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -17,6 +17,6 @@ cd build touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT +rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT git reset --hard diff --git a/gitlab/build-mac b/gitlab/build-mac index aeed0988..854bc8e3 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -17,6 +17,6 @@ cd build touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT +rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT git reset --hard diff --git a/gitlab/build-mingw b/gitlab/build-mingw index f06e3861..59c5a928 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -19,6 +19,7 @@ cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-header touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT +cp config.log ../artifacts/$COMMIT cp destdir/usr/local/bin/* ../artifacts/$COMMIT git reset --hard

1 0

Giovanni Mascellani : vkd3d: Use CONST_VTABLE.
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: vkd3d Branch: master Commit: 627cf50320f90c481882b2192c3f895cfd08747d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/627cf50320f90c481882b2192c3f8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Sep 28 10:39:30 2023 +0200 vkd3d: Use CONST_VTABLE. --- gitlab/build-mingw | 2 +- libs/vkd3d-common/blob.c | 1 + libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gitlab/build-mingw b/gitlab/build-mingw index 59c5a928..c9d3b9f7 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -13,7 +13,7 @@ mkdir build cd build mkdir vulkan-headers cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers -../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Wno-missing-prototypes -Wno-discarded-qualifiers -Wno-incompatible-pointer-types -Werror" LDFLAGS="-static-libgcc" && \ +../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Wno-missing-prototypes -Wno-incompatible-pointer-types -Werror" LDFLAGS="-static-libgcc" && \ make -j$(nproc) && \ make -j$(nproc) install DESTDIR="$PWD/destdir" || \ touch ../pipeline_failed diff --git a/libs/vkd3d-common/blob.c b/libs/vkd3d-common/blob.c index c46abb55..0f6d5a5e 100644 --- a/libs/vkd3d-common/blob.c +++ b/libs/vkd3d-common/blob.c @@ -18,6 +18,7 @@ #define COBJMACROS #define INITGUID +#define CONST_VTABLE #include "vkd3d.h" #include "vkd3d_blob.h" #include "vkd3d_debug.h" diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 89f8b15e..d20651cc 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -22,6 +22,7 @@ #define COBJMACROS #define NONAMELESSUNION #define VK_NO_PROTOTYPES +#define CONST_VTABLE #ifdef _WIN32 # define _WIN32_WINNT 0x0600 /* for condition variables */

1 0

Giovanni Mascellani : demos: Do not trigger -Wmissing-prototypes for wmain().
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: vkd3d Branch: master Commit: ede1ff69515d86e76f5147b21acad7c8d8a40b27 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ede1ff69515d86e76f5147b21acad… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Sep 28 12:31:48 2023 +0200 demos: Do not trigger -Wmissing-prototypes for wmain(). For some reason wmain() is not exempted from -Wmissing-prototypes in the same way as main() is. So we just declare a prototype for it. --- demos/gears.c | 3 +++ demos/triangle.c | 3 +++ gitlab/build-mingw | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/demos/gears.c b/demos/gears.c index ab90e0d4..5809648e 100644 --- a/demos/gears.c +++ b/demos/gears.c @@ -888,6 +888,9 @@ static int cxg_main(void) } #ifdef _WIN32 +/* Do not trigger -Wmissing-prototypes. */ +int wmain(void); + int wmain(void) #else int main(void) diff --git a/demos/triangle.c b/demos/triangle.c index b331da0c..79257ed8 100644 --- a/demos/triangle.c +++ b/demos/triangle.c @@ -401,6 +401,9 @@ static int cxt_main(void) } #ifdef _WIN32 +/* Do not trigger -Wmissing-prototypes. */ +int wmain(void); + int wmain(void) #else int main(void) diff --git a/gitlab/build-mingw b/gitlab/build-mingw index c9d3b9f7..383f9c4b 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -13,7 +13,7 @@ mkdir build cd build mkdir vulkan-headers cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers -../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Wno-missing-prototypes -Wno-incompatible-pointer-types -Werror" LDFLAGS="-static-libgcc" && \ +../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Wno-incompatible-pointer-types -Werror" LDFLAGS="-static-libgcc" && \ make -j$(nproc) && \ make -j$(nproc) install DESTDIR="$PWD/destdir" || \ touch ../pipeline_failed

1 0