wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Huw Davies : winecoreaudio: Avoid 64-bit ptr truncation.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: 80be5c25e3eedb401ca42b480b3e884f771e7388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80be5c25e3eedb401ca42b48… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:52 2021 +0000 winecoreaudio: Avoid 64-bit ptr truncation. This makes winecoreaudio consistent with the other midi drivers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/midi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 64fc3618f61..32826cb658c 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -958,9 +958,9 @@ static DWORD WINAPI MIDIIn_MessageThread(LPVOID p) /************************************************************************** * modMessage */ -DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("%d %08x %08x %08x %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { case DRVM_INIT: @@ -999,9 +999,9 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw /************************************************************************** * midMessage */ -DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("%d %08x %08x %08x %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { case DRVM_INIT: case DRVM_EXIT:

1 0

Huw Davies : winecoreaudio: Remove system includes.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: a73bc760a58350ec935d93becb962cb93173afcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a73bc760a58350ec935d93be… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:51 2021 +0000 winecoreaudio: Remove system includes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 413e22d18ba..b4cf325c9d2 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -15,42 +15,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define NONAMELESSUNION #define COBJMACROS -#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 "windef.h" #include "winbase.h" #include "winnls.h"

1 0

Huw Davies : winecoreaudio: Store the device id as a DWORD.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: 8d812e23301da7a62ff25311dbcc112b8e4be83b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d812e23301da7a62ff25311… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:50 2021 +0000 winecoreaudio: Store the device id as a DWORD. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 047979df4f3..413e22d18ba 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -129,7 +129,7 @@ struct ACImpl { HANDLE event; float *vols; - AudioDeviceID adevid; + DWORD dev_id; HANDLE timer; AudioSession *session; @@ -406,7 +406,7 @@ end: return params.result; } -static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) +static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) { HKEY devices_key; UINT i = 0; @@ -470,13 +470,13 @@ static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; - AudioDeviceID adevid; + DWORD dev_id; EDataFlow dataflow; HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); - if(!get_deviceid_by_guid(guid, &adevid, &dataflow)) + if(!get_deviceid_by_guid(guid, &dev_id, &dataflow)) return AUDCLNT_E_DEVICE_INVALIDATED; if(dataflow != eRender && dataflow != eCapture) @@ -504,7 +504,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->parent = dev; IMMDevice_AddRef(This->parent); - This->adevid = adevid; + This->dev_id = dev_id; *out = (IAudioClient *)&This->IAudioClient3_iface; IAudioClient3_AddRef(&This->IAudioClient3_iface); @@ -765,7 +765,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - params.dev_id = This->adevid; + params.dev_id = This->dev_id; params.flow = This->dataflow; params.share = mode; params.duration = duration; @@ -882,7 +882,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx); if(pwfx) dump_fmt(pwfx); - params.dev_id = This->adevid; + params.dev_id = This->dev_id; params.flow = This->dataflow; params.share = mode; params.fmt_in = pwfx; @@ -915,7 +915,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; - params.dev_id = This->adevid; + params.dev_id = This->dev_id; params.flow = This->dataflow; params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); if(!params.fmt)

1 0

