- Wine-Devel - list.winehq.org

[PATCH v2 3/6] winecoreaudio: Introduce a stream structure.
by Andrew Eikum Nov. 17, 2021

Nov. 17, 2021

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 633 +++++++++++++++--------------- dlls/winecoreaudio.drv/unixlib.h | 23 ++ 2 files changed, 337 insertions(+), 319 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f8b538971f2..11be188d110 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -125,35 +125,21 @@ struct ACImpl { IMMDevice *parent; IUnknown *pUnkFTMarshal; - WAVEFORMATEX *fmt; - EDataFlow dataflow; DWORD flags; - AUDCLNT_SHAREMODE share; HANDLE event; float *vols; BOOL initted; AudioDeviceID adevid; AudioObjectPropertyScope scope; - AudioConverterRef converter; - AudioComponentInstance unit; - AudioStreamBasicDescription dev_desc; /* audio unit format, not necessarily the same as fmt */ HANDLE timer; - UINT32 period_ms, bufsize_frames, period_frames; - UINT64 written_frames; - UINT32 lcl_offs_frames, wri_offs_frames, held_frames, tmp_buffer_frames; - UINT32 cap_bufsize_frames, cap_offs_frames, cap_held_frames, wrap_bufsize_frames, resamp_bufsize_frames; - INT32 getbuf_last; - BOOL playing; - BYTE *cap_buffer, *wrap_buffer, *resamp_buffer, *local_buffer, *tmp_buffer; AudioSession *session; AudioSessionWrapper *session_wrapper; + struct coreaudio_stream *stream; struct list entry; - - OSSpinLock lock; }; static const IAudioClient3Vtbl AudioClient3_Vtbl; @@ -556,6 +542,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; + This->stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); + if(!This->stream){ + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; @@ -571,14 +562,16 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient else if(dataflow == eCapture) This->scope = kAudioDevicePropertyScopeInput; else{ + HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); return E_INVALIDARG; } - This->lock = 0; + This->stream->lock = 0; hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { + HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); return hr; } @@ -588,7 +581,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->adevid = adevid; - if(!(This->unit = get_audiounit(This->dataflow, This->adevid))){ + if(!(This->stream->unit = get_audiounit(This->dataflow, This->adevid))){ + HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); return AUDCLNT_E_DEVICE_INVALIDATED; } @@ -650,24 +644,25 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) WaitForSingleObject(event, INFINITE); CloseHandle(event); } - AudioOutputUnitStop(This->unit); - AudioComponentInstanceDispose(This->unit); - if(This->converter) - AudioConverterDispose(This->converter); + AudioOutputUnitStop(This->stream->unit); + AudioComponentInstanceDispose(This->stream->unit); + if(This->stream->converter) + AudioConverterDispose(This->stream->converter); if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - HeapFree(GetProcessHeap(), 0, This->cap_buffer); - HeapFree(GetProcessHeap(), 0, This->local_buffer); - free(This->wrap_buffer); - HeapFree(GetProcessHeap(), 0, This->resamp_buffer); - CoTaskMemFree(This->fmt); + HeapFree(GetProcessHeap(), 0, This->stream->tmp_buffer); + HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); + HeapFree(GetProcessHeap(), 0, This->stream->local_buffer); + free(This->stream->wrap_buffer); + HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); + CoTaskMemFree(This->stream->fmt); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); + HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -890,14 +885,14 @@ static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) { - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; - if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->stream->fmt; + if((This->stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (This->stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * This->fmt->nBlockAlign); + This->stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * This->stream->fmt->nBlockAlign); else - memset(buffer, 0, frames * This->fmt->nBlockAlign); + memset(buffer, 0, frames * This->stream->fmt->nBlockAlign); } /* CA is pulling data from us */ @@ -908,31 +903,31 @@ static OSStatus ca_render_cb(void *user, AudioUnitRenderActionFlags *flags, ACImpl *This = user; UINT32 to_copy_bytes, to_copy_frames, chunk_bytes, lcl_offs_bytes; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - if(This->playing){ - lcl_offs_bytes = This->lcl_offs_frames * This->fmt->nBlockAlign; - to_copy_frames = min(nframes, This->held_frames); - to_copy_bytes = to_copy_frames * This->fmt->nBlockAlign; + if(This->stream->playing){ + lcl_offs_bytes = This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign; + to_copy_frames = min(nframes, This->stream->held_frames); + to_copy_bytes = to_copy_frames * This->stream->fmt->nBlockAlign; - chunk_bytes = (This->bufsize_frames - This->lcl_offs_frames) * This->fmt->nBlockAlign; + chunk_bytes = (This->stream->bufsize_frames - This->stream->lcl_offs_frames) * This->stream->fmt->nBlockAlign; if(to_copy_bytes > chunk_bytes){ - memcpy(data->mBuffers[0].mData, This->local_buffer + lcl_offs_bytes, chunk_bytes); - memcpy(((BYTE *)data->mBuffers[0].mData) + chunk_bytes, This->local_buffer, to_copy_bytes - chunk_bytes); + memcpy(data->mBuffers[0].mData, This->stream->local_buffer + lcl_offs_bytes, chunk_bytes); + memcpy(((BYTE *)data->mBuffers[0].mData) + chunk_bytes, This->stream->local_buffer, to_copy_bytes - chunk_bytes); }else - memcpy(data->mBuffers[0].mData, This->local_buffer + lcl_offs_bytes, to_copy_bytes); + memcpy(data->mBuffers[0].mData, This->stream->local_buffer + lcl_offs_bytes, to_copy_bytes); - This->lcl_offs_frames += to_copy_frames; - This->lcl_offs_frames %= This->bufsize_frames; - This->held_frames -= to_copy_frames; + This->stream->lcl_offs_frames += to_copy_frames; + This->stream->lcl_offs_frames %= This->stream->bufsize_frames; + This->stream->held_frames -= to_copy_frames; }else to_copy_bytes = to_copy_frames = 0; if(nframes > to_copy_frames) silence_buffer(This, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return noErr; } @@ -950,38 +945,38 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe { ACImpl *This = user; - *nframes = min(*nframes, This->cap_held_frames); + *nframes = min(*nframes, This->stream->cap_held_frames); if(!*nframes){ data->mBuffers[0].mData = NULL; data->mBuffers[0].mDataByteSize = 0; - data->mBuffers[0].mNumberChannels = This->fmt->nChannels; + data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; return noErr; } - data->mBuffers[0].mDataByteSize = *nframes * This->fmt->nBlockAlign; - data->mBuffers[0].mNumberChannels = This->fmt->nChannels; + data->mBuffers[0].mDataByteSize = *nframes * This->stream->fmt->nBlockAlign; + data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - if(This->cap_offs_frames + *nframes > This->cap_bufsize_frames){ - UINT32 chunk_frames = This->cap_bufsize_frames - This->cap_offs_frames; + if(This->stream->cap_offs_frames + *nframes > This->stream->cap_bufsize_frames){ + UINT32 chunk_frames = This->stream->cap_bufsize_frames - This->stream->cap_offs_frames; - if(This->wrap_bufsize_frames < *nframes){ - free(This->wrap_buffer); - This->wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); - This->wrap_bufsize_frames = *nframes; + if(This->stream->wrap_bufsize_frames < *nframes){ + free(This->stream->wrap_buffer); + This->stream->wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); + This->stream->wrap_bufsize_frames = *nframes; } - memcpy(This->wrap_buffer, This->cap_buffer + This->cap_offs_frames * This->fmt->nBlockAlign, - chunk_frames * This->fmt->nBlockAlign); - memcpy(This->wrap_buffer + chunk_frames * This->fmt->nBlockAlign, This->cap_buffer, - (*nframes - chunk_frames) * This->fmt->nBlockAlign); + memcpy(This->stream->wrap_buffer, This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign, + chunk_frames * This->stream->fmt->nBlockAlign); + memcpy(This->stream->wrap_buffer + chunk_frames * This->stream->fmt->nBlockAlign, This->stream->cap_buffer, + (*nframes - chunk_frames) * This->stream->fmt->nBlockAlign); - data->mBuffers[0].mData = This->wrap_buffer; + data->mBuffers[0].mData = This->stream->wrap_buffer; }else - data->mBuffers[0].mData = This->cap_buffer + This->cap_offs_frames * This->fmt->nBlockAlign; + data->mBuffers[0].mData = This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign; - This->cap_offs_frames += *nframes; - This->cap_offs_frames %= This->cap_bufsize_frames; - This->cap_held_frames -= *nframes; + This->stream->cap_offs_frames += *nframes; + This->stream->cap_offs_frames %= This->stream->cap_bufsize_frames; + This->stream->cap_held_frames -= *nframes; if(packets) *packets = NULL; @@ -991,48 +986,48 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe static void capture_resample(ACImpl *This) { - UINT32 resamp_period_frames = MulDiv(This->period_frames, This->dev_desc.mSampleRate, This->fmt->nSamplesPerSec); + UINT32 resamp_period_frames = MulDiv(This->stream->period_frames, This->stream->dev_desc.mSampleRate, This->stream->fmt->nSamplesPerSec); OSStatus sc; /* the resampling process often needs more source frames than we'd * guess from a straight conversion using the sample rate ratio. so * only convert if we have extra source data. */ - while(This->cap_held_frames > resamp_period_frames * 2){ + while(This->stream->cap_held_frames > resamp_period_frames * 2){ AudioBufferList converted_list; - UInt32 wanted_frames = This->period_frames; + UInt32 wanted_frames = This->stream->period_frames; converted_list.mNumberBuffers = 1; - converted_list.mBuffers[0].mNumberChannels = This->fmt->nChannels; - converted_list.mBuffers[0].mDataByteSize = wanted_frames * This->fmt->nBlockAlign; + converted_list.mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; + converted_list.mBuffers[0].mDataByteSize = wanted_frames * This->stream->fmt->nBlockAlign; - if(This->resamp_bufsize_frames < wanted_frames){ - HeapFree(GetProcessHeap(), 0, This->resamp_buffer); - This->resamp_buffer = HeapAlloc(GetProcessHeap(), 0, converted_list.mBuffers[0].mDataByteSize); - This->resamp_bufsize_frames = wanted_frames; + if(This->stream->resamp_bufsize_frames < wanted_frames){ + HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); + This->stream->resamp_buffer = HeapAlloc(GetProcessHeap(), 0, converted_list.mBuffers[0].mDataByteSize); + This->stream->resamp_bufsize_frames = wanted_frames; } - converted_list.mBuffers[0].mData = This->resamp_buffer; + converted_list.mBuffers[0].mData = This->stream->resamp_buffer; - sc = AudioConverterFillComplexBuffer(This->converter, feed_cb, + sc = AudioConverterFillComplexBuffer(This->stream->converter, feed_cb, This, &wanted_frames, &converted_list, NULL); if(sc != noErr){ WARN("AudioConverterFillComplexBuffer failed: %x\n", (int)sc); break; } - ca_wrap_buffer(This->local_buffer, - This->wri_offs_frames * This->fmt->nBlockAlign, - This->bufsize_frames * This->fmt->nBlockAlign, - This->resamp_buffer, wanted_frames * This->fmt->nBlockAlign); + ca_wrap_buffer(This->stream->local_buffer, + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, + This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, + This->stream->resamp_buffer, wanted_frames * This->stream->fmt->nBlockAlign); - This->wri_offs_frames += wanted_frames; - This->wri_offs_frames %= This->bufsize_frames; - if(This->held_frames + wanted_frames > This->bufsize_frames){ - This->lcl_offs_frames += buf_ptr_diff(This->lcl_offs_frames, - This->wri_offs_frames, This->bufsize_frames); - This->held_frames = This->bufsize_frames; + This->stream->wri_offs_frames += wanted_frames; + This->stream->wri_offs_frames %= This->stream->bufsize_frames; + if(This->stream->held_frames + wanted_frames > This->stream->bufsize_frames){ + This->stream->lcl_offs_frames += buf_ptr_diff(This->stream->lcl_offs_frames, + This->stream->wri_offs_frames, This->stream->bufsize_frames); + This->stream->held_frames = This->stream->bufsize_frames; }else - This->held_frames += wanted_frames; + This->stream->held_frames += wanted_frames; } } @@ -1052,48 +1047,48 @@ static OSStatus ca_capture_cb(void *user, AudioUnitRenderActionFlags *flags, OSStatus sc; UINT32 cap_wri_offs_frames; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - cap_wri_offs_frames = (This->cap_offs_frames + This->cap_held_frames) % This->cap_bufsize_frames; + cap_wri_offs_frames = (This->stream->cap_offs_frames + This->stream->cap_held_frames) % This->stream->cap_bufsize_frames; list.mNumberBuffers = 1; - list.mBuffers[0].mNumberChannels = This->fmt->nChannels; - list.mBuffers[0].mDataByteSize = nframes * This->fmt->nBlockAlign; + list.mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; + list.mBuffers[0].mDataByteSize = nframes * This->stream->fmt->nBlockAlign; - if(!This->playing || cap_wri_offs_frames + nframes > This->cap_bufsize_frames){ - if(This->wrap_bufsize_frames < nframes){ - free(This->wrap_buffer); - This->wrap_buffer = malloc(list.mBuffers[0].mDataByteSize); - This->wrap_bufsize_frames = nframes; + if(!This->stream->playing || cap_wri_offs_frames + nframes > This->stream->cap_bufsize_frames){ + if(This->stream->wrap_bufsize_frames < nframes){ + free(This->stream->wrap_buffer); + This->stream->wrap_buffer = malloc(list.mBuffers[0].mDataByteSize); + This->stream->wrap_bufsize_frames = nframes; } - list.mBuffers[0].mData = This->wrap_buffer; + list.mBuffers[0].mData = This->stream->wrap_buffer; }else - list.mBuffers[0].mData = This->cap_buffer + cap_wri_offs_frames * This->fmt->nBlockAlign; + list.mBuffers[0].mData = This->stream->cap_buffer + cap_wri_offs_frames * This->stream->fmt->nBlockAlign; - sc = AudioUnitRender(This->unit, flags, ts, bus, nframes, &list); + sc = AudioUnitRender(This->stream->unit, flags, ts, bus, nframes, &list); if(sc != noErr){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return sc; } - if(This->playing){ - if(list.mBuffers[0].mData == This->wrap_buffer){ - ca_wrap_buffer(This->cap_buffer, - cap_wri_offs_frames * This->fmt->nBlockAlign, - This->cap_bufsize_frames * This->fmt->nBlockAlign, - This->wrap_buffer, list.mBuffers[0].mDataByteSize); + if(This->stream->playing){ + if(list.mBuffers[0].mData == This->stream->wrap_buffer){ + ca_wrap_buffer(This->stream->cap_buffer, + cap_wri_offs_frames * This->stream->fmt->nBlockAlign, + This->stream->cap_bufsize_frames * This->stream->fmt->nBlockAlign, + This->stream->wrap_buffer, list.mBuffers[0].mDataByteSize); } - This->cap_held_frames += list.mBuffers[0].mDataByteSize / This->fmt->nBlockAlign; - if(This->cap_held_frames > This->cap_bufsize_frames){ - This->cap_offs_frames += This->cap_held_frames % This->cap_bufsize_frames; - This->cap_offs_frames %= This->cap_bufsize_frames; - This->cap_held_frames = This->cap_bufsize_frames; + This->stream->cap_held_frames += list.mBuffers[0].mDataByteSize / This->stream->fmt->nBlockAlign; + if(This->stream->cap_held_frames > This->stream->cap_bufsize_frames){ + This->stream->cap_offs_frames += This->stream->cap_held_frames % This->stream->cap_bufsize_frames; + This->stream->cap_offs_frames %= This->stream->cap_bufsize_frames; + This->stream->cap_held_frames = This->stream->cap_bufsize_frames; } } - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return noErr; } @@ -1244,31 +1239,31 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_ALREADY_INITIALIZED; } - This->fmt = clone_format(fmt); - if(!This->fmt){ - OSSpinLockUnlock(&This->lock); + This->stream->fmt = clone_format(fmt); + if(!This->stream->fmt){ + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } - This->period_ms = period / 10000; - This->period_frames = MulDiv(period, This->fmt->nSamplesPerSec, 10000000); + This->stream->period_ms = period / 10000; + This->stream->period_frames = MulDiv(period, This->stream->fmt->nSamplesPerSec, 10000000); - This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + This->stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - This->bufsize_frames -= This->bufsize_frames % This->period_frames; + This->stream->bufsize_frames -= This->stream->bufsize_frames % This->stream->period_frames; - hr = ca_setup_audiounit(This->dataflow, This->unit, This->fmt, &This->dev_desc, &This->converter); + hr = ca_setup_audiounit(This->dataflow, This->stream->unit, This->stream->fmt, &This->stream->dev_desc, &This->stream->converter); if(FAILED(hr)){ - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return hr; } @@ -1279,15 +1274,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, input.inputProc = &ca_capture_cb; input.inputProcRefCon = This; - sc = AudioUnitSetProperty(This->unit, kAudioOutputUnitProperty_SetInputCallback, + sc = AudioUnitSetProperty(This->stream->unit, kAudioOutputUnitProperty_SetInputCallback, kAudioUnitScope_Output, 1, &input, sizeof(input)); if(sc != noErr){ WARN("Couldn't set callback: %x\n", (int)sc); - AudioConverterDispose(This->converter); - This->converter = NULL; - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + AudioConverterDispose(This->stream->converter); + This->stream->converter = NULL; + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } }else{ @@ -1297,65 +1292,65 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, input.inputProc = &ca_render_cb; input.inputProcRefCon = This; - sc = AudioUnitSetProperty(This->unit, kAudioUnitProperty_SetRenderCallback, + sc = AudioUnitSetProperty(This->stream->unit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, 0, &input, sizeof(input)); if(sc != noErr){ WARN("Couldn't set callback: %x\n", (int)sc); - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } } - sc = AudioUnitInitialize(This->unit); + sc = AudioUnitInitialize(This->stream->unit); if(sc != noErr){ WARN("Couldn't initialize: %x\n", (int)sc); - if(This->converter){ - AudioConverterDispose(This->converter); - This->converter = NULL; + if(This->stream->converter){ + AudioConverterDispose(This->stream->converter); + This->stream->converter = NULL; } - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } /* we play audio continuously because AudioOutputUnitStart sometimes takes * a while to return */ - sc = AudioOutputUnitStart(This->unit); + sc = AudioOutputUnitStart(This->stream->unit); if(sc != noErr){ WARN("Unit failed to start: %x\n", (int)sc); - if(This->converter){ - AudioConverterDispose(This->converter); - This->converter = NULL; + if(This->stream->converter){ + AudioConverterDispose(This->stream->converter); + This->stream->converter = NULL; } - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } - This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign); - silence_buffer(This, This->local_buffer, This->bufsize_frames); + This->stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->bufsize_frames * fmt->nBlockAlign); + silence_buffer(This, This->stream->local_buffer, This->stream->bufsize_frames); if(This->dataflow == eCapture){ - This->cap_bufsize_frames = MulDiv(duration, This->dev_desc.mSampleRate, 10000000); - This->cap_buffer = HeapAlloc(GetProcessHeap(), 0, This->cap_bufsize_frames * This->fmt->nBlockAlign); + This->stream->cap_bufsize_frames = MulDiv(duration, This->stream->dev_desc.mSampleRate, 10000000); + This->stream->cap_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->cap_bufsize_frames * This->stream->fmt->nBlockAlign); } This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); if(!This->vols){ - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } for(i = 0; i < fmt->nChannels; ++i) This->vols[i] = 1.f; - This->share = mode; + This->stream->share = mode; This->flags = flags; EnterCriticalSection(&g_sessions_lock); @@ -1364,11 +1359,11 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, &This->session); if(FAILED(hr)){ LeaveCriticalSection(&g_sessions_lock); - CoTaskMemFree(This->fmt); - This->fmt = NULL; + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_INVALIDARG; } @@ -1380,7 +1375,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->initted = TRUE; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1395,16 +1390,16 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!frames) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - *frames = This->bufsize_frames; + *frames = This->stream->bufsize_frames; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1477,10 +1472,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!out) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1493,23 +1488,23 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, &size, &latency); if(sc != noErr){ WARN("Couldn't get _Latency property: %x\n", (int)sc); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } hr = ca_get_max_stream_latency(This, &stream_latency); if(FAILED(hr)){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } latency += stream_latency; /* pretend we process audio in Period chunks, so max latency includes * the period time */ - *out = MulDiv(latency, 10000000, This->fmt->nSamplesPerSec) - + This->period_ms * 10000; + *out = MulDiv(latency, 10000000, This->stream->fmt->nSamplesPerSec) + + This->stream->period_ms * 10000; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1523,7 +1518,7 @@ static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, if(This->dataflow == eCapture) capture_resample(This); - *numpad = This->held_frames; + *numpad = This->stream->held_frames; return S_OK; } @@ -1539,11 +1534,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!numpad) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); hr = AudioClient_GetCurrentPadding_nolock(This, numpad); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } @@ -1891,35 +1886,35 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - if(This->playing){ - OSSpinLockUnlock(&This->lock); + if(This->stream->playing){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_STOPPED; } if((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_EVENTHANDLE_NOT_SET; } if(This->event && !This->timer) if(!CreateTimerQueueTimer(&This->timer, g_timer_q, ca_period_cb, - This, 0, This->period_ms, WT_EXECUTEINTIMERTHREAD)){ + This, 0, This->stream->period_ms, WT_EXECUTEINTIMERTHREAD)){ This->timer = NULL; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); WARN("Unable to create timer: %u\n", GetLastError()); return E_OUTOFMEMORY; } - This->playing = TRUE; + This->stream->playing = TRUE; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1930,21 +1925,21 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - if(!This->playing){ - OSSpinLockUnlock(&This->lock); + if(!This->stream->playing){ + OSSpinLockUnlock(&This->stream->lock); return S_FALSE; } - This->playing = FALSE; + This->stream->playing = FALSE; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1955,36 +1950,36 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - if(This->playing){ - OSSpinLockUnlock(&This->lock); + if(This->stream->playing){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_STOPPED; } - if(This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } if(This->dataflow == eRender){ - This->written_frames = 0; + This->stream->written_frames = 0; }else{ - This->written_frames += This->held_frames; + This->stream->written_frames += This->stream->held_frames; } - This->held_frames = 0; - This->lcl_offs_frames = 0; - This->wri_offs_frames = 0; - This->cap_offs_frames = 0; - This->cap_held_frames = 0; + This->stream->held_frames = 0; + This->stream->lcl_offs_frames = 0; + This->stream->wri_offs_frames = 0; + This->stream->cap_offs_frames = 0; + This->stream->cap_held_frames = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1999,27 +1994,27 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!event) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; } if (This->event){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); FIXME("called twice\n"); return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); } This->event = event; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2035,23 +2030,23 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); @@ -2066,7 +2061,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } }else @@ -2077,7 +2072,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } }else @@ -2088,7 +2083,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } }else @@ -2098,11 +2093,11 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, } if(*ppv){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); FIXME("stub %s\n", debugstr_guid(riid)); return E_NOINTERFACE; @@ -2274,49 +2269,49 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return E_POINTER; *data = NULL; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - if(This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } if(!frames){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } hr = AudioClient_GetCurrentPadding_nolock(This, &pad); if(FAILED(hr)){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } - if(pad + frames > This->bufsize_frames){ - OSSpinLockUnlock(&This->lock); + if(pad + frames > This->stream->bufsize_frames){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_BUFFER_TOO_LARGE; } - if(This->wri_offs_frames + frames > This->bufsize_frames){ - if(This->tmp_buffer_frames < frames){ - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, frames * This->fmt->nBlockAlign); - if(!This->tmp_buffer){ - OSSpinLockUnlock(&This->lock); + if(This->stream->wri_offs_frames + frames > This->stream->bufsize_frames){ + if(This->stream->tmp_buffer_frames < frames){ + HeapFree(GetProcessHeap(), 0, This->stream->tmp_buffer); + This->stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, frames * This->stream->fmt->nBlockAlign); + if(!This->stream->tmp_buffer){ + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } - This->tmp_buffer_frames = frames; + This->stream->tmp_buffer_frames = frames; } - *data = This->tmp_buffer; - This->getbuf_last = -frames; + *data = This->stream->tmp_buffer; + This->stream->getbuf_last = -frames; }else{ - *data = This->local_buffer + This->wri_offs_frames * This->fmt->nBlockAlign; - This->getbuf_last = frames; + *data = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; + This->stream->getbuf_last = frames; } silence_buffer(This, *data, frames); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2329,46 +2324,46 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( TRACE("(%p)->(%u, %x)\n", This, frames, flags); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!frames){ - This->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + This->stream->getbuf_last = 0; + OSSpinLockUnlock(&This->stream->lock); return S_OK; } - if(!This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(!This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } - if(frames > (This->getbuf_last >= 0 ? This->getbuf_last : -This->getbuf_last)){ - OSSpinLockUnlock(&This->lock); + if(frames > (This->stream->getbuf_last >= 0 ? This->stream->getbuf_last : -This->stream->getbuf_last)){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_INVALID_SIZE; } - if(This->getbuf_last >= 0) - buffer = This->local_buffer + This->wri_offs_frames * This->fmt->nBlockAlign; + if(This->stream->getbuf_last >= 0) + buffer = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; else - buffer = This->tmp_buffer; + buffer = This->stream->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT) silence_buffer(This, buffer, frames); - if(This->getbuf_last < 0) - ca_wrap_buffer(This->local_buffer, - This->wri_offs_frames * This->fmt->nBlockAlign, - This->bufsize_frames * This->fmt->nBlockAlign, - buffer, frames * This->fmt->nBlockAlign); + if(This->stream->getbuf_last < 0) + ca_wrap_buffer(This->stream->local_buffer, + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, + This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, + buffer, frames * This->stream->fmt->nBlockAlign); - This->wri_offs_frames += frames; - This->wri_offs_frames %= This->bufsize_frames; - This->held_frames += frames; - This->written_frames += frames; - This->getbuf_last = 0; + This->stream->wri_offs_frames += frames; + This->stream->wri_offs_frames %= This->stream->bufsize_frames; + This->stream->held_frames += frames; + This->stream->written_frames += frames; + This->stream->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2436,38 +2431,38 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - if(This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } capture_resample(This); - if(This->held_frames < This->period_frames){ + if(This->stream->held_frames < This->stream->period_frames){ *frames = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_S_BUFFER_EMPTY; } *flags = 0; - chunk_frames = This->bufsize_frames - This->lcl_offs_frames; - if(chunk_frames < This->period_frames){ - chunk_bytes = chunk_frames * This->fmt->nBlockAlign; - if(!This->tmp_buffer) - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, This->period_frames * This->fmt->nBlockAlign); - *data = This->tmp_buffer; - memcpy(*data, This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign, chunk_bytes); - memcpy((*data) + chunk_bytes, This->local_buffer, This->period_frames * This->fmt->nBlockAlign - chunk_bytes); + chunk_frames = This->stream->bufsize_frames - This->stream->lcl_offs_frames; + if(chunk_frames < This->stream->period_frames){ + chunk_bytes = chunk_frames * This->stream->fmt->nBlockAlign; + if(!This->stream->tmp_buffer) + This->stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->period_frames * This->stream->fmt->nBlockAlign); + *data = This->stream->tmp_buffer; + memcpy(*data, This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign, chunk_bytes); + memcpy((*data) + chunk_bytes, This->stream->local_buffer, This->stream->period_frames * This->stream->fmt->nBlockAlign - chunk_bytes); }else - *data = This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign; + *data = This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign; - This->getbuf_last = *frames = This->period_frames; + This->stream->getbuf_last = *frames = This->stream->period_frames; if(devpos) - *devpos = This->written_frames; + *devpos = This->stream->written_frames; if(qpcpos){ /* fixme: qpc of recording time */ LARGE_INTEGER stamp, freq; QueryPerformanceCounter(&stamp); @@ -2475,7 +2470,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; } - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2487,31 +2482,31 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( TRACE("(%p)->(%u)\n", This, done); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!done){ - This->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + This->stream->getbuf_last = 0; + OSSpinLockUnlock(&This->stream->lock); return S_OK; } - if(!This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(!This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } - if(This->getbuf_last != done){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last != done){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_INVALID_SIZE; } - This->written_frames += done; - This->held_frames -= done; - This->lcl_offs_frames += done; - This->lcl_offs_frames %= This->bufsize_frames; - This->getbuf_last = 0; + This->stream->written_frames += done; + This->stream->held_frames -= done; + This->stream->lcl_offs_frames += done; + This->stream->lcl_offs_frames %= This->stream->bufsize_frames; + This->stream->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2526,16 +2521,16 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( if(!frames) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); capture_resample(This); - if(This->held_frames >= This->period_frames) - *frames = This->period_frames; + if(This->stream->held_frames >= This->stream->period_frames) + *frames = This->stream->period_frames; else *frames = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2592,10 +2587,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); - if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) + *freq = (UINT64)This->stream->fmt->nSamplesPerSec * This->stream->fmt->nBlockAlign; else - *freq = This->fmt->nSamplesPerSec; + *freq = This->stream->fmt->nSamplesPerSec; return S_OK; } @@ -2603,10 +2598,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, UINT64 *pos, UINT64 *qpctime) { - *pos = This->written_frames - This->held_frames; + *pos = This->stream->written_frames - This->stream->held_frames; - if(This->share == AUDCLNT_SHAREMODE_SHARED) - *pos *= This->fmt->nBlockAlign; + if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) + *pos *= This->stream->fmt->nBlockAlign; if(qpctime){ LARGE_INTEGER stamp, freq; @@ -2629,11 +2624,11 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, if(!pos) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); hr = AudioClock_GetPosition_nolock(This, pos, qpctime); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } @@ -2763,9 +2758,9 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ if(This->client){ - OSSpinLockLock(&This->client->lock); + OSSpinLockLock(&This->client->stream->lock); This->client->session_wrapper = NULL; - OSSpinLockUnlock(&This->client->lock); + OSSpinLockUnlock(&This->client->stream->lock); AudioClient_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); @@ -2793,14 +2788,14 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - OSSpinLockLock(&client->lock); - if(client->playing){ + OSSpinLockLock(&client->stream->lock); + if(client->stream->playing){ *state = AudioSessionStateActive; - OSSpinLockUnlock(&client->lock); + OSSpinLockUnlock(&client->stream->lock); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - OSSpinLockUnlock(&client->lock); + OSSpinLockUnlock(&client->stream->lock); } LeaveCriticalSection(&g_sessions_lock); @@ -2979,7 +2974,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) if(index == (UINT32)-1){ UINT32 i; level = 1.; - for(i = 0; i < This->fmt->nChannels; ++i){ + for(i = 0; i < This->stream->fmt->nChannels; ++i){ Float32 tmp; tmp = This->session->master_vol * This->session->channel_vols[i] * This->vols[i]; @@ -2990,7 +2985,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) This->session->channel_vols[index] * This->vols[index]; } - sc = AudioUnitSetParameter(This->unit, kHALOutputParam_Volume, + sc = AudioUnitSetParameter(This->stream->unit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, level, 0); if(sc != noErr) WARN("Couldn't set volume: %x\n", (int)sc); @@ -3180,7 +3175,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if(!out) return E_POINTER; - *out = This->fmt->nChannels; + *out = This->stream->fmt->nChannels; return S_OK; } @@ -3196,17 +3191,17 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(level < 0.f || level > 1.f) return E_INVALIDARG; - if(index >= This->fmt->nChannels) + if(index >= This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); ret = ca_setvol(This, index); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return ret; } @@ -3221,7 +3216,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if(!level) return E_POINTER; - if(index >= This->fmt->nChannels) + if(index >= This->stream->fmt->nChannels) return E_INVALIDARG; *level = This->vols[index]; @@ -3241,17 +3236,17 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; ret = ca_setvol(This, -1); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return ret; } @@ -3267,15 +3262,15 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 7c1200464b9..6a991f1de98 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -18,6 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +struct coreaudio_stream /* To be made private */ +{ + OSSpinLock lock; + AudioComponentInstance unit; + AudioConverterRef converter; + AudioStreamBasicDescription dev_desc; /* audio unit format, not necessarily the same as fmt */ + AudioDeviceID dev_id; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + + BOOL playing; + SIZE_T local_buffer_size, tmp_buffer_size; + UINT32 period_ms, period_frames; + UINT32 bufsize_frames, resamp_bufsize_frames; + UINT32 lcl_offs_frames, held_frames, wri_offs_frames, tmp_buffer_frames; + UINT32 cap_bufsize_frames, cap_offs_frames, cap_held_frames; + UINT32 wrap_bufsize_frames; + UINT64 written_frames; + INT32 getbuf_last; + WAVEFORMATEX *fmt; + BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; +}; + struct endpoint { WCHAR *name; -- 2.33.1

1 0

[PATCH v2 2/6] winecoreaudio: Move get_endpoint_ids to a unixlib.
by Andrew Eikum Nov. 17, 2021

Nov. 17, 2021

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/Makefile.in | 1 + dlls/winecoreaudio.drv/coreaudio.c | 229 ++++++++++++++++++++++++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 211 ++++++++------------------ dlls/winecoreaudio.drv/unixlib.h | 44 ++++++ 4 files changed, 326 insertions(+), 159 deletions(-) create mode 100644 dlls/winecoreaudio.drv/unixlib.h diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index afbc50c7148..b6bf5bd4587 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -1,4 +1,5 @@ MODULE = winecoreaudio.drv +UNIXLIB = winecoreaudio.so IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(COREAUDIO_LIBS) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 1f222367bed..f3af24f80fb 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1,5 +1,8 @@ /* - * Wine Driver for CoreAudio + * Unixlib for winecoreaudio driver. + * + * Copyright 2011 Andrew Eikum for CodeWeavers + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,16 +18,230 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - +#if 0 +#pragma makedep unix +#endif #include "config.h" +#define LoadResource __carbon_LoadResource +#define CompareString __carbon_CompareString +#define GetCurrentThread __carbon_GetCurrentThread +#define GetCurrentProcess __carbon_GetCurrentProcess + #include <stdarg.h> +#include <errno.h> +#include <limits.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/ioctl.h> +#include <fcntl.h> +#include <fenv.h> +#include <unistd.h> + +#include <libkern/OSAtomic.h> +#include <CoreAudio/CoreAudio.h> +#include <AudioToolbox/AudioFormat.h> +#include <AudioToolbox/AudioConverter.h> +#include <AudioUnit/AudioUnit.h> + +#undef LoadResource +#undef CompareString +#undef GetCurrentThread +#undef GetCurrentProcess +#undef _CDECL + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" -#include "coreaudio.h" +#include "winnls.h" +#include "winreg.h" +#include "mmdeviceapi.h" +#include "initguid.h" +#include "audioclient.h" #include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/unixlib.h" + +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); + +static HRESULT osstatus_to_hresult(OSStatus sc) +{ + switch(sc){ + case kAudioFormatUnsupportedDataFormatError: + case kAudioFormatUnknownFormatError: + case kAudioDeviceUnsupportedFormatError: + return AUDCLNT_E_UNSUPPORTED_FORMAT; + case kAudioHardwareBadDeviceError: + return AUDCLNT_E_DEVICE_INVALIDATED; + } + return E_FAIL; +} + +static AudioObjectPropertyScope get_scope(EDataFlow flow) +{ + return (flow == eRender) ? kAudioDevicePropertyScopeOutput : kAudioDevicePropertyScopeInput; +} + +static BOOL device_has_channels(AudioDeviceID device, EDataFlow flow) +{ + AudioObjectPropertyAddress addr; + AudioBufferList *buffers; + BOOL ret = FALSE; + OSStatus sc; + UInt32 size; + int i; + + addr.mSelector = kAudioDevicePropertyStreamConfiguration; + addr.mScope = get_scope(flow); + addr.mElement = 0; + + sc = AudioObjectGetPropertyDataSize(device, &addr, 0, NULL, &size); + if(sc != noErr){ + WARN("Unable to get _StreamConfiguration property size for device %u: %x\n", + (unsigned int)device, (int)sc); + return FALSE; + } + + buffers = malloc(size); + if(!buffers) return FALSE; + + sc = AudioObjectGetPropertyData(device, &addr, 0, NULL, &size, buffers); + if(sc != noErr){ + WARN("Unable to get _StreamConfiguration property for device %u: %x\n", + (unsigned int)device, (int)sc); + free(buffers); + return FALSE; + } + + for(i = 0; i < buffers->mNumberBuffers; i++){ + if(buffers->mBuffers[i].mNumberChannels > 0){ + ret = TRUE; + break; + } + } + free(buffers); + return ret; +} + +static NTSTATUS get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + unsigned int num_devices, i, needed; + AudioDeviceID *devices, default_id; + AudioObjectPropertyAddress addr; + struct endpoint *endpoint; + UInt32 devsize, size; + struct endpoint_info + { + CFStringRef name; + AudioDeviceID id; + } *info; + OSStatus sc; + WCHAR *ptr; + + params->num = 0; + params->default_idx = 0; + + addr.mScope = kAudioObjectPropertyScopeGlobal; + addr.mElement = kAudioObjectPropertyElementMaster; + if(params->flow == eRender) addr.mSelector = kAudioHardwarePropertyDefaultOutputDevice; + else if(params->flow == eCapture) addr.mSelector = kAudioHardwarePropertyDefaultInputDevice; + else{ + params->result = E_INVALIDARG; + return STATUS_SUCCESS; + } + + size = sizeof(default_id); + sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, &size, &default_id); + if(sc != noErr){ + WARN("Getting _DefaultInputDevice property failed: %x\n", (int)sc); + default_id = -1; + } + + addr.mSelector = kAudioHardwarePropertyDevices; + sc = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &addr, 0, NULL, &devsize); + if(sc != noErr){ + WARN("Getting _Devices property size failed: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + num_devices = devsize / sizeof(AudioDeviceID); + devices = malloc(devsize); + info = malloc(num_devices * sizeof(*info)); + if(!devices || !info){ + free(info); + free(devices); + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, &devsize, devices); + if(sc != noErr){ + WARN("Getting _Devices property failed: %x\n", (int)sc); + free(info); + free(devices); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + addr.mSelector = kAudioObjectPropertyName; + addr.mScope = get_scope(params->flow); + addr.mElement = 0; + + for(i = 0; i < num_devices; i++){ + if(!device_has_channels(devices[i], params->flow)) continue; + + size = sizeof(CFStringRef); + sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, &size, &info[params->num].name); + if(sc != noErr){ + WARN("Unable to get _Name property for device %u: %x\n", + (unsigned int)devices[i], (int)sc); + continue; + } + info[params->num++].id = devices[i]; + } + free(devices); + + needed = sizeof(*endpoint) * params->num; + endpoint = params->endpoints; + ptr = (WCHAR *)(endpoint + params->num); + + for(i = 0; i < params->num; i++){ + SIZE_T len = CFStringGetLength(info[i].name); + needed += (len + 1) * sizeof(WCHAR); + + if(needed <= params->size){ + endpoint->name = ptr; + CFStringGetCharacters(info[i].name, CFRangeMake(0, len), (UniChar*)endpoint->name); + ptr[len] = 0; + endpoint->id = info[i].id; + endpoint++; + ptr += len + 1; + } + CFRelease(info[i].name); + if(info[i].id == default_id) params->default_idx = i; + } + free(info); + + if(needed > params->size){ + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + else params->result = S_OK; + + return STATUS_SUCCESS; +} + +unixlib_entry_t __wine_unix_call_funcs[] = +{ + get_endpoint_ids, +}; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f07f4bae5fb..f8b538971f2 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -56,8 +56,10 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wine/list.h" +#include "wine/unixlib.h" #include "ole2.h" #include "mmdeviceapi.h" @@ -69,9 +71,12 @@ #include "endpointvolume.h" #include "audioclient.h" #include "audiopolicy.h" +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); +unixlib_handle_t coreaudio_handle = 0; + #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; @@ -245,6 +250,9 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: + if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, + &coreaudio_handle, sizeof(coreaudio_handle), NULL)) + return FALSE; g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; @@ -319,7 +327,7 @@ exit: RegCloseKey(drv_key); } -static void get_device_guid(EDataFlow flow, AudioDeviceID device, GUID *guid) +static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) { HKEY key = NULL, dev_key; DWORD type, size = sizeof(*guid); @@ -333,7 +341,7 @@ static void get_device_guid(EDataFlow flow, AudioDeviceID device, GUID *guid) key_name[0] = '0'; key_name[1] = ','; - sprintfW(key_name + 2, key_fmt, device); + sprintfW(key_name + 2, key_fmt, device_id); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ @@ -359,164 +367,61 @@ static void get_device_guid(EDataFlow flow, AudioDeviceID device, GUID *guid) RegCloseKey(key); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, - GUID **guids, UINT *num, UINT *def_index) +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, + GUID **guids_out, UINT *num, UINT *def_index) { - UInt32 devsize, size; - AudioDeviceID *devices; - AudioDeviceID default_id; - AudioObjectPropertyAddress addr; - OSStatus sc; - int i, ndevices; - - TRACE("%d %p %p %p\n", flow, ids, num, def_index); - - addr.mScope = kAudioObjectPropertyScopeGlobal; - addr.mElement = kAudioObjectPropertyElementMaster; - if(flow == eRender) - addr.mSelector = kAudioHardwarePropertyDefaultOutputDevice; - else if(flow == eCapture) - addr.mSelector = kAudioHardwarePropertyDefaultInputDevice; - else - return E_INVALIDARG; - - size = sizeof(default_id); - sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, - NULL, &size, &default_id); - if(sc != noErr){ - WARN("Getting _DefaultInputDevice property failed: %x\n", (int)sc); - default_id = -1; - } - - addr.mSelector = kAudioHardwarePropertyDevices; - sc = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &addr, 0, - NULL, &devsize); - if(sc != noErr){ - WARN("Getting _Devices property size failed: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - devices = HeapAlloc(GetProcessHeap(), 0, devsize); - if(!devices) - return E_OUTOFMEMORY; - - sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, - &devsize, devices); - if(sc != noErr){ - WARN("Getting _Devices property failed: %x\n", (int)sc); - HeapFree(GetProcessHeap(), 0, devices); - return osstatus_to_hresult(sc); + struct get_endpoint_ids_params params; + unsigned int i; + GUID *guids; + WCHAR **ids; + + TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); + + params.flow = flow; + params.size = 1000; + params.endpoints = NULL; + do{ + heap_free(params.endpoints); + params.endpoints = heap_alloc(params.size); + UNIX_CALL(get_endpoint_ids, &params); + }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if(FAILED(params.result)) goto end; + + ids = heap_alloc_zero(params.num * sizeof(*ids)); + guids = heap_alloc(params.num * sizeof(*guids)); + if(!ids || !guids){ + params.result = E_OUTOFMEMORY; + goto end; } - ndevices = devsize / sizeof(AudioDeviceID); - - *ids = HeapAlloc(GetProcessHeap(), 0, ndevices * sizeof(WCHAR *)); - if(!*ids){ - HeapFree(GetProcessHeap(), 0, devices); - return E_OUTOFMEMORY; - } - - *guids = HeapAlloc(GetProcessHeap(), 0, ndevices * sizeof(GUID)); - if(!*guids){ - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, devices); - return E_OUTOFMEMORY; - } - - *num = 0; - *def_index = (UINT)-1; - for(i = 0; i < ndevices; ++i){ - AudioBufferList *buffers; - CFStringRef name; - SIZE_T len; - int j; - - addr.mSelector = kAudioDevicePropertyStreamConfiguration; - if(flow == eRender) - addr.mScope = kAudioDevicePropertyScopeOutput; - else - addr.mScope = kAudioDevicePropertyScopeInput; - addr.mElement = 0; - sc = AudioObjectGetPropertyDataSize(devices[i], &addr, 0, NULL, &size); - if(sc != noErr){ - WARN("Unable to get _StreamConfiguration property size for " - "device %u: %x\n", (unsigned int)devices[i], (int)sc); - continue; - } - - buffers = HeapAlloc(GetProcessHeap(), 0, size); - if(!buffers){ - HeapFree(GetProcessHeap(), 0, devices); - for(j = 0; j < *num; ++j) - HeapFree(GetProcessHeap(), 0, (*ids)[j]); - HeapFree(GetProcessHeap(), 0, *guids); - HeapFree(GetProcessHeap(), 0, *ids); - return E_OUTOFMEMORY; + for(i = 0; i < params.num; i++){ + int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + ids[i] = heap_alloc(size); + if(!ids[i]){ + params.result = E_OUTOFMEMORY; + goto end; } - - sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, - &size, buffers); - if(sc != noErr){ - WARN("Unable to get _StreamConfiguration property for " - "device %u: %x\n", (unsigned int)devices[i], (int)sc); - HeapFree(GetProcessHeap(), 0, buffers); - continue; - } - - /* check that there's at least one channel in this device before - * we claim it as usable */ - for(j = 0; j < buffers->mNumberBuffers; ++j) - if(buffers->mBuffers[j].mNumberChannels > 0) - break; - if(j >= buffers->mNumberBuffers){ - HeapFree(GetProcessHeap(), 0, buffers); - continue; - } - - HeapFree(GetProcessHeap(), 0, buffers); - - size = sizeof(name); - addr.mSelector = kAudioObjectPropertyName; - sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, - &size, &name); - if(sc != noErr){ - WARN("Unable to get _Name property for device %u: %x\n", - (unsigned int)devices[i], (int)sc); - continue; - } - - len = CFStringGetLength(name) + 1; - (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if(!(*ids)[*num]){ - CFRelease(name); - HeapFree(GetProcessHeap(), 0, devices); - for(j = 0; j < *num; ++j) - HeapFree(GetProcessHeap(), 0, (*ids)[j]); - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *guids); - return E_OUTOFMEMORY; + memcpy(ids[i], params.endpoints[i].name, size); + get_device_guid(flow, params.endpoints[i].id, guids + i); + } + *def_index = params.default_idx; + +end: + heap_free(params.endpoints); + if(FAILED(params.result)){ + heap_free(guids); + if(ids){ + for(i = 0; i < params.num; i++) heap_free(ids[i]); + heap_free(ids); } - CFStringGetCharacters(name, CFRangeMake(0, len - 1), (UniChar*)(*ids)[*num]); - ((*ids)[*num])[len - 1] = 0; - CFRelease(name); - - get_device_guid(flow, devices[i], &(*guids)[*num]); - - if(*def_index == (UINT)-1 && devices[i] == default_id) - *def_index = *num; - - TRACE("device %u: id %s key %u%s\n", *num, debugstr_w((*ids)[*num]), - (unsigned int)devices[i], (*def_index == *num) ? " (default)" : ""); - - (*num)++; + }else{ + *ids_out = ids; + *guids_out = guids; + *num = params.num; } - if(*def_index == (UINT)-1) - *def_index = 0; - - HeapFree(GetProcessHeap(), 0, devices); - - return S_OK; + return params.result; } static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h new file mode 100644 index 00000000000..7c1200464b9 --- /dev/null +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -0,0 +1,44 @@ +/* + * Unixlib header file for winecoreaudio driver. + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +struct endpoint +{ + WCHAR *name; + DWORD id; +}; + +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + +enum unix_funcs +{ + unix_get_endpoint_ids, +}; + +extern unixlib_handle_t coreaudio_handle; + +#define UNIX_CALL( func, params ) __wine_unix_call( coreaudio_handle, unix_ ## func, params ) -- 2.33.1

1 0

[PATCH v2 1/6] winecoreaudio: Move DriverProc to midi.c.
by Andrew Eikum Nov. 17, 2021

Nov. 17, 2021

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Fix copyright date typo. dlls/winecoreaudio.drv/coreaudio.c | 81 ------------------------------ dlls/winecoreaudio.drv/coreaudio.h | 9 ---- dlls/winecoreaudio.drv/midi.c | 78 +++++++++++++++++++++++++++- 3 files changed, 77 insertions(+), 91 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 321c24b477c..1f222367bed 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1,8 +1,6 @@ /* * Wine Driver for CoreAudio * - * Copyright 2005 Emmanuel Maillard - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -30,82 +28,3 @@ #include "mmddk.h" #include "coreaudio.h" #include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); - - -/************************************************************************** - * CoreAudio_drvLoad [internal] - */ -static LRESULT CoreAudio_drvLoad(void) -{ - TRACE("()\n"); - - if (CoreAudio_MIDIInit() != DRV_SUCCESS) - return DRV_FAILURE; - - return DRV_SUCCESS; -} - -/************************************************************************** - * CoreAudio_drvFree [internal] - */ -static LRESULT CoreAudio_drvFree(void) -{ - TRACE("()\n"); - CoreAudio_MIDIRelease(); - return DRV_SUCCESS; -} - -/************************************************************************** - * CoreAudio_drvOpen [internal] - */ -static LRESULT CoreAudio_drvOpen(LPSTR str) -{ - TRACE("(%s)\n", str); - return 1; -} - -/************************************************************************** - * CoreAudio_drvClose [internal] - */ -static DWORD CoreAudio_drvClose(DWORD dwDevID) -{ - TRACE("(%08x)\n", dwDevID); - return 1; -} - -/************************************************************************** - * DriverProc (WINECOREAUDIO.1) - */ -LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", - dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : - wMsg == DRV_FREE ? "DRV_FREE" : - wMsg == DRV_OPEN ? "DRV_OPEN" : - wMsg == DRV_CLOSE ? "DRV_CLOSE" : - wMsg == DRV_ENABLE ? "DRV_ENABLE" : - wMsg == DRV_DISABLE ? "DRV_DISABLE" : - wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : - wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : - wMsg == DRV_INSTALL ? "DRV_INSTALL" : - wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", - wMsg, dwParam1, dwParam2); - - switch(wMsg) { - case DRV_LOAD: return CoreAudio_drvLoad(); - case DRV_FREE: return CoreAudio_drvFree(); - case DRV_OPEN: return CoreAudio_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: return CoreAudio_drvClose(dwDevID); - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: return 1; - case DRV_CONFIGURE: MessageBoxA(0, "CoreAudio driver!", "CoreAudio driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; - default: - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); - } -} diff --git a/dlls/winecoreaudio.drv/coreaudio.h b/dlls/winecoreaudio.drv/coreaudio.h index 68b52502333..e04043c4010 100644 --- a/dlls/winecoreaudio.drv/coreaudio.h +++ b/dlls/winecoreaudio.drv/coreaudio.h @@ -22,15 +22,6 @@ #include "wine/debug.h" -extern LONG CoreAudio_WaveInit(void); -extern void CoreAudio_WaveRelease(void); - -extern LONG CoreAudio_MIDIInit(void); -extern LONG CoreAudio_MIDIRelease(void); - -extern LONG CoreAudio_MixerInit(void); -extern void CoreAudio_MixerRelease(void); - /* fourcc is in native order, where MSB is the first character. */ static inline const char* wine_dbgstr_fourcc(INT32 fourcc) { diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index c299d116f12..64fc3618f61 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -8,7 +8,7 @@ * current support is limited to MIDI ports of OSS systems * 98/9 rewriting MCI code for MIDI * 98/11 split in midi.c and mcimidi.c - * Copyright 2006 Emmanuel Maillard + * Copyright 2005, 2006 Emmanuel Maillard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1033,3 +1033,79 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw } return MMSYSERR_NOTSUPPORTED; } + +/************************************************************************** + * CoreAudio_drvLoad [internal] + */ +static LRESULT CoreAudio_drvLoad(void) +{ + TRACE("()\n"); + + if (CoreAudio_MIDIInit() != DRV_SUCCESS) + return DRV_FAILURE; + + return DRV_SUCCESS; +} + +/************************************************************************** + * CoreAudio_drvFree [internal] + */ +static LRESULT CoreAudio_drvFree(void) +{ + TRACE("()\n"); + CoreAudio_MIDIRelease(); + return DRV_SUCCESS; +} + +/************************************************************************** + * CoreAudio_drvOpen [internal] + */ +static LRESULT CoreAudio_drvOpen(LPSTR str) +{ + TRACE("(%s)\n", str); + return 1; +} + +/************************************************************************** + * CoreAudio_drvClose [internal] + */ +static DWORD CoreAudio_drvClose(DWORD dwDevID) +{ + TRACE("(%08x)\n", dwDevID); + return 1; +} + +/************************************************************************** + * DriverProc (WINECOREAUDIO.1) + */ +LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) +{ + TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", + dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : + wMsg == DRV_FREE ? "DRV_FREE" : + wMsg == DRV_OPEN ? "DRV_OPEN" : + wMsg == DRV_CLOSE ? "DRV_CLOSE" : + wMsg == DRV_ENABLE ? "DRV_ENABLE" : + wMsg == DRV_DISABLE ? "DRV_DISABLE" : + wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : + wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : + wMsg == DRV_INSTALL ? "DRV_INSTALL" : + wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", + wMsg, dwParam1, dwParam2); + + switch(wMsg) { + case DRV_LOAD: return CoreAudio_drvLoad(); + case DRV_FREE: return CoreAudio_drvFree(); + case DRV_OPEN: return CoreAudio_drvOpen((LPSTR)dwParam1); + case DRV_CLOSE: return CoreAudio_drvClose(dwDevID); + case DRV_ENABLE: return 1; + case DRV_DISABLE: return 1; + case DRV_QUERYCONFIGURE: return 1; + case DRV_CONFIGURE: MessageBoxA(0, "CoreAudio driver!", "CoreAudio driver", MB_OK); return 1; + case DRV_INSTALL: return DRVCNF_RESTART; + case DRV_REMOVE: return DRVCNF_RESTART; + default: + return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + } +} -- 2.33.1

1 0

[PATCH 1/9] Revert "makefiles: Use static importlibs on all platforms."
by Rémi Bernon Nov. 17, 2021

Nov. 17, 2021

This reverts commit a9b5bb326a1514e2c4185633ab34b22c9bbc9863. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This first patch is only there so that the testbot can run the tests without failing spuriously. The change broke graphics drivers, although I don't know precisely how and it should probably be fixed instead of reverting it. tools/makedep.c | 78 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ea46aed8d8..d5412eccfa4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2189,10 +2189,19 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra for (j = 0; j < subdirs.count; j++) { if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) - lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); - else - lib = get_static_lib( submakes[j], name ); - if (lib) break; + { + if (is_cross || !*dll_ext || submakes[j]->staticimplib) + lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); + else + { + strarray_add_uniq( deps, strmake( "%s/lib%s.def", submakes[j]->obj_dir, name )); + if (needs_implib_symlink( submakes[j] )) + strarray_add_uniq( deps, strmake( "dlls/lib%s.def", name )); + } + break; + } + + if ((lib = get_static_lib( submakes[j], name ))) break; } if (lib) @@ -2579,8 +2588,12 @@ static void output_uninstall_rules( struct makefile *make ) static struct strarray output_importlib_symlinks( const struct makefile *make ) { struct strarray ret = empty_strarray; - const char *lib, *dst, *ext[2] = { "a", "cross.a" }; - int i, count = 1 + !!crosstarget; + const char *lib, *dst, *ext[4]; + int i, count = 0; + + ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; + if (crosstarget) ext[count++] = "cross.a"; + if (needs_delay_lib( make )) ext[count++] = "delay.a"; for (i = 0; i < count; i++) { @@ -3307,27 +3320,42 @@ static void output_module( struct makefile *make ) if (spec_file && make->importlib) { char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); - - strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); - if (!*dll_ext && needs_delay_lib( make )) + if (*dll_ext && !make->implib_objs.count) { - strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); - output( "%s.delay.a ", importlib_path ); + strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); + output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output( "\t%s%s -w --def -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.def", make->importlib ), + strmake( "d%s/lib%s.def", so_dir, make->importlib )); + } + else + { + strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); + if (!*dll_ext && needs_delay_lib( make )) + { + strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); + output( "%s.delay.a ", importlib_path ); + } + output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.a", make->importlib ), + strmake( "d%s/lib%s.a", so_dir, make->importlib )); } - output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - output_filenames( target_flags ); - if (make->is_win16) output_filename( "-m16" ); - output_filename( "--export" ); - output_filename( spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - add_install_rule( make, make->importlib, - strmake( "lib%s.a", make->importlib ), - strmake( "d%s/lib%s.a", so_dir, make->importlib )); - if (crosstarget) { struct strarray cross_files = strarray_replace_extension( &make->implib_objs, ".o", ".cross.o" ); -- 2.33.1

3 13

[PATCH 1/3] d3d10core/tests: Add a test for DXGI_FORMAT_R8G8_UINT support in vertex buffers.
by Nikolay Sivov Nov. 17, 2021

Nov. 17, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b8338152bb7..73151f2296c 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -13645,6 +13645,10 @@ static void test_format_support(void) {DXGI_FORMAT_R32_UINT}, {DXGI_FORMAT_R16_UINT}, }; + static const struct format_support vertex_buffers[] = + { + {DXGI_FORMAT_R8G8_UINT}, + }; if (!(device = create_device())) { @@ -13685,6 +13689,9 @@ static void test_format_support(void) check_format_support(format_support, index_buffers, ARRAY_SIZE(index_buffers), D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); + check_format_support(format_support, vertex_buffers, ARRAY_SIZE(vertex_buffers), + D3D10_FORMAT_SUPPORT_IA_VERTEX_BUFFER, "vertex buffer"); + check_format_support(format_support, display_format_support, ARRAY_SIZE(display_format_support), D3D10_FORMAT_SUPPORT_DISPLAY, "display"); -- 2.33.0

3 7

[PATCH 6/6] win32u: Move NtUserScrollDC implementation from user32.
by Jacek Caban Nov. 17, 2021

Nov. 17, 2021

3 2

[PATCH 5/6] win32u: Move NtUserGetMouseMovePointsEx implementation from user32.
by Jacek Caban Nov. 17, 2021

Nov. 17, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/input.c | 67 ----------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/input.c | 64 +++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 +++++++ 7 files changed, 79 insertions(+), 69 deletions(-)

3 2

[PATCH 4/6] win32u: Move NtUserUnregisterHotKey implementation from user32.
by Jacek Caban Nov. 17, 2021

Nov. 17, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/input.c | 28 ---------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 +++++ 8 files changed, 43 insertions(+), 30 deletions(-)

3 2

[PATCH 3/6] win32u: Move NtUserGetKeyboardLayoutList implementation from user32.
by Jacek Caban Nov. 17, 2021

Nov. 17, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 7 +--- dlls/user32/input.c | 51 -------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 70 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 47 ++++++++++++++++++++++++ dlls/win32u/wrappers.c | 5 +++ 9 files changed, 132 insertions(+), 59 deletions(-)

3 2

[PATCH 2/6] win32u: Move NtUserActivateKeyboardLayout implementation from user32.
by Jacek Caban Nov. 17, 2021

Nov. 17, 2021

3 2