Alexandre Julliard : faudio: Import upstream release 23.12.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9aefdbb9d9c4e681b3bbb502015d9c4dcfc0b013
URL:    https://gitlab.winehq.org/wine/wine/-/commit/9aefdbb9d9c4e681b3bbb502015d9c4...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Dec  4 17:24:13 2023 +0100

faudio: Import upstream release 23.12.

---

 libs/faudio/include/FAudio.h      | 2 +-
 libs/faudio/src/FAudio.c          | 7 ++++++-
 libs/faudio/src/FAudio_internal.c | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h
index 0c75809f79d..1a873ca2064 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	10
+#define FAUDIO_MINOR_VERSION	12
 #define FAUDIO_PATCH_VERSION	 0
 
 #define FAUDIO_COMPILED_VERSION ( \
diff --git a/libs/faudio/src/FAudio.c b/libs/faudio/src/FAudio.c
index b20097b02fc..9366ad58208 100644
--- a/libs/faudio/src/FAudio.c
+++ b/libs/faudio/src/FAudio.c
@@ -294,7 +294,8 @@ uint32_t FAudio_CreateSourceVoice(
 
 	if (	pSourceFormat->wFormatTag == FAUDIO_FORMAT_PCM ||
 		pSourceFormat->wFormatTag == FAUDIO_FORMAT_IEEE_FLOAT ||
-		pSourceFormat->wFormatTag == FAUDIO_FORMAT_WMAUDIO2	)
+		pSourceFormat->wFormatTag == FAUDIO_FORMAT_WMAUDIO2 ||
+		pSourceFormat->wFormatTag == FAUDIO_FORMAT_WMAUDIO3	)
 	{
 		FAudioWaveFormatExtensible *fmtex = (FAudioWaveFormatExtensible*) audio->pMalloc(
 			sizeof(FAudioWaveFormatExtensible)
@@ -321,6 +322,10 @@ uint32_t FAudio_CreateSourceVoice(
 		{
 			FAudio_memcpy(&fmtex->SubFormat, &DATAFORMAT_SUBTYPE_WMAUDIO2, sizeof(FAudioGUID));
 		}
+		else if (pSourceFormat->wFormatTag == FAUDIO_FORMAT_WMAUDIO3)
+		{
+			FAudio_memcpy(&fmtex->SubFormat, &DATAFORMAT_SUBTYPE_WMAUDIO3, sizeof(FAudioGUID));
+		}
 		(*ppSourceVoice)->src.format = &fmtex->Format;
 	}
 	else if (pSourceFormat->wFormatTag == FAUDIO_FORMAT_MSADPCM)
diff --git a/libs/faudio/src/FAudio_internal.c b/libs/faudio/src/FAudio_internal.c
index 95322e7ab55..f0d46cfa4b6 100644
--- a/libs/faudio/src/FAudio_internal.c
+++ b/libs/faudio/src/FAudio_internal.c
@@ -105,6 +105,7 @@ static const char *get_wformattag_string(const FAudioWaveFormatEx *fmt)
 	FMT_STRING(IEEE_FLOAT)
 	FMT_STRING(XMAUDIO2)
 	FMT_STRING(WMAUDIO2)
+	FMT_STRING(WMAUDIO3)
 	FMT_STRING(EXTENSIBLE)
 #undef FMT_STRING
 	return "UNKNOWN!";