Skip to content

W
wine-winehq
Commit 370a538e authored by Andrew Eikum's avatar Andrew Eikum Committed by Alexandre Julliard
Browse files
Options

mmdevapi: Stub implement IAudioClient2.

Signed-off-by: 's avatarAndrew Eikum <aeikum@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent afd14322
Hide whitespace changes
Inline Side-by-side
Showing with 463 additions and 273 deletions
dlls/mmdevapi/devenum.c
View file @ 370a538e
...@@ -591,7 +591,8 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls ...@@ -591,7 +591,8 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls
if (!ppv) if (!ppv)
return E_POINTER; return E_POINTER;
if (IsEqualIID(riid, &IID_IAudioClient)){ if (IsEqualIID(riid, &IID_IAudioClient) ||
IsEqualIID(riid, &IID_IAudioClient2)){
hr = drvs.pGetAudioEndpoint(&This->devguid, iface, (IAudioClient**)ppv); hr = drvs.pGetAudioEndpoint(&This->devguid, iface, (IAudioClient**)ppv);
}else if (IsEqualIID(riid, &IID_IAudioEndpointVolume) || }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume) ||
IsEqualIID(riid, &IID_IAudioEndpointVolumeEx)) IsEqualIID(riid, &IID_IAudioEndpointVolumeEx))
......
dlls/mmdevapi/tests/render.c
View file @ 370a538e
...@@ -133,6 +133,7 @@ static void test_uninitialized(IAudioClient *ac) ...@@ -133,6 +133,7 @@ static void test_uninitialized(IAudioClient *ac)
static void test_audioclient(void) static void test_audioclient(void)
{ {
IAudioClient *ac; IAudioClient *ac;
IAudioClient2 *ac2;
IUnknown *unk; IUnknown *unk;
HRESULT hr; HRESULT hr;
ULONG ref; ULONG ref;
...@@ -140,6 +141,11 @@ static void test_audioclient(void) ...@@ -140,6 +141,11 @@ static void test_audioclient(void)
REFERENCE_TIME t1, t2; REFERENCE_TIME t1, t2;
HANDLE handle; HANDLE handle;
hr = IMMDevice_Activate(dev, &IID_IAudioClient2, CLSCTX_INPROC_SERVER,
NULL, (void**)&ac2);
ok(hr == S_OK, "IAudioClient2 Activation failed with %08x\n", hr);
IAudioClient2_Release(ac2);
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER,
NULL, (void**)&ac); NULL, (void**)&ac);
ok(hr == S_OK, "Activation failed with %08x\n", hr); ok(hr == S_OK, "Activation failed with %08x\n", hr);
...@@ -244,6 +250,11 @@ static void test_audioclient(void) ...@@ -244,6 +250,11 @@ static void test_audioclient(void)
"IsFormatSupported(0xffffffff) call returns %08x\n", hr); "IsFormatSupported(0xffffffff) call returns %08x\n", hr);
} }
hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient2, (void**)&ac2);
ok(hr == S_OK, "Failed to query IAudioClient2 interface: %08x\n", hr);
IAudioClient2_Release(ac2);
test_uninitialized(ac); test_uninitialized(ac);
hr = IAudioClient_Initialize(ac, 3, 0, 5000000, 0, pwfx, NULL); hr = IAudioClient_Initialize(ac, 3, 0, 5000000, 0, pwfx, NULL);
......
dlls/winealsa.drv/mmdevdrv.c
View file @ 370a538e
...@@ -88,7 +88,7 @@ typedef struct _AudioSessionWrapper { ...@@ -88,7 +88,7 @@ typedef struct _AudioSessionWrapper {
} AudioSessionWrapper; } AudioSessionWrapper;
struct ACImpl { struct ACImpl {
IAudioClient IAudioClient_iface; IAudioClient2 IAudioClient2_iface;
IAudioRenderClient IAudioRenderClient_iface; IAudioRenderClient IAudioRenderClient_iface;
IAudioCaptureClient IAudioCaptureClient_iface; IAudioCaptureClient IAudioCaptureClient_iface;
IAudioClock IAudioClock_iface; IAudioClock IAudioClock_iface;
...@@ -172,7 +172,7 @@ static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', ...@@ -172,7 +172,7 @@ static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\',
'w','i','n','e','a','l','s','a','.','d','r','v','\\','d','e','v','i','c','e','s',0}; 'w','i','n','e','a','l','s','a','.','d','r','v','\\','d','e','v','i','c','e','s',0};
static const WCHAR guidW[] = {'g','u','i','d',0}; static const WCHAR guidW[] = {'g','u','i','d',0};
static const IAudioClientVtbl AudioClient_Vtbl; static const IAudioClient2Vtbl AudioClient2_Vtbl;
static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
...@@ -185,9 +185,9 @@ static const IAudioSessionManager2Vtbl AudioSessionManager2_Vtbl; ...@@ -185,9 +185,9 @@ static const IAudioSessionManager2Vtbl AudioSessionManager2_Vtbl;
static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
static inline ACImpl *impl_from_IAudioClient(IAudioClient *iface) static inline ACImpl *impl_from_IAudioClient2(IAudioClient2 *iface)
{ {
return CONTAINING_RECORD(iface, ACImpl, IAudioClient_iface); return CONTAINING_RECORD(iface, ACImpl, IAudioClient2_iface);
} }
static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface)
...@@ -788,7 +788,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ...@@ -788,7 +788,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
if(!This) if(!This)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
This->IAudioClient_iface.lpVtbl = &AudioClient_Vtbl; This->IAudioClient2_iface.lpVtbl = &AudioClient2_Vtbl;
This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl;
This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl;
This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl; This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl;
...@@ -804,7 +804,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ...@@ -804,7 +804,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
return E_UNEXPECTED; return E_UNEXPECTED;
} }
hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient2_iface, &This->pUnkFTMarshal);
if (FAILED(hr)) { if (FAILED(hr)) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return hr; return hr;
...@@ -851,22 +851,24 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ...@@ -851,22 +851,24 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
This->parent = dev; This->parent = dev;
IMMDevice_AddRef(This->parent); IMMDevice_AddRef(This->parent);
*out = &This->IAudioClient_iface; *out = (IAudioClient *)&This->IAudioClient2_iface;
IAudioClient_AddRef(&This->IAudioClient_iface); IAudioClient2_AddRef(&This->IAudioClient2_iface);
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient2 *iface,
REFIID riid, void **ppv) REFIID riid, void **ppv)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
if(!ppv) if(!ppv)
return E_POINTER; return E_POINTER;
*ppv = NULL; *ppv = NULL;
if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClient)) if(IsEqualIID(riid, &IID_IUnknown) ||
IsEqualIID(riid, &IID_IAudioClient) ||
IsEqualIID(riid, &IID_IAudioClient2))
*ppv = iface; *ppv = iface;
else if(IsEqualIID(riid, &IID_IMarshal)) else if(IsEqualIID(riid, &IID_IMarshal))
return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv);
...@@ -879,18 +881,18 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, ...@@ -879,18 +881,18 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface,
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI AudioClient_AddRef(IAudioClient *iface) static ULONG WINAPI AudioClient_AddRef(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
ULONG ref; ULONG ref;
ref = InterlockedIncrement(&This->ref); ref = InterlockedIncrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %u\n", This, ref);
return ref; return ref;
} }
static ULONG WINAPI AudioClient_Release(IAudioClient *iface) static ULONG WINAPI AudioClient_Release(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
ULONG ref; ULONG ref;
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
...@@ -907,7 +909,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) ...@@ -907,7 +909,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface)
CloseHandle(event); CloseHandle(event);
} }
IAudioClient_Stop(iface); IAudioClient2_Stop(iface);
IMMDevice_Release(This->parent); IMMDevice_Release(This->parent);
IUnknown_Release(This->pUnkFTMarshal); IUnknown_Release(This->pUnkFTMarshal);
This->lock.DebugInfo->Spare[0] = 0; This->lock.DebugInfo->Spare[0] = 0;
...@@ -1236,12 +1238,12 @@ static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) ...@@ -1236,12 +1238,12 @@ static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames)
memset(buffer, 0, frames * This->fmt->nBlockAlign); memset(buffer, 0, frames * This->fmt->nBlockAlign);
} }
static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, static HRESULT WINAPI AudioClient_Initialize(IAudioClient2 *iface,
AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration,
REFERENCE_TIME period, const WAVEFORMATEX *fmt, REFERENCE_TIME period, const WAVEFORMATEX *fmt,
const GUID *sessionguid) const GUID *sessionguid)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
snd_pcm_sw_params_t *sw_params = NULL; snd_pcm_sw_params_t *sw_params = NULL;
snd_pcm_format_t format; snd_pcm_format_t format;
unsigned int rate, alsa_period_us; unsigned int rate, alsa_period_us;
...@@ -1528,10 +1530,10 @@ exit: ...@@ -1528,10 +1530,10 @@ exit:
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient2 *iface,
UINT32 *out) UINT32 *out)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, out); TRACE("(%p)->(%p)\n", This, out);
...@@ -1552,10 +1554,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface, ...@@ -1552,10 +1554,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient2 *iface,
REFERENCE_TIME *latency) REFERENCE_TIME *latency)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, latency); TRACE("(%p)->(%p)\n", This, latency);
...@@ -1585,10 +1587,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, ...@@ -1585,10 +1587,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient2 *iface,
UINT32 *out) UINT32 *out)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, out); TRACE("(%p)->(%p)\n", This, out);
...@@ -1612,11 +1614,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, ...@@ -1612,11 +1614,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient2 *iface,
AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt,
WAVEFORMATEX **out) WAVEFORMATEX **out)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
snd_pcm_format_mask_t *formats = NULL; snd_pcm_format_mask_t *formats = NULL;
snd_pcm_format_t format; snd_pcm_format_t format;
HRESULT hr = S_OK; HRESULT hr = S_OK;
...@@ -1763,10 +1765,10 @@ exit: ...@@ -1763,10 +1765,10 @@ exit:
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient2 *iface,
WAVEFORMATEX **pwfx) WAVEFORMATEX **pwfx)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
WAVEFORMATEXTENSIBLE *fmt; WAVEFORMATEXTENSIBLE *fmt;
snd_pcm_format_mask_t *formats; snd_pcm_format_mask_t *formats;
unsigned int max_rate, max_channels; unsigned int max_rate, max_channels;
...@@ -1894,10 +1896,10 @@ exit: ...@@ -1894,10 +1896,10 @@ exit:
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient2 *iface,
REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod) REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
...@@ -2392,9 +2394,9 @@ static int alsa_rewind_best_effort(ACImpl *This) ...@@ -2392,9 +2394,9 @@ static int alsa_rewind_best_effort(ACImpl *This)
return len; return len;
} }
static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) static HRESULT WINAPI AudioClient_Start(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -2460,9 +2462,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) ...@@ -2460,9 +2462,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -2488,9 +2490,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) ...@@ -2488,9 +2490,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -2535,10 +2537,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) ...@@ -2535,10 +2537,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient2 *iface,
HANDLE event) HANDLE event)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, event); TRACE("(%p)->(%p)\n", This, event);
...@@ -2570,10 +2572,10 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, ...@@ -2570,10 +2572,10 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, static HRESULT WINAPI AudioClient_GetService(IAudioClient2 *iface, REFIID riid,
void **ppv) void **ppv)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
...@@ -2654,7 +2656,38 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, ...@@ -2654,7 +2656,38 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid,
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static const IAudioClientVtbl AudioClient_Vtbl = static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface,
AUDIO_STREAM_CATEGORY category, BOOL *offload_capable)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable);
return E_NOTIMPL;
}
static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface,
const AudioClientProperties *prop)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(%p)\n", This, prop);
return E_NOTIMPL;
}
static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface,
const WAVEFORMATEX *format, BOOL event_driven, REFERENCE_TIME *min_duration,
REFERENCE_TIME *max_duration)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(%p, %u, %p, %p)\n", This, format, event_driven, min_duration, max_duration);
return E_NOTIMPL;
}
static const IAudioClient2Vtbl AudioClient2_Vtbl =
{ {
AudioClient_QueryInterface, AudioClient_QueryInterface,
AudioClient_AddRef, AudioClient_AddRef,
...@@ -2670,7 +2703,10 @@ static const IAudioClientVtbl AudioClient_Vtbl = ...@@ -2670,7 +2703,10 @@ static const IAudioClientVtbl AudioClient_Vtbl =
AudioClient_Stop, AudioClient_Stop,
AudioClient_Reset, AudioClient_Reset,
AudioClient_SetEventHandle, AudioClient_SetEventHandle,
AudioClient_GetService AudioClient_GetService,
AudioClient_IsOffloadCapable,
AudioClient_SetClientProperties,
AudioClient_GetBufferSizeLimits,
}; };
static HRESULT WINAPI AudioRenderClient_QueryInterface( static HRESULT WINAPI AudioRenderClient_QueryInterface(
...@@ -2701,13 +2737,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( ...@@ -2701,13 +2737,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface(
static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface)
{ {
ACImpl *This = impl_from_IAudioRenderClient(iface); ACImpl *This = impl_from_IAudioRenderClient(iface);
return AudioClient_AddRef(&This->IAudioClient_iface); return AudioClient_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface)
{ {
ACImpl *This = impl_from_IAudioRenderClient(iface); ACImpl *This = impl_from_IAudioRenderClient(iface);
return AudioClient_Release(&This->IAudioClient_iface); return AudioClient_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface,
...@@ -2867,13 +2903,13 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( ...@@ -2867,13 +2903,13 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface(
static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface) static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface)
{ {
ACImpl *This = impl_from_IAudioCaptureClient(iface); ACImpl *This = impl_from_IAudioCaptureClient(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface)
{ {
ACImpl *This = impl_from_IAudioCaptureClient(iface); ACImpl *This = impl_from_IAudioCaptureClient(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface,
...@@ -3042,13 +3078,13 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, ...@@ -3042,13 +3078,13 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface,
static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static ULONG WINAPI AudioClock_Release(IAudioClock *iface)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
...@@ -3160,13 +3196,13 @@ static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, ...@@ -3160,13 +3196,13 @@ static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface,
static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface)
{ {
ACImpl *This = impl_from_IAudioClock2(iface); ACImpl *This = impl_from_IAudioClock2(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface)
{ {
ACImpl *This = impl_from_IAudioClock2(iface); ACImpl *This = impl_from_IAudioClock2(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface,
...@@ -3205,7 +3241,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ...@@ -3205,7 +3241,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
ret->client = client; ret->client = client;
if(client){ if(client){
ret->session = client->session; ret->session = client->session;
AudioClient_AddRef(&client->IAudioClient_iface); AudioClient_AddRef(&client->IAudioClient2_iface);
} }
return ret; return ret;
...@@ -3253,7 +3289,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) ...@@ -3253,7 +3289,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
EnterCriticalSection(&This->client->lock); EnterCriticalSection(&This->client->lock);
This->client->session_wrapper = NULL; This->client->session_wrapper = NULL;
LeaveCriticalSection(&This->client->lock); LeaveCriticalSection(&This->client->lock);
AudioClient_Release(&This->client->IAudioClient_iface); AudioClient_Release(&This->client->IAudioClient2_iface);
} }
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
...@@ -3595,13 +3631,13 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface( ...@@ -3595,13 +3631,13 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface(
static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface) static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface)
{ {
ACImpl *This = impl_from_IAudioStreamVolume(iface); ACImpl *This = impl_from_IAudioStreamVolume(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface) static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface)
{ {
ACImpl *This = impl_from_IAudioStreamVolume(iface); ACImpl *This = impl_from_IAudioStreamVolume(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioStreamVolume_GetChannelCount( static HRESULT WINAPI AudioStreamVolume_GetChannelCount(
......
dlls/wineandroid.drv/mmdevdrv.c
View file @ 370a538e
...@@ -107,7 +107,7 @@ typedef struct _AudioSessionWrapper { ...@@ -107,7 +107,7 @@ typedef struct _AudioSessionWrapper {
} AudioSessionWrapper; } AudioSessionWrapper;
struct ACImpl { struct ACImpl {
IAudioClient IAudioClient_iface; IAudioClient2 IAudioClient2_iface;
IAudioRenderClient IAudioRenderClient_iface; IAudioRenderClient IAudioRenderClient_iface;
IAudioCaptureClient IAudioCaptureClient_iface; IAudioCaptureClient IAudioCaptureClient_iface;
IAudioClock IAudioClock_iface; IAudioClock IAudioClock_iface;
...@@ -174,7 +174,7 @@ static struct list g_sessions = LIST_INIT(g_sessions); ...@@ -174,7 +174,7 @@ static struct list g_sessions = LIST_INIT(g_sessions);
static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
static const IAudioClientVtbl AudioClient_Vtbl; static const IAudioClient2Vtbl AudioClient2_Vtbl;
static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
...@@ -185,9 +185,9 @@ static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; ...@@ -185,9 +185,9 @@ static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl;
static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl;
static const IAudioSessionManager2Vtbl AudioSessionManager2_Vtbl; static const IAudioSessionManager2Vtbl AudioSessionManager2_Vtbl;
static inline ACImpl *impl_from_IAudioClient(IAudioClient *iface) static inline ACImpl *impl_from_IAudioClient2(IAudioClient2 *iface)
{ {
return CONTAINING_RECORD(iface, ACImpl, IAudioClient_iface); return CONTAINING_RECORD(iface, ACImpl, IAudioClient2_iface);
} }
static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface)
...@@ -377,7 +377,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, ...@@ -377,7 +377,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev,
if(!This) if(!This)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient2_iface, &This->pUnkFTMarshal);
if (FAILED(hr)) { if (FAILED(hr)) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return hr; return hr;
...@@ -385,7 +385,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, ...@@ -385,7 +385,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev,
This->dataflow = flow; This->dataflow = flow;
This->IAudioClient_iface.lpVtbl = &AudioClient_Vtbl; This->IAudioClient2_iface.lpVtbl = &AudioClient2_Vtbl;
This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl;
This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl;
This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl; This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl;
...@@ -398,23 +398,24 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, ...@@ -398,23 +398,24 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev,
This->parent = dev; This->parent = dev;
IMMDevice_AddRef(This->parent); IMMDevice_AddRef(This->parent);
IAudioClient_AddRef(&This->IAudioClient_iface); *out = (IAudioClient *)&This->IAudioClient2_iface;
IAudioClient2_AddRef(&This->IAudioClient2_iface);
*out = &This->IAudioClient_iface;
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient2 *iface,
REFIID riid, void **ppv) REFIID riid, void **ppv)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
if(!ppv) if(!ppv)
return E_POINTER; return E_POINTER;
*ppv = NULL; *ppv = NULL;
if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClient)) if(IsEqualIID(riid, &IID_IUnknown) ||
IsEqualIID(riid, &IID_IAudioClient) ||
IsEqualIID(riid, &IID_IAudioClient2))
*ppv = iface; *ppv = iface;
else if(IsEqualIID(riid, &IID_IMarshal)) else if(IsEqualIID(riid, &IID_IMarshal))
return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv);
...@@ -426,18 +427,18 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, ...@@ -426,18 +427,18 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface,
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI AudioClient_AddRef(IAudioClient *iface) static ULONG WINAPI AudioClient_AddRef(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
ULONG ref; ULONG ref;
ref = InterlockedIncrement(&This->ref); ref = InterlockedIncrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %u\n", This, ref);
return ref; return ref;
} }
static ULONG WINAPI AudioClient_Release(IAudioClient *iface) static ULONG WINAPI AudioClient_Release(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
ULONG ref; ULONG ref;
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
...@@ -454,7 +455,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) ...@@ -454,7 +455,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface)
CloseHandle(event); CloseHandle(event);
} }
IAudioClient_Stop(iface); IAudioClient2_Stop(iface);
IMMDevice_Release(This->parent); IMMDevice_Release(This->parent);
IUnknown_Release(This->pUnkFTMarshal); IUnknown_Release(This->pUnkFTMarshal);
...@@ -784,12 +785,12 @@ static HRESULT try_open_capture_device(SLAndroidDataFormat_PCM_EX *pcm, unsigned ...@@ -784,12 +785,12 @@ static HRESULT try_open_capture_device(SLAndroidDataFormat_PCM_EX *pcm, unsigned
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, static HRESULT WINAPI AudioClient_Initialize(IAudioClient2 *iface,
AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration,
REFERENCE_TIME period, const WAVEFORMATEX *fmt, REFERENCE_TIME period, const WAVEFORMATEX *fmt,
const GUID *sessionguid) const GUID *sessionguid)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
int i, num_buffers; int i, num_buffers;
HRESULT hr; HRESULT hr;
SLresult sr; SLresult sr;
...@@ -1019,10 +1020,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, ...@@ -1019,10 +1020,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient2 *iface,
UINT32 *frames) UINT32 *frames)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, frames); TRACE("(%p)->(%p)\n", This, frames);
...@@ -1045,10 +1046,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface, ...@@ -1045,10 +1046,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient2 *iface,
REFERENCE_TIME *latency) REFERENCE_TIME *latency)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, latency); TRACE("(%p)->(%p)\n", This, latency);
...@@ -1071,10 +1072,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, ...@@ -1071,10 +1072,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient2 *iface,
UINT32 *numpad) UINT32 *numpad)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, numpad); TRACE("(%p)->(%p)\n", This, numpad);
...@@ -1097,11 +1098,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, ...@@ -1097,11 +1098,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient2 *iface,
AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx,
WAVEFORMATEX **outpwfx) WAVEFORMATEX **outpwfx)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
SLAndroidDataFormat_PCM_EX pcm; SLAndroidDataFormat_PCM_EX pcm;
HRESULT hr; HRESULT hr;
...@@ -1133,7 +1134,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, ...@@ -1133,7 +1134,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface,
if(FAILED(hr)){ if(FAILED(hr)){
if(outpwfx){ if(outpwfx){
hr = IAudioClient_GetMixFormat(iface, outpwfx); hr = IAudioClient2_GetMixFormat(iface, outpwfx);
if(FAILED(hr)) if(FAILED(hr))
return hr; return hr;
return S_FALSE; return S_FALSE;
...@@ -1147,10 +1148,10 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, ...@@ -1147,10 +1148,10 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface,
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient2 *iface,
WAVEFORMATEX **pwfx) WAVEFORMATEX **pwfx)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
WAVEFORMATEXTENSIBLE *fmt; WAVEFORMATEXTENSIBLE *fmt;
TRACE("(%p)->(%p)\n", This, pwfx); TRACE("(%p)->(%p)\n", This, pwfx);
...@@ -1185,10 +1186,10 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, ...@@ -1185,10 +1186,10 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient2 *iface,
REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod) REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
...@@ -1342,9 +1343,9 @@ static void CALLBACK sl_period_callback(void *user, BOOLEAN timer) ...@@ -1342,9 +1343,9 @@ static void CALLBACK sl_period_callback(void *user, BOOLEAN timer)
SetEvent(This->event); SetEvent(This->event);
} }
static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) static HRESULT WINAPI AudioClient_Start(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
SLresult sr; SLresult sr;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -1396,9 +1397,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) ...@@ -1396,9 +1397,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
SLresult sr; SLresult sr;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -1438,9 +1439,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) ...@@ -1438,9 +1439,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
SLresult sr; SLresult sr;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -1495,10 +1496,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) ...@@ -1495,10 +1496,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient2 *iface,
HANDLE event) HANDLE event)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, event); TRACE("(%p)->(%p)\n", This, event);
...@@ -1530,10 +1531,10 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, ...@@ -1530,10 +1531,10 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, static HRESULT WINAPI AudioClient_GetService(IAudioClient2 *iface, REFIID riid,
void **ppv) void **ppv)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
...@@ -1614,7 +1615,38 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, ...@@ -1614,7 +1615,38 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid,
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static const IAudioClientVtbl AudioClient_Vtbl = static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface,
AUDIO_STREAM_CATEGORY category, BOOL *offload_capable)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable);
return E_NOTIMPL;
}
static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface,
const AudioClientProperties *prop)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(%p)\n", This, prop);
return E_NOTIMPL;
}
static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface,
const WAVEFORMATEX *format, BOOL event_driven, REFERENCE_TIME *min_duration,
REFERENCE_TIME *max_duration)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(%p, %u, %p, %p)\n", This, format, event_driven, min_duration, max_duration);
return E_NOTIMPL;
}
static const IAudioClient2Vtbl AudioClient2_Vtbl =
{ {
AudioClient_QueryInterface, AudioClient_QueryInterface,
AudioClient_AddRef, AudioClient_AddRef,
...@@ -1630,7 +1662,10 @@ static const IAudioClientVtbl AudioClient_Vtbl = ...@@ -1630,7 +1662,10 @@ static const IAudioClientVtbl AudioClient_Vtbl =
AudioClient_Stop, AudioClient_Stop,
AudioClient_Reset, AudioClient_Reset,
AudioClient_SetEventHandle, AudioClient_SetEventHandle,
AudioClient_GetService AudioClient_GetService,
AudioClient_IsOffloadCapable,
AudioClient_SetClientProperties,
AudioClient_GetBufferSizeLimits,
}; };
static HRESULT WINAPI AudioRenderClient_QueryInterface( static HRESULT WINAPI AudioRenderClient_QueryInterface(
...@@ -1660,13 +1695,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( ...@@ -1660,13 +1695,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface(
static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface)
{ {
ACImpl *This = impl_from_IAudioRenderClient(iface); ACImpl *This = impl_from_IAudioRenderClient(iface);
return AudioClient_AddRef(&This->IAudioClient_iface); return AudioClient_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface)
{ {
ACImpl *This = impl_from_IAudioRenderClient(iface); ACImpl *This = impl_from_IAudioRenderClient(iface);
return AudioClient_Release(&This->IAudioClient_iface); return AudioClient_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface,
...@@ -1827,13 +1862,13 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( ...@@ -1827,13 +1862,13 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface(
static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface) static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface)
{ {
ACImpl *This = impl_from_IAudioCaptureClient(iface); ACImpl *This = impl_from_IAudioCaptureClient(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface)
{ {
ACImpl *This = impl_from_IAudioCaptureClient(iface); ACImpl *This = impl_from_IAudioCaptureClient(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface,
...@@ -2005,13 +2040,13 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, ...@@ -2005,13 +2040,13 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface,
static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static ULONG WINAPI AudioClock_Release(IAudioClock *iface)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
...@@ -2101,13 +2136,13 @@ static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, ...@@ -2101,13 +2136,13 @@ static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface,
static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface)
{ {
ACImpl *This = impl_from_IAudioClock2(iface); ACImpl *This = impl_from_IAudioClock2(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface)
{ {
ACImpl *This = impl_from_IAudioClock2(iface); ACImpl *This = impl_from_IAudioClock2(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface,
...@@ -2146,7 +2181,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ...@@ -2146,7 +2181,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
ret->client = client; ret->client = client;
if(client){ if(client){
ret->session = client->session; ret->session = client->session;
AudioClient_AddRef(&client->IAudioClient_iface); AudioClient_AddRef(&client->IAudioClient2_iface);
} }
return ret; return ret;
...@@ -2194,7 +2229,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) ...@@ -2194,7 +2229,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
EnterCriticalSection(&This->client->lock); EnterCriticalSection(&This->client->lock);
This->client->session_wrapper = NULL; This->client->session_wrapper = NULL;
LeaveCriticalSection(&This->client->lock); LeaveCriticalSection(&This->client->lock);
AudioClient_Release(&This->client->IAudioClient_iface); AudioClient_Release(&This->client->IAudioClient2_iface);
} }
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
...@@ -2537,13 +2572,13 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface( ...@@ -2537,13 +2572,13 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface(
static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface) static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface)
{ {
ACImpl *This = impl_from_IAudioStreamVolume(iface); ACImpl *This = impl_from_IAudioStreamVolume(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface) static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface)
{ {
ACImpl *This = impl_from_IAudioStreamVolume(iface); ACImpl *This = impl_from_IAudioStreamVolume(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioStreamVolume_GetChannelCount( static HRESULT WINAPI AudioStreamVolume_GetChannelCount(
......
dlls/winecoreaudio.drv/mmdevdrv.c
View file @ 370a538e
...@@ -130,7 +130,7 @@ typedef struct _AudioSessionWrapper { ...@@ -130,7 +130,7 @@ typedef struct _AudioSessionWrapper {
} AudioSessionWrapper; } AudioSessionWrapper;
struct ACImpl { struct ACImpl {
IAudioClient IAudioClient_iface; IAudioClient2 IAudioClient2_iface;
IAudioRenderClient IAudioRenderClient_iface; IAudioRenderClient IAudioRenderClient_iface;
IAudioCaptureClient IAudioCaptureClient_iface; IAudioCaptureClient IAudioCaptureClient_iface;
IAudioClock IAudioClock_iface; IAudioClock IAudioClock_iface;
...@@ -173,7 +173,7 @@ struct ACImpl { ...@@ -173,7 +173,7 @@ struct ACImpl {
OSSpinLock lock; OSSpinLock lock;
}; };
static const IAudioClientVtbl AudioClient_Vtbl; static const IAudioClient2Vtbl AudioClient2_Vtbl;
static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
...@@ -212,9 +212,9 @@ static struct list g_sessions = LIST_INIT(g_sessions); ...@@ -212,9 +212,9 @@ static struct list g_sessions = LIST_INIT(g_sessions);
static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
static HRESULT ca_setvol(ACImpl *This, UINT32 index); static HRESULT ca_setvol(ACImpl *This, UINT32 index);
static inline ACImpl *impl_from_IAudioClient(IAudioClient *iface) static inline ACImpl *impl_from_IAudioClient2(IAudioClient2 *iface)
{ {
return CONTAINING_RECORD(iface, ACImpl, IAudioClient_iface); return CONTAINING_RECORD(iface, ACImpl, IAudioClient2_iface);
} }
static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface)
...@@ -674,7 +674,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ...@@ -674,7 +674,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
if(!This) if(!This)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
This->IAudioClient_iface.lpVtbl = &AudioClient_Vtbl; This->IAudioClient2_iface.lpVtbl = &AudioClient2_Vtbl;
This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl;
This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl;
This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl; This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl;
...@@ -694,7 +694,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ...@@ -694,7 +694,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
This->lock = 0; This->lock = 0;
hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient2_iface, &This->pUnkFTMarshal);
if (FAILED(hr)) { if (FAILED(hr)) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return hr; return hr;
...@@ -710,22 +710,24 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ...@@ -710,22 +710,24 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
return AUDCLNT_E_DEVICE_INVALIDATED; return AUDCLNT_E_DEVICE_INVALIDATED;
} }
*out = &This->IAudioClient_iface; *out = (IAudioClient *)&This->IAudioClient2_iface;
IAudioClient_AddRef(&This->IAudioClient_iface); IAudioClient2_AddRef(&This->IAudioClient2_iface);
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient2 *iface,
REFIID riid, void **ppv) REFIID riid, void **ppv)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
if(!ppv) if(!ppv)
return E_POINTER; return E_POINTER;
*ppv = NULL; *ppv = NULL;
if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClient)) if(IsEqualIID(riid, &IID_IUnknown) ||
IsEqualIID(riid, &IID_IAudioClient) ||
IsEqualIID(riid, &IID_IAudioClient2))
*ppv = iface; *ppv = iface;
else if(IsEqualIID(riid, &IID_IMarshal)) else if(IsEqualIID(riid, &IID_IMarshal))
return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv);
...@@ -738,18 +740,18 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, ...@@ -738,18 +740,18 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface,
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI AudioClient_AddRef(IAudioClient *iface) static ULONG WINAPI AudioClient_AddRef(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
ULONG ref; ULONG ref;
ref = InterlockedIncrement(&This->ref); ref = InterlockedIncrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %u\n", This, ref);
return ref; return ref;
} }
static ULONG WINAPI AudioClient_Release(IAudioClient *iface) static ULONG WINAPI AudioClient_Release(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
ULONG ref; ULONG ref;
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %u\n", This, ref);
...@@ -1295,12 +1297,12 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni ...@@ -1295,12 +1297,12 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, static HRESULT WINAPI AudioClient_Initialize(IAudioClient2 *iface,
AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration,
REFERENCE_TIME period, const WAVEFORMATEX *fmt, REFERENCE_TIME period, const WAVEFORMATEX *fmt,
const GUID *sessionguid) const GUID *sessionguid)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
HRESULT hr; HRESULT hr;
OSStatus sc; OSStatus sc;
int i; int i;
...@@ -1499,10 +1501,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, ...@@ -1499,10 +1501,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient2 *iface,
UINT32 *frames) UINT32 *frames)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, frames); TRACE("(%p)->(%p)\n", This, frames);
...@@ -1577,10 +1579,10 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) ...@@ -1577,10 +1579,10 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient2 *iface,
REFERENCE_TIME *out) REFERENCE_TIME *out)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
UInt32 latency, stream_latency, size; UInt32 latency, stream_latency, size;
AudioObjectPropertyAddress addr; AudioObjectPropertyAddress addr;
OSStatus sc; OSStatus sc;
...@@ -1642,10 +1644,10 @@ static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, ...@@ -1642,10 +1644,10 @@ static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient2 *iface,
UINT32 *numpad) UINT32 *numpad)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%p)\n", This, numpad); TRACE("(%p)->(%p)\n", This, numpad);
...@@ -1662,11 +1664,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, ...@@ -1662,11 +1664,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface,
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient2 *iface,
AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx,
WAVEFORMATEX **outpwfx) WAVEFORMATEX **outpwfx)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
AudioStreamBasicDescription dev_desc; AudioStreamBasicDescription dev_desc;
AudioConverterRef converter; AudioConverterRef converter;
AudioComponentInstance unit; AudioComponentInstance unit;
...@@ -1729,7 +1731,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, ...@@ -1729,7 +1731,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface,
unsupported: unsupported:
if(outpwfx){ if(outpwfx){
hr = IAudioClient_GetMixFormat(&This->IAudioClient_iface, outpwfx); hr = IAudioClient2_GetMixFormat(&This->IAudioClient2_iface, outpwfx);
if(FAILED(hr)) if(FAILED(hr))
return hr; return hr;
return S_FALSE; return S_FALSE;
...@@ -1854,10 +1856,10 @@ static void convert_channel_layout(const AudioChannelLayout *ca_layout, WAVEFORM ...@@ -1854,10 +1856,10 @@ static void convert_channel_layout(const AudioChannelLayout *ca_layout, WAVEFORM
fmt->dwChannelMask = ca_mask; fmt->dwChannelMask = ca_mask;
} }
static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient2 *iface,
WAVEFORMATEX **pwfx) WAVEFORMATEX **pwfx)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
WAVEFORMATEXTENSIBLE *fmt; WAVEFORMATEXTENSIBLE *fmt;
OSStatus sc; OSStatus sc;
UInt32 size; UInt32 size;
...@@ -1972,10 +1974,10 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, ...@@ -1972,10 +1974,10 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient2 *iface,
REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod) REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
...@@ -1998,9 +2000,9 @@ void CALLBACK ca_period_cb(void *user, BOOLEAN timer) ...@@ -1998,9 +2000,9 @@ void CALLBACK ca_period_cb(void *user, BOOLEAN timer)
SetEvent(This->event); SetEvent(This->event);
} }
static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) static HRESULT WINAPI AudioClient_Start(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -2037,9 +2039,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) ...@@ -2037,9 +2039,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -2062,9 +2064,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) ...@@ -2062,9 +2064,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -2102,10 +2104,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) ...@@ -2102,10 +2104,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient2 *iface,
HANDLE event) HANDLE event)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, event); TRACE("(%p)->(%p)\n", This, event);
...@@ -2137,10 +2139,10 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, ...@@ -2137,10 +2139,10 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, static HRESULT WINAPI AudioClient_GetService(IAudioClient2 *iface, REFIID riid,
void **ppv) void **ppv)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
...@@ -2221,7 +2223,38 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, ...@@ -2221,7 +2223,38 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid,
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static const IAudioClientVtbl AudioClient_Vtbl = static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface,
AUDIO_STREAM_CATEGORY category, BOOL *offload_capable)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable);
return E_NOTIMPL;
}
static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface,
const AudioClientProperties *prop)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(%p)\n", This, prop);
return E_NOTIMPL;
}
static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface,
const WAVEFORMATEX *format, BOOL event_driven, REFERENCE_TIME *min_duration,
REFERENCE_TIME *max_duration)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(%p, %u, %p, %p)\n", This, format, event_driven, min_duration, max_duration);
return E_NOTIMPL;
}
static const IAudioClient2Vtbl AudioClient2_Vtbl =
{ {
AudioClient_QueryInterface, AudioClient_QueryInterface,
AudioClient_AddRef, AudioClient_AddRef,
...@@ -2237,7 +2270,10 @@ static const IAudioClientVtbl AudioClient_Vtbl = ...@@ -2237,7 +2270,10 @@ static const IAudioClientVtbl AudioClient_Vtbl =
AudioClient_Stop, AudioClient_Stop,
AudioClient_Reset, AudioClient_Reset,
AudioClient_SetEventHandle, AudioClient_SetEventHandle,
AudioClient_GetService AudioClient_GetService,
AudioClient_IsOffloadCapable,
AudioClient_SetClientProperties,
AudioClient_GetBufferSizeLimits,
}; };
static HRESULT WINAPI AudioRenderClient_QueryInterface( static HRESULT WINAPI AudioRenderClient_QueryInterface(
...@@ -2268,13 +2304,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( ...@@ -2268,13 +2304,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface(
static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface)
{ {
ACImpl *This = impl_from_IAudioRenderClient(iface); ACImpl *This = impl_from_IAudioRenderClient(iface);
return AudioClient_AddRef(&This->IAudioClient_iface); return AudioClient_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface)
{ {
ACImpl *This = impl_from_IAudioRenderClient(iface); ACImpl *This = impl_from_IAudioRenderClient(iface);
return AudioClient_Release(&This->IAudioClient_iface); return AudioClient_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface,
...@@ -2425,13 +2461,13 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( ...@@ -2425,13 +2461,13 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface(
static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface) static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface)
{ {
ACImpl *This = impl_from_IAudioCaptureClient(iface); ACImpl *This = impl_from_IAudioCaptureClient(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface)
{ {
ACImpl *This = impl_from_IAudioCaptureClient(iface); ACImpl *This = impl_from_IAudioCaptureClient(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface,
...@@ -2593,13 +2629,13 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, ...@@ -2593,13 +2629,13 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface,
static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static ULONG WINAPI AudioClock_Release(IAudioClock *iface)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
...@@ -2689,13 +2725,13 @@ static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, ...@@ -2689,13 +2725,13 @@ static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface,
static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface)
{ {
ACImpl *This = impl_from_IAudioClock2(iface); ACImpl *This = impl_from_IAudioClock2(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface)
{ {
ACImpl *This = impl_from_IAudioClock2(iface); ACImpl *This = impl_from_IAudioClock2(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface,
...@@ -2734,7 +2770,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ...@@ -2734,7 +2770,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
ret->client = client; ret->client = client;
if(client){ if(client){
ret->session = client->session; ret->session = client->session;
AudioClient_AddRef(&client->IAudioClient_iface); AudioClient2_AddRef(&client->IAudioClient2_iface);
} }
return ret; return ret;
...@@ -2782,7 +2818,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) ...@@ -2782,7 +2818,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
OSSpinLockLock(&This->client->lock); OSSpinLockLock(&This->client->lock);
This->client->session_wrapper = NULL; This->client->session_wrapper = NULL;
OSSpinLockUnlock(&This->client->lock); OSSpinLockUnlock(&This->client->lock);
AudioClient_Release(&This->client->IAudioClient_iface); AudioClient_Release(&This->client->IAudioClient2_iface);
} }
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
...@@ -3177,13 +3213,13 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface( ...@@ -3177,13 +3213,13 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface(
static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface) static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface)
{ {
ACImpl *This = impl_from_IAudioStreamVolume(iface); ACImpl *This = impl_from_IAudioStreamVolume(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface) static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface)
{ {
ACImpl *This = impl_from_IAudioStreamVolume(iface); ACImpl *This = impl_from_IAudioStreamVolume(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioStreamVolume_GetChannelCount( static HRESULT WINAPI AudioStreamVolume_GetChannelCount(
......
dlls/wineoss.drv/mmdevdrv.c
View file @ 370a538e
...@@ -90,7 +90,7 @@ typedef struct _AudioSessionWrapper { ...@@ -90,7 +90,7 @@ typedef struct _AudioSessionWrapper {
} AudioSessionWrapper; } AudioSessionWrapper;
struct ACImpl { struct ACImpl {
IAudioClient IAudioClient_iface; IAudioClient2 IAudioClient2_iface;
IAudioRenderClient IAudioRenderClient_iface; IAudioRenderClient IAudioRenderClient_iface;
IAudioCaptureClient IAudioCaptureClient_iface; IAudioCaptureClient IAudioCaptureClient_iface;
IAudioClock IAudioClock_iface; IAudioClock IAudioClock_iface;
...@@ -168,7 +168,7 @@ static struct list g_sessions = LIST_INIT(g_sessions); ...@@ -168,7 +168,7 @@ static struct list g_sessions = LIST_INIT(g_sessions);
static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
static const IAudioClientVtbl AudioClient_Vtbl; static const IAudioClient2Vtbl AudioClient2_Vtbl;
static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
...@@ -179,9 +179,9 @@ static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; ...@@ -179,9 +179,9 @@ static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl;
static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl;
static const IAudioSessionManager2Vtbl AudioSessionManager2_Vtbl; static const IAudioSessionManager2Vtbl AudioSessionManager2_Vtbl;
static inline ACImpl *impl_from_IAudioClient(IAudioClient *iface) static inline ACImpl *impl_from_IAudioClient2(IAudioClient2 *iface)
{ {
return CONTAINING_RECORD(iface, ACImpl, IAudioClient_iface); return CONTAINING_RECORD(iface, ACImpl, IAudioClient2_iface);
} }
static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface)
...@@ -605,7 +605,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, ...@@ -605,7 +605,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev,
if(!This) if(!This)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient2_iface, &This->pUnkFTMarshal);
if (FAILED(hr)) { if (FAILED(hr)) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return hr; return hr;
...@@ -652,7 +652,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, ...@@ -652,7 +652,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev,
TRACE("min_channels: %d\n", This->ai.min_channels); TRACE("min_channels: %d\n", This->ai.min_channels);
TRACE("max_channels: %d\n", This->ai.max_channels); TRACE("max_channels: %d\n", This->ai.max_channels);
This->IAudioClient_iface.lpVtbl = &AudioClient_Vtbl; This->IAudioClient2_iface.lpVtbl = &AudioClient2_Vtbl;
This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl;
This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl;
This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl; This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl;
...@@ -665,23 +665,24 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, ...@@ -665,23 +665,24 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev,
This->parent = dev; This->parent = dev;
IMMDevice_AddRef(This->parent); IMMDevice_AddRef(This->parent);
IAudioClient_AddRef(&This->IAudioClient_iface); *out = (IAudioClient *)&This->IAudioClient2_iface;
IAudioClient2_AddRef(&This->IAudioClient2_iface);
*out = &This->IAudioClient_iface;
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient2 *iface,
REFIID riid, void **ppv) REFIID riid, void **ppv)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
if(!ppv) if(!ppv)
return E_POINTER; return E_POINTER;
*ppv = NULL; *ppv = NULL;
if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClient)) if(IsEqualIID(riid, &IID_IUnknown) ||
IsEqualIID(riid, &IID_IAudioClient) ||
IsEqualIID(riid, &IID_IAudioClient2))
*ppv = iface; *ppv = iface;
else if(IsEqualIID(riid, &IID_IMarshal)) else if(IsEqualIID(riid, &IID_IMarshal))
return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv);
...@@ -693,18 +694,18 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, ...@@ -693,18 +694,18 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface,
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI AudioClient_AddRef(IAudioClient *iface) static ULONG WINAPI AudioClient_AddRef(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
ULONG ref; ULONG ref;
ref = InterlockedIncrement(&This->ref); ref = InterlockedIncrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %u\n", This, ref);
return ref; return ref;
} }
static ULONG WINAPI AudioClient_Release(IAudioClient *iface) static ULONG WINAPI AudioClient_Release(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
ULONG ref; ULONG ref;
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
...@@ -721,7 +722,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) ...@@ -721,7 +722,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface)
CloseHandle(event); CloseHandle(event);
} }
IAudioClient_Stop(iface); IAudioClient2_Stop(iface);
IMMDevice_Release(This->parent); IMMDevice_Release(This->parent);
IUnknown_Release(This->pUnkFTMarshal); IUnknown_Release(This->pUnkFTMarshal);
This->lock.DebugInfo->Spare[0] = 0; This->lock.DebugInfo->Spare[0] = 0;
...@@ -1028,12 +1029,12 @@ static HRESULT get_audio_session(const GUID *sessionguid, ...@@ -1028,12 +1029,12 @@ static HRESULT get_audio_session(const GUID *sessionguid,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, static HRESULT WINAPI AudioClient_Initialize(IAudioClient2 *iface,
AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration,
REFERENCE_TIME period, const WAVEFORMATEX *fmt, REFERENCE_TIME period, const WAVEFORMATEX *fmt,
const GUID *sessionguid) const GUID *sessionguid)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
int i; int i;
HRESULT hr; HRESULT hr;
...@@ -1158,10 +1159,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, ...@@ -1158,10 +1159,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient2 *iface,
UINT32 *frames) UINT32 *frames)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, frames); TRACE("(%p)->(%p)\n", This, frames);
...@@ -1184,10 +1185,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface, ...@@ -1184,10 +1185,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient2 *iface,
REFERENCE_TIME *latency) REFERENCE_TIME *latency)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, latency); TRACE("(%p)->(%p)\n", This, latency);
...@@ -1210,10 +1211,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, ...@@ -1210,10 +1211,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient2 *iface,
UINT32 *numpad) UINT32 *numpad)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, numpad); TRACE("(%p)->(%p)\n", This, numpad);
...@@ -1236,11 +1237,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, ...@@ -1236,11 +1237,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient2 *iface,
AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx,
WAVEFORMATEX **outpwfx) WAVEFORMATEX **outpwfx)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
int fd = -1; int fd = -1;
HRESULT ret; HRESULT ret;
...@@ -1282,10 +1283,10 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, ...@@ -1282,10 +1283,10 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface,
return ret; return ret;
} }
static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient2 *iface,
WAVEFORMATEX **pwfx) WAVEFORMATEX **pwfx)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
WAVEFORMATEXTENSIBLE *fmt; WAVEFORMATEXTENSIBLE *fmt;
int formats; int formats;
...@@ -1375,10 +1376,10 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, ...@@ -1375,10 +1376,10 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient2 *iface,
REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod) REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
...@@ -1559,9 +1560,9 @@ static void CALLBACK oss_period_callback(void *user, BOOLEAN timer) ...@@ -1559,9 +1560,9 @@ static void CALLBACK oss_period_callback(void *user, BOOLEAN timer)
SetEvent(This->event); SetEvent(This->event);
} }
static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) static HRESULT WINAPI AudioClient_Start(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -1596,9 +1597,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) ...@@ -1596,9 +1597,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -1622,9 +1623,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) ...@@ -1622,9 +1623,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -1660,10 +1661,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) ...@@ -1660,10 +1661,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient2 *iface,
HANDLE event) HANDLE event)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p)\n", This, event); TRACE("(%p)->(%p)\n", This, event);
...@@ -1695,10 +1696,10 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, ...@@ -1695,10 +1696,10 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, static HRESULT WINAPI AudioClient_GetService(IAudioClient2 *iface, REFIID riid,
void **ppv) void **ppv)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
...@@ -1779,7 +1780,38 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, ...@@ -1779,7 +1780,38 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid,
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static const IAudioClientVtbl AudioClient_Vtbl = static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface,
AUDIO_STREAM_CATEGORY category, BOOL *offload_capable)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable);
return E_NOTIMPL;
}
static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface,
const AudioClientProperties *prop)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(%p)\n", This, prop);
return E_NOTIMPL;
}
static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface,
const WAVEFORMATEX *format, BOOL event_driven, REFERENCE_TIME *min_duration,
REFERENCE_TIME *max_duration)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(%p, %u, %p, %p)\n", This, format, event_driven, min_duration, max_duration);
return E_NOTIMPL;
}
static const IAudioClient2Vtbl AudioClient2_Vtbl =
{ {
AudioClient_QueryInterface, AudioClient_QueryInterface,
AudioClient_AddRef, AudioClient_AddRef,
...@@ -1795,7 +1827,10 @@ static const IAudioClientVtbl AudioClient_Vtbl = ...@@ -1795,7 +1827,10 @@ static const IAudioClientVtbl AudioClient_Vtbl =
AudioClient_Stop, AudioClient_Stop,
AudioClient_Reset, AudioClient_Reset,
AudioClient_SetEventHandle, AudioClient_SetEventHandle,
AudioClient_GetService AudioClient_GetService,
AudioClient_IsOffloadCapable,
AudioClient_SetClientProperties,
AudioClient_GetBufferSizeLimits,
}; };
static HRESULT WINAPI AudioRenderClient_QueryInterface( static HRESULT WINAPI AudioRenderClient_QueryInterface(
...@@ -1825,13 +1860,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( ...@@ -1825,13 +1860,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface(
static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface)
{ {
ACImpl *This = impl_from_IAudioRenderClient(iface); ACImpl *This = impl_from_IAudioRenderClient(iface);
return AudioClient_AddRef(&This->IAudioClient_iface); return AudioClient_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface)
{ {
ACImpl *This = impl_from_IAudioRenderClient(iface); ACImpl *This = impl_from_IAudioRenderClient(iface);
return AudioClient_Release(&This->IAudioClient_iface); return AudioClient_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface,
...@@ -1991,13 +2026,13 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( ...@@ -1991,13 +2026,13 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface(
static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface) static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface)
{ {
ACImpl *This = impl_from_IAudioCaptureClient(iface); ACImpl *This = impl_from_IAudioCaptureClient(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface)
{ {
ACImpl *This = impl_from_IAudioCaptureClient(iface); ACImpl *This = impl_from_IAudioCaptureClient(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface,
...@@ -2167,13 +2202,13 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, ...@@ -2167,13 +2202,13 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface,
static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static ULONG WINAPI AudioClock_Release(IAudioClock *iface)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
...@@ -2276,13 +2311,13 @@ static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, ...@@ -2276,13 +2311,13 @@ static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface,
static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface)
{ {
ACImpl *This = impl_from_IAudioClock2(iface); ACImpl *This = impl_from_IAudioClock2(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface)
{ {
ACImpl *This = impl_from_IAudioClock2(iface); ACImpl *This = impl_from_IAudioClock2(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface,
...@@ -2321,7 +2356,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ...@@ -2321,7 +2356,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
ret->client = client; ret->client = client;
if(client){ if(client){
ret->session = client->session; ret->session = client->session;
AudioClient_AddRef(&client->IAudioClient_iface); AudioClient_AddRef(&client->IAudioClient2_iface);
} }
return ret; return ret;
...@@ -2369,7 +2404,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) ...@@ -2369,7 +2404,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
EnterCriticalSection(&This->client->lock); EnterCriticalSection(&This->client->lock);
This->client->session_wrapper = NULL; This->client->session_wrapper = NULL;
LeaveCriticalSection(&This->client->lock); LeaveCriticalSection(&This->client->lock);
AudioClient_Release(&This->client->IAudioClient_iface); AudioClient_Release(&This->client->IAudioClient2_iface);
} }
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
...@@ -2712,13 +2747,13 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface( ...@@ -2712,13 +2747,13 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface(
static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface) static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface)
{ {
ACImpl *This = impl_from_IAudioStreamVolume(iface); ACImpl *This = impl_from_IAudioStreamVolume(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface) static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface)
{ {
ACImpl *This = impl_from_IAudioStreamVolume(iface); ACImpl *This = impl_from_IAudioStreamVolume(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioStreamVolume_GetChannelCount( static HRESULT WINAPI AudioStreamVolume_GetChannelCount(
......
dlls/winepulse.drv/mmdevdrv.c
View file @ 370a538e
...@@ -157,7 +157,7 @@ typedef struct _ACPacket { ...@@ -157,7 +157,7 @@ typedef struct _ACPacket {
} ACPacket; } ACPacket;
struct ACImpl { struct ACImpl {
IAudioClient IAudioClient_iface; IAudioClient2 IAudioClient2_iface;
IAudioRenderClient IAudioRenderClient_iface; IAudioRenderClient IAudioRenderClient_iface;
IAudioCaptureClient IAudioCaptureClient_iface; IAudioCaptureClient IAudioCaptureClient_iface;
IAudioClock IAudioClock_iface; IAudioClock IAudioClock_iface;
...@@ -198,7 +198,7 @@ struct ACImpl { ...@@ -198,7 +198,7 @@ struct ACImpl {
static const WCHAR defaultW[] = {'P','u','l','s','e','a','u','d','i','o',0}; static const WCHAR defaultW[] = {'P','u','l','s','e','a','u','d','i','o',0};
static const IAudioClientVtbl AudioClient_Vtbl; static const IAudioClient2Vtbl AudioClient2_Vtbl;
static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
...@@ -210,9 +210,9 @@ static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; ...@@ -210,9 +210,9 @@ static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl;
static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
static inline ACImpl *impl_from_IAudioClient(IAudioClient *iface) static inline ACImpl *impl_from_IAudioClient2(IAudioClient2 *iface)
{ {
return CONTAINING_RECORD(iface, ACImpl, IAudioClient_iface); return CONTAINING_RECORD(iface, ACImpl, IAudioClient2_iface);
} }
static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface)
...@@ -1228,7 +1228,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ...@@ -1228,7 +1228,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
if (!This) if (!This)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
This->IAudioClient_iface.lpVtbl = &AudioClient_Vtbl; This->IAudioClient2_iface.lpVtbl = &AudioClient2_Vtbl;
This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl;
This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl;
This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl; This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl;
...@@ -1239,23 +1239,23 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ...@@ -1239,23 +1239,23 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
for (i = 0; i < PA_CHANNELS_MAX; ++i) for (i = 0; i < PA_CHANNELS_MAX; ++i)
This->vol[i] = 1.f; This->vol[i] = 1.f;
hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient_iface, &This->marshal); hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient2_iface, &This->marshal);
if (hr) { if (hr) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return hr; return hr;
} }
IMMDevice_AddRef(This->parent); IMMDevice_AddRef(This->parent);
*out = &This->IAudioClient_iface; *out = (IAudioClient *)&This->IAudioClient2_iface;
IAudioClient_AddRef(&This->IAudioClient_iface); IAudioClient2_AddRef(&This->IAudioClient2_iface);
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient2 *iface,
REFIID riid, void **ppv) REFIID riid, void **ppv)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
...@@ -1263,7 +1263,9 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, ...@@ -1263,7 +1263,9 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface,
return E_POINTER; return E_POINTER;
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClient)) if (IsEqualIID(riid, &IID_IUnknown) ||
IsEqualIID(riid, &IID_IAudioClient) ||
IsEqualIID(riid, &IID_IAudioClient2))
*ppv = iface; *ppv = iface;
if (*ppv) { if (*ppv) {
IUnknown_AddRef((IUnknown*)*ppv); IUnknown_AddRef((IUnknown*)*ppv);
...@@ -1277,18 +1279,18 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, ...@@ -1277,18 +1279,18 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface,
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI AudioClient_AddRef(IAudioClient *iface) static ULONG WINAPI AudioClient_AddRef(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
ULONG ref; ULONG ref;
ref = InterlockedIncrement(&This->ref); ref = InterlockedIncrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %u\n", This, ref);
return ref; return ref;
} }
static ULONG WINAPI AudioClient_Release(IAudioClient *iface) static ULONG WINAPI AudioClient_Release(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
ULONG ref; ULONG ref;
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %u\n", This, ref);
...@@ -1587,12 +1589,12 @@ static HRESULT pulse_spec_from_waveformat(ACImpl *This, const WAVEFORMATEX *fmt) ...@@ -1587,12 +1589,12 @@ static HRESULT pulse_spec_from_waveformat(ACImpl *This, const WAVEFORMATEX *fmt)
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, static HRESULT WINAPI AudioClient_Initialize(IAudioClient2 *iface,
AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration,
REFERENCE_TIME period, const WAVEFORMATEX *fmt, REFERENCE_TIME period, const WAVEFORMATEX *fmt,
const GUID *sessionguid) const GUID *sessionguid)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
HRESULT hr = S_OK; HRESULT hr = S_OK;
UINT32 bufsize_bytes; UINT32 bufsize_bytes;
...@@ -1711,10 +1713,10 @@ exit: ...@@ -1711,10 +1713,10 @@ exit:
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient2 *iface,
UINT32 *out) UINT32 *out)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%p)\n", This, out); TRACE("(%p)->(%p)\n", This, out);
...@@ -1731,10 +1733,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface, ...@@ -1731,10 +1733,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface,
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient2 *iface,
REFERENCE_TIME *latency) REFERENCE_TIME *latency)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
const pa_buffer_attr *attr; const pa_buffer_attr *attr;
REFERENCE_TIME lat; REFERENCE_TIME lat;
HRESULT hr; HRESULT hr;
...@@ -1781,10 +1783,10 @@ static void ACImpl_GetCapturePad(ACImpl *This, UINT32 *out) ...@@ -1781,10 +1783,10 @@ static void ACImpl_GetCapturePad(ACImpl *This, UINT32 *out)
*out = This->held_bytes / pa_frame_size(&This->ss); *out = This->held_bytes / pa_frame_size(&This->ss);
} }
static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient2 *iface,
UINT32 *out) UINT32 *out)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%p)\n", This, out); TRACE("(%p)->(%p)\n", This, out);
...@@ -1809,11 +1811,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, ...@@ -1809,11 +1811,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient2 *iface,
AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt,
WAVEFORMATEX **out) WAVEFORMATEX **out)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
HRESULT hr = S_OK; HRESULT hr = S_OK;
WAVEFORMATEX *closest = NULL; WAVEFORMATEX *closest = NULL;
BOOL exclusive; BOOL exclusive;
...@@ -1962,10 +1964,10 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, ...@@ -1962,10 +1964,10 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface,
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient2 *iface,
WAVEFORMATEX **pwfx) WAVEFORMATEX **pwfx)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
WAVEFORMATEXTENSIBLE *fmt = &pulse_fmt[This->dataflow == eCapture]; WAVEFORMATEXTENSIBLE *fmt = &pulse_fmt[This->dataflow == eCapture];
TRACE("(%p)->(%p)\n", This, pwfx); TRACE("(%p)->(%p)\n", This, pwfx);
...@@ -1980,10 +1982,10 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, ...@@ -1980,10 +1982,10 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient2 *iface,
REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod) REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
...@@ -1998,9 +2000,9 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, ...@@ -1998,9 +2000,9 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) static HRESULT WINAPI AudioClient_Start(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
HRESULT hr = S_OK; HRESULT hr = S_OK;
int success; int success;
pa_operation *o; pa_operation *o;
...@@ -2049,9 +2051,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) ...@@ -2049,9 +2051,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface)
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
HRESULT hr = S_OK; HRESULT hr = S_OK;
pa_operation *o; pa_operation *o;
int success; int success;
...@@ -2088,9 +2090,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) ...@@ -2088,9 +2090,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface)
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient2 *iface)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
...@@ -2143,10 +2145,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) ...@@ -2143,10 +2145,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface)
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient2 *iface,
HANDLE event) HANDLE event)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%p)\n", This, event); TRACE("(%p)->(%p)\n", This, event);
...@@ -2171,10 +2173,10 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, ...@@ -2171,10 +2173,10 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface,
return hr; return hr;
} }
static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, static HRESULT WINAPI AudioClient_GetService(IAudioClient2 *iface, REFIID riid,
void **ppv) void **ppv)
{ {
ACImpl *This = impl_from_IAudioClient(iface); ACImpl *This = impl_from_IAudioClient2(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
...@@ -2226,7 +2228,38 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, ...@@ -2226,7 +2228,38 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid,
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static const IAudioClientVtbl AudioClient_Vtbl = static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface,
AUDIO_STREAM_CATEGORY category, BOOL *offload_capable)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable);
return E_NOTIMPL;
}
static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface,
const AudioClientProperties *prop)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(%p)\n", This, prop);
return E_NOTIMPL;
}
static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface,
const WAVEFORMATEX *format, BOOL event_driven, REFERENCE_TIME *min_duration,
REFERENCE_TIME *max_duration)
{
ACImpl *This = impl_from_IAudioClient2(iface);
FIXME("(%p)->(%p, %u, %p, %p)\n", This, format, event_driven, min_duration, max_duration);
return E_NOTIMPL;
}
static const IAudioClient2Vtbl AudioClient2_Vtbl =
{ {
AudioClient_QueryInterface, AudioClient_QueryInterface,
AudioClient_AddRef, AudioClient_AddRef,
...@@ -2242,7 +2275,10 @@ static const IAudioClientVtbl AudioClient_Vtbl = ...@@ -2242,7 +2275,10 @@ static const IAudioClientVtbl AudioClient_Vtbl =
AudioClient_Stop, AudioClient_Stop,
AudioClient_Reset, AudioClient_Reset,
AudioClient_SetEventHandle, AudioClient_SetEventHandle,
AudioClient_GetService AudioClient_GetService,
AudioClient_IsOffloadCapable,
AudioClient_SetClientProperties,
AudioClient_GetBufferSizeLimits,
}; };
static HRESULT WINAPI AudioRenderClient_QueryInterface( static HRESULT WINAPI AudioRenderClient_QueryInterface(
...@@ -2273,13 +2309,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( ...@@ -2273,13 +2309,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface(
static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface)
{ {
ACImpl *This = impl_from_IAudioRenderClient(iface); ACImpl *This = impl_from_IAudioRenderClient(iface);
return AudioClient_AddRef(&This->IAudioClient_iface); return AudioClient_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface)
{ {
ACImpl *This = impl_from_IAudioRenderClient(iface); ACImpl *This = impl_from_IAudioRenderClient(iface);
return AudioClient_Release(&This->IAudioClient_iface); return AudioClient_Release(&This->IAudioClient2_iface);
} }
static void alloc_tmp_buffer(ACImpl *This, UINT32 bytes) static void alloc_tmp_buffer(ACImpl *This, UINT32 bytes)
...@@ -2438,13 +2474,13 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( ...@@ -2438,13 +2474,13 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface(
static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface) static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface)
{ {
ACImpl *This = impl_from_IAudioCaptureClient(iface); ACImpl *This = impl_from_IAudioCaptureClient(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface)
{ {
ACImpl *This = impl_from_IAudioCaptureClient(iface); ACImpl *This = impl_from_IAudioCaptureClient(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface,
...@@ -2586,13 +2622,13 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, ...@@ -2586,13 +2622,13 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface,
static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static ULONG WINAPI AudioClock_Release(IAudioClock *iface)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
...@@ -2690,13 +2726,13 @@ static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, ...@@ -2690,13 +2726,13 @@ static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface,
static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface)
{ {
ACImpl *This = impl_from_IAudioClock2(iface); ACImpl *This = impl_from_IAudioClock2(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface)
{ {
ACImpl *This = impl_from_IAudioClock2(iface); ACImpl *This = impl_from_IAudioClock2(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface,
...@@ -2746,13 +2782,13 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface( ...@@ -2746,13 +2782,13 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface(
static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface) static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface)
{ {
ACImpl *This = impl_from_IAudioStreamVolume(iface); ACImpl *This = impl_from_IAudioStreamVolume(iface);
return IAudioClient_AddRef(&This->IAudioClient_iface); return IAudioClient2_AddRef(&This->IAudioClient2_iface);
} }
static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface) static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface)
{ {
ACImpl *This = impl_from_IAudioStreamVolume(iface); ACImpl *This = impl_from_IAudioStreamVolume(iface);
return IAudioClient_Release(&This->IAudioClient_iface); return IAudioClient2_Release(&This->IAudioClient2_iface);
} }
static HRESULT WINAPI AudioStreamVolume_GetChannelCount( static HRESULT WINAPI AudioStreamVolume_GetChannelCount(
...@@ -2904,7 +2940,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ...@@ -2904,7 +2940,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
ret->client = client; ret->client = client;
if (client) { if (client) {
ret->session = client->session; ret->session = client->session;
AudioClient_AddRef(&client->IAudioClient_iface); AudioClient_AddRef(&client->IAudioClient2_iface);
} }
return ret; return ret;
...@@ -2950,7 +2986,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) ...@@ -2950,7 +2986,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
if (!ref) { if (!ref) {
if (This->client) { if (This->client) {
This->client->session_wrapper = NULL; This->client->session_wrapper = NULL;
AudioClient_Release(&This->client->IAudioClient_iface); AudioClient_Release(&This->client->IAudioClient2_iface);
} }
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment