wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Zebediah Figura : configure: Try to detect MinGW libjpeg using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 8459b0d5e0503dee61068a6e4271588af500ab43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8459b0d5e0503dee61068a6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 15:03:40 2021 -0600 configure: Try to detect MinGW libjpeg using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 11 ++++++ 2 files changed, 122 insertions(+) diff --git a/configure b/configure index 21adceb6c69..1d1e9a7be6f 100755 --- a/configure +++ b/configure @@ -12463,6 +12463,117 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|FAudio ${notice_platform}MinGW development files not found (or too old); using bundled version." fi + if ${JPEG_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + JPEG_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libjpeg 2>/dev/null` +fi +fi +if ${JPEG_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + JPEG_PE_LIBS=`$MINGW_PKG_CONFIG --libs libjpeg 2>/dev/null` +fi +fi + +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $JPEG_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW jpeglib.h" >&5 +printf %s "checking for MinGW jpeglib.h... " >&6; } +if test ${ac_cv_mingw_header_jpeglib_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stddef.h> + #include <stdio.h> +#include <jpeglib.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_jpeglib_h=yes +else $as_nop + ac_cv_mingw_header_jpeglib_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_jpeglib_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_jpeglib_h" >&6; } +if test "x$ac_cv_mingw_header_jpeglib_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jpeg_start_decompress in MinGW -ljpeg" >&5 +printf %s "checking for jpeg_start_decompress in MinGW -ljpeg... " >&6; } +if test ${ac_cv_mingw_lib_jpeg+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-ljpeg $JPEG_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char jpeg_start_decompress (); +int +main (void) +{ +return jpeg_start_decompress (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_jpeg=yes +else $as_nop + ac_cv_mingw_lib_jpeg=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_jpeg" >&5 +printf "%s\n" "$ac_cv_mingw_lib_jpeg" >&6; } +if test "x$ac_cv_mingw_lib_jpeg" = xyes +then : + : +else $as_nop + JPEG_PE_CFLAGS=""; JPEG_PE_LIBS="" +fi +else $as_nop + JPEG_PE_CFLAGS=""; JPEG_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$JPEG_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libjpeg ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index 0078d1f33aa..bd8e4495274 100644 --- a/configure.ac +++ b/configure.ac @@ -1044,6 +1044,17 @@ then WINE_NOTICE([FAudio ${notice_platform}MinGW development files not found (or too old); using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(JPEG,[libjpeg],, + [WINE_CHECK_MINGW_HEADER(jpeglib.h, + [WINE_CHECK_MINGW_LIB(jpeg,jpeg_start_decompress,[:],[JPEG_PE_CFLAGS=""; JPEG_PE_LIBS=""],[$JPEG_PE_LIBS])], + [JPEG_PE_CFLAGS=""; JPEG_PE_LIBS=""], + [#include <stddef.h> + #include <stdio.h>])]) + if test "x$JPEG_PE_LIBS" = "x" + then + WINE_NOTICE([libjpeg ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Zebediah Figura : configure: Try to detect MinGW FAudio using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 872d13d14a222dd30893f7b5c868e57f87e2ebe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=872d13d14a222dd30893f7b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 15:03:39 2021 -0600 configure: Try to detect MinGW FAudio using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 9 +++++ 2 files changed, 120 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 990d28a37fc..21adceb6c69 100755 --- a/configure +++ b/configure @@ -12353,7 +12353,117 @@ fi done test -n "$MINGW_PKG_CONFIG" || MINGW_PKG_CONFIG="false" -if ${ZLIB_PE_CFLAGS:+false} : +if ${FAUDIO_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + FAUDIO_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags FAudio 2>/dev/null` +fi +fi +if ${FAUDIO_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + FAUDIO_PE_LIBS=`$MINGW_PKG_CONFIG --libs FAudio 2>/dev/null` +fi +fi +FAUDIO_PE_LIBS=${FAUDIO_PE_LIBS:-"-lFAudio"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $FAUDIO_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW FAudio.h" >&5 +printf %s "checking for MinGW FAudio.h... " >&6; } +if test ${ac_cv_mingw_header_FAudio_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <FAudio.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_FAudio_h=yes +else $as_nop + ac_cv_mingw_header_FAudio_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_FAudio_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_FAudio_h" >&6; } +if test "x$ac_cv_mingw_header_FAudio_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FAudio_CommitOperationSet in MinGW -lFAudio" >&5 +printf %s "checking for FAudio_CommitOperationSet in MinGW -lFAudio... " >&6; } +if test ${ac_cv_mingw_lib_FAudio+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lFAudio $FAUDIO_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char FAudio_CommitOperationSet (); +int +main (void) +{ +return FAudio_CommitOperationSet (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_FAudio=yes +else $as_nop + ac_cv_mingw_lib_FAudio=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_FAudio" >&5 +printf "%s\n" "$ac_cv_mingw_lib_FAudio" >&6; } +if test "x$ac_cv_mingw_lib_FAudio" = xyes +then : + : +else $as_nop + FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS="" +fi +else $as_nop + FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$FAUDIO_PE_LIBS" = "x" + then + as_fn_append wine_notices "|FAudio ${notice_platform}MinGW development files not found (or too old); using bundled version." + fi + + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} then : diff --git a/configure.ac b/configure.ac index ef542dee171..0078d1f33aa 100644 --- a/configure.ac +++ b/configure.ac @@ -1035,6 +1035,15 @@ dnl **** External libraries **** if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false" then + WINE_MINGW_PACKAGE_FLAGS(FAUDIO,[FAudio],[-lFAudio], + [WINE_CHECK_MINGW_HEADER(FAudio.h, + [WINE_CHECK_MINGW_LIB(FAudio,FAudio_CommitOperationSet,[:],[FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS=""],[$FAUDIO_PE_LIBS])], + [FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS=""])]) + if test "x$FAUDIO_PE_LIBS" = "x" + then + WINE_NOTICE([FAudio ${notice_platform}MinGW development files not found (or too old); using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Zebediah Figura : configure: Try to detect MinGW zlib using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 9ac28955cfb3a56f891dd537cca1c65df8474c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ac28955cfb3a56f891dd537… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 15:03:38 2021 -0600 configure: Try to detect MinGW zlib using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 69 ++++++++++++++++++++++++ configure | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 12 +++++ 3 files changed, 250 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index 07a0359a3f1..a8d1ecad275 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -64,6 +64,15 @@ AC_CHECK_TOOL(READELF,[readelf],true)]) AC_DEFUN([WINE_PATH_PKG_CONFIG], [WINE_CHECK_HOST_TOOL(PKG_CONFIG,[pkg-config])]) +AC_DEFUN([WINE_PATH_MINGW_PKG_CONFIG], +[case "$host_cpu" in + i[[3456789]]86*) + ac_prefix_list="m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-w64-mingw32-pkg-config ])" ;; + *) + ac_prefix_list="$host_cpu-w64-mingw32-pkg-config" ;; +esac +AC_CHECK_PROGS(MINGW_PKG_CONFIG,[$ac_prefix_list],false)]) + dnl **** Extract the soname of a library **** dnl dnl Usage: WINE_CHECK_SONAME(library, function, [action-if-found, [action-if-not-found, [other_libraries, [pattern]]]]) @@ -124,6 +133,28 @@ CPPFLAGS=$ac_save_CPPFLAGS AS_VAR_POPDEF([ac_libs])dnl AS_VAR_POPDEF([ac_cflags])])dnl +dnl **** Get flags from MinGW pkg-config or alternate xxx-config program **** +dnl +dnl Usage: WINE_MINGW_PACKAGE_FLAGS(var,pkg-name,[default-lib,[checks]]) +dnl +AC_DEFUN([WINE_MINGW_PACKAGE_FLAGS], +[AC_REQUIRE([WINE_PATH_MINGW_PKG_CONFIG])dnl +AS_VAR_PUSHDEF([ac_cflags],[[$1]_PE_CFLAGS])dnl +AS_VAR_PUSHDEF([ac_libs],[[$1]_PE_LIBS])dnl +AS_VAR_IF([ac_cflags],[], + [AS_VAR_SET_IF([MINGW_PKG_CONFIG], + [ac_cflags=`$MINGW_PKG_CONFIG --cflags [$2] 2>/dev/null`])]) +AS_VAR_IF([ac_libs],[], + [AS_VAR_SET_IF([MINGW_PKG_CONFIG], + [ac_libs=`$MINGW_PKG_CONFIG --libs [$2] 2>/dev/null`])]) +m4_ifval([$3],[ac_libs=[$]{ac_libs:-"$3"}]) +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $ac_cflags" +$4 +CPPFLAGS=$ac_save_CPPFLAGS +AS_VAR_POPDEF([ac_libs])dnl +AS_VAR_POPDEF([ac_cflags])])dnl + dnl **** Get flags for an external lib program **** dnl dnl Usage: WINE_EXTLIB_FLAGS(var,pkg-name,default-libs,default-cflags) @@ -189,6 +220,44 @@ ac_exeext=$ac_wine_try_cflags_saved_exeext]) AS_VAR_IF([ac_var],[yes],[m4_default([$2], [EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS $1"])], [$3])dnl AS_VAR_POPDEF([ac_var])]) +dnl **** Check whether the given MinGW header is available **** +dnl +dnl Usage: WINE_CHECK_MINGW_HEADER(header,[action-if-found],[action-if-not-found],[other-includes]) +dnl +AC_DEFUN([WINE_CHECK_MINGW_HEADER], +[AS_VAR_PUSHDEF([ac_var],[ac_cv_mingw_header_$1])dnl +AC_CACHE_CHECK([for MinGW $1], ac_var, +[ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$4 +#include <$1>]])],[AS_VAR_SET([ac_var],[yes])],[AS_VAR_SET([ac_var],[no])]) +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext]) +AS_VAR_IF([ac_var],[yes],[$2],[$3])dnl +AS_VAR_POPDEF([ac_var])]) + +dnl **** Check whether the given MinGW library is available **** +dnl +dnl Usage: WINE_CHECK_MINGW_LIB(library,function,[action-if-found],[action-if-not-found],[other-libraries]) +dnl +AC_DEFUN([WINE_CHECK_MINGW_LIB], +[AS_VAR_PUSHDEF([ac_var],[ac_cv_mingw_lib_$1])dnl +AC_CACHE_CHECK([for $2 in MinGW -l$1], ac_var, +[ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-l$1 $5 $LIBS" +AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],[AS_VAR_SET([ac_var],[yes])],[AS_VAR_SET([ac_var],[no])]) +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs]) +AS_VAR_IF([ac_var],[yes],[$3],[$4])dnl +AS_VAR_POPDEF([ac_var])]) + dnl **** Check if we can link an empty shared lib (no main) with special CFLAGS **** dnl dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]]) diff --git a/configure b/configure index 8e3ec2a1363..990d28a37fc 100755 --- a/configure +++ b/configure @@ -734,6 +734,7 @@ GSM_PE_LIBS GSM_PE_CFLAGS FAUDIO_PE_LIBS FAUDIO_PE_CFLAGS +MINGW_PKG_CONFIG EXCESS_PRECISION_CFLAGS CROSSDEBUG DELAYLOADFLAG @@ -12296,6 +12297,173 @@ esac fi +if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false" +then + case "$host_cpu" in + i[3456789]86*) + ac_prefix_list="i686-w64-mingw32-pkg-config i586-w64-mingw32-pkg-config i486-w64-mingw32-pkg-config i386-w64-mingw32-pkg-config " ;; + *) + ac_prefix_list="$host_cpu-w64-mingw32-pkg-config" ;; +esac +for ac_prog in $ac_prefix_list +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MINGW_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$MINGW_PKG_CONFIG"; then + ac_cv_prog_MINGW_PKG_CONFIG="$MINGW_PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_MINGW_PKG_CONFIG="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MINGW_PKG_CONFIG=$ac_cv_prog_MINGW_PKG_CONFIG +if test -n "$MINGW_PKG_CONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MINGW_PKG_CONFIG" >&5 +printf "%s\n" "$MINGW_PKG_CONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$MINGW_PKG_CONFIG" && break +done +test -n "$MINGW_PKG_CONFIG" || MINGW_PKG_CONFIG="false" + +if ${ZLIB_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + ZLIB_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags zlib 2>/dev/null` +fi +fi +if ${ZLIB_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + ZLIB_PE_LIBS=`$MINGW_PKG_CONFIG --libs zlib 2>/dev/null` +fi +fi +ZLIB_PE_LIBS=${ZLIB_PE_LIBS:-"-lz"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $ZLIB_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW zlib.h" >&5 +printf %s "checking for MinGW zlib.h... " >&6; } +if test ${ac_cv_mingw_header_zlib_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <zlib.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_zlib_h=yes +else $as_nop + ac_cv_mingw_header_zlib_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_zlib_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_zlib_h" >&6; } +if test "x$ac_cv_mingw_header_zlib_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inflate in MinGW -lz" >&5 +printf %s "checking for inflate in MinGW -lz... " >&6; } +if test ${ac_cv_mingw_lib_z+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lz $ZLIB_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char inflate (); +int +main (void) +{ +return inflate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_z=yes +else $as_nop + ac_cv_mingw_lib_z=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_z" >&5 +printf "%s\n" "$ac_cv_mingw_lib_z" >&6; } +if test "x$ac_cv_mingw_lib_z" = xyes +then : + : +else $as_nop + ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS="" +fi +else $as_nop + ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$ZLIB_PE_LIBS" = "x" + then + as_fn_append wine_notices "|zlib ${notice_platform}MinGW development files not found; using bundled version." + fi +fi + if ${FAUDIO_PE_LIBS:+false} : then : FAUDIO_PE_LIBS="faudio mfplat mfreadwrite mfuuid propsys" @@ -22958,6 +23126,7 @@ CROSSLDFLAGS = $CROSSLDFLAGS DELAYLOADFLAG = $DELAYLOADFLAG CROSSDEBUG = $CROSSDEBUG EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS +MINGW_PKG_CONFIG = $MINGW_PKG_CONFIG FAUDIO_PE_CFLAGS = $FAUDIO_PE_CFLAGS FAUDIO_PE_LIBS = $FAUDIO_PE_LIBS GSM_PE_CFLAGS = $GSM_PE_CFLAGS diff --git a/configure.ac b/configure.ac index 9d88ea7cf6e..ef542dee171 100644 --- a/configure.ac +++ b/configure.ac @@ -1033,6 +1033,18 @@ WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"], dnl **** External libraries **** +if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false" +then + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], + [WINE_CHECK_MINGW_HEADER(zlib.h, + [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])], + [ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""])]) + if test "x$ZLIB_PE_LIBS" = "x" + then + WINE_NOTICE([zlib ${notice_platform}MinGW development files not found; using bundled version.]) + fi +fi + WINE_EXTLIB_FLAGS(FAUDIO, faudio, "faudio mfplat mfreadwrite mfuuid propsys", "-I\$(top_srcdir)/libs/faudio/include") WINE_EXTLIB_FLAGS(GSM, gsm, gsm, "-I\$(top_srcdir)/libs/gsm/inc") WINE_EXTLIB_FLAGS(JPEG, jpeg, jpeg, "-I\$(top_srcdir)/libs/jpeg")

1 0

Alex Henrie : krnl386: Add GetLPErrMode stub.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 819d049f1277090033bcfe17783490cd6b190c88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=819d049f1277090033bcfe17… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 1 22:35:23 2021 -0700 krnl386: Add GetLPErrMode stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52102 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 2 +- dlls/krnl386.exe16/task.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index 6a55aad78f8..d98e136c77e 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -100,7 +100,7 @@ 96 pascal -ret16 FreeLibrary(word) FreeLibrary16 97 pascal -ret16 GetTempFileName(word str word ptr) GetTempFileName16 98 pascal -ret16 GetLastDiskChange() KERNEL_nop -99 stub GetLPErrMode +99 pascal GetLPErrMode() 100 pascal -ret16 ValidateCodeSegments() KERNEL_nop 101 stub NoHookDosCall 102 pascal -register DOS3Call() DOS3Call diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c index 892f4d19f07..30a40328c86 100644 --- a/dlls/krnl386.exe16/task.c +++ b/dlls/krnl386.exe16/task.c @@ -1255,6 +1255,16 @@ WORD WINAPI GetExeVersion16(void) } +/*********************************************************************** + * GetLPErrMode (KERNEL.99) + */ +SEGPTR WINAPI GetLPErrMode(void) +{ + FIXME("(): stub\n"); + return 0; +} + + /*********************************************************************** * SetErrorMode (KERNEL.107) */

1 0

Mohamad Al-Jaf : kernelbase: Add SetCachedSigningLevel stub.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 04d1cab16a993f52dbb586d41ad625859e050518 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d1cab16a993f52dbb586d4… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Nov 30 19:14:38 2021 -0500 kernelbase: Add SetCachedSigningLevel stub. Needed for Microsoft Edge offline installer. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-security-base-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/security.c | 9 +++++++++ include/winbase.h | 1 + 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index fc9af375db6..771407fc203 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -87,7 +87,7 @@ @ stub QuerySecurityAccessMask @ stdcall RevertToSelf() advapi32.RevertToSelf @ stdcall SetAclInformation(ptr ptr long long) advapi32.SetAclInformation -@ stub SetCachedSigningLevel +@ stdcall SetCachedSigningLevel(ptr long long long) kernelbase.SetCachedSigningLevel @ stdcall SetFileSecurityW(wstr long ptr) advapi32.SetFileSecurityW @ stdcall SetKernelObjectSecurity(long long ptr) advapi32.SetKernelObjectSecurity @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) advapi32.SetPrivateObjectSecurity diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 015324f7677..0e5f953aa50 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1343,6 +1343,7 @@ @ stdcall -import SearchPathA(str str str long ptr ptr) @ stdcall -import SearchPathW(wstr wstr wstr long ptr ptr) @ stdcall SetCPGlobal(long) +@ stdcall -import SetCachedSigningLevel(ptr long long long) @ stdcall SetCalendarInfoA(long long long str) @ stdcall -import SetCalendarInfoW(long long long wstr) # @ stub SetClientTimeZoneInformation diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7bc0c262fdd..da3d5e4035b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1393,7 +1393,7 @@ @ stdcall SearchPathA(str str str long ptr ptr) @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) @ stdcall SetAclInformation(ptr ptr long long) -# @ stub SetCachedSigningLevel +@ stdcall SetCachedSigningLevel(ptr long long long) @ stdcall SetCalendarInfoW(long long long wstr) # @ stub SetClientDynamicTimeZoneInformation # @ stub SetClientTimeZoneInformation diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 472076cf7fe..71e09bdefb5 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -1547,3 +1547,12 @@ BOOL WINAPI SetAclInformation( PACL acl, LPVOID info, DWORD len, ACL_INFORMATION FIXME( "%p %p 0x%08x 0x%08x - stub\n", acl, info, len, class ); return TRUE; } + +/****************************************************************************** + * SetCachedSigningLevel (kernelbase.@) + */ +BOOL WINAPI SetCachedSigningLevel( PHANDLE source, ULONG count, ULONG flags, HANDLE file ) +{ + FIXME( "%p %u %u %p - stub\n", source, count, flags, file ); + return TRUE; +} diff --git a/include/winbase.h b/include/winbase.h index 2928385bde6..8e8a185b4ff 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2611,6 +2611,7 @@ WINBASEAPI DWORD WINAPI SearchPathA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR WINBASEAPI DWORD WINAPI SearchPathW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); #define SearchPath WINELIB_NAME_AW(SearchPath) WINADVAPI BOOL WINAPI SetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI BOOL WINAPI SetCachedSigningLevel(PHANDLE,ULONG,ULONG,HANDLE); WINBASEAPI BOOL WINAPI SetCommConfig(HANDLE,LPCOMMCONFIG,DWORD); WINBASEAPI BOOL WINAPI SetCommBreak(HANDLE); WINBASEAPI BOOL WINAPI SetCommMask(HANDLE,DWORD);

