- Wine-Devel - list.winehq.org

[PATCH 1/6] wined3d: Respect the BO buffer offset in wined3d_context_gl_copy_bo_address().
by Zebediah Figura Nov. 24, 2021

Nov. 24, 2021

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index b327b7bba8e..3c57bcbe249 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2828,7 +2828,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src_bo->id)); GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst_bo->id)); GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, - (GLintptr)src->addr, (GLintptr)dst->addr, size)); + src_bo->b.buffer_offset + (GLintptr)src->addr, + dst_bo->b.buffer_offset + (GLintptr)dst->addr, size)); checkGLcall("direct buffer copy"); wined3d_context_gl_reference_bo(context_gl, src_bo); @@ -2850,7 +2851,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, else if (!dst_bo && src_bo) { wined3d_context_gl_bind_bo(context_gl, src_bo->binding, src_bo->id); - GL_EXTCALL(glGetBufferSubData(src_bo->binding, (GLintptr)src->addr, size, dst->addr)); + GL_EXTCALL(glGetBufferSubData(src_bo->binding, src_bo->b.buffer_offset + (GLintptr)src->addr, size, dst->addr)); checkGLcall("buffer download"); wined3d_context_gl_reference_bo(context_gl, src_bo); @@ -2858,7 +2859,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, else if (dst_bo && !src_bo) { wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); - GL_EXTCALL(glBufferSubData(dst_bo->binding, (GLintptr)dst->addr, size, src->addr)); + GL_EXTCALL(glBufferSubData(dst_bo->binding, dst_bo->b.buffer_offset + (GLintptr)dst->addr, size, src->addr)); checkGLcall("buffer upload"); wined3d_context_gl_reference_bo(context_gl, dst_bo); -- 2.33.0

4 13

[PATCH] server: Implement the \??\GLOBALROOT symbolic link.
by Jinoh Kang Nov. 24, 2021

Nov. 24, 2021

\??\GLOBALROOT is a well-known NT symbolic link that allows applications to access the NT object manager's root namespace via Win32 APIs. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/om.c | 59 +++++++++++++++++++++++++++++++++++++++++++ server/directory.c | 3 +++ server/object.h | 2 ++ server/symlink.c | 13 ++++++++++ 4 files changed, 77 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 77eb58a23b5..250984ebdda 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2388,6 +2388,64 @@ static void test_get_next_thread(void) CloseHandle(thread); } +static void test_globalroot(void) +{ + NTSTATUS status; + IO_STATUS_BLOCK iosb; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + HANDLE h; + WCHAR buffer[256]; + ULONG len, full_len, i; + static const struct { const WCHAR *name, *target; } symlinks[] = { + { L"\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\??\\GLOBALROOT\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\DosDevices", L"\\??" }, + { L"\\??\\GLOBALROOT\\BaseNamedObjects\\Global", NULL }, + }; + + for (i = 0; i < ARRAY_SIZE(symlinks); i++) + { + pRtlInitUnicodeString(&str, symlinks[i].name); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); + ok(status == STATUS_SUCCESS, "NtOpenSymbolicLinkObject failed %08x\n", status); + + str.Buffer = buffer; + str.MaximumLength = sizeof(buffer); + len = 0xdeadbeef; + memset( buffer, 0xaa, sizeof(buffer) ); + status = pNtQuerySymbolicLinkObject( h, &str, &len); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + full_len = str.Length + sizeof(WCHAR); + ok( len == full_len, "bad length %u (expected %u)\n", len, full_len ); + ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); + + if (symlinks[i].target) + { + ok( compare_unicode_string( &str, symlinks[i].target ), + "symlink %s: target expected %s, got %s\n", + debugstr_w( symlinks[i].name ), + debugstr_w( symlinks[i].target ), + debugstr_w( str.Buffer ) ); + } + + pNtClose(h); + } + + pRtlInitUnicodeString(&str, L"\\??\\GLOBALROOT\\Device\\Null"); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + status = pNtOpenFile(&h, GENERIC_READ | GENERIC_WRITE, &attr, &iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + ok(status == STATUS_SUCCESS, + "expected STATUS_SUCCESS, got %08x\n", status); + + test_object_type(h, L"File"); + + pNtClose(h); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2446,4 +2504,5 @@ START_TEST(om) test_duplicate_object(); test_object_types(); test_get_next_thread(); + test_globalroot(); } diff --git a/server/directory.c b/server/directory.c index 70a34d3f1bb..2cd61be0838 100644 --- a/server/directory.c +++ b/server/directory.c @@ -378,6 +378,7 @@ void init_directories( struct fd *intl_fd ) /* symlinks */ static const WCHAR link_dosdevW[] = {'D','o','s','D','e','v','i','c','e','s'}; + static const WCHAR link_globalrootW[] = {'G','L','O','B','A','L','R','O','O','T'}; static const WCHAR link_globalW[] = {'G','l','o','b','a','l'}; static const WCHAR link_nulW[] = {'N','U','L'}; static const WCHAR link_pipeW[] = {'P','I','P','E'}; @@ -392,6 +393,7 @@ void init_directories( struct fd *intl_fd ) static const WCHAR link_consoleW[] = {'\\','D','e','v','i','c','e','\\','C','o','n','D','r','v', '\\','C','o','n','s','o','l','e'}; static const struct unicode_str link_dosdev_str = {link_dosdevW, sizeof(link_dosdevW)}; + static const struct unicode_str link_globalroot_str = {link_globalrootW, sizeof(link_globalrootW)}; static const struct unicode_str link_global_str = {link_globalW, sizeof(link_globalW)}; static const struct unicode_str link_nul_str = {link_nulW, sizeof(link_nulW)}; static const struct unicode_str link_pipe_str = {link_pipeW, sizeof(link_pipeW)}; @@ -470,6 +472,7 @@ void init_directories( struct fd *intl_fd ) /* symlinks */ release_object( create_obj_symlink( &root_directory->obj, &link_dosdev_str, OBJ_PERMANENT, &dir_global->obj, NULL )); + release_object( create_root_symlink( &dir_global->obj, &link_globalroot_str, OBJ_PERMANENT, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_global_str, OBJ_PERMANENT, &dir_global->obj, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_nul_str, OBJ_PERMANENT, null_device, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_pipe_str, OBJ_PERMANENT, named_pipe_device, NULL )); diff --git a/server/object.h b/server/object.h index 97d6c0e91f8..f156f1d2f13 100644 --- a/server/object.h +++ b/server/object.h @@ -279,6 +279,8 @@ extern void init_directories( struct fd *intl_fd ); /* symbolic link functions */ +extern struct object *create_root_symlink( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); extern struct object *create_obj_symlink( struct object *root, const struct unicode_str *name, unsigned int attr, struct object *target, const struct security_descriptor *sd ); diff --git a/server/symlink.c b/server/symlink.c index fa97d9155fa..27d48e2f994 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -110,6 +110,8 @@ static struct object *symlink_lookup_name( struct object *obj, struct unicode_st if (!name->len && (attr & OBJ_OPENLINK)) return NULL; if (obj == root) return NULL; + if (!symlink->len) return get_root_directory(); + target_str.str = symlink->target; target_str.len = symlink->len; if ((target = lookup_named_object( NULL, &target_str, attr, &name_left ))) @@ -131,6 +133,17 @@ static void symlink_destroy( struct object *obj ) free( symlink->target ); } +struct object *create_root_symlink( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) +{ + struct symlink *symlink; + + if (!(symlink = create_named_object( root, &symlink_ops, name, attr, sd ))) return NULL; + symlink->target = NULL; + symlink->len = 0; + return &symlink->obj; +} + struct object *create_symlink( struct object *root, const struct unicode_str *name, unsigned int attr, const struct unicode_str *target, const struct security_descriptor *sd ) -- 2.31.1

1 0

[PATCH 11/11] winecoreaudio: Avoid 64-bit ptr truncation.
by Huw Davies Nov. 24, 2021

Nov. 24, 2021

This makes winecoreaudio consistent with the other midi drivers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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: -- 2.23.0

2 1

[PATCH 10/11] winecoreaudio: Remove system includes.
by Huw Davies Nov. 24, 2021

Nov. 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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" -- 2.23.0

2 1

[PATCH 09/11] winecoreaudio: Store the device id as a DWORD.
by Huw Davies Nov. 24, 2021

Nov. 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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) -- 2.23.0

2 1

[PATCH 08/11] winecoreaudio: Make the coreaudio_stream structure private to the unixlib.
by Huw Davies Nov. 24, 2021

Nov. 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 { -- 2.23.0

2 1

[PATCH 07/11] winecoreaudio: Move set_volumes to the unixlib.
by Huw Davies Nov. 24, 2021

Nov. 24, 2021

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> --- 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; -- 2.23.0

2 1

[PATCH 06/11] winecoreaudio: Move is_started to the unixlib.
by Huw Davies Nov. 24, 2021

Nov. 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; -- 2.23.0

2 1

[PATCH 05/11] winecoreaudio: Move get_frequency to the unixlib.
by Huw Davies Nov. 24, 2021

Nov. 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; -- 2.23.0

2 1

[PATCH 04/11] winecoreaudio: Move get_position to the unixlib.
by Huw Davies Nov. 24, 2021

Nov. 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; -- 2.23.0

2 1