diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 003e83dc..39424277 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -8725,9 +8725,9 @@ fi # | * dlls/xaudio2_7/xaudio_dll.c # | if test "$enable_xaudio2_CommitChanges" -eq 1; then - patch_apply xaudio2_CommitChanges/0001-xaudio2-revert-commit-b747d6f6ccdf1699a9242a570d681f.patch + patch_apply xaudio2_CommitChanges/0001-xaudio2-Return-S_OK-in-IXAudio2-in-CommitChanges.patch ( - printf '%s\n' '+ { "Thomas Crider", "xaudio2: Revert commit b747d6f6ccdf1699a9242a570d681fa246de592e, fixes #44883.", 1 },'; + printf '%s\n' '+ { "Thomas Crider", "xaudio2: Return S_OK in IXAudio2 in CommitChanges.", 1 },'; ) >> "$patchlist" fi diff --git a/patches/xaudio2_CommitChanges/0001-xaudio2-revert-commit-b747d6f6ccdf1699a9242a570d681f.patch b/patches/xaudio2_CommitChanges/0001-xaudio2-Return-S_OK-in-IXAudio2-in-CommitChanges.patch similarity index 74% rename from patches/xaudio2_CommitChanges/0001-xaudio2-revert-commit-b747d6f6ccdf1699a9242a570d681f.patch rename to patches/xaudio2_CommitChanges/0001-xaudio2-Return-S_OK-in-IXAudio2-in-CommitChanges.patch index 0c639105..9fd509bb 100644 --- a/patches/xaudio2_CommitChanges/0001-xaudio2-revert-commit-b747d6f6ccdf1699a9242a570d681f.patch +++ b/patches/xaudio2_CommitChanges/0001-xaudio2-Return-S_OK-in-IXAudio2-in-CommitChanges.patch @@ -1,15 +1,14 @@ -From f9e60ebf4fab57207c3a836110575c938c9bcd24 Mon Sep 17 00:00:00 2001 +From 69a209f88bb8a21ec48638e6d6b6f805a258d788 Mon Sep 17 00:00:00 2001 From: Thomas Crider Date: Fri, 13 Apr 2018 18:09:21 -0400 -Subject: [PATCH] xaudio2: revert commit - b747d6f6ccdf1699a9242a570d681fa246de592e, fixes #44883 +Subject: [PATCH] xaudio2: Return S_OK in IXAudio2 in CommitChanges --- dlls/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c -index 28cf98565b..647d2fdab3 100644 +index 28cf985..647d2fd 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1895,7 +1895,7 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, @@ -22,5 +21,5 @@ index 28cf98565b..647d2fdab3 100644 static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, -- -2.17.0 +1.9.1