wine-devel April 2022

wine-devel@winehq.org

87 participants
938 discussions

[PATCH 5/5] wineoss: Move set_volumes to the unixlib.
by Huw Davies 18 Apr '22

18 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 35 ++++++----------------------------- dlls/wineoss.drv/oss.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 31 ++++++++++--------------------- 3 files changed, 51 insertions(+), 50 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index cdd9b09bff7..9e3380ca8d9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -18,22 +18,7 @@ */ #define COBJMACROS -#include "config.h" - #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 <unistd.h> -#include <math.h> -#include <sys/soundcard.h> -#include <pthread.h> #include "windef.h" #include "winbase.h" @@ -277,16 +262,6 @@ static DWORD WINAPI timer_thread(void *user) return 0; } -static void oss_lock(struct oss_stream *stream) -{ - pthread_mutex_lock(&stream->lock); -} - -static void oss_unlock(struct oss_stream *stream) -{ - pthread_mutex_unlock(&stream->lock); -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -361,11 +336,13 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) static void set_stream_volumes(ACImpl *This) { - struct oss_stream *stream = This->stream; + struct set_volumes_params params; - oss_lock(stream); - stream->mute = This->session->mute; - oss_unlock(stream); + 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; + OSS_CALL(set_volumes, &params); } static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 79f2e994d89..b4e2cbda704 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -44,6 +44,28 @@ #include "unixlib.h" +struct oss_stream +{ + WAVEFORMATEX *fmt; + EDataFlow flow; + UINT flags; + AUDCLNT_SHAREMODE share; + HANDLE event; + + int fd; + + BOOL playing, mute, please_quit; + UINT64 written_frames, last_pos_frames; + UINT32 period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; + UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ + REFERENCE_TIME period; + + BYTE *local_buffer, *tmp_buffer; + INT32 getbuf_last; /* <0 when using tmp_buffer */ + + pthread_mutex_t lock; +}; + WINE_DEFAULT_DEBUG_CHANNEL(oss); /* copied from kernelbase */ @@ -1316,6 +1338,18 @@ static NTSTATUS get_position(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS set_volumes(void *args) +{ + struct set_volumes_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + stream->mute = !params->master_volume; + oss_unlock(stream); + + return STATUS_SUCCESS; +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -1368,6 +1402,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/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index ed93f0836b1..1ed152fe794 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -18,27 +18,7 @@ #include "mmdeviceapi.h" -struct oss_stream -{ - WAVEFORMATEX *fmt; - EDataFlow flow; - UINT flags; - AUDCLNT_SHAREMODE share; - HANDLE event; - - int fd; - - BOOL playing, mute, please_quit; - UINT64 written_frames, last_pos_frames; - UINT32 period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; - UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ - REFERENCE_TIME period; - - BYTE *local_buffer, *tmp_buffer; - INT32 getbuf_last; /* <0 when using tmp_buffer */ - - pthread_mutex_t lock; -}; +struct stream_oss; /* From <dlls/mmdevapi/mmdevapi.h> */ enum DriverPriority @@ -208,6 +188,14 @@ struct get_position_params UINT64 *qpctime; }; +struct set_volumes_params +{ + struct oss_stream *stream; + float master_volume; + const float *volumes; + const float *session_volumes; +}; + struct set_event_handle_params { struct oss_stream *stream; @@ -243,6 +231,7 @@ enum oss_funcs oss_get_next_packet_size, oss_get_frequency, oss_get_position, + oss_set_volumes, oss_set_event_handle, oss_is_started, }; -- 2.25.1

3 2

[PATCH 4/5] wineoss: Move is_started to the unixlib.
by Huw Davies 18 Apr '22