1 0

Alexandre Julliard : makefiles: Support per-platform values for EXTRADLLFLAGS.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: a041075cd2c26874757e0b6e1449c23c1326241c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a041075cd2c26874757e0b6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:49 2021 +0100 makefiles: Support per-platform values for EXTRADLLFLAGS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + tools/makedep.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 7e823208840..185bc563e68 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -7,6 +7,7 @@ EXTRAINCL = $(UNWIND_CFLAGS) EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 +x86_64_EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x170000000 C_SRCS = \ actctx.c \ diff --git a/tools/makedep.c b/tools/makedep.c index 2301ecf191e..e69dc3ce0a4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4131,6 +4131,12 @@ static void load_sources( struct makefile *make ) if (make->extlib) make->staticlib = make->extlib; if (make->staticlib) make->module = make->staticlib; + if (host_cpu) + { + value = get_expanded_file_local_var( make, host_cpu, "EXTRADLLFLAGS" ); + if (value.count) make->extradllflags = value; + } + make->disabled = make->obj_dir && strarray_exists( &disabled_dirs, make->obj_dir ); make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ); make->use_msvcrt = (make->module || make->testdll || make->is_win16) &&

1 0

Alexandre Julliard : ntdll: Add fallback implementations for the Unix library functions.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: d10410eac2b598699a3619d6e3f908e256af3afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d10410eac2b598699a3619d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:40 2021 +0100 ntdll: Add fallback implementations for the Unix library functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/loader.c | 8 ++++---- dlls/ntdll/unixlib.h | 15 ++++++--------- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 665c4480ad4..c33acd71759 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -76,8 +76,6 @@ static DWORD (WINAPI *pCtrlRoutine)(void *); SYSTEM_DLL_INIT_BLOCK LdrSystemDllInitBlock = { 0xf0 }; -const struct unix_funcs *unix_funcs = NULL; - /* windows directory */ const WCHAR windows_dir[] = L"C:\\windows"; /* system directory with trailing backslash */ @@ -4443,6 +4441,44 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } +static NTSTATUS CDECL load_so_dll_fallback( UNICODE_STRING *nt_name, void **module ) +{ + return STATUS_INVALID_IMAGE_FORMAT; +} + +static void CDECL init_builtin_dll_fallback( void *module ) +{ +} + +static NTSTATUS CDECL init_unix_lib_fallback( void *module, DWORD reason, const void *ptr_in, void *ptr_out ) +{ + return STATUS_DLL_NOT_FOUND; +} + +static NTSTATUS CDECL unwind_builtin_dll_fallback( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, + CONTEXT *context ) +{ + return STATUS_UNSUCCESSFUL; +} + +static LONGLONG WINAPI RtlGetSystemTimePrecise_fallback(void) +{ + LARGE_INTEGER now; + NtQuerySystemTime( &now ); + return now.QuadPart; +} + +static const struct unix_funcs unix_fallbacks = +{ + load_so_dll_fallback, + init_builtin_dll_fallback, + init_unix_lib_fallback, + unwind_builtin_dll_fallback, + RtlGetSystemTimePrecise_fallback, +}; + +const struct unix_funcs *unix_funcs = &unix_fallbacks; + /*********************************************************************** * __wine_set_unix_funcs */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 61041061b32..82d099de3be 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2156,14 +2156,14 @@ static ULONG_PTR get_image_address(void) */ static struct unix_funcs unix_funcs = { -#ifdef __aarch64__ - NtCurrentTeb, -#endif - RtlGetSystemTimePrecise, load_so_dll, init_builtin_dll, init_unix_lib, unwind_builtin_dll, + RtlGetSystemTimePrecise, +#ifdef __aarch64__ + NtCurrentTeb, +#endif }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 803b6a082bb..d60f8cc50e4 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,24 +26,21 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 132 +#define NTDLL_UNIXLIB_VERSION 133 struct unix_funcs { - /* Nt* functions */ -#ifdef __aarch64__ - TEB * (WINAPI *NtCurrentTeb)(void); -#endif - - /* other Win32 API functions */ - LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); - /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); void (CDECL *init_builtin_dll)( void *module ); NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); + /* other Win32 API functions */ + LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); +#ifdef __aarch64__ + TEB * (WINAPI *NtCurrentTeb)(void); +#endif }; #endif /* __NTDLL_UNIXLIB_H */

1 0

Alexandre Julliard : ntdll: Set the TEB offset for Wow64 mode also in 64-bit.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 1b447409cb83e1ebc6037fadbca309c304055ade URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b447409cb83e1ebc6037fad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 11:23:16 2021 +0100 ntdll: Set the TEB offset for Wow64 mode also in 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ca3e0a9dc81..30d8ac1553c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2128,6 +2128,15 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) peb->ImageSubSystemMajorVersion = main_image_info.MajorSubsystemVersion; peb->ImageSubSystemMinorVersion = main_image_info.MinorSubsystemVersion; +#ifdef _WIN64 + if (main_image_info.Machine != current_machine) + { + NtCurrentTeb()->WowTebOffset = teb_offset; + NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset); + set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); + } +#endif + load_global_options( &params->ImagePathName ); if (NtCurrentTeb()->WowTebOffset)