Huw Davies : winecoreaudio: Make the coreaudio_stream structure private to the unixlib.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: 37265acd513961255205a0d775794dc4e3f9ff74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37265acd513961255205a0d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:49 2021 +0000 winecoreaudio: Make the coreaudio_stream structure private to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 23 +++++++++++++++++++++++ dlls/winecoreaudio.drv/unixlib.h | 23 +---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 5569869de6e..fd32a2a99ac 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -72,6 +72,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); +struct coreaudio_stream +{ + 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; + 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; + SIZE_T local_buffer_size, tmp_buffer_size; +}; + static HRESULT osstatus_to_hresult(OSStatus sc) { switch(sc){ diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index df00d27c27a..6f51c7877fa 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -18,28 +18,7 @@ * 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; - 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; - SIZE_T local_buffer_size, tmp_buffer_size; -}; +struct coreaudio_stream; struct endpoint {

1 0

Huw Davies : winecoreaudio: Move set_volumes to the unixlib.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: b3bfa1e54b4b2119703cde1b2c0dd329cbd60ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3bfa1e54b4b2119703cde1b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:48 2021 +0000 winecoreaudio: Move set_volumes to the unixlib. The session setvol helper has been removed to reduce the number of helper functions as the loop over the session's clients isn't very complicated. Session mute is handled by setting the master volume to zero. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 31 +++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 103 +++++++++++++------------------------ dlls/winecoreaudio.drv/unixlib.h | 10 ++++ 3 files changed, 77 insertions(+), 67 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 9636975607c..5569869de6e 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1554,6 +1554,36 @@ static NTSTATUS is_started(void *args) return STATUS_SUCCESS; } +static NTSTATUS set_volumes(void *args) +{ + struct set_volumes_params *params = args; + struct coreaudio_stream *stream = params->stream; + Float32 level = 1.0, tmp; + OSStatus sc; + UINT32 i; + + if(params->channel >= stream->fmt->nChannels || params->channel < -1){ + ERR("Incorrect channel %d\n", params->channel); + return STATUS_SUCCESS; + } + + if(params->channel == -1){ + for(i = 0; i < stream->fmt->nChannels; ++i){ + tmp = params->master_volume * params->volumes[i] * params->session_volumes[i]; + level = tmp < level ? tmp : level; + } + }else + level = params->master_volume * params->volumes[params->channel] * + params->session_volumes[params->channel]; + + sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, + kAudioUnitScope_Global, 0, level, 0); + if(sc != noErr) + WARN("Couldn't set volume: %x\n", (int)sc); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1575,4 +1605,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_position, get_frequency, is_started, + set_volumes, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 07260c16ff0..047979df4f3 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -176,7 +176,6 @@ static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); -static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index); static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { @@ -337,6 +336,19 @@ static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) RegCloseKey(key); } +static void set_stream_volumes(ACImpl *This, int channel) +{ + struct set_volumes_params params; + + params.stream = This->stream; + params.master_volume = This->session->mute ? 0.0f : This->session->master_vol; + params.volumes = This->vols; + params.session_volumes = This->session->channel_vols; + params.channel = channel; + + UNIX_CALL(set_volumes, &params); +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) { @@ -782,8 +794,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, params.stream, -1); - end: if(FAILED(params.result)){ if(params.stream){ @@ -792,8 +802,10 @@ end: } HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; - }else + }else{ This->stream = params.stream; + set_stream_volumes(This, -1); + } LeaveCriticalSection(&g_sessions_lock); @@ -1818,52 +1830,6 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = AudioSessionControl_SetDuckingPreference }; -/* index == -1 means set all channels, otherwise sets only the given channel */ -static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index) -{ - Float32 level; - OSStatus sc; - - if(This->session->mute) - level = 0.; - else{ - if(index == (UINT32)-1){ - UINT32 i; - level = 1.; - for(i = 0; i < stream->fmt->nChannels; ++i){ - Float32 tmp; - tmp = This->session->master_vol * - This->session->channel_vols[i] * This->vols[i]; - level = tmp < level ? tmp : level; - } - }else - level = This->session->master_vol * - This->session->channel_vols[index] * This->vols[index]; - } - - sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, - kAudioUnitScope_Global, 0, level, 0); - if(sc != noErr) - WARN("Couldn't set volume: %x\n", (int)sc); - - return S_OK; -} - -static HRESULT ca_session_setvol(AudioSession *session, UINT32 index) -{ - HRESULT ret = S_OK; - ACImpl *client; - - LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry){ - HRESULT hr; - hr = ca_setvol(client, client->stream, index); - if(FAILED(hr)) - ret = hr; - } - - return ret; -} - static HRESULT WINAPI SimpleAudioVolume_QueryInterface( ISimpleAudioVolume *iface, REFIID riid, void **ppv) { @@ -1902,7 +1868,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; - HRESULT ret; + ACImpl *client; TRACE("(%p)->(%f, %s)\n", session, level, wine_dbgstr_guid(context)); @@ -1916,11 +1882,12 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( session->master_vol = level; - ret = ca_session_setvol(session, -1); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, -1); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI SimpleAudioVolume_GetMasterVolume( @@ -1944,6 +1911,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%u, %s)\n", session, mute, debugstr_guid(context)); @@ -1954,7 +1922,8 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, session->mute = mute; - ca_session_setvol(session, -1); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, -1); LeaveCriticalSection(&g_sessions_lock); @@ -2040,7 +2009,6 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( IAudioStreamVolume *iface, UINT32 index, float level) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - HRESULT ret; TRACE("(%p)->(%d, %f)\n", This, index, level); @@ -2055,11 +2023,11 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); - ret = ca_setvol(This, This->stream, index); + set_stream_volumes(This, index); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( @@ -2085,7 +2053,6 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( { ACImpl *This = impl_from_IAudioStreamVolume(iface); UINT32 i; - HRESULT ret; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -2100,11 +2067,11 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; - ret = ca_setvol(This, This->stream, -1); + set_stream_volumes(This, -1); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( @@ -2198,7 +2165,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - HRESULT ret; + ACImpl *client; TRACE("(%p)->(%d, %f, %s)\n", session, index, level, wine_dbgstr_guid(context)); @@ -2217,11 +2184,12 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( session->channel_vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); - ret = ca_session_setvol(session, index); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, index); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI ChannelAudioVolume_GetChannelVolume( @@ -2249,8 +2217,8 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - int i; - HRESULT ret; + ACImpl *client; + UINT32 i; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, wine_dbgstr_guid(context)); @@ -2269,11 +2237,12 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; - ret = ca_session_setvol(session, -1); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, -1); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI ChannelAudioVolume_GetAllVolumes( diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index aac2df15f47..df00d27c27a 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -194,6 +194,15 @@ struct is_started_params HRESULT result; }; +struct set_volumes_params +{ + struct coreaudio_stream *stream; + float master_volume; + const float *volumes; + const float *session_volumes; + int channel; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -215,6 +224,7 @@ enum unix_funcs unix_get_position, unix_get_frequency, unix_is_started, + unix_set_volumes, }; extern unixlib_handle_t coreaudio_handle;

1 0

Huw Davies : winecoreaudio: Move is_started to the unixlib.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: 22981cc913ecfce1f31f0e69dcd133e847cf0302 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22981cc913ecfce1f31f0e69… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:47 2021 +0000 winecoreaudio: Move is_started to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 14 ++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 8 ++++---- dlls/winecoreaudio.drv/unixlib.h | 7 +++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f59723d48f6..9636975607c 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1541,6 +1541,19 @@ static NTSTATUS get_frequency(void *args) return STATUS_SUCCESS; } +static NTSTATUS is_started(void *args) +{ + struct is_started_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(stream->playing) + params->result = S_OK; + else + params->result = S_FALSE; + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1561,4 +1574,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_next_packet_size, get_position, get_frequency, + is_started, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f79d808d8ed..07260c16ff0 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1628,6 +1628,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, AudioSessionState *state) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); + struct is_started_params params; ACImpl *client; TRACE("(%p)->(%p)\n", This, state); @@ -1644,14 +1645,13 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - OSSpinLockLock(&client->stream->lock); - if(client->stream->playing){ + params.stream = client->stream; + UNIX_CALL(is_started, &params); + if(params.result == S_OK){ *state = AudioSessionStateActive; - OSSpinLockUnlock(&client->stream->lock); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - OSSpinLockUnlock(&client->stream->lock); } LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 5dcefe2eb05..aac2df15f47 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -188,6 +188,12 @@ struct get_frequency_params UINT64 *freq; }; +struct is_started_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -208,6 +214,7 @@ enum unix_funcs unix_get_next_packet_size, unix_get_position, unix_get_frequency, + unix_is_started, }; extern unixlib_handle_t coreaudio_handle;

