Module: wine Branch: master Commit: e7752e6191452e4e10c35e919fa76102755d7979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7752e6191452e4e10c35e919...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Fri Mar 20 07:38:03 2020 +0000
xaudio2_7: Trace FAudio version being used.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com Signed-off-by: Andrew Eikum aeikum@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 3 ++- configure.ac | 3 ++- dlls/xaudio2_7/xaudio_dll.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/configure b/configure index 1bde1100b9..a7bcae77b9 100755 --- a/configure +++ b/configure @@ -15359,7 +15359,8 @@ done ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $FAUDIO_LIBS" for ac_func in FAudio_CommitOperationSet \ - F3DAudioInitialize8 + F3DAudioInitialize8 \ + FAudioLinkedVersion do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.ac b/configure.ac index 7096e2fb66..b7bd7fb079 100644 --- a/configure.ac +++ b/configure.ac @@ -1756,7 +1756,8 @@ then [AC_CHECK_HEADERS([FAudio.h], [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])]) WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \ - F3DAudioInitialize8], [$FAUDIO_LIBS]) + F3DAudioInitialize8 \ + FAudioLinkedVersion], [$FAUDIO_LIBS]) ]) fi WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"], diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index fa0361182c..e8b81b125a 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -90,6 +90,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); +#ifdef HAVE_FAUDIOLINKEDVERSION + TRACE("Using FAudio version %d\n", FAudioLinkedVersion() ); +#endif break; } return TRUE; diff --git a/include/config.h.in b/include/config.h.in index de434d6ed2..4fa805ef19 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -152,6 +152,9 @@ /* Define to 1 if you have the `fallocate' function. */ #undef HAVE_FALLOCATE
+/* Define to 1 if you have the `FAudioLinkedVersion' function. */ +#undef HAVE_FAUDIOLINKEDVERSION + /* Define to 1 if you have the `FAudio_CommitOperationSet' function. */ #undef HAVE_FAUDIO_COMMITOPERATIONSET