[PATCH 0/1] MR8126: include: Do not register classes from xapofx or x3daudio dlls.

[Elizabeth Figura (＠zfigura)]

Alternatively we can avoid "makedep register" for these DLLs by using a separate IDL in dlls/xaudio2_7/.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8126

[PATCH 1/1] include: Do not register classes from xapofx or x3daudio dlls.

[Elizabeth Figura]

From: Elizabeth Figura <zfigura(a)codeweavers.com>

---
 include/xaudio2.idl   | 2 +-
 include/xaudio2fx.idl | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/xaudio2.idl b/include/xaudio2.idl
index ac63757720b..d75013d88e1 100644
--- a/include/xaudio2.idl
+++ b/include/xaudio2.idl
@@ -28,7 +28,7 @@ import "mmreg.h";
 
 #pragma pack(push,1)
 
-#if XAUDIO2_VER <= 7
+#if XAUDIO2_VER <= 7 && !defined(XAPOFX1_VER) && !defined(X3DAUDIO1_VER)
 
 [
     threading(both),
diff --git a/include/xaudio2fx.idl b/include/xaudio2fx.idl
index a340d2de824..95657ca4f9a 100644
--- a/include/xaudio2fx.idl
+++ b/include/xaudio2fx.idl
@@ -22,7 +22,9 @@ import "unknwn.idl";
 #define XAUDIO2_VER 9
 #endif
 
+#if !defined(XAPOFX1_VER) && !defined(X3DAUDIO1_VER)
 #if XAUDIO2_VER < 8
+
 [
     threading(both),
 #if XAUDIO2_VER == 0
@@ -73,3 +75,4 @@ HRESULT __stdcall CreateAudioReverb(IUnknown **out);
 HRESULT __stdcall CreateAudioVolumeMeter(IUnknown **out);
 
 #endif
+#endif
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8126

[Alexandre Julliard (＠julliard)]

> Alternatively we can avoid "makedep register" for these DLLs by using a separate IDL in dlls/xaudio2_7/.

That seems better than creating a bunch of empty registration scripts.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8126#note_104320