March 2022 - Wine-commits - list.winehq.org

Huw Davies : winealsa: Move get_next_packet_size to the unixlib.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 08461970172fedd45e9870fb1b0665ff241b326f URL: https://source.winehq.org/git/wine.git/?a=commit;h=08461970172fedd45e9870fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 08:20:02 2022 +0000 winealsa: Move get_next_packet_size 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/winealsa.drv/alsa.c | 13 +++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 11 +++++------ dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 02063fd3374..6234591aae4 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2082,6 +2082,18 @@ static NTSTATUS get_current_padding(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_next_packet_size(void *args) +{ + struct get_next_packet_size_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + *params->frames = stream->held_frames < stream->mmdev_period_frames ? 0 : stream->mmdev_period_frames; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -2120,5 +2132,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, + get_next_packet_size, set_event_handle, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b50025aa77c..7dacd2606cf 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1414,20 +1414,19 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( IAudioCaptureClient *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct alsa_stream *stream = This->stream; + struct get_next_packet_size_params params; TRACE("(%p)->(%p)\n", This, frames); if(!frames) return E_POINTER; - alsa_lock(stream); - - *frames = stream->held_frames < stream->mmdev_period_frames ? 0 : stream->mmdev_period_frames; + params.stream = This->stream; + params.frames = frames; - alsa_unlock(stream); + ALSA_CALL(get_next_packet_size, &params); - return S_OK; + return params.result; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index ddca1a3100c..88f4fae4a9e 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -187,6 +187,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct get_next_packet_size_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT32 *frames; +}; + struct set_event_handle_params { struct alsa_stream *stream; @@ -212,6 +219,7 @@ enum alsa_funcs alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, + alsa_get_next_packet_size, alsa_set_event_handle, };

1 0

Huw Davies : winealsa: Move get_frequency to the unixlib.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: a30888693ae97460fb9aefc949f327a8b34c5730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a30888693ae97460fb9aefc9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 08:20:03 2022 +0000 winealsa: 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/winealsa.drv/alsa.c | 17 +++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 12 ++++++------ dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 6234591aae4..5f13ce07de6 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2094,6 +2094,22 @@ static NTSTATUS get_next_packet_size(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_frequency(void *args) +{ + struct get_frequency_params *params = args; + struct alsa_stream *stream = params->stream; + UINT64 *freq = params->freq; + + alsa_lock(stream); + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; + else + *freq = stream->fmt->nSamplesPerSec; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -2133,5 +2149,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_latency, get_current_padding, get_next_packet_size, + get_frequency, set_event_handle, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7dacd2606cf..fde97eb4cb7 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1478,16 +1478,16 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); - struct alsa_stream *stream = This->stream; + struct get_frequency_params params; TRACE("(%p)->(%p)\n", This, freq); - if(stream->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; - else - *freq = stream->fmt->nSamplesPerSec; + params.stream = This->stream; + params.freq = freq; - return S_OK; + ALSA_CALL(get_frequency, &params); + + return params.result; } static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 88f4fae4a9e..6053fe9dc8a 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -194,6 +194,13 @@ struct get_next_packet_size_params UINT32 *frames; }; +struct get_frequency_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT64 *freq; +}; + struct set_event_handle_params { struct alsa_stream *stream; @@ -220,6 +227,7 @@ enum alsa_funcs alsa_get_latency, alsa_get_current_padding, alsa_get_next_packet_size, + alsa_get_frequency, alsa_set_event_handle, };

1 0