18 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 8 ++++---- dlls/wineoss.drv/oss.c | 11 +++++++++++ dlls/wineoss.drv/unixlib.h | 7 +++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c921b4975c9..cdd9b09bff7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1596,6 +1596,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); @@ -1612,14 +1613,13 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - oss_lock(client->stream); - if(client->stream->playing){ + params.stream = client->stream; + OSS_CALL(is_started, &params); + if(params.result == S_OK){ *state = AudioSessionStateActive; - oss_unlock(client->stream); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - oss_unlock(client->stream); } LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a39b0bc4f66..79f2e994d89 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1336,6 +1336,16 @@ static NTSTATUS set_event_handle(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS is_started(void *args) +{ + struct is_started_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + return oss_unlock_result(stream, &params->result, stream->playing ? S_OK : S_FALSE); +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -1359,4 +1369,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_frequency, get_position, set_event_handle, + is_started, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 982b11ec44f..ed93f0836b1 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -215,6 +215,12 @@ struct set_event_handle_params HRESULT result; }; +struct is_started_params +{ + struct oss_stream *stream; + HRESULT result; +}; + enum oss_funcs { oss_test_connect, @@ -238,6 +244,7 @@ enum oss_funcs oss_get_frequency, oss_get_position, oss_set_event_handle, + oss_is_started, }; extern unixlib_handle_t oss_handle; -- 2.25.1

3 2

[PATCH 3/5] wineoss: Move get_position to the unixlib.
by Huw Davies 18 Apr '22

18 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 45 +++++-------------------------------- dlls/wineoss.drv/oss.c | 45 +++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 ++++++++ 3 files changed, 60 insertions(+), 39 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 6498a4750d4..c921b4975c9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1442,52 +1442,19 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); - struct oss_stream *stream = This->stream; + struct get_position_params params; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); if(!pos) return E_POINTER; - oss_lock(stream); - - if(stream->flow == eRender){ - *pos = stream->written_frames - stream->held_frames; - if(*pos < stream->last_pos_frames) - *pos = stream->last_pos_frames; - }else if(stream->flow == eCapture){ - audio_buf_info bi; - UINT32 held; - - if(ioctl(stream->fd, SNDCTL_DSP_GETISPACE, &bi) < 0){ - TRACE("GETISPACE failed: %d (%s)\n", errno, strerror(errno)); - held = 0; - }else{ - if(bi.bytes <= bi.fragsize) - held = 0; - else - held = bi.bytes / stream->fmt->nBlockAlign; - } - - *pos = stream->written_frames + held; - } - - stream->last_pos_frames = *pos; - - TRACE("returning: %s\n", wine_dbgstr_longlong(*pos)); - if(stream->share == AUDCLNT_SHAREMODE_SHARED) - *pos *= stream->fmt->nBlockAlign; - - oss_unlock(stream); - - if(qpctime){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } + params.stream = This->stream; + params.position = pos; + params.qpctime = qpctime; + OSS_CALL(get_position, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 3a512c7cd9e..a39b0bc4f66 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1272,6 +1272,50 @@ static NTSTATUS get_frequency(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_position(void *args) +{ + struct get_position_params *params = args; + struct oss_stream *stream = params->stream; + UINT64 *pos = params->position, *qpctime = params->qpctime; + + oss_lock(stream); + + if(stream->flow == eRender){ + *pos = stream->written_frames - stream->held_frames; + if(*pos < stream->last_pos_frames) + *pos = stream->last_pos_frames; + }else if(stream->flow == eCapture){ + audio_buf_info bi; + UINT32 held; + + if(ioctl(stream->fd, SNDCTL_DSP_GETISPACE, &bi) < 0){ + TRACE("GETISPACE failed: %d (%s)\n", errno, strerror(errno)); + held = 0; + }else{ + if(bi.bytes <= bi.fragsize) + held = 0; + else + held = bi.bytes / stream->fmt->nBlockAlign; + } + + *pos = stream->written_frames + held; + } + + stream->last_pos_frames = *pos; + + TRACE("returning: %s\n", wine_dbgstr_longlong(*pos)); + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *pos *= stream->fmt->nBlockAlign; + + if(qpctime){ + LARGE_INTEGER stamp, freq; + NtQueryPerformanceCounter(&stamp, &freq); + *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return oss_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -1313,5 +1357,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/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 9a544ae7899..982b11ec44f 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -200,6 +200,14 @@ struct get_frequency_params UINT64 *frequency; }; +struct get_position_params +{ + struct oss_stream *stream; + HRESULT result; + UINT64 *position; + UINT64 *qpctime; +}; + struct set_event_handle_params { struct oss_stream *stream; @@ -228,6 +236,7 @@ enum oss_funcs oss_get_current_padding, oss_get_next_packet_size, oss_get_frequency, + oss_get_position, oss_set_event_handle, }; -- 2.25.1

3 2

[PATCH 2/5] wineoss: Move get_frequency to the unixlib.
by Huw Davies 18 Apr '22

18 Apr '22

Technically the lock doesn't need to be taken here since the data is static, however doing so keeps the implementation consistent with the others. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 11 +++++------ dlls/wineoss.drv/oss.c | 17 +++++++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c101d757836..6498a4750d4 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1427,16 +1427,15 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); - struct oss_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.frequency = freq; + OSS_CALL(get_frequency, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index ffea1bb8338..3a512c7cd9e 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1256,6 +1256,22 @@ static NTSTATUS get_next_packet_size(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_frequency(void *args) +{ + struct get_frequency_params *params = args; + struct oss_stream *stream = params->stream; + UINT64 *freq = params->frequency; + + oss_lock(stream); + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; + else + *freq = stream->fmt->nSamplesPerSec; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -1296,5 +1312,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/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index a809ad41d3e..9a544ae7899 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -193,6 +193,13 @@ struct get_next_packet_size_params UINT32 *frames; }; +struct get_frequency_params +{ + struct oss_stream *stream; + HRESULT result; + UINT64 *frequency; +}; + struct set_event_handle_params { struct oss_stream *stream; @@ -220,6 +227,7 @@ enum oss_funcs oss_get_latency, oss_get_current_padding, oss_get_next_packet_size, + oss_get_frequency, oss_set_event_handle, }; -- 2.25.1

3 2

[PATCH 1/5] wineoss: Move get_next_packet_size to the unixlib.
by Huw Davies 18 Apr '22

18 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 12 +++++------- dlls/wineoss.drv/oss.c | 14 ++++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 80bac1d9ceb..c101d757836 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1364,20 +1364,18 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( IAudioCaptureClient *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct oss_stream *stream = This->stream; + struct get_next_packet_size_params params; TRACE("(%p)->(%p)\n", This, frames); if(!frames) return E_POINTER; - oss_lock(stream); - - *frames = stream->held_frames < stream->period_frames ? 0 : stream->period_frames; - - oss_unlock(stream); + params.stream = This->stream; + params.frames = frames; + OSS_CALL(get_next_packet_size, &params); - return S_OK; + return params.result; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index f1994295618..ffea1bb8338 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1243,6 +1243,19 @@ static NTSTATUS get_current_padding(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_next_packet_size(void *args) +{ + struct get_next_packet_size_params *params = args; + struct oss_stream *stream = params->stream; + UINT32 *frames = params->frames; + + oss_lock(stream); + + *frames = stream->held_frames < stream->period_frames ? 0 : stream->period_frames; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -1282,5 +1295,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/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 2f0884b9ac5..a809ad41d3e 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -186,6 +186,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct get_next_packet_size_params +{ + struct oss_stream *stream; + HRESULT result; + UINT32 *frames; +}; + struct set_event_handle_params { struct oss_stream *stream; @@ -212,6 +219,7 @@ enum oss_funcs oss_get_buffer_size, oss_get_latency, oss_get_current_padding, + oss_get_next_packet_size, oss_set_event_handle, }; -- 2.25.1

3 2

[PATCH v2 11/11] winex11: Use pthread for xrender locking.
by Jacek Caban 18 Apr '22

18 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/xrender.c | 45 ++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 26 deletions(-)

2 1

[PATCH v2 10/11] winex11: Use pthread for xrandr locking.
by Jacek Caban 18 Apr '22

18 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-)

2 1

[PATCH v2 09/11] winex11: Use pthread for error handler locking.
by Jacek Caban 18 Apr '22

18 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/x11drv_main.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)

2 1

[PATCH v2 08/11] winex11: Use pthread for D3DKMT locking.
by Jacek Caban 18 Apr '22

18 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/x11drv_main.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)

2 1

[PATCH v2 07/11] winex11: Use pthread for win data locking.
by Jacek Caban 18 Apr '22

18 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/window.c | 28 +++++++++++++++------------- dlls/winex11.drv/x11drv.h | 3 +-- dlls/winex11.drv/x11drv_main.c | 4 +--- 3 files changed, 17 insertions(+), 18 deletions(-)

2 1

← Newer
1
...
44
45
46
47
48
49
50
...
94
Older →

Jump to page:

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-devel April 2022