February 2022 - Wine-commits

Francois Gouget : testbot/doc: Update the field sizes in the schema.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: tools Branch: master Commit: 921328dd27941b7f0d6e1b5dc4c133d45bbf9a5b URL: https://source.winehq.org/git/tools.git/?a=commit;h=921328dd27941b7f0d6e1b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 22 19:50:01 2022 +0100 testbot/doc: Update the field sizes in the schema. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/winetestbot-schema.dia | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index a5ef142..b2a6862 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1003,7 +1003,7 @@ <dia:string>#Id#</dia:string> </dia:attribute> <dia:attribute name="type"> - <dia:string>#INT(7)#</dia:string> + <dia:string>#INT#</dia:string> </dia:attribute> <dia:attribute name="comment"> <dia:string>##</dia:string> @@ -1026,7 +1026,7 @@ <dia:string>#WebPatchId#</dia:string> </dia:attribute> <dia:attribute name="type"> - <dia:string>#INT(7)#</dia:string> + <dia:string>#INT#</dia:string> </dia:attribute> <dia:attribute name="comment"> <dia:string>##</dia:string> @@ -1257,7 +1257,7 @@ <dia:string>#Id#</dia:string> </dia:attribute> <dia:attribute name="type"> - <dia:string>#INT(5)#</dia:string> + <dia:string>#INT#</dia:string> </dia:attribute> <dia:attribute name="comment"> <dia:string>##</dia:string> @@ -1441,7 +1441,7 @@ <dia:string>#PatchId#</dia:string> </dia:attribute> <dia:attribute name="type"> - <dia:string>#INT(7)#</dia:string> + <dia:string>#INT#</dia:string> </dia:attribute> <dia:attribute name="comment"> <dia:string>##</dia:string> @@ -1626,7 +1626,7 @@ <dia:string>#PatchId#</dia:string> </dia:attribute> <dia:attribute name="type"> - <dia:string>#INT(7)#</dia:string> + <dia:string>#INT#</dia:string> </dia:attribute> <dia:attribute name="comment"> <dia:string>##</dia:string> @@ -1719,7 +1719,7 @@ <dia:string>#JobId#</dia:string> </dia:attribute> <dia:attribute name="type"> - <dia:string>#INT(5)#</dia:string> + <dia:string>#INT#</dia:string> </dia:attribute> <dia:attribute name="comment"> <dia:string>##</dia:string> @@ -1996,7 +1996,7 @@ <dia:string>#JobId#</dia:string> </dia:attribute> <dia:attribute name="type"> - <dia:string>#INT(5)#</dia:string> + <dia:string>#INT#</dia:string> </dia:attribute> <dia:attribute name="comment"> <dia:string>##</dia:string> @@ -2503,7 +2503,7 @@ <dia:string>#ChildPid#</dia:string> </dia:attribute> <dia:attribute name="type"> - <dia:string>#INT(5)#</dia:string> + <dia:string>#INT#</dia:string> </dia:attribute> <dia:attribute name="comment"> <dia:string>##</dia:string> @@ -3376,7 +3376,7 @@ <dia:string>#RecordGroupId#</dia:string> </dia:attribute> <dia:attribute name="type"> - <dia:string>#INT(6)#</dia:string> + <dia:string>#INT#</dia:string> </dia:attribute> <dia:attribute name="comment"> <dia:string>##</dia:string> @@ -3538,7 +3538,7 @@ <dia:string>#Id#</dia:string> </dia:attribute> <dia:attribute name="type"> - <dia:string>#INT(6)#</dia:string> + <dia:string>#INT#</dia:string> </dia:attribute> <dia:attribute name="comment"> <dia:string>##</dia:string>

1 0

