[PATCH 0/2] MR2909: Xact corrections

[PATCH 1/2] xactengine: Correct interfaces for IXACT3Cue

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/xactengine3_7/xact_dll.c | 4 ++--
 include/xact3.h               | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c
index f2737e0a9bd..0191c975a71 100644
--- a/dlls/xactengine3_7/xact_dll.c
+++ b/dlls/xactengine3_7/xact_dll.c
@@ -316,7 +316,7 @@ static HRESULT WINAPI IXACT3CueImpl_GetProperties(IXACT3Cue *iface,
 }
 #endif

-#if XACT3_VER >= 0x0300
+#if XACT3_VER >= 0x0305
 static HRESULT WINAPI IXACT3CueImpl_SetOutputVoices(IXACT3Cue *iface,
         const XAUDIO2_VOICE_SENDS *pSendList)
 {
@@ -356,7 +356,7 @@ static const IXACT3CueVtbl XACT3Cue_Vtbl =
 #if XACT3_VER >= 0x0205
     IXACT3CueImpl_GetProperties,
 #endif
-#if XACT3_VER >= 0x0300
+#if XACT3_VER >= 0x0305
     IXACT3CueImpl_SetOutputVoices,
     IXACT3CueImpl_SetOutputVoiceMatrix
 #endif
diff --git a/include/xact3.h b/include/xact3.h
index a1df1a51330..99fd8dcea5b 100644
--- a/include/xact3.h
+++ b/include/xact3.h
@@ -487,8 +487,10 @@ DECLARE_INTERFACE(IXACT3Cue)
     STDMETHOD(GetVariable)(THIS_ XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE *nValue) PURE;
     STDMETHOD(Pause)(THIS_ BOOL fPause) PURE;
     STDMETHOD(GetProperties)(THIS_ LPXACT_CUE_INSTANCE_PROPERTIES *ppProperties) PURE;
+#if XACT3_VER >= 0x0305
     STDMETHOD(SetOutputVoices)(THIS_ const XAUDIO2_VOICE_SENDS *pSendList) PURE;
     STDMETHOD(SetOutputVoiceMatrix)(THIS_ IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, const float *pLevelMatrix) PURE;
+#endif
 };
 #undef INTERFACE

[PATCH 2/2] include: xact* - Use STDMETHOD when returning HRESULT

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 include/xact.h  | 2 +-
 include/xact3.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/xact.h b/include/xact.h
index 03a354e69a9..c6b34cc2c05 100644
--- a/include/xact.h
+++ b/include/xact.h
@@ -708,7 +708,7 @@ DECLARE_INTERFACE(IXACTWaveBank)
 #define INTERFACE IXACTEngine
 DECLARE_INTERFACE_(IXACTEngine,IUnknown)
 {
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID iid, void **out) PURE;
+    STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE;
     STDMETHOD_(ULONG,AddRef)(THIS) PURE;
     STDMETHOD_(ULONG,Release)(THIS) PURE;
     STDMETHOD(GetRendererCount)(THIS_ XACTINDEX *count) PURE;
diff --git a/include/xact3.h b/include/xact3.h
index 99fd8dcea5b..939a80e2af5 100644
--- a/include/xact3.h
+++ b/include/xact3.h
@@ -664,7 +664,7 @@ DECLARE_INTERFACE(IXACT3WaveBank)
 DECLARE_INTERFACE_(IXACT3Engine,IUnknown)
 {
     /*** IUnknown methods ***/
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
     STDMETHOD_(ULONG,AddRef)(THIS) PURE;
     STDMETHOD_(ULONG,Release)(THIS) PURE;
     /*** IXACT3Engine methods ***/