April 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : dwrite/layout: Fix invalid index access to cluster array.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 571ffaf380f3d80da60ff8bca4031baceefa7811 URL: https://source.winehq.org/git/wine.git/?a=commit;h=571ffaf380f3d80da60ff8bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 15 18:22:46 2019 +0300 dwrite/layout: Fix invalid index access to cluster array. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45543 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4cd5ce4..d101a5a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1853,6 +1853,9 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust metrics.trailingWhitespaceLength += cluster->length; trailingspacewidth += cluster->width; + + if (index == 0) + break; } /* Line metrics length includes trailing whitespace length too */

1 0

Alexandre Julliard : configure: Don' t inherit CFLAGS for cross-compilation.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 09e1c0f6cad7ab5bde000d9a4a6aa7223dd16701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e1c0f6cad7ab5bde000d9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 14 10:52:33 2019 +0200 configure: Don't inherit CFLAGS for cross-compilation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c21c70d..15f7848 100755 --- a/configure +++ b/configure @@ -9670,7 +9670,7 @@ test -n "$CROSSCC" || CROSSCC="false" then ac_save_CC="$CC" saved_CFLAGS=$CFLAGS - CROSSCFLAGS=${CROSSCFLAGS:-$CFLAGS} + CROSSCFLAGS=${CROSSCFLAGS:-"-g -O2"} EXTRACROSSCFLAGS="-DWINE_CROSSTEST -Wall" diff --git a/configure.ac b/configure.ac index 02e7e9e..b459e0e 100644 --- a/configure.ac +++ b/configure.ac @@ -1002,7 +1002,7 @@ then then ac_save_CC="$CC" saved_CFLAGS=$CFLAGS - AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-$CFLAGS}) + AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-"-g -O2"}) AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSSTEST -Wall") CC="$CROSSCC"

1 0