1 0

Huw Davies : winecoreaudio: Move get_frequency to the unixlib.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: b884ca314d64911c2ba6ea801a0196649adf43db URL: https://source.winehq.org/git/wine.git/?a=commit;h=b884ca314d64911c2ba6ea80… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:46 2021 +0000 winecoreaudio: Move get_frequency to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 15 +++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 11 +++++------ dlls/winecoreaudio.drv/unixlib.h | 8 ++++++++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index d7390c5a677..f59723d48f6 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1527,6 +1527,20 @@ static NTSTATUS get_position(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_frequency(void *args) +{ + struct get_frequency_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *params->freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; + else + *params->freq = stream->fmt->nSamplesPerSec; + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1546,4 +1560,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_current_padding, get_next_packet_size, get_position, + get_frequency, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index ebfc0543af8..f79d808d8ed 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1458,15 +1458,14 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); + struct get_frequency_params params; TRACE("(%p)->(%p)\n", This, freq); - if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)This->stream->fmt->nSamplesPerSec * This->stream->fmt->nBlockAlign; - else - *freq = This->stream->fmt->nSamplesPerSec; - - return S_OK; + params.stream = This->stream; + params.freq = freq; + UNIX_CALL(get_frequency, &params); + return params.result; } static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e9edaf82973..5dcefe2eb05 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -181,6 +181,13 @@ struct get_position_params UINT64 *qpctime; }; +struct get_frequency_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT64 *freq; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -200,6 +207,7 @@ enum unix_funcs unix_get_current_padding, unix_get_next_packet_size, unix_get_position, + unix_get_frequency, }; extern unixlib_handle_t coreaudio_handle;

1 0

Huw Davies : winecoreaudio: Move get_position to the unixlib.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: 46f5083e23d2fd3bcd1065c654ac9b44921a3e47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46f5083e23d2fd3bcd1065c6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:45 2021 +0000 winecoreaudio: Move get_position to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 25 +++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 32 ++++++-------------------------- dlls/winecoreaudio.drv/unixlib.h | 9 +++++++++ 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 0ed4fcb02fe..d7390c5a677 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1503,6 +1503,30 @@ static NTSTATUS get_next_packet_size(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_position(void *args) +{ + struct get_position_params *params = args; + struct coreaudio_stream *stream = params->stream; + LARGE_INTEGER stamp, freq; + + OSSpinLockLock(&stream->lock); + + *params->pos = stream->written_frames - stream->held_frames; + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *params->pos *= stream->fmt->nBlockAlign; + + if(params->qpctime){ + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + OSSpinLockUnlock(&stream->lock); + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1521,4 +1545,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_latency, get_current_padding, get_next_packet_size, + get_position, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index b0208ce0a44..ebfc0543af8 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1469,42 +1469,22 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) return S_OK; } -static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, - UINT64 *pos, UINT64 *qpctime) -{ - *pos = This->stream->written_frames - This->stream->held_frames; - - if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) - *pos *= This->stream->fmt->nBlockAlign; - - if(qpctime){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - return S_OK; -} - static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); - HRESULT hr; + struct get_position_params params; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); if(!pos) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - hr = AudioClock_GetPosition_nolock(This, pos, qpctime); - - OSSpinLockUnlock(&This->stream->lock); - - return hr; + params.stream = This->stream; + params.pos = pos; + params.qpctime = qpctime; + UNIX_CALL(get_position, &params); + return params.result; } static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 32eb57a866a..e9edaf82973 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -173,6 +173,14 @@ struct get_next_packet_size_params UINT32 *frames; }; +struct get_position_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT64 *pos; + UINT64 *qpctime; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -191,6 +199,7 @@ enum unix_funcs unix_get_latency, unix_get_current_padding, unix_get_next_packet_size, + unix_get_position, }; extern unixlib_handle_t coreaudio_handle;

1 0

Huw Davies : winecoreaudio: Move get_next_packet_size to the unixlib.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: 5ff056f399beec5f0f1fffca0af1f842ebcbb8d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ff056f399beec5f0f1fffca… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:44 2021 +0000 winecoreaudio: Move get_next_packet_size to the unixlib. The capture_resample syscall can now be removed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 27 ++++++++++++++++++++++----- dlls/winecoreaudio.drv/mmdevdrv.c | 22 +++++----------------- dlls/winecoreaudio.drv/unixlib.h | 10 ++++++++-- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index d723291bb24..0ed4fcb02fe 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1068,9 +1068,8 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe return noErr; } -static NTSTATUS capture_resample(void *args) +static void capture_resample(struct coreaudio_stream *stream) { - struct coreaudio_stream *stream = args; UINT32 resamp_period_frames = muldiv(stream->period_frames, stream->dev_desc.mSampleRate, stream->fmt->nSamplesPerSec); OSStatus sc; @@ -1115,7 +1114,6 @@ static NTSTATUS capture_resample(void *args) }else stream->held_frames += wanted_frames; } - return STATUS_SUCCESS; } static NTSTATUS get_buffer_size(void *args) @@ -1485,6 +1483,26 @@ static NTSTATUS release_capture_buffer(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_next_packet_size(void *args) +{ + struct get_next_packet_size_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + capture_resample(stream); + + if(stream->held_frames >= stream->period_frames) + *params->frames = stream->period_frames; + else + *params->frames = 0; + + OSSpinLockUnlock(&stream->lock); + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1502,6 +1520,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, - - capture_resample /* temporary */ + get_next_packet_size, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index cc37bebdc77..b0208ce0a44 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -683,11 +683,6 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static void capture_resample(ACImpl *This) -{ - UNIX_CALL(capture_resample, This->stream); -} - static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, @@ -1401,24 +1396,17 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( IAudioCaptureClient *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + struct get_next_packet_size_params params; TRACE("(%p)->(%p)\n", This, frames); if(!frames) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - capture_resample(This); - - if(This->stream->held_frames >= This->stream->period_frames) - *frames = This->stream->period_frames; - else - *frames = 0; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + UNIX_CALL(get_next_packet_size, &params); + return params.result; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 9bb636fd625..32eb57a866a 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -166,6 +166,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct get_next_packet_size_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT32 *frames; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -183,8 +190,7 @@ enum unix_funcs unix_get_buffer_size, unix_get_latency, unix_get_current_padding, - - unix_capture_resample /* temporary */ + unix_get_next_packet_size, }; extern unixlib_handle_t coreaudio_handle;

1 0

Huw Davies : winecoreaudio: Release the correct stream on init failure.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: ddf294c1a24ab244c320ce9cef99f86ec8c3e215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf294c1a24ab244c320ce9c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:43 2021 +0000 winecoreaudio: Release the correct stream on init failure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index aa051cb3d61..cc37bebdc77 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -764,6 +764,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.duration = duration; params.period = period; params.fmt = fmt; + params.stream = NULL; UNIX_CALL(create_stream, &params); if(FAILED(params.result)) goto end; @@ -791,7 +792,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, end: if(FAILED(params.result)){ if(params.stream){ - release_params.stream = This->stream; + release_params.stream = params.stream; UNIX_CALL(release_stream, &release_params); } HeapFree(GetProcessHeap(), 0, This->vols);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021