wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

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

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/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

Santino Mazza : ncrypt/tests: Test for NCryptSetProperty.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 53cb28e6d9daa7cbcc190cd02aeaba37c297adc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cb28e6d9daa7cbcc190cd0… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Mon Feb 21 12:13:44 2022 +0100 ncrypt/tests: Test for NCryptSetProperty. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/tests/ncrypt.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 58173fd0ff0..d1bcbbcab2a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -205,6 +205,51 @@ static void test_get_property(void) NCryptFreeObject(prov); } +static void test_set_property(void) +{ + NCRYPT_PROV_HANDLE prov; + SECURITY_STATUS ret; + NCRYPT_KEY_HANDLE key; + DWORD keylength; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + keylength = 2048; + ret = NCryptSetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); + ok(ret == ERROR_SUCCESS || broken(ret == NTE_INVALID_HANDLE), "got %#lx\n", ret); + + ret = NCryptSetProperty(0, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + todo_wine + { + ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); + ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + NCryptFreeObject(key); + + key = 0; + ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(key, "got null handle\n"); + + keylength = 2048; + ret = NCryptSetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); + ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + + ret = NCryptSetProperty(key, L"My Custom Property", (BYTE *)L"value", sizeof(L"value"), 0); + ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + } + NCryptFreeObject(key); + NCryptFreeObject(prov); +} + static void test_create_persisted_key(void) { NCRYPT_PROV_HANDLE prov; @@ -255,5 +300,6 @@ START_TEST(ncrypt) test_key_import_rsa(); test_free_object(); test_get_property(); + test_set_property(); test_create_persisted_key(); }

1 0

Santino Mazza : ncrypt/tests: Test for NCryptCreatePersistedKey.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: bac61d050595c0a6522ba583fd8371413d89be73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bac61d050595c0a6522ba583… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Mon Feb 21 12:13:43 2022 +0100 ncrypt/tests: Test for NCryptCreatePersistedKey. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/tests/ncrypt.c | 50 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 7ca20b2bfa6..58173fd0ff0 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -136,7 +136,7 @@ static void test_key_import_rsa(void) NCryptFreeObject(prov); } -static void test_ncrypt_free_object(void) +static void test_free_object(void) { NCRYPT_PROV_HANDLE prov; NCRYPT_KEY_HANDLE key; @@ -205,9 +205,55 @@ static void test_get_property(void) NCryptFreeObject(prov); } +static void test_create_persisted_key(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + SECURITY_STATUS ret; + DWORD size, keylength; + WCHAR alggroup[4]; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + todo_wine { + key = 0; + ret = NCryptCreatePersistedKey(0, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + ret = NCryptCreatePersistedKey(prov, &key, NULL, NULL, 0, 0); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL), "got %#lx\n", ret); + + ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(key, "got null handle\n"); + + ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, NULL, 0, &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == 8, "got %lu\n", size); + + size = 0; + alggroup[0] = 0; + ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)alggroup, sizeof(alggroup), &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == 8, "got %lu\n", size); + ok(!lstrcmpW(alggroup, L"RSA"), "The string doesn't match with 'RSA'\n"); + + ret = NCryptGetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == 4, "got %lu\n", size); + ok(keylength == 1024, "got %lu\n", keylength); + + NCryptFinalizeKey(key, 0); + NCryptFreeObject(key); + NCryptFreeObject(prov); + } +} + START_TEST(ncrypt) { test_key_import_rsa(); - test_ncrypt_free_object(); + test_free_object(); test_get_property(); + test_create_persisted_key(); }

1 0

Santino Mazza : ncrypt: Check null handle when setting or getting properties.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: ebf4953e90fddc672f55b498cbfb66ba7e8fef15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf4953e90fddc672f55b498… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Mon Feb 21 12:13:42 2022 +0100 ncrypt: Check null handle when setting or getting properties. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 3 +++ dlls/ncrypt/tests/ncrypt.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f8ae2d7a796..68d9d884618 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -164,7 +164,9 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name TRACE("(%#Ix, %s, %p, %lu, %p, %#lx)\n", handle, wine_dbgstr_w(name), output, outsize, result, flags); if (flags) FIXME("flags %#lx not supported\n", flags); + if (!object) return NTE_INVALID_HANDLE; if (!(property = get_object_property(object, name))) return NTE_INVALID_PARAMETER; + *result = property->value_size; if (!output) return ERROR_SUCCESS; if (outsize < property->value_size) return NTE_BUFFER_TOO_SMALL; @@ -376,6 +378,7 @@ SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name TRACE("(%#Ix, %s, %p, %lu, %#lx)\n", handle, wine_dbgstr_w(name), input, insize, flags); if (flags) FIXME("flags %#lx not supported\n", flags); + if (!object) return NTE_INVALID_HANDLE; return set_object_property(object, name, input, insize); } diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 891e5b60254..7ca20b2bfa6 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -199,6 +199,9 @@ static void test_get_property(void) ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(keylength == 1024, "got %lu\n", keylength); + ret = NCryptGetProperty(0, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, size, &size, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + NCryptFreeObject(prov); }