Huw Davies : winealsa: Move get_position to the unixlib.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 3ddb038513f2779ba647dac3bce48296875412aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ddb038513f2779ba647dac3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 08:20:04 2022 +0000 winealsa: 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/winealsa.drv/alsa.c | 53 +++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 62 +++++--------------------------------------- dlls/winealsa.drv/unixlib.h | 9 +++++++ 3 files changed, 68 insertions(+), 56 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 5f13ce07de6..870ec4db151 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2110,6 +2110,58 @@ static NTSTATUS get_frequency(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_position(void *args) +{ + struct get_position_params *params = args; + struct alsa_stream *stream = params->stream; + UINT64 position; + snd_pcm_state_t alsa_state; + + alsa_lock(stream); + + /* avail_update required to get accurate snd_pcm_state() */ + snd_pcm_avail_update(stream->pcm_handle); + alsa_state = snd_pcm_state(stream->pcm_handle); + + if(stream->flow == eRender){ + position = stream->written_frames - stream->held_frames; + + if(stream->started && alsa_state == SND_PCM_STATE_RUNNING && stream->held_frames) + /* we should be using snd_pcm_delay here, but it is broken + * especially during ALSA device underrun. instead, let's just + * interpolate between periods with the system timer. */ + position += interp_elapsed_frames(stream); + + position = min(position, stream->written_frames - stream->held_frames + stream->mmdev_period_frames); + + position = min(position, stream->written_frames); + }else + position = stream->written_frames + stream->held_frames; + + /* ensure monotic growth */ + if(position < stream->last_pos_frames) + position = stream->last_pos_frames; + else + stream->last_pos_frames = position; + + TRACE("frames written: %u, held: %u, state: 0x%x, position: %u\n", + (UINT32)(stream->written_frames%1000000000), stream->held_frames, + alsa_state, (UINT32)(position%1000000000)); + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *params->pos = position * stream->fmt->nBlockAlign; + else + *params->pos = position; + + if(params->qpctime){ + LARGE_INTEGER stamp, freq; + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -2150,5 +2202,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_current_padding, get_next_packet_size, get_frequency, + get_position, set_event_handle, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index fde97eb4cb7..6dfa3ad013f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -951,15 +951,6 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, return S_OK; } -static snd_pcm_uframes_t interp_elapsed_frames(struct alsa_stream *stream) -{ - LARGE_INTEGER time_freq, current_time, time_diff; - QueryPerformanceFrequency(&time_freq); - QueryPerformanceCounter(&current_time); - time_diff.QuadPart = current_time.QuadPart - stream->last_period_time.QuadPart; - return MulDiv(time_diff.QuadPart, stream->fmt->nSamplesPerSec, time_freq.QuadPart); -} - static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); @@ -1494,61 +1485,20 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); - struct alsa_stream *stream = This->stream; - UINT64 position; - snd_pcm_state_t alsa_state; + struct get_position_params params; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); if(!pos) return E_POINTER; - alsa_lock(stream); - - /* avail_update required to get accurate snd_pcm_state() */ - snd_pcm_avail_update(stream->pcm_handle); - alsa_state = snd_pcm_state(stream->pcm_handle); - - if(stream->flow == eRender){ - position = stream->written_frames - stream->held_frames; - - if(stream->started && alsa_state == SND_PCM_STATE_RUNNING && stream->held_frames) - /* we should be using snd_pcm_delay here, but it is broken - * especially during ALSA device underrun. instead, let's just - * interpolate between periods with the system timer. */ - position += interp_elapsed_frames(stream); - - position = min(position, stream->written_frames - stream->held_frames + stream->mmdev_period_frames); - - position = min(position, stream->written_frames); - }else - position = stream->written_frames + stream->held_frames; - - /* ensure monotic growth */ - if(position < stream->last_pos_frames) - position = stream->last_pos_frames; - else - stream->last_pos_frames = position; - - TRACE("frames written: %u, held: %u, state: 0x%x, position: %u\n", - (UINT32)(stream->written_frames%1000000000), stream->held_frames, - alsa_state, (UINT32)(position%1000000000)); - - alsa_unlock(stream); - - if(stream->share == AUDCLNT_SHAREMODE_SHARED) - *pos = position * stream->fmt->nBlockAlign; - else - *pos = position; + params.stream = This->stream; + params.pos = pos; + params.qpctime = qpctime; - if(qpctime){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } + ALSA_CALL(get_position, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 6053fe9dc8a..89b53fbcb9a 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -201,6 +201,14 @@ struct get_frequency_params UINT64 *freq; }; +struct get_position_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT64 *pos; + UINT64 *qpctime; +}; + struct set_event_handle_params { struct alsa_stream *stream; @@ -228,6 +236,7 @@ enum alsa_funcs alsa_get_current_padding, alsa_get_next_packet_size, alsa_get_frequency, + alsa_get_position, alsa_set_event_handle, };

1 0

Huw Davies : winealsa: Move is_started to the unixlib.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 7977f5321968aced4152098c27e3662519e1fc66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7977f5321968aced4152098c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 08:20:05 2022 +0000 winealsa: 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/winealsa.drv/alsa.c | 11 +++++++++++ dlls/winealsa.drv/mmdevdrv.c | 19 ++++--------------- dlls/winealsa.drv/unixlib.h | 7 +++++++ 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 870ec4db151..365f5637b20 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2182,6 +2182,16 @@ static NTSTATUS set_event_handle(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS is_started(void *args) +{ + struct is_started_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + return alsa_unlock_result(stream, &params->result, stream->started ? S_OK : S_FALSE); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -2204,4 +2214,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_frequency, get_position, set_event_handle, + is_started, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6dfa3ad013f..0f6a30e0f45 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -25,7 +25,6 @@ #include <stdarg.h> #include <stdio.h> #include <math.h> -#include <pthread.h> #include "windef.h" #include "winbase.h" @@ -237,16 +236,6 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static void alsa_lock(struct alsa_stream *stream) -{ - pthread_mutex_lock(&stream->lock); -} - -static void alsa_unlock(struct alsa_stream *stream) -{ - pthread_mutex_unlock(&stream->lock); -} - static HRESULT alsa_stream_release(struct alsa_stream *stream, HANDLE timer_thread) { struct release_stream_params params; @@ -1640,6 +1629,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); @@ -1656,14 +1646,13 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - alsa_lock(client->stream); - if(client->stream->started){ + params.stream = client->stream; + ALSA_CALL(is_started, &params); + if(params.result == S_OK){ *state = AudioSessionStateActive; - alsa_unlock(client->stream); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - alsa_unlock(client->stream); } LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 89b53fbcb9a..b73f40c8282 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -216,6 +216,12 @@ struct set_event_handle_params HRESULT result; }; +struct is_started_params +{ + struct alsa_stream *stream; + HRESULT result; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -238,6 +244,7 @@ enum alsa_funcs alsa_get_frequency, alsa_get_position, alsa_set_event_handle, + alsa_is_started, }; extern unixlib_handle_t alsa_handle;

1 0

Huw Davies : winealsa: Move set_volumes to the unixlib.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 253b1325b4a8ffc02e0c05e336c201ae8bbb3705 URL: https://source.winehq.org/git/wine.git/?a=commit;h=253b1325b4a8ffc02e0c05e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 08:20:06 2022 +0000 winealsa: Move set_volumes 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/winealsa.drv/alsa.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 12 ++++++----- dlls/winealsa.drv/unixlib.h | 46 +++++++++------------------------------- 3 files changed, 67 insertions(+), 41 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 365f5637b20..c199a2e603d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -45,6 +45,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); +struct alsa_stream +{ + snd_pcm_t *pcm_handle; + snd_pcm_uframes_t alsa_bufsize_frames, alsa_period_frames, safe_rewind_frames; + snd_pcm_hw_params_t *hw_params; /* does not hold state between calls */ + snd_pcm_format_t alsa_format; + + LARGE_INTEGER last_period_time; + + WAVEFORMATEX *fmt; + DWORD flags; + AUDCLNT_SHAREMODE share; + EDataFlow flow; + HANDLE event; + + BOOL need_remapping; + int alsa_channels; + int alsa_channel_map[32]; + + BOOL started, please_quit; + REFERENCE_TIME mmdev_period_rt; + UINT64 written_frames, last_pos_frames; + UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; + snd_pcm_uframes_t remapping_buf_frames; + UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ + UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ + UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ + UINT32 vol_adjusted_frames; /* Frames we've already adjusted the volume of but didn't write yet */ + UINT32 data_in_alsa_frames; + + BYTE *local_buffer, *tmp_buffer, *remapping_buf, *silence_buf; + LONG32 getbuf_last; /* <0 when using tmp_buffer */ + float *vols; + + pthread_mutex_t lock; +}; + #define EXTRA_SAFE_RT 40000 static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', @@ -2162,6 +2199,18 @@ static NTSTATUS get_position(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS set_volumes(void *args) +{ + struct set_volumes_params *params = args; + struct alsa_stream *stream = params->stream; + unsigned int i; + + for(i = 0; i < stream->fmt->nChannels; i++) + stream->vols[i] = params->volumes[i] * params->session_volumes[i] * params->master_volume; + + return STATUS_SUCCESS; +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -2213,6 +2262,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_next_packet_size, get_frequency, get_position, + set_volumes, set_event_handle, is_started, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0f6a30e0f45..c2ec3dd54af 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -334,12 +334,14 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) static void set_stream_volumes(ACImpl *This) { - struct alsa_stream *stream = This->stream; - unsigned int i; + 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; - for(i = 0; i < stream->fmt->nChannels; i++) - stream->vols[i] = This->session->mute ? 0.0f : - This->vols[i] * This->session->channel_vols[i] * This->session->master_vol; + ALSA_CALL(set_volumes, &params); } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index b73f40c8282..4326f79a50b 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -18,42 +18,7 @@ #include "audioclient.h" -struct alsa_stream -{ - snd_pcm_t *pcm_handle; - snd_pcm_uframes_t alsa_bufsize_frames, alsa_period_frames, safe_rewind_frames; - snd_pcm_hw_params_t *hw_params; /* does not hold state between calls */ - snd_pcm_format_t alsa_format; - - LARGE_INTEGER last_period_time; - - WAVEFORMATEX *fmt; - DWORD flags; - AUDCLNT_SHAREMODE share; - EDataFlow flow; - HANDLE event; - - BOOL need_remapping; - int alsa_channels; - int alsa_channel_map[32]; - - BOOL started, please_quit; - REFERENCE_TIME mmdev_period_rt; - UINT64 written_frames, last_pos_frames; - UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; - snd_pcm_uframes_t remapping_buf_frames; - UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ - UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ - UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ - UINT32 vol_adjusted_frames; /* Frames we've already adjusted the volume of but didn't write yet */ - UINT32 data_in_alsa_frames; - - BYTE *local_buffer, *tmp_buffer, *remapping_buf, *silence_buf; - LONG32 getbuf_last; /* <0 when using tmp_buffer */ - float *vols; - - pthread_mutex_t lock; -}; +struct alsa_stream; struct endpoint { @@ -209,6 +174,14 @@ struct get_position_params UINT64 *qpctime; }; +struct set_volumes_params +{ + struct alsa_stream *stream; + float master_volume; + const float *volumes; + const float *session_volumes; +}; + struct set_event_handle_params { struct alsa_stream *stream; @@ -243,6 +216,7 @@ enum alsa_funcs alsa_get_next_packet_size, alsa_get_frequency, alsa_get_position, + alsa_set_volumes, alsa_set_event_handle, alsa_is_started, };

1 0

Zebediah Figura : wined3d: Trace GL buffer object creation more accurately.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 94c08e6dd1e72083fb9b42874e659b79978640af URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c08e6dd1e72083fb9b4287… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 10 17:07:06 2022 -0600 wined3d: Trace GL buffer object creation more accurately. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4f356bdc7ec..d14b40d8e3e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1080,6 +1080,7 @@ static struct wined3d_allocator_block *wined3d_device_gl_allocate_memory(struct *id = wined3d_allocator_chunk_gl(block->chunk)->gl_buffer; wined3d_device_gl_allocator_unlock(device_gl); + TRACE("Allocated offset %Iu from buffer object %u.\n", block->offset, *id); return block; } @@ -1144,6 +1145,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win checkGLcall("buffer object creation"); return false; } + TRACE("Created buffer object %u.\n", id); wined3d_context_gl_bind_bo(context_gl, binding, id); if (!coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) @@ -1158,7 +1160,6 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win checkGLcall("buffer object creation"); } - TRACE("Created buffer object %u.\n", id); bo->id = id; bo->memory = memory; bo->size = size;

