From 0ff86943edb16b9230e8fd3829a6d9a47902e7bd Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 28 Sep 2021 08:59:28 +1000
Subject: [PATCH] Rebase against de7adacedbdd78fd1ed8ee0986a78670e11a60bc.

---
 patches/patchinstall.sh                       |  5 +-
 ...clude-Add-SPSTREAMFORMAT-enum-values.patch | 99 -------------------
 staging/upstream-commit                       |  2 +-
 3 files changed, 3 insertions(+), 103 deletions(-)
 delete mode 100644 patches/sapi-iteration-tokens/0002-include-Add-SPSTREAMFORMAT-enum-values.patch

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 72ce1c38..9706603a 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "2660cd9fcbb23897b041c43bcac1dc2a7aa3c01f"
+	echo "de7adacedbdd78fd1ed8ee0986a78670e11a60bc"
 }
 
 # Show version information
@@ -3088,11 +3088,10 @@ fi
 # |   *	[#51775] sapi: Allow iteration of Token objects.
 # |
 # | Modified files:
-# |   *	dlls/sapi/sapi.rgs, dlls/sapi/token.c, include/sapi.idl
+# |   *	dlls/sapi/sapi.rgs, dlls/sapi/token.c
 # |
 if test "$enable_sapi_iteration_tokens" -eq 1; then
 	patch_apply sapi-iteration-tokens/0001-sapi-Implement-ISpRegDataKey-CreateKey.patch
-	patch_apply sapi-iteration-tokens/0002-include-Add-SPSTREAMFORMAT-enum-values.patch
 	patch_apply sapi-iteration-tokens/0003-sapi-Implement-ISpRegDataKey-GetStringValue.patch
 	patch_apply sapi-iteration-tokens/0004-sapi-EnumTokens-setup-enumeration-members.patch
 	patch_apply sapi-iteration-tokens/0005-sapi-Implement-ISpObjectTokenEnumBuilder-Item.patch
diff --git a/patches/sapi-iteration-tokens/0002-include-Add-SPSTREAMFORMAT-enum-values.patch b/patches/sapi-iteration-tokens/0002-include-Add-SPSTREAMFORMAT-enum-values.patch
deleted file mode 100644
index e9019a71..00000000
--- a/patches/sapi-iteration-tokens/0002-include-Add-SPSTREAMFORMAT-enum-values.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 248e1d6f1779eab962cfcd91ef31b1dd0feeab62 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 22 Sep 2021 19:01:44 +1000
-Subject: [PATCH 2/8] include: Add SPSTREAMFORMAT enum values
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- include/sapi.idl | 75 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 75 insertions(+)
-
-diff --git a/include/sapi.idl b/include/sapi.idl
-index 59c2540ba21..d2c1aac8afc 100644
---- a/include/sapi.idl
-+++ b/include/sapi.idl
-@@ -351,6 +351,81 @@ typedef [hidden] enum SPVALUETYPE
-     SPDF_ALL           = 0x000000ff
- } SPVALUETYPE;
- 
-+typedef [hidden] enum SPSTREAMFORMAT
-+{
-+    SPSF_Default = -1,
-+    SPSF_NoAssignedFormat = 0,
-+    SPSF_Text,
-+    SPSF_NonStandardFormat,
-+    SPSF_ExtendedAudioFormat,
-+    SPSF_8kHz8BitMono,
-+    SPSF_8kHz8BitStereo,
-+    SPSF_8kHz16BitMono,
-+    SPSF_8kHz16BitStereo,
-+    SPSF_11kHz8BitMono,
-+    SPSF_11kHz8BitStereo,
-+    SPSF_11kHz16BitMono,
-+    SPSF_11kHz16BitStereo,
-+    SPSF_12kHz8BitMono,
-+    SPSF_12kHz8BitStereo,
-+    SPSF_12kHz16BitMono,
-+    SPSF_12kHz16BitStereo,
-+    SPSF_16kHz8BitMono,
-+    SPSF_16kHz8BitStereo,
-+    SPSF_16kHz16BitMono,
-+    SPSF_16kHz16BitStereo,
-+    SPSF_22kHz8BitMono,
-+    SPSF_22kHz8BitStereo,
-+    SPSF_22kHz16BitMono,
-+    SPSF_22kHz16BitStereo,
-+    SPSF_24kHz8BitMono,
-+    SPSF_24kHz8BitStereo,
-+    SPSF_24kHz16BitMono,
-+    SPSF_24kHz16BitStereo,
-+    SPSF_32kHz8BitMono,
-+    SPSF_32kHz8BitStereo,
-+    SPSF_32kHz16BitMono,
-+    SPSF_32kHz16BitStereo,
-+    SPSF_44kHz8BitMono,
-+    SPSF_44kHz8BitStereo,
-+    SPSF_44kHz16BitMono,
-+    SPSF_44kHz16BitStereo,
-+    SPSF_48kHz8BitMono,
-+    SPSF_48kHz8BitStereo,
-+    SPSF_48kHz16BitMono,
-+    SPSF_48kHz16BitStereo,
-+    SPSF_TrueSpeech_8kHz1BitMono,
-+    SPSF_CCITT_ALaw_8kHzMono,
-+    SPSF_CCITT_ALaw_8kHzStereo,
-+    SPSF_CCITT_ALaw_11kHzMono,
-+    SPSF_CCITT_ALaw_11kHzStereo,
-+    SPSF_CCITT_ALaw_22kHzMono,
-+    SPSF_CCITT_ALaw_22kHzStereo,
-+    SPSF_CCITT_ALaw_44kHzMono,
-+    SPSF_CCITT_ALaw_44kHzStereo,
-+    SPSF_CCITT_uLaw_8kHzMono,
-+    SPSF_CCITT_uLaw_8kHzStereo,
-+    SPSF_CCITT_uLaw_11kHzMono,
-+    SPSF_CCITT_uLaw_11kHzStereo,
-+    SPSF_CCITT_uLaw_22kHzMono,
-+    SPSF_CCITT_uLaw_22kHzStereo,
-+    SPSF_CCITT_uLaw_44kHzMono,
-+    SPSF_CCITT_uLaw_44kHzStereo,
-+    SPSF_ADPCM_8kHzMono,
-+    SPSF_ADPCM_8kHzStereo,
-+    SPSF_ADPCM_11kHzMono,
-+    SPSF_ADPCM_11kHzStereo,
-+    SPSF_ADPCM_22kHzMono,
-+    SPSF_ADPCM_22kHzStereo,
-+    SPSF_ADPCM_44kHzMono,
-+    SPSF_ADPCM_44kHzStereo,
-+    SPSF_GSM610_8kHzMono,
-+    SPSF_GSM610_11kHzMono,
-+    SPSF_GSM610_22kHzMono,
-+    SPSF_GSM610_44kHzMono,
-+    SPSF_NUM_FORMATS
-+} SPSTREAMFORMAT;
-+
- typedef unsigned short SPPHONEID;
- 
- typedef [restricted, hidden] struct SPPHRASEELEMENT
--- 
-2.33.0
-
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 41414672..9a7826f0 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-2660cd9fcbb23897b041c43bcac1dc2a7aa3c01f
+de7adacedbdd78fd1ed8ee0986a78670e11a60bc