1 0

Alexandre Julliard : ntdll: Don't try to convert binaries to 64-bit in Wow64 mode.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 679a2f531bdba5a1abbf9db44f1d0defd8a945a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=679a2f531bdba5a1abbf9db4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:13 2021 +0100 ntdll: Don't try to convert binaries to 64-bit in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 86aec79dbfc..665c4480ad4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2118,6 +2118,7 @@ static BOOL convert_to_pe64( HMODULE module, const SECTION_IMAGE_INFORMATION *in ULONG i, old_prot; if (nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) return TRUE; /* already 64-bit */ + if (NtCurrentTeb()->WowTebOffset) return TRUE; /* no need to convert */ if (!info->ImageContainsCode) return TRUE; /* no need to convert */ TRACE( "%p\n", module ); @@ -2207,6 +2208,7 @@ static BOOL is_valid_binary( HANDLE file, const SECTION_IMAGE_INFORMATION *info #else if (info->Machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; #endif + if (NtCurrentTeb()->WowTebOffset) return TRUE; if (!info->ImageContainsCode) return TRUE; if (!(info->u.s.ComPlusNativeReady)) {

1 0

Alexandre Julliard : wow64: Add support for user callbacks.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 716599703671fe0e003c022a21f39621fe064d67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=716599703671fe0e003c022a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:08 2021 +0100 wow64: Add support for user callbacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 1 + dlls/wow64/wow64.spec | 2 +- include/winternl.h | 7 ++-- 4 files changed, 118 insertions(+), 4 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index bee186456cc..75a5df5c453 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -70,6 +70,18 @@ struct mem_header BYTE data[1]; }; +/* stack frame for user callbacks */ +struct user_callback_frame +{ + struct user_callback_frame *prev_frame; + struct mem_header *temp_list; + void **ret_ptr; + ULONG *ret_len; + NTSTATUS status; + __wine_jmp_buf jmpbuf; +}; + + SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; /* wow64win syscall table */ @@ -143,6 +155,26 @@ NTSTATUS WINAPI wow64_NtAllocateUuids( UINT *args ) } +/*********************************************************************** + * wow64_NtCallbackReturn + */ +NTSTATUS WINAPI wow64_NtCallbackReturn( UINT *args ) +{ + void *ret_ptr = get_ptr( &args ); + ULONG ret_len = get_ulong( &args ); + NTSTATUS status = get_ulong( &args ); + + struct user_callback_frame *frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA]; + + if (!frame) return STATUS_NO_CALLBACK_ACTIVE; + + *frame->ret_ptr = ret_ptr; + *frame->ret_len = ret_len; + frame->status = status; + __wine_longjmp( &frame->jmpbuf, 1 ); +} + + /********************************************************************** * wow64_NtClose */ @@ -793,6 +825,86 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON } +/********************************************************************** + * Wow64KiUserCallbackDispatcher (wow64.@) + */ +NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, + void **ret_ptr, ULONG *ret_len ) +{ + struct user_callback_frame frame; + + frame.prev_frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA]; + frame.temp_list = NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST]; + frame.ret_ptr = ret_ptr; + frame.ret_len = ret_len; + + NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = &frame; + NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = NULL; + + /* cf. 32-bit KeUserModeCallback */ + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + { + I386_CONTEXT orig_ctx, ctx = { CONTEXT_I386_FULL }; + void *args_data; + ULONG *stack; + + NtQueryInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx), NULL ); + + stack = args_data = ULongToPtr( (ctx.Esp - len) & ~15 ); + memcpy( args_data, args, len ); + *(--stack) = 0; + *(--stack) = len; + *(--stack) = PtrToUlong( args_data ); + *(--stack) = id; + *(--stack) = 0xdeadbabe; + + orig_ctx = ctx; + ctx.Esp = PtrToUlong( stack ); + ctx.Eip = pLdrSystemDllInitBlock->pKiUserCallbackDispatcher; + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); + + if (!__wine_setjmpex( &frame.jmpbuf, NULL )) + cpu_simulate(); + else + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, + &orig_ctx, sizeof(orig_ctx) ); + } + break; + + case IMAGE_FILE_MACHINE_ARMNT: + { + ARM_CONTEXT orig_ctx, ctx = { CONTEXT_ARM_FULL }; + void *args_data; + + NtQueryInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx), NULL ); + + args_data = ULongToPtr( (ctx.Sp - len) & ~15 ); + memcpy( args_data, args, len ); + + ctx.R0 = id; + ctx.R1 = PtrToUlong( args ); + ctx.R2 = len; + ctx.Sp = PtrToUlong( args_data ); + ctx.Pc = pLdrSystemDllInitBlock->pKiUserCallbackDispatcher; + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); + + if (!__wine_setjmpex( &frame.jmpbuf, NULL )) + cpu_simulate(); + else + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, + &orig_ctx, sizeof(orig_ctx) ); + } + break; + } + + NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = frame.prev_frame; + NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = frame.temp_list; + return frame.status; +} + + /********************************************************************** * Wow64LdrpInitialize (wow64.@) */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index cb8fed9b99c..1e122e97314 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -37,6 +37,7 @@ SYSCALL_ENTRY( NtAllocateVirtualMemoryEx ) \ SYSCALL_ENTRY( NtAreMappedFilesTheSame ) \ SYSCALL_ENTRY( NtAssignProcessToJobObject ) \ + SYSCALL_ENTRY( NtCallbackReturn ) \ SYSCALL_ENTRY( NtCancelIoFile ) \ SYSCALL_ENTRY( NtCancelIoFileEx ) \ SYSCALL_ENTRY( NtCancelTimer ) \ diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index 5c3f39c50f1..e05a608d319 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -9,7 +9,7 @@ @ stub Wow64GetWow64ImageOption @ stub Wow64IsControlFlowGuardEnforced @ stub Wow64IsStackExtentsCheckEnforced -@ stub Wow64KiUserCallbackDispatcher +@ stdcall Wow64KiUserCallbackDispatcher(long ptr long ptr ptr) @ stdcall Wow64LdrpInitialize(ptr) @ stub Wow64LogPrint @ stub Wow64NotifyUnsimulateComplete diff --git a/include/winternl.h b/include/winternl.h index 5c2a1c07aeb..5b6ba98be42 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1080,9 +1080,10 @@ typedef struct _TEB64 } TEB64; /* reserved TEB64 TLS slots for Wow64 */ -#define WOW64_TLS_CPURESERVED 1 -#define WOW64_TLS_TEMPLIST 3 -#define WOW64_TLS_FILESYSREDIR 8 +#define WOW64_TLS_CPURESERVED 1 +#define WOW64_TLS_TEMPLIST 3 +#define WOW64_TLS_USERCALLBACKDATA 5 +#define WOW64_TLS_FILESYSREDIR 8 /***********************************************************************

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021