1 0

Zebediah Figura : wined3d: Prevent buildup of retired OpenGL buffer objects' memory.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: ee12556960e30fc22f276d2de2833e63be90cee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee12556960e30fc22f276d2d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 10 17:56:54 2022 -0600 wined3d: Prevent buildup of retired OpenGL buffer objects' memory. Analogous to d71358f5e9e20f4a99354a0192b67009019b78d3 for the Vulkan backend. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52574 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index bb186706ad5..8ac5c28c892 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2713,6 +2713,7 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ device_gl->completed_fence_id = 0; device_gl->current_fence_id = 1; } + device_gl->retired_bo_size = 0; wined3d_context_gl_cleanup_resources(context_gl); } @@ -3123,15 +3124,26 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) { + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); const struct wined3d_gl_info *gl_info = context_gl->gl_info; TRACE("context_gl %p, bo %p.\n", context_gl, bo); if (bo->memory) { + unsigned int order = bo->memory->order; + if (bo->b.map_ptr) wined3d_allocator_chunk_gl_unmap(wined3d_allocator_chunk_gl(bo->memory->chunk), context_gl); wined3d_context_gl_destroy_allocator_block(context_gl, bo->memory, bo->command_fence_id); + + if (bo->command_fence_id == device_gl->current_fence_id) + { + device_gl->retired_bo_size += WINED3D_ALLOCATOR_CHUNK_SIZE >> order; + if (device_gl->retired_bo_size > WINED3D_RETIRED_BO_SIZE_THRESHOLD) + wined3d_context_gl_submit_command_fence(context_gl); + } + bo->id = 0; return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e46b6dfb9e0..e0a60a5807d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4154,6 +4154,7 @@ struct wined3d_device_gl struct wined3d_allocator allocator; uint64_t completed_fence_id; uint64_t current_fence_id; + uint64_t retired_bo_size; struct wined3d_retired_block_gl {

1 0

Matteo Bruni : d3d11: Report support for MapNoOverwriteOnDynamicBufferSRV.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 3dc960c8cc18cb434ed985439a68427f99e65b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dc960c8cc18cb434ed98543… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 10 19:22:44 2022 -0600 d3d11: Report support for MapNoOverwriteOnDynamicBufferSRV. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index cda1a97f974..577a3de5bf8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4090,7 +4090,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 options->ConstantBufferPartialUpdate = FALSE; options->ConstantBufferOffsetting = TRUE; options->MapNoOverwriteOnDynamicConstantBuffer = FALSE; - options->MapNoOverwriteOnDynamicBufferSRV = FALSE; + options->MapNoOverwriteOnDynamicBufferSRV = TRUE; options->MultisampleRTVWithForcedSampleCountOne = FALSE; options->SAD4ShaderInstructions = FALSE; options->ExtendedDoublesShaderInstructions = FALSE;

1 0

Zebediah Figura : d3d11: Report support for MapNoOverwriteOnDynamicConstantBuffer.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 1ca215ea04c2c592d4ff0f708ea558db7464d684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca215ea04c2c592d4ff0f70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 10 19:22:45 2022 -0600 d3d11: Report support for MapNoOverwriteOnDynamicConstantBuffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 577a3de5bf8..7d2c2636f4b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4089,7 +4089,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 options->CopyWithOverlap = FALSE; options->ConstantBufferPartialUpdate = FALSE; options->ConstantBufferOffsetting = TRUE; - options->MapNoOverwriteOnDynamicConstantBuffer = FALSE; + options->MapNoOverwriteOnDynamicConstantBuffer = TRUE; options->MapNoOverwriteOnDynamicBufferSRV = TRUE; options->MultisampleRTVWithForcedSampleCountOne = FALSE; options->SAD4ShaderInstructions = FALSE;

1 0

Paul Gofman : ws2_32: Manage shorter length for IP_RECVTOS.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: f95fd91f1d6086ed1e28d5e3d3a84db10e19ef41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f95fd91f1d6086ed1e28d5e3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 10 12:40:54 2022 +0300 ws2_32: Manage shorter length for IP_RECVTOS. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +++++++++++ dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1ed0418692d..402cb7762fc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1770,6 +1770,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_PKTINFO, optval, optlen ); case IP_RECVTOS: + if (*optlen < sizeof(DWORD) || !optval) + { + *optlen = 0; + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_RECVTOS, optval, optlen ); case IP_RECVTTL: @@ -3086,6 +3092,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_PKTINFO, optval, optlen ); case IP_RECVTOS: + if (optlen < sizeof(DWORD) || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_RECVTOS, optval, optlen ); case IP_RECVTTL: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3bde96b722d..98c806d6a8a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1185,6 +1185,7 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_RECVTOS, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}, {0}, FALSE}, };

1 0