Alexandre Julliard : configure: Cache result of the cross-compiler check.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 2b5dc2ebd57d3119be6a9cb63482fbb434b8bf34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b5dc2ebd57d3119be6a9cb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 14 14:48:39 2019 +0200 configure: Cache result of the cross-compiler check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 37 ++++++++++++++++++++++--------------- configure.ac | 29 +++++++++++++++-------------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/configure b/configure index 15f7848..31fcebb 100755 --- a/configure +++ b/configure @@ -9679,7 +9679,10 @@ test -n "$CROSSCC" || CROSSCC="false" CFLAGS=$CROSSCFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CROSSCC works" >&5 $as_echo_n "checking whether $CROSSCC works... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +if ${wine_cv_crosscc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9691,23 +9694,27 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - set x $CROSSCC - shift - while test $# -ge 1 - do - case "$1" in - *-gcc) CROSSTARGET=`expr "$1" : '$.*$-gcc'` ;; - *-clang) CROSSTARGET=`expr "$1" : '$.*$-clang'` ;; - esac - shift - done + wine_cv_crosscc=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + wine_cv_crosscc=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_crosscc" >&5 +$as_echo "$wine_cv_crosscc" >&6; } + if test $wine_cv_crosscc = yes + then + set x $CROSSCC + shift + while test $# -ge 1 + do + case "$1" in + *-gcc) CROSSTARGET=`expr "$1" : '$.*$-gcc'` ;; + *-clang) CROSSTARGET=`expr "$1" : '$.*$-clang'` ;; + esac + shift + done + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-strict-aliasing" >&5 $as_echo_n "checking whether the cross-compiler supports -fno-strict-aliasing... " >&6; } if ${ac_cv_crosscflags__fno_strict_aliasing+:} false; then : diff --git a/configure.ac b/configure.ac index b459e0e..51ca0fa 100644 --- a/configure.ac +++ b/configure.ac @@ -1007,20 +1007,21 @@ then CC="$CROSSCC" CFLAGS=$CROSSCFLAGS - AC_MSG_CHECKING([whether $CROSSCC works]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AC_MSG_RESULT([yes]) - set x $CROSSCC - shift - while test $# -ge 1 - do - case "$1" in - *-gcc) CROSSTARGET=`expr "$1" : '$.*$-gcc'` ;; - *-clang) CROSSTARGET=`expr "$1" : '$.*$-clang'` ;; - esac - shift - done], - [AC_MSG_RESULT([no])]) + AC_CACHE_CHECK([whether $CROSSCC works], wine_cv_crosscc, + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],[wine_cv_crosscc=yes],[wine_cv_crosscc=no])]) + if test $wine_cv_crosscc = yes + then + set x $CROSSCC + shift + while test $# -ge 1 + do + case "$1" in + *-gcc) CROSSTARGET=`expr "$1" : '$.*$-gcc'` ;; + *-clang) CROSSTARGET=`expr "$1" : '$.*$-clang'` ;; + esac + shift + done + fi WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"])

1 0

Alexandre Julliard : configure: Also cache negative results of soname checks.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 92714fcb62ec451576e500ea6d50094f5397a16f URL: https://source.winehq.org/git/wine.git/?a=commit;h=92714fcb62ec451576e500ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 14 14:49:08 2019 +0200 configure: Also cache negative results of soname checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 3 ++- configure | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92714fcb62ec451576e5…

1 0

Alexandre Julliard : configure: Cache result of the flex version check.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 86a5dc80d839fbef7802ddb44f638ea0a00cf950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86a5dc80d839fbef7802ddb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 14 14:50:00 2019 +0200 configure: Cache result of the flex version check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 22 +++++++++++++--------- configure.ac | 18 +++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/configure b/configure index f938535..949e95f 100755 --- a/configure +++ b/configure @@ -5786,21 +5786,25 @@ then fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether flex is recent enough" >&5 $as_echo_n "checking whether flex is recent enough... " >&6; } -cat >conftest.l <<EOF +if ${wine_cv_recent_flex+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.l <<EOF %top{ #include "prediluvian.h" } %% EOF -if $FLEX -t conftest.l >/dev/null 2>&5 -then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Your flex version is too old. Please install flex version 2.5.33 or newer." "$LINENO" 5 + if $FLEX -t conftest.l >/dev/null 2>&5 + then + wine_cv_recent_flex=yes + else + wine_cv_recent_flex=no + fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_recent_flex" >&5 +$as_echo "$wine_cv_recent_flex" >&6; } +test $wine_cv_recent_flex != no || as_fn_error $? "Your flex version is too old. Please install flex version 2.5.33 or newer." "$LINENO" 5 for ac_prog in bison do diff --git a/configure.ac b/configure.ac index 51ca0fa..f2f75f0 100644 --- a/configure.ac +++ b/configure.ac @@ -269,20 +269,20 @@ if test "$FLEX" = "none" then AC_MSG_ERROR([no suitable flex found. Please install the 'flex' package.]) fi -AC_MSG_CHECKING([whether flex is recent enough]) -cat >conftest.l <<EOF +AC_CACHE_CHECK([whether flex is recent enough],wine_cv_recent_flex, + [cat >conftest.l <<EOF %top{ #include "prediluvian.h" } %% EOF -if $FLEX -t conftest.l >/dev/null 2>&AS_MESSAGE_LOG_FD -then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Your flex version is too old. Please install flex version 2.5.33 or newer.]) -fi + if $FLEX -t conftest.l >/dev/null 2>&AS_MESSAGE_LOG_FD + then + wine_cv_recent_flex=yes + else + wine_cv_recent_flex=no + fi]) +test $wine_cv_recent_flex != no || AC_MSG_ERROR([Your flex version is too old. Please install flex version 2.5.33 or newer.]) dnl Check for bison AC_CHECK_PROGS(BISON,bison,none)

1 0

Alexandre Julliard : configure: Cache results of the compiler checks.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 9b75443c2fabbe1043927917f620f78f0082356b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b75443c2fabbe1043927917… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 14 14:51:29 2019 +0200 configure: Cache results of the compiler checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 89 ++++++++++++++++++++++++++++++++++++++---------------------- configure.ac | 47 +++++++++++++++----------------- 2 files changed, 78 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b75443c2fabbe104392…

1 0

Alexandre Julliard : configure: Cache result of the msgfmt check.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 9d250fbfa2125b2fa7d824bf8af5bbd3a304ab8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d250fbfa2125b2fa7d824bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 14 14:59:37 2019 +0200 configure: Cache result of the msgfmt check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +++++++++------ configure.ac | 13 ++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/configure b/configure index bb0259a..3e87c86 100755 --- a/configure +++ b/configure @@ -6712,7 +6712,6 @@ $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } with_gettext=yes with_gettextpo=yes - { ac_cv_header_gettext_po_h=; unset ac_cv_header_gettext_po_h;} fi test "x$with_gettext" != xno || MSGFMT=false @@ -6720,6 +6719,9 @@ if test "$MSGFMT" != "false" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether msgfmt supports contexts" >&5 $as_echo_n "checking whether msgfmt supports contexts... " >&6; } +if ${wine_cv_msgfmt_contexts+:} false; then : + $as_echo_n "(cached) " >&6 +else cat >conftest.po <<EOF # comment msgctxt "ctxt" @@ -6728,14 +6730,15 @@ msgstr "str" EOF if $MSGFMT -o /dev/null conftest.po 2>&5 then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + wine_cv_msgfmt_contexts=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - MSGFMT=false + wine_cv_msgfmt_contexts=no fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_msgfmt_contexts" >&5 +$as_echo "$wine_cv_msgfmt_contexts" >&6; } + test $wine_cv_msgfmt_contexts != no || MSGFMT=false +fi if test "$MSGFMT" = false; then : case "x$with_gettext" in x) as_fn_append wine_warnings "|gettext tools not found (or too old), translations won't be built." ;; diff --git a/configure.ac b/configure.ac index e2b7635..719afe6 100644 --- a/configure.ac +++ b/configure.ac @@ -366,14 +366,13 @@ else dnl Maintainer mode requires gettext with_gettext=yes with_gettextpo=yes - AS_UNSET(ac_cv_header_gettext_po_h) fi test "x$with_gettext" != xno || MSGFMT=false if test "$MSGFMT" != "false" then - AC_MSG_CHECKING([whether msgfmt supports contexts]) - cat >conftest.po <<EOF + AC_CACHE_CHECK([whether msgfmt supports contexts],wine_cv_msgfmt_contexts, + [cat >conftest.po <<EOF # comment msgctxt "ctxt" msgid "id" @@ -381,11 +380,11 @@ msgstr "str" EOF if $MSGFMT -o /dev/null conftest.po 2>&AS_MESSAGE_LOG_FD then - AC_MSG_RESULT([yes]) + wine_cv_msgfmt_contexts=yes else - AC_MSG_RESULT([no]) - MSGFMT=false - fi + wine_cv_msgfmt_contexts=no + fi]) + test $wine_cv_msgfmt_contexts != no || MSGFMT=false fi WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false], [gettext tools not found (or too old), translations won't be built.],

1 0

Józef Kucia : build: Add linker scripts to EXTRA_*_DEPENDENCIES.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: vkd3d Branch: master Commit: 6b1fa5692497c72a16a94594e76cd73dcad0fcb1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b1fa5692497c72a16a9459… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 12 17:13:17 2019 +0200 build: Add linker scripts to EXTRA_*_DEPENDENCIES. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2b5bca0..299ec26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,6 +85,7 @@ libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map +EXTRA_libvkd3d_shader_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-shader/vkd3d_shader.map endif libvkd3d_la_SOURCES = \ @@ -110,6 +111,7 @@ libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map +EXTRA_libvkd3d_la_DEPENDENCIES = $(srcdir)/libs/vkd3d/vkd3d.map endif libvkd3d_utils_la_SOURCES = \ @@ -120,6 +122,7 @@ libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map +EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map endif EXTRA_DIST = LICENSE

1 0

Józef Kucia : build: Redirect stderr to /dev/ null in VKD3D_PROG_WIDL.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: vkd3d Branch: master Commit: 68945ffcf32af516f21ae59b38fb84f7d3288b66 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=68945ffcf32af516f21ae59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 15 10:13:54 2019 +0200 build: Redirect stderr to /dev/null in VKD3D_PROG_WIDL. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- m4/widl.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/widl.m4 b/m4/widl.m4 index 2849356..6d22606 100644 --- a/m4/widl.m4 +++ b/m4/widl.m4 @@ -5,7 +5,7 @@ AC_DEFUN([VKD3D_PROG_WIDL], AS_IF([test "x$WIDL" != "xno"], [AC_MSG_CHECKING([checking whether widl version >= $1.$2]) -vkd3d_widl_version=`$WIDL -V | $SED -E '/version/{s/.* version (.*)/\1/;q;}'` +vkd3d_widl_version=`$WIDL -V 2>/dev/null | $SED -E '/version/{s/.* version (.*)/\1/;q;}'` AX_COMPARE_VERSION([$vkd3d_widl_version], [ge], [$1.$2], [AC_MSG_RESULT([yes ($vkd3d_widl_version)])],

1 0

Józef Kucia : build: Print widl in configuration summary.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: vkd3d Branch: master Commit: 393f1d858da8e4aef867f46fb9b3c2925261eeb8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=393f1d858da8e4aef867f46… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 15 10:13:55 2019 +0200 build: Print widl in configuration summary. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 28f2ac9..02f9028 100644 --- a/configure.ac +++ b/configure.ac @@ -129,6 +129,8 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], AS_ECHO([" Configuration summary for $PACKAGE $VERSION + widl: ${WIDL} + Have XCB: ${HAVE_XCB} Have SPIRV-Tools: ${with_spirv_tools}

1 0