Francois Gouget : testbot/testagentd: Compress the Windows TestAgent server.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: tools Branch: master Commit: 23582e8124f4e30548350058f09fb2e3c8f60961 URL: https://source.winehq.org/git/tools.git/?a=commit;h=23582e8124f4e3054835005… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 22 19:53:49 2022 +0100 testbot/testagentd: Compress the Windows TestAgent server. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 645e268..0677ace 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -4,6 +4,7 @@ CROSSCC32 = i686-w64-mingw32-gcc CROSSSTRIP32 = i686-w64-mingw32-strip CROSSCC64 = x86_64-w64-mingw32-gcc CROSSSTRIP64 = x86_64-w64-mingw32-strip +CROSSZIPEXE = upx-ucl all: build iso build: $(builddir)/testagentd @@ -25,6 +26,10 @@ WIN_SOURCES = testagentd.c platform_windows.c TestAgentd32.exe: $(WIN_SOURCES:.c=.obj32) $(CROSSCC32) -o $@ $(WIN_SOURCES:.c=.obj32) -lws2_32 $(CROSSSTRIP32) $@ + if which $(CROSSZIPEXE); \ + then \ + $(CROSSZIPEXE) --best -q -q $@; \ + fi .SUFFIXES: .obj32 .c.obj32: @@ -33,6 +38,10 @@ TestAgentd32.exe: $(WIN_SOURCES:.c=.obj32) TestAgentd64.exe: $(WIN_SOURCES:.c=.obj64) $(CROSSCC64) -o $@ $(WIN_SOURCES:.c=.obj64) -lws2_32 $(CROSSSTRIP64) $@ + if which $(CROSSZIPEXE); \ + then \ + $(CROSSZIPEXE) --best -q -q $@; \ + fi .SUFFIXES: .obj64 .c.obj64:

1 0

Francois Gouget : testbot/LibvirtTool: Enable Windows' 'test signing' for '-tsign' snapshots.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: tools Branch: master Commit: 7e445b8e067c4860354c0d59c2e67552874aef32 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7e445b8e067c4860354c0d5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 22 19:55:34 2022 +0100 testbot/LibvirtTool: Enable Windows' 'test signing' for '-tsign' snapshots. This allows running some more driver tests. Note that this requires a 64-bit TestAgentd in order to be able to run bcdedit.exe on 64-bit Windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50661 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index ef662cd..6364b30 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -586,7 +586,7 @@ sub GetSnapshotConfig($) { $Config->{locale} ||= $1; # take only the last match } - elsif ($Config->{base} =~ s/-(live|u8)$//) + elsif ($Config->{base} =~ s/-(live|tsign|u8)$//) { $Config->{$1} = 1; } @@ -660,6 +660,15 @@ sub CreateSnapshot($$$$) Error("Could not change the Windows boot delay on $VMKey\n"); } + if ($Config->{tsign}) + { + # Takes effect after the next reboot + if (RunAndWait($PTA, ["bcdedit.exe", "/set", "testsigning", "on"])) + { + FatalError("Could not turn on test signing on $VMKey\n"); + } + } + $Reboot = 1; }

1 0

Alexandre Julliard : ntdll: Load the apiset schema at startup.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: e3c9d73cd1d092542d846a368196e26cd5c44972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3c9d73cd1d092542d846a36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 21 22:23:03 2022 +0100 ntdll: Load the apiset schema at startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 96301b1654e..98a5c933215 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1992,6 +1992,82 @@ static void load_ntdll(void) } +/*********************************************************************** + * load_apiset_dll + */ +static void load_apiset_dll(void) +{ + static WCHAR path[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\', + 'a','p','i','s','e','t','s','c','h','e','m','a','.','d','l','l',0}; + const char *pe_dir = get_pe_dir( current_machine ); + const IMAGE_NT_HEADERS *nt; + const IMAGE_SECTION_HEADER *sec; + API_SET_NAMESPACE *map; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + NTSTATUS status; + HANDLE handle, mapping; + SIZE_T size; + char *name; + void *ptr; + UINT i; + + init_unicode_string( &str, path ); + InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); + + name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/apisetschema.dll") ); + if (build_dir) sprintf( name, "%s/dlls/apisetschema/apisetschema.dll", build_dir ); + else sprintf( name, "%s%s/apisetschema.dll", dll_dir, pe_dir ); + status = open_unix_file( &handle, name, GENERIC_READ | SYNCHRONIZE, &attr, 0, + FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_OPEN, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE, NULL, 0 ); + free( name ); + + if (!status) + { + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, + NULL, NULL, PAGE_READONLY, SEC_COMMIT, handle ); + NtClose( handle ); + } + if (!status) + { + ptr = NULL; + size = 0; + status = NtMapViewOfSection( mapping, NtCurrentProcess(), &ptr, + is_win64 && wow_peb ? 0x7fffffff : 0, 0, NULL, + &size, ViewShare, 0, PAGE_READONLY ); + NtClose( mapping ); + } + if (!status) + { + nt = get_rva( ptr, ((IMAGE_DOS_HEADER *)ptr)->e_lfanew ); + sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) + { + if (memcmp( (char *)sec->Name, ".apiset", 8 )) continue; + map = (API_SET_NAMESPACE *)((char *)ptr + sec->PointerToRawData); + if (sec->PointerToRawData < size && + size - sec->PointerToRawData >= sec->Misc.VirtualSize && + map->Version == 6 && + map->Size <= sec->Misc.VirtualSize) + { + NtCurrentTeb()->Peb->ApiSetMap = map; + if (wow_peb) wow_peb->ApiSetMap = PtrToUlong(map); + NtUnmapViewOfSection( NtCurrentProcess(), ptr ); + TRACE( "loaded %s apiset at %p\n", debugstr_w(path), map ); + return; + } + break; + } + NtUnmapViewOfSection( NtCurrentProcess(), ptr ); + status = STATUS_APISET_NOT_PRESENT; + } + ERR( "failed to load apiset: %x\n", status ); +} + + /*********************************************************************** * load_wow64_ntdll */ @@ -2098,6 +2174,7 @@ static void start_main_thread(void) NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); + load_apiset_dll(); ntdll_init_syscalls( 0, &syscall_table, p__wine_syscall_dispatcher ); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); if (status == STATUS_REVISION_MISMATCH)

1 0

Zebediah Figura : wined3d: Introduce a wined3d_texture_update_sub_resource() helper.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 81068b89d8e37a5fb82fe18432104bb92bb0b384 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81068b89d8e37a5fb82fe184… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 20 23:22:23 2022 -0600 wined3d: Introduce a wined3d_texture_update_sub_resource() helper. 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/cs.c | 30 ++---------------------------- dlls/wined3d/texture.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7280739b8b2..f294be29091 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2739,43 +2739,17 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi const struct wined3d_cs_update_sub_resource *op = data; struct wined3d_resource *resource = op->resource; const struct wined3d_box *box = &op->box; - unsigned int width, height, depth, level; struct wined3d_context *context; - struct wined3d_texture *texture; - struct wined3d_box src_box; context = context_acquire(cs->c.device, NULL, 0); if (resource->type == WINED3D_RTYPE_BUFFER) - { wined3d_buffer_update_sub_resource(buffer_from_resource(resource), context, &op->bo, box->left, box->right - box->left); - goto done; - } - - texture = wined3d_texture_from_resource(resource); - - level = op->sub_resource_idx % texture->level_count; - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); - depth = wined3d_texture_get_level_depth(texture, level); - - /* Only load the sub-resource for partial updates. */ - if (!box->left && !box->top && !box->front - && box->right == width && box->bottom == height && box->back == depth) - wined3d_texture_prepare_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); else - wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - - wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); - texture->texture_ops->texture_upload_data(context, &op->bo.addr, texture->resource.format, &src_box, - op->row_pitch, op->slice_pitch, texture, op->sub_resource_idx, - WINED3D_LOCATION_TEXTURE_RGB, box->left, box->top, box->front); - - wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_update_sub_resource(texture_from_resource(resource), + op->sub_resource_idx, context, &op->bo, box, op->row_pitch, op->slice_pitch); -done: context_release(context); wined3d_resource_release(resource); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1323d533eff..3bbdb492998 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4533,6 +4533,32 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); } +void wined3d_texture_update_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, const struct upload_bo *upload_bo, const struct wined3d_box *box, + unsigned int row_pitch, unsigned int slice_pitch) +{ + unsigned int level = sub_resource_idx % texture->level_count; + unsigned int width = wined3d_texture_get_level_width(texture, level); + unsigned int height = wined3d_texture_get_level_height(texture, level); + unsigned int depth = wined3d_texture_get_level_depth(texture, level); + struct wined3d_box src_box; + + /* Only load the sub-resource for partial updates. */ + if (!box->left && !box->top && !box->front + && box->right == width && box->bottom == height && box->back == depth) + wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); + else + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); + + wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); + texture->texture_ops->texture_upload_data(context, &upload_bo->addr, texture->resource.format, + &src_box, row_pitch, slice_pitch, texture, sub_resource_idx, + WINED3D_LOCATION_TEXTURE_RGB, box->left, box->top, box->front); + + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); +} + static void wined3d_texture_no3d_upload_data(struct wined3d_context *context, const struct wined3d_const_bo_address *src_bo_addr, const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 989fd33d2bf..277d5a94fb0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4643,6 +4643,9 @@ BOOL wined3d_texture_can_use_pbo(const struct wined3d_texture *texture, const st void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, HWND window, RECT *rect) DECLSPEC_HIDDEN; +void wined3d_texture_update_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, const struct upload_bo *upload_bo, const struct wined3d_box *box, + unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) DECLSPEC_HIDDEN;

1 0

Huw Davies : winealsa: Store the channel volumes in the stream.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: f608d78910894de739d4f7bba08f03f179b270e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f608d78910894de739d4f7bb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 18 08:29:27 2022 +0000 winealsa: Store the channel volumes in the stream. 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/mmdevdrv.c | 24 +++++++++++++++++++++++- dlls/winealsa.drv/unixlib.h | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 48694710719..d1f9a1d35a4 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -321,6 +321,15 @@ static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; } +static void set_stream_volumes(ACImpl *This) +{ + struct alsa_stream *stream = This->stream; + unsigned int i; + + for(i = 0; i < stream->fmt->nChannels; i++) + stream->vols[i] = This->vols[i]; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) { @@ -591,6 +600,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); HeapFree(GetProcessHeap(), 0, stream->hw_params); CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream->vols); HeapFree(GetProcessHeap(), 0, stream); } HeapFree(GetProcessHeap(), 0, This); @@ -1171,6 +1181,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; + stream->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); + if(!stream->vols){ + hr = E_OUTOFMEMORY; + goto exit; + } + for(i = 0; i < fmt->nChannels; ++i) + stream->vols[i] = 1.f; + stream->share = mode; stream->flags = flags; @@ -1194,11 +1212,13 @@ exit: stream->local_buffer = NULL; CoTaskMemFree(stream->fmt); stream->fmt = NULL; + HeapFree(GetProcessHeap(), 0, stream->vols); HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; }else{ This->stream = stream; + set_stream_volumes(This); } LeaveCriticalSection(&This->lock); @@ -1471,7 +1491,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ /* Adjust the buffer based on the volume for each channel */ for (i = 0; i < channels; i++) - vol[i] = This->vols[i] * This->session->master_vol; + vol[i] = stream->vols[i] * This->session->master_vol; for (i = 0; i < min(channels, This->session->channel_count); i++) { vol[i] *= This->session->channel_vols[i]; @@ -3214,6 +3234,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( EnterCriticalSection(&This->lock); This->vols[index] = level; + set_stream_volumes(This); LeaveCriticalSection(&This->lock); @@ -3258,6 +3279,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; + set_stream_volumes(This); LeaveCriticalSection(&This->lock); diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index cd8d303b5d3..f121763952c 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -49,6 +49,7 @@ struct alsa_stream BYTE *local_buffer, *tmp_buffer, *remapping_buf, *silence_buf; LONG32 getbuf_last; /* <0 when using tmp_buffer */ + float *vols; }; struct endpoint

1 0

Huw Davies : winealsa: Remove an unnecessary check on the session channel count.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 8130371614b9845f23a935912493d501bbfb6574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8130371614b9845f23a93591… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 18 08:29:28 2022 +0000 winealsa: Remove an unnecessary check on the session channel count. This must always be at least equal to any given stream's channels. 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/mmdevdrv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index d1f9a1d35a4..8f198531cc0 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1491,13 +1491,11 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ /* Adjust the buffer based on the volume for each channel */ for (i = 0; i < channels; i++) - vol[i] = stream->vols[i] * This->session->master_vol; - for (i = 0; i < min(channels, This->session->channel_count); i++) { + vol[i] = stream->vols[i] * This->session->master_vol; vol[i] *= This->session->channel_vols[i]; adjust |= vol[i] != 1.0f; } - while (i < channels) adjust |= vol[i++] != 1.0f; if (!adjust) return; /* Skip the frames we've already adjusted before */

1 0

Huw Davies : winealsa: Store the session channel vols in the stream.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: a4de96a1f0d2d17329e8f94084e328069d73c6e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4de96a1f0d2d17329e8f940… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 18 08:29:29 2022 +0000 winealsa: Store the session channel vols in the stream. 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/mmdevdrv.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8f198531cc0..222decdb150 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -327,7 +327,7 @@ static void set_stream_volumes(ACImpl *This) unsigned int i; for(i = 0; i < stream->fmt->nChannels; i++) - stream->vols[i] = This->vols[i]; + stream->vols[i] = This->vols[i] * This->session->channel_vols[i]; } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, @@ -1493,7 +1493,6 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ for (i = 0; i < channels; i++) { vol[i] = stream->vols[i] * This->session->master_vol; - vol[i] *= This->session->channel_vols[i]; adjust |= vol[i] != 1.0f; } if (!adjust) return; @@ -3375,6 +3374,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%d, %f, %s)\n", session, index, level, wine_dbgstr_guid(context)); @@ -3394,6 +3394,9 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( session->channel_vols[index] = level; + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); + LeaveCriticalSection(&g_sessions_lock); return S_OK; @@ -3425,6 +3428,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; unsigned int i; + ACImpl *client; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, wine_dbgstr_guid(context)); @@ -3445,6 +3449,9 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); + LeaveCriticalSection(&g_sessions_lock); return S_OK;

1 0

Huw Davies : winealsa: Store the session master volume in the stream.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 4f8a2e456b805159ffd459fbdc23bb4c76e018da URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f8a2e456b805159ffd459fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 18 08:29:30 2022 +0000 winealsa: Store the session master volume in the stream. 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/mmdevdrv.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 222decdb150..959157ade87 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -327,7 +327,7 @@ static void set_stream_volumes(ACImpl *This) unsigned int i; for(i = 0; i < stream->fmt->nChannels; i++) - stream->vols[i] = This->vols[i] * This->session->channel_vols[i]; + stream->vols[i] = This->vols[i] * This->session->channel_vols[i] * This->session->master_vol; } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, @@ -1472,7 +1472,6 @@ static BYTE *remap_channels(struct alsa_stream *stream, BYTE *buf, snd_pcm_ufram static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) { struct alsa_stream *stream = This->stream; - float vol[ARRAY_SIZE(stream->alsa_channel_map)]; BOOL adjust = FALSE; UINT32 i, channels; BYTE *end; @@ -1492,8 +1491,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ /* Adjust the buffer based on the volume for each channel */ for (i = 0; i < channels; i++) { - vol[i] = stream->vols[i] * This->session->master_vol; - adjust |= vol[i] != 1.0f; + adjust |= stream->vols[i] != 1.0f; } if (!adjust) return; @@ -1510,7 +1508,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ do \ { \ for (i = 0; i < channels; i++) \ - p[i] = p[i] * vol[i]; \ + p[i] = p[i] * stream->vols[i]; \ p += i; \ } while ((BYTE*)p != end); \ } while (0) @@ -1548,7 +1546,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ v[3] = q[2] & ~0xff; for (k = 0; k < 4; k++) { - v[k] = (INT32)((INT32)v[k] * vol[i]); + v[k] = (INT32)((INT32)v[k] * stream->vols[i]); v[k] &= mask; if (++i == channels) i = 0; } @@ -1559,7 +1557,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ p = (BYTE*)q; while (p != end) { - UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * vol[i]); + UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * stream->vols[i]); v &= mask; *p++ = v >> 8 & 0xff; *p++ = v >> 16 & 0xff; @@ -1575,7 +1573,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ do { for (i = 0; i < channels; i++) - p[i] = (int)((p[i] - 128) * vol[i]) + 128; + p[i] = (int)((p[i] - 128) * stream->vols[i]) + 128; p += i; } while ((BYTE*)p != end); break; @@ -3086,6 +3084,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%f, %s)\n", session, level, wine_dbgstr_guid(context)); @@ -3101,6 +3100,9 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( session->master_vol = level; + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); + LeaveCriticalSection(&g_sessions_lock); return S_OK;

1 0

Huw Davies : winealsa: Store the session mute state in the stream volumes.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 444d429fcc910765c8942a5447394b8b6e53b3f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=444d429fcc910765c8942a54… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 18 08:29:31 2022 +0000 winealsa: Store the session mute state in the stream volumes. 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/mmdevdrv.c | 45 ++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 959157ade87..14dfbd07acb 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -327,7 +327,8 @@ static void set_stream_volumes(ACImpl *This) unsigned int i; for(i = 0; i < stream->fmt->nChannels; i++) - stream->vols[i] = This->vols[i] * This->session->channel_vols[i] * This->session->master_vol; + stream->vols[i] = This->session->mute ? 0.0f : + This->vols[i] * This->session->channel_vols[i] * This->session->master_vol; } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, @@ -1469,30 +1470,32 @@ static BYTE *remap_channels(struct alsa_stream *stream, BYTE *buf, snd_pcm_ufram return stream->remapping_buf; } -static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) +static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) { struct alsa_stream *stream = This->stream; BOOL adjust = FALSE; - UINT32 i, channels; + UINT32 i, channels, mute = 0; BYTE *end; if (stream->vol_adjusted_frames >= frames) return; channels = stream->fmt->nChannels; - if (mute) + /* Adjust the buffer based on the volume for each channel */ + for (i = 0; i < channels; i++) + { + adjust |= stream->vols[i] != 1.0f; + if (stream->vols[i] == 0.0f) + mute++; + } + + if (mute == channels) { int err = snd_pcm_format_set_silence(stream->alsa_format, buf, frames * channels); if (err < 0) WARN("Setting buffer to silence failed: %d (%s)\n", err, snd_strerror(err)); return; } - - /* Adjust the buffer based on the volume for each channel */ - for (i = 0; i < channels; i++) - { - adjust |= stream->vols[i] != 1.0f; - } if (!adjust) return; /* Skip the frames we've already adjusted before */ @@ -1584,13 +1587,12 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ } } -static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, - snd_pcm_uframes_t frames, BOOL mute) +static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) { struct alsa_stream *stream = This->stream; snd_pcm_sframes_t written; - adjust_buffer_volume(This, buf, frames, mute); + adjust_buffer_volume(This, buf, frames); /* Mark the frames we've already adjusted */ if (stream->vol_adjusted_frames < frames) @@ -1639,7 +1641,7 @@ static snd_pcm_sframes_t alsa_write_buffer_wrap(ACImpl *This, BYTE *buf, else chunk = to_write; - tmp = alsa_write_best_effort(This, buf + offs * stream->fmt->nBlockAlign, chunk, This->session->mute); + tmp = alsa_write_best_effort(This, buf + offs * stream->fmt->nBlockAlign, chunk); if(tmp < 0) return ret; if(!tmp) @@ -1722,7 +1724,7 @@ static void alsa_write_data(ACImpl *This) if(stream->data_in_alsa_frames == 0 && stream->held_frames < stream->alsa_period_frames) { alsa_write_best_effort(This, stream->silence_buf, - stream->alsa_period_frames - stream->held_frames, FALSE); + stream->alsa_period_frames - stream->held_frames); stream->vol_adjusted_frames = 0; } @@ -1766,6 +1768,7 @@ static void alsa_read_data(ACImpl *This) struct alsa_stream *stream = This->stream; snd_pcm_sframes_t nread; UINT32 pos = stream->wri_offs_frames, limit = stream->held_frames; + unsigned int i; if(!stream->started) goto exit; @@ -1799,7 +1802,10 @@ static void alsa_read_data(ACImpl *This) } } - if(This->session->mute){ + for(i = 0; i < stream->fmt->nChannels; i++) + if(stream->vols[i] != 0.0f) + break; + if(i == stream->fmt->nChannels){ /* mute */ int err; if((err = snd_pcm_format_set_silence(stream->alsa_format, stream->local_buffer + pos * stream->fmt->nBlockAlign, @@ -3129,13 +3135,20 @@ 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)); if(context) FIXME("Notifications not supported yet\n"); + EnterCriticalSection(&g_sessions_lock); + session->mute = mute; + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); + + LeaveCriticalSection(&g_sessions_lock); return S_OK; }

1 0