Rebase against 436fb03a87ae6dcbbbe149e401942b7eb8369f51

patches/xaudio2-revert/0001-Revert-xaudio2-Export-functions-by-ordinal.patch

@@ -0,0 +1,48 @@
+From 6070be771682c1c1e621acfa9e25ab4ae0db0e75 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Wed, 3 Jul 2019 09:19:14 +1000
+Subject: [PATCH 1/2] Revert "xaudio2: Export functions by ordinal."
+
+This reverts commit 92a5299b1d0a0775e1158f334c0348a3ffe8f063.
+---
+ dlls/xaudio2_8/xaudio2_8.spec | 12 ++++++------
+ dlls/xaudio2_9/xaudio2_9.spec | 12 ++++++------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/dlls/xaudio2_8/xaudio2_8.spec b/dlls/xaudio2_8/xaudio2_8.spec
+index 78bf05bdb6..0b9f23866b 100644
+--- a/dlls/xaudio2_8/xaudio2_8.spec
++++ b/dlls/xaudio2_8/xaudio2_8.spec
+@@ -1,6 +1,6 @@
+-1 stdcall -ordinal XAudio2Create(ptr long long)
+-2 stdcall -ordinal CreateAudioReverb(ptr)
+-3 stdcall -ordinal CreateAudioVolumeMeter(ptr)
+-4 cdecl -ordinal CreateFX(ptr ptr ptr long)
+-5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr)
+-6 cdecl -ordinal X3DAudioInitialize(long float ptr)
++@ stdcall XAudio2Create(ptr long long)
++@ stdcall CreateAudioVolumeMeter(ptr)
++@ stdcall CreateAudioReverb(ptr)
++@ cdecl CreateFX(ptr ptr ptr long)
++@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr)
++@ cdecl X3DAudioInitialize(long float ptr)
+diff --git a/dlls/xaudio2_9/xaudio2_9.spec b/dlls/xaudio2_9/xaudio2_9.spec
+index 78bf05bdb6..0b9f23866b 100644
+--- a/dlls/xaudio2_9/xaudio2_9.spec
++++ b/dlls/xaudio2_9/xaudio2_9.spec
+@@ -1,6 +1,6 @@
+-1 stdcall -ordinal XAudio2Create(ptr long long)
+-2 stdcall -ordinal CreateAudioReverb(ptr)
+-3 stdcall -ordinal CreateAudioVolumeMeter(ptr)
+-4 cdecl -ordinal CreateFX(ptr ptr ptr long)
+-5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr)
+-6 cdecl -ordinal X3DAudioInitialize(long float ptr)
++@ stdcall XAudio2Create(ptr long long)
++@ stdcall CreateAudioVolumeMeter(ptr)
++@ stdcall CreateAudioReverb(ptr)
++@ cdecl CreateFX(ptr ptr ptr long)
++@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr)
++@ cdecl X3DAudioInitialize(long float ptr)
+-- 
+2.20.1
+

patches/xaudio2-revert/0002-Revert-xaudio2-Add-TRACE-functions-to-CreateAudioRev.patch

@@ -0,0 +1,36 @@
+From 1e3508c74fcb56b75574f9a2d4d723d94976a3d4 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Wed, 3 Jul 2019 09:19:18 +1000
+Subject: [PATCH 2/2] Revert "xaudio2: Add TRACE functions to
+ CreateAudioReverb/CreateAudioVolumeMeter."
+
+This reverts commit 6103b8173b119fb8c80a107f0284a83399438066.
+---
+ dlls/xaudio2_7/xaudio_dll.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
+index a87e0124d3..da0b0aa606 100644
+--- a/dlls/xaudio2_7/xaudio_dll.c
++++ b/dlls/xaudio2_7/xaudio_dll.c
+@@ -2075,8 +2075,6 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out)
+     IClassFactory *cf;
+     HRESULT hr;
+ 
+-    TRACE("%p\n", out);
+-
+     hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf);
+     if(FAILED(hr))
+         return hr;
+@@ -2093,8 +2091,6 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out)
+     IClassFactory *cf;
+     HRESULT hr;
+ 
+-    TRACE("%p\n", out);
+-
+     hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf);
+     if(FAILED(hr))
+         return hr;
+-- 
+2.20.1
+