diff --git a/patches/xactengine-initial/0012-xaudio2_7-Trace-FAudio-version-being-used.patch b/patches/xactengine-initial/0012-xaudio2_7-Trace-FAudio-version-being-used.patch index 51afc353..11c58d7c 100644 --- a/patches/xactengine-initial/0012-xaudio2_7-Trace-FAudio-version-being-used.patch +++ b/patches/xactengine-initial/0012-xaudio2_7-Trace-FAudio-version-being-used.patch @@ -1,26 +1,57 @@ -From 0b54c7d231cc8ba9cde2bd5cda542ec61ba86fdf Mon Sep 17 00:00:00 2001 +From b331a9b8e5a7eb893fa9a8e04244646910354430 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes -Date: Tue, 14 Jan 2020 15:47:43 +1100 +Date: Tue, 14 Jan 2020 15:47:15 +1100 Subject: [PATCH] xaudio2_7: Trace FAudio version being used Signed-off-by: Alistair Leslie-Hughes --- - dlls/xaudio2_7/xact_dll.c | 2 ++ - 1 file changed, 2 insertions(+) + configure.ac | 3 ++- + dlls/xaudio2_7/xaudio_dll.c | 3 +++ + include/config.h.in | 3 +++ + 3 files changed, 8 insertions(+), 1 deletion(-) -diff --git a/dlls/xaudio2_7/xact_dll.c b/dlls/xaudio2_7/xact_dll.c -index dfe74cebc2..4c576d87ba 100644 ---- a/dlls/xaudio2_7/xact_dll.c -+++ b/dlls/xaudio2_7/xact_dll.c -@@ -52,6 +52,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) +diff --git a/configure.ac b/configure.ac +index 47d2b750c0..f688b56967 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1738,7 +1738,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 a87e0124d3..2601a280ba 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 1d0b216b6a..887ed3026b 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 + -- -2.25.1 +2.17.1 diff --git a/patches/xactengine-initial/0013-xaudio2_7-Trace-FAudio-version-being-used.patch b/patches/xactengine-initial/0013-xaudio2_7-Trace-FAudio-version-being-used.patch index e20b25f7..d8b88089 100644 --- a/patches/xactengine-initial/0013-xaudio2_7-Trace-FAudio-version-being-used.patch +++ b/patches/xactengine-initial/0013-xaudio2_7-Trace-FAudio-version-being-used.patch @@ -1,26 +1,28 @@ -From 9b14a6c11c5d720682965f0dc92c3f3a5d92a345 Mon Sep 17 00:00:00 2001 +From 3819655b9f19a5c1c6a456a278bfd9cf050c759d Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes -Date: Tue, 14 Jan 2020 15:47:15 +1100 +Date: Tue, 14 Jan 2020 15:47:43 +1100 Subject: [PATCH] xaudio2_7: Trace FAudio version being used Signed-off-by: Alistair Leslie-Hughes --- - dlls/xaudio2_7/xaudio_dll.c | 2 ++ - 1 file changed, 2 insertions(+) + dlls/xaudio2_7/xact_dll.c | 4 ++++ + 1 file changed, 4 insertions(+) -diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c -index a87e0124d3..ae18a72e2b 100644 ---- a/dlls/xaudio2_7/xaudio_dll.c -+++ b/dlls/xaudio2_7/xaudio_dll.c -@@ -90,6 +90,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) +diff --git a/dlls/xaudio2_7/xact_dll.c b/dlls/xaudio2_7/xact_dll.c +index dfe74cebc2..2406964deb 100644 +--- a/dlls/xaudio2_7/xact_dll.c ++++ b/dlls/xaudio2_7/xact_dll.c +@@ -52,6 +52,10 @@ 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; -- -2.25.1 +2.17.1