[PATCH 0/4] MR2695: wine{alsa,coreaudio,oss,pulse}: Use dedicated macros to call interface functions.

[PATCH 1/4] winealsa: Use dedicated macros to call interface functions.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winealsa.drv/mmdevdrv.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index c46ae41f48b..5d23368fcda 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -1181,13 +1181,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface(
 static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface)
 {
     ACImpl *This = impl_from_IAudioRenderClient(iface);
-    return AudioClient_AddRef(&This->IAudioClient3_iface);
+    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
 }

static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface)
 {
     ACImpl *This = impl_from_IAudioRenderClient(iface);
-    return AudioClient_Release(&This->IAudioClient3_iface);
+    return IAudioClient3_Release(&This->IAudioClient3_iface);
 }

static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface,
@@ -1500,7 +1500,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
     ret->client = client;
     if(client){
         ret->session = client->session;
-        AudioClient_AddRef(&client->IAudioClient3_iface);
+        IAudioClient3_AddRef(&client->IAudioClient3_iface);
     }

return ret;
@@ -1548,7 +1548,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
             EnterCriticalSection(&g_sessions_lock);
             This->client->session_wrapper = NULL;
             LeaveCriticalSection(&g_sessions_lock);
-            AudioClient_Release(&This->client->IAudioClient3_iface);
+            IAudioClient3_Release(&This->client->IAudioClient3_iface);
         }
         HeapFree(GetProcessHeap(), 0, This);
     }
@@ -1773,13 +1773,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface(
 static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface);
-    return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface);
 }

static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface);
-    return AudioSessionControl_Release(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface);
 }

static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume(
@@ -2055,13 +2055,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface(
 static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface);
-    return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface);
 }

static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface);
-    return AudioSessionControl_Release(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface);
 }

static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

[PATCH 2/4] winecoreaudio: Use dedicated macros to call interface functions.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winecoreaudio.drv/mmdevdrv.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index 21c2528cab1..75ea96979cb 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -1146,13 +1146,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface(
 static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface)
 {
     ACImpl *This = impl_from_IAudioRenderClient(iface);
-    return AudioClient_AddRef(&This->IAudioClient3_iface);
+    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
 }

static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface)
 {
     ACImpl *This = impl_from_IAudioRenderClient(iface);
-    return AudioClient_Release(&This->IAudioClient3_iface);
+    return IAudioClient3_Release(&This->IAudioClient3_iface);
 }

static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface,
@@ -1499,7 +1499,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
     if(!ref){
         if(This->client){
             This->client->session_wrapper = NULL;
-            AudioClient_Release(&This->client->IAudioClient3_iface);
+            IAudioClient3_Release(&This->client->IAudioClient3_iface);
         }
         HeapFree(GetProcessHeap(), 0, This);
     }
@@ -1726,13 +1726,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface(
 static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface);
-    return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface);
 }

static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface);
-    return AudioSessionControl_Release(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface);
 }

static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume(
@@ -2006,13 +2006,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface(
 static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface);
-    return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface);
 }

static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface);
-    return AudioSessionControl_Release(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface);
 }

static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

[PATCH 3/4] wineoss: Use dedicated macros to call interface functions.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/wineoss.drv/mmdevdrv.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 56e619dd163..55a8a75c653 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -1137,13 +1137,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface(
 static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface)
 {
     ACImpl *This = impl_from_IAudioRenderClient(iface);
-    return AudioClient_AddRef(&This->IAudioClient3_iface);
+    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
 }

static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface)
 {
     ACImpl *This = impl_from_IAudioRenderClient(iface);
-    return AudioClient_Release(&This->IAudioClient3_iface);
+    return IAudioClient3_Release(&This->IAudioClient3_iface);
 }

static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface,
@@ -1449,7 +1449,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
     ret->client = client;
     if(client){
         ret->session = client->session;
-        AudioClient_AddRef(&client->IAudioClient3_iface);
+        IAudioClient3_AddRef(&client->IAudioClient3_iface);
     }

return ret;
@@ -1497,7 +1497,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
             EnterCriticalSection(&g_sessions_lock);
             This->client->session_wrapper = NULL;
             LeaveCriticalSection(&g_sessions_lock);
-            AudioClient_Release(&This->client->IAudioClient3_iface);
+            IAudioClient3_Release(&This->client->IAudioClient3_iface);
         }
         HeapFree(GetProcessHeap(), 0, This);
     }
@@ -1722,13 +1722,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface(
 static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface);
-    return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface);
 }

static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface);
-    return AudioSessionControl_Release(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface);
 }

static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume(
@@ -2001,13 +2001,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface(
 static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface);
-    return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface);
 }

static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface);
-    return AudioSessionControl_Release(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface);
 }

static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

[PATCH 4/4] winepulse: Use dedicated macros to call interface functions.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winepulse.drv/mmdevdrv.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 7f1dbb765cf..72fbdebdd3f 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -1381,13 +1381,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface(
 static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface)
 {
     ACImpl *This = impl_from_IAudioRenderClient(iface);
-    return AudioClient_AddRef(&This->IAudioClient3_iface);
+    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
 }

static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface)
 {
     ACImpl *This = impl_from_IAudioRenderClient(iface);
-    return AudioClient_Release(&This->IAudioClient3_iface);
+    return IAudioClient3_Release(&This->IAudioClient3_iface);
 }

static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface,
@@ -1876,7 +1876,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
     ret->client = client;
     if (client) {
         ret->session = client->session;
-        AudioClient_AddRef(&client->IAudioClient3_iface);
+        IAudioClient3_AddRef(&client->IAudioClient3_iface);
     }

return ret;
@@ -1922,7 +1922,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
     if (!ref) {
         if (This->client) {
             This->client->session_wrapper = NULL;
-            AudioClient_Release(&This->client->IAudioClient3_iface);
+            IAudioClient3_Release(&This->client->IAudioClient3_iface);
         }
         HeapFree(GetProcessHeap(), 0, This);
     }
@@ -2146,13 +2146,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface(
 static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface);
-    return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface);
 }

static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface);
-    return AudioSessionControl_Release(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface);
 }

static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume(
@@ -2269,13 +2269,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface(
 static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface);
-    return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface);
 }

static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface)
 {
     AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface);
-    return AudioSessionControl_Release(&This->IAudioSessionControl2_iface);
+    return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface);
 }

static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

[PATCH 0/4] MR2695: wine{alsa,coreaudio,oss,pulse}: Use dedicated macros to call interface functions. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.