1 0

Santino Mazza : ncrypt: Validate existence of property before creating one.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: e08c2f35f8c8a1a9947b13bb1a696a918c665868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e08c2f35f8c8a1a9947b13bb… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Mon Feb 21 12:13:41 2022 +0100 ncrypt: Validate existence of property before creating one. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 4f9a2f357bd..f8ae2d7a796 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -144,12 +144,12 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) return ret; } -static const struct object_property *get_object_property(struct object *object, const WCHAR *name) +static struct object_property *get_object_property(struct object *object, const WCHAR *name) { unsigned int i; for (i = 0; i < object->num_properties; i++) { - const struct object_property *property = &object->properties[i]; + struct object_property *property = &object->properties[i]; if (!lstrcmpW(property->key, name)) return property; } return NULL; @@ -181,17 +181,16 @@ static struct object *allocate_object(enum object_type type) return ret; } -static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +struct object_property *add_object_property(struct object *object, const WCHAR *name) { struct object_property *property; - FIXME("check duplicates\n"); if (!object->num_properties) { if (!(object->properties = malloc(sizeof(*property)))) { ERR("Error allocating memory.\n"); - return NTE_NO_MEMORY; + return NULL; } property = &object->properties[object->num_properties++]; } @@ -201,7 +200,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) { ERR("Error allocating memory.\n"); - return NTE_NO_MEMORY; + return NULL; } object->properties = tmp; property = &object->properties[object->num_properties++]; @@ -211,12 +210,22 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) { ERR("Error allocating memory.\n"); - return NTE_NO_MEMORY; + return NULL; } lstrcpyW(property->key, name); + return property; +} + +static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +{ + struct object_property *property = get_object_property(object, name); + void *tmp; + + if (!property && !(property = add_object_property(object, name))) return NTE_NO_MEMORY; + property->value_size = value_size; - if (!(property->value = malloc(value_size))) + if (!(tmp = realloc(property->value, value_size))) { ERR("Error allocating memory.\n"); free(property->key); @@ -224,7 +233,9 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n return NTE_NO_MEMORY; } + property->value = tmp; memcpy(property->value, value, value_size); + return ERROR_SUCCESS; }

1 0

Huw Davies : winealsa: Keep a copy of the dataflow in the stream.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: a63ca0eb0b95484ebf7897ece52e79d6b243fa80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a63ca0eb0b95484ebf7897ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 18 08:29:33 2022 +0000 winealsa: Keep a copy of the dataflow 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 | 15 ++++++++------- dlls/winealsa.drv/unixlib.h | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c9a7c331158..5bb3bdbcc73 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1030,6 +1030,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } stream->alsa_format = format; + stream->flow = This->dataflow; rate = fmt->nSamplesPerSec; if((err = snd_pcm_hw_params_set_rate_near(stream->pcm_handle, stream->hw_params, @@ -1276,7 +1277,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, * + mmdevapi_period such that at the end of it, ALSA still has data; * + EXTRA_SAFE (~4ms) to allow for late callback invocation / fluctuation; * + alsa_period such that ALSA always has at least one period to play. */ - if(This->dataflow == eRender) + if(stream->flow == eRender) *latency = MulDiv(stream->hidden_frames, 10000000, stream->fmt->nSamplesPerSec); else *latency = MulDiv(stream->alsa_period_frames, 10000000, stream->fmt->nSamplesPerSec) @@ -1826,9 +1827,9 @@ static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) QueryPerformanceCounter(&stream->last_period_time); - if(This->dataflow == eRender) + if(stream->flow == eRender) alsa_write_data(stream); - else if(This->dataflow == eCapture) + else if(stream->flow == eCapture) alsa_read_data(stream); LeaveCriticalSection(&This->lock); @@ -1900,7 +1901,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return AUDCLNT_E_NOT_STOPPED; } - if(This->dataflow == eCapture){ + if(stream->flow == eCapture){ /* dump any data that might be leftover in the ALSA capture buffer */ snd_pcm_readi(stream->pcm_handle, stream->local_buffer, stream->bufsize_frames); @@ -1964,7 +1965,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) return S_FALSE; } - if(This->dataflow == eRender) + if(stream->flow == eRender) alsa_rewind_best_effort(This); stream->started = FALSE; @@ -2007,7 +2008,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) if(snd_pcm_prepare(stream->pcm_handle) < 0) WARN("snd_pcm_prepare failed\n"); - if(This->dataflow == eRender){ + if(stream->flow == eRender){ stream->written_frames = 0; stream->last_pos_frames = 0; }else{ @@ -2675,7 +2676,7 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, snd_pcm_avail_update(stream->pcm_handle); alsa_state = snd_pcm_state(stream->pcm_handle); - if(This->dataflow == eRender){ + if(stream->flow == eRender){ position = stream->written_frames - stream->held_frames; if(stream->started && alsa_state == SND_PCM_STATE_RUNNING && stream->held_frames) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index f121763952c..c0dc625e27f 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -30,6 +30,7 @@ struct alsa_stream WAVEFORMATEX *fmt; DWORD flags; AUDCLNT_SHAREMODE share; + EDataFlow flow; HANDLE event; BOOL need_remapping;

1 0

Huw Davies : winealsa: Pass a stream ptr to alsa_{read|write}_data().
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 02d0071724d599be663a77de9fc68090438d934c URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d0071724d599be663a77de… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 18 08:29:32 2022 +0000 winealsa: Pass a stream ptr to alsa_{read|write}_data(). 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 | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 14dfbd07acb..c9a7c331158 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1470,9 +1470,8 @@ 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) +static void adjust_buffer_volume(const struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) { - struct alsa_stream *stream = This->stream; BOOL adjust = FALSE; UINT32 i, channels, mute = 0; BYTE *end; @@ -1587,12 +1586,11 @@ 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) +static snd_pcm_sframes_t alsa_write_best_effort(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) { - struct alsa_stream *stream = This->stream; snd_pcm_sframes_t written; - adjust_buffer_volume(This, buf, frames); + adjust_buffer_volume(stream, buf, frames); /* Mark the frames we've already adjusted */ if (stream->vol_adjusted_frames < frames) @@ -1625,11 +1623,10 @@ static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, snd_pcm return written; } -static snd_pcm_sframes_t alsa_write_buffer_wrap(ACImpl *This, BYTE *buf, +static snd_pcm_sframes_t alsa_write_buffer_wrap(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t buflen, snd_pcm_uframes_t offs, snd_pcm_uframes_t to_write) { - struct alsa_stream *stream = This->stream; snd_pcm_sframes_t ret = 0; while(to_write){ @@ -1641,7 +1638,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); + tmp = alsa_write_best_effort(stream, buf + offs * stream->fmt->nBlockAlign, chunk); if(tmp < 0) return ret; if(!tmp) @@ -1663,9 +1660,8 @@ static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) return bufsize - (left - right); } -static UINT data_not_in_alsa(ACImpl *This) +static UINT data_not_in_alsa(struct alsa_stream *stream) { - struct alsa_stream *stream = This->stream; UINT32 diff; diff = buf_ptr_diff(stream->lcl_offs_frames, stream->wri_offs_frames, stream->bufsize_frames); @@ -1692,9 +1688,8 @@ static UINT data_not_in_alsa(ACImpl *This) * * During Stop, we rewind the ALSA buffer */ -static void alsa_write_data(ACImpl *This) +static void alsa_write_data(struct alsa_stream *stream) { - struct alsa_stream *stream = This->stream; snd_pcm_sframes_t written; snd_pcm_uframes_t avail, max_copy_frames, data_frames_played; int err; @@ -1723,13 +1718,13 @@ static void alsa_write_data(ACImpl *This) * continuous rendering. Additional benefit: Force ALSA to start. */ if(stream->data_in_alsa_frames == 0 && stream->held_frames < stream->alsa_period_frames) { - alsa_write_best_effort(This, stream->silence_buf, + alsa_write_best_effort(stream, stream->silence_buf, stream->alsa_period_frames - stream->held_frames); stream->vol_adjusted_frames = 0; } if(stream->started) - max_copy_frames = data_not_in_alsa(This); + max_copy_frames = data_not_in_alsa(stream); else max_copy_frames = 0; @@ -1747,7 +1742,7 @@ static void alsa_write_data(ACImpl *This) to_write = min(avail, max_copy_frames); - written = alsa_write_buffer_wrap(This, stream->local_buffer, + written = alsa_write_buffer_wrap(stream, stream->local_buffer, stream->bufsize_frames, stream->lcl_offs_frames, to_write); if(written <= 0) break; @@ -1763,9 +1758,8 @@ static void alsa_write_data(ACImpl *This) SetEvent(stream->event); } -static void alsa_read_data(ACImpl *This) +static void alsa_read_data(struct alsa_stream *stream) { - struct alsa_stream *stream = This->stream; snd_pcm_sframes_t nread; UINT32 pos = stream->wri_offs_frames, limit = stream->held_frames; unsigned int i; @@ -1833,9 +1827,9 @@ static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) QueryPerformanceCounter(&stream->last_period_time); if(This->dataflow == eRender) - alsa_write_data(This); + alsa_write_data(stream); else if(This->dataflow == eCapture) - alsa_read_data(This); + alsa_read_data(stream); LeaveCriticalSection(&This->lock); } @@ -1923,7 +1917,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) offs = stream->wri_offs_frames - stream->held_frames; /* fill it with data */ - written = alsa_write_buffer_wrap(This, stream->local_buffer, + written = alsa_write_buffer_wrap(stream, stream->local_buffer, stream->bufsize_frames, offs, avail); if(written > 0){

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022