wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Zebediah Figura : tests: Add some tests for #ifdef and defined().
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: vkd3d Branch: master Commit: f8ad29aad0927be9cef85355c0968a75fa2bc74c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f8ad29aad0927be9cef8535… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 21 17:23:46 2020 -0600 tests: Add some tests for #ifdef and defined(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/preproc-ifdef.shader_test | 89 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/Makefile.am b/Makefile.am index 60789f4..0ee7eda 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,6 +65,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/preproc-if.shader_test \ + tests/preproc-ifdef.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ @@ -208,6 +209,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/preproc-if.shader_test \ + tests/preproc-ifdef.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/tests/preproc-ifdef.shader_test b/tests/preproc-ifdef.shader_test new file mode 100644 index 0000000..b31aeb9 --- /dev/null +++ b/tests/preproc-ifdef.shader_test @@ -0,0 +1,89 @@ +[preproc] +#define KEY +#ifdef KEY +pass +#endif + +[preproc] +#define KEY +#if defined(KEY) +pass +#endif + +[preproc] +#define KEY +#if defined KEY +pass +#endif + +[preproc] +#ifndef KEY +pass +#endif + +[preproc] +#if !defined(KEY) +pass +#endif + +[preproc] +#define KEY +#ifndef KEY +fail +#else +pass +#endif + +[preproc] +#ifdef KEY +fail +#else +pass +#endif + +[preproc] +#define KEY(a, b) +#ifdef KEY +pass +#endif + +[preproc] +#ifdef KEY +fail +#endif +#define KEY +pass + +[preproc] +#define KEY 0 +#ifdef KEY +pass +#endif + +[preproc] +#define KEY +#undef KEY +#ifndef KEY +pass +#endif + +[preproc] +#if KEY +fail +#else +pass +#endif + +[preproc] +#if KEY == 0 +pass +#else +fail +#endif + +[preproc] +#if KEY == 1 +fail +#else +pass +#endif

1 0

Zebediah Figura : tests: Add some basic tests for #if and related preprocessor directives.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: vkd3d Branch: master Commit: ca28ac17fb39b234a4ce0686abf8259f83b55755 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ca28ac17fb39b234a4ce068… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 21 17:23:45 2020 -0600 tests: Add some basic tests for #if and related preprocessor directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/preproc-if.shader_test | 126 +++++++++++++++++++++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 31 +++++++++++ 3 files changed, 159 insertions(+) diff --git a/Makefile.am b/Makefile.am index 93289a2..60789f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,6 +64,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ + tests/preproc-if.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ @@ -206,6 +207,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ + tests/preproc-if.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/tests/preproc-if.shader_test b/tests/preproc-if.shader_test new file mode 100644 index 0000000..54ee94d --- /dev/null +++ b/tests/preproc-if.shader_test @@ -0,0 +1,126 @@ +[preproc] +#if 1 +pass +#endif + +[preproc] +#if 1 +pass + +[preproc] +pass +#if 0 +fail + +[preproc] +#if 1 +pass +#else +fail +#endif + +[preproc] +#if 0 +fail +#else +pass +#endif + +[preproc] +#if 0 +fail +#else +pass + +[preproc] +#if 0 +fail +#elif 1 +pass +#else +fail +#endif + +[preproc] +#if 1 +pass +#elif 1 +fail +#else +fail +#endif + +[preproc] +#if 0 +fail +#elif 0 +fail +#else +pass +#endif + +[preproc] +#if 0 +#if 1 +fail +#endif +#else +#if 0 +fail +#else +pass +#endif +#endif + +[preproc] +#if 0 +fail +#endif +pass + +[preproc] +#endif +pass + +[preproc] +/* The #elif is effectively ignored here. */ +#if 0 +fail +#else +pass +#elif 0 +#endif + +[preproc] +#if 0 +fail +#else +#elif 0 +pass +#endif + +[preproc] +/* Similarly, the second #else is effectively ignored here. */ +#if 0 +fail +#else +pass +#else +#endif + +[preproc] +/* Similarly, the second #else is effectively ignored here. */ +#if 0 +fail +#else +#else +pass +#endif + +[preproc] +#if 0 +#define KEY fail +#else +#define KEY pass +#endif +KEY diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 787e90a..39495fa 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -102,6 +102,7 @@ static ID3D10Blob *compile_shader(const char *source, const char *target) enum parse_state { STATE_NONE, + STATE_PREPROC, STATE_SHADER_INVALID_PIXEL, STATE_SHADER_PIXEL, STATE_TEST, @@ -345,6 +346,33 @@ START_TEST(shader_runner_d3d12) shader_source_len = 0; break; } + + case STATE_PREPROC: + { + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + char *text; + + hr = D3DPreprocess(shader_source, strlen(shader_source), NULL, NULL, NULL, &blob, &errors); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + if (errors) + { + if (vkd3d_test_state.debug_level) + trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + } + + text = ID3D10Blob_GetBufferPointer(blob); + ok(strstr(text, "pass"), "'pass' not found in preprocessed shader.\n"); + ok(!strstr(text, "fail"), "'fail' found in preprocessed shader.\n"); + ID3D10Blob_Release(blob); + } + + shader_source_len = 0; + break; + } } } @@ -359,6 +387,8 @@ START_TEST(shader_runner_d3d12) state = STATE_SHADER_INVALID_PIXEL; else if (!strcmp(line, "[test]\n")) state = STATE_TEST; + else if (!strcmp(line, "[preproc]\n")) + state = STATE_PREPROC; vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); } @@ -371,6 +401,7 @@ START_TEST(shader_runner_d3d12) fprintf(stderr, "Ignoring line '%s' in %s.\n", line, argv[1]); break; + case STATE_PREPROC: case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_PIXEL: {

1 0

Zebediah Figura : vkd3d-shader: Initialize "messages" to NULL in vkd3d_shader_preprocess() (Valgrind).
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: vkd3d Branch: master Commit: 52f844d2dcb3335b84336c50943d604461335ad3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=52f844d2dcb3335b84336c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 21 17:23:44 2020 -0600 vkd3d-shader: Initialize "messages" to NULL in vkd3d_shader_preprocess() (Valgrind). 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> --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 664110e..6289a18 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1152,5 +1152,8 @@ int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info { TRACE("compile_info %p, out %p, messages %p.\n", compile_info, out, messages); + if (messages) + *messages = NULL; + return VKD3D_ERROR_NOT_IMPLEMENTED; }

1 0

Zebediah Figura : vkd3d-utils: Initialize "messages_blob" to NULL in D3DPreprocess().
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: vkd3d Branch: master Commit: dc36245be26b6509aa13a57129e782d2ce1a8e92 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dc36245be26b6509aa13a57… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 21 17:23:43 2020 -0600 vkd3d-utils: Initialize "messages_blob" to NULL in D3DPreprocess(). 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> --- libs/vkd3d-utils/vkd3d_utils_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 9b608f6..f799d0a 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -268,6 +268,9 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename TRACE("data %p, size %lu, filename %s, macros %p, include %p, preprocessed_blob %p, messages_blob %p.\n", data, size, debugstr_a(filename), macros, include, preprocessed_blob, messages_blob); + if (messages_blob) + *messages_blob = NULL; + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = &preprocess_info; compile_info.source.code = data;

1 0

Zebediah Figura : vkd3d-utils: Initialize "messages_blob" to NULL in D3DCompile2().
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: vkd3d Branch: master Commit: 6cd5205fa7d70f4cfe42bbac3c63200fdf3ba7fd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6cd5205fa7d70f4cfe42bba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 21 17:23:42 2020 -0600 vkd3d-utils: Initialize "messages_blob" to NULL in D3DCompile2(). 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> --- libs/vkd3d-utils/vkd3d_utils_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index f5cb5b5..9b608f6 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -176,6 +176,9 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen if (secondary_flags) FIXME("Ignoring secondary flags %#x.\n", secondary_flags); + if (messages_blob) + *messages_blob = NULL; + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = &preprocess_info; compile_info.source.code = data;

1 0

Alexandre Julliard : Wine release 5.22
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: website Branch: master Commit: c5a7f6ce16ceade0460019c1a5f59a4b9fdfc4ff URL: https://source.winehq.org/git/website.git/?a=commit;h=c5a7f6ce16ceade046001… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 21:54:55 2020 +0100 Wine release 5.22 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020112001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2020112001.xml b/news/en/2020112001.xml new file mode 100644 index 00000000..daef3d31 --- /dev/null +++ b/news/en/2020112001.xml @@ -0,0 +1,16 @@ +<news> +<date>November 20, 2020</date> +<title>Wine 5.22 Released</title> +<body> + The Wine development release 5.22 is now available. + <a href="{$root}/announce/5.22">What's new</a> in this release: +<ul> + <li>C runtime libraries converted to PE.</li> + <li>Use fontconfig cache for faster startup.</li> + <li>Video playback improvements.</li> + <li>3DES cipher support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.22.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-5.22 : Alexandre Julliard : Release 5.22
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: refs/tags/wine-5.22 Tag: fc762df5029ef34b1b0e45484b635683b6b69144 URL: https://source.winehq.org/git/wine.git/?a=tag;h=fc762df5029ef34b1b0e45484b6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 21:52:26 2020 +0100 Release 5.22

1 0

Alexandre Julliard : Release 5.22.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: bedfb9cae224a369efa4588332a5518dbee57035 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bedfb9cae224a369efa45883… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 21:52:25 2020 +0100 Release 5.22. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 838 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 474 insertions(+), 385 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bedfb9cae224a369efa4…

1 0

Andrew Eikum : mmdevapi: Support older version of the AudioClientProperties structure.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: db87636c91e5dca657150361fa9aabfe62ddf38c URL: https://source.winehq.org/git/wine.git/?a=commit;h=db87636c91e5dca657150361… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 20 08:58:28 2020 -0600 mmdevapi: Support older version of the AudioClientProperties structure. Warframe when using a win10 prefix uses an xaudio2_9redist.dll which uses the older AudioClientProperties structure (missing the Options member). Based on a patch by Alistair Leslie-Hughes. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 12 +++++++++++- dlls/winealsa.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/wineandroid.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/winecoreaudio.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/wineoss.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/winepulse.drv/mmdevdrv.c | 22 +++++++++++++++------- include/audioclient.idl | 8 ++++++++ 7 files changed, 94 insertions(+), 36 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index a0aa1b18936..495c1c6f496 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -276,6 +276,7 @@ static void test_audioclient(void) hr = IAudioClient2_SetClientProperties(ac2, NULL); ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); + /* invalid cbSize */ client_props.cbSize = 0; client_props.bIsOffload = FALSE; client_props.eCategory = AudioCategory_BackgroundCapableMedia; @@ -284,7 +285,8 @@ static void test_audioclient(void) hr = IAudioClient2_SetClientProperties(ac2, &client_props); ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); - client_props.cbSize = sizeof(client_props); + /* offload consistency */ + client_props.cbSize = sizeof(client_props) - sizeof(client_props.Options); client_props.bIsOffload = TRUE; hr = IAudioClient2_SetClientProperties(ac2, &client_props); @@ -293,10 +295,18 @@ static void test_audioclient(void) else ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); + /* disable offload */ client_props.bIsOffload = FALSE; hr = IAudioClient2_SetClientProperties(ac2, &client_props); ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); + /* Options field added in Win 8.1 */ + client_props.cbSize = sizeof(client_props); + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == S_OK || + broken(hr == E_INVALIDARG) /* <= win8 */, + "SetClientProperties failed: %08x\n", hr); + IAudioClient2_Release(ac2); } else diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0c255a66f7d..318350471db 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2676,21 +2676,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 7d543ec4f61..d9b7cde2c80 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1635,21 +1635,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 846e0ae3b1e..b002189e199 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2243,21 +2243,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fd0784eb323..db2c6b23914 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1800,21 +1800,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index cef8a2d4d5b..417067f0bf8 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2248,21 +2248,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/include/audioclient.idl b/include/audioclient.idl index 132e78a602b..cd13be5d575 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -126,6 +126,14 @@ typedef struct _AudioClientProperties AUDCLNT_STREAMOPTIONS Options; } AudioClientProperties; +typedef struct _Win8AudioClientProperties +{ + UINT32 cbSize; + BOOL bIsOffload; + AUDIO_STREAM_CATEGORY eCategory; + /* Options field added in Win 8.1 */ +} Win8AudioClientProperties; + [ local, pointer_default(unique),

1 0

Nikolay Sivov : mf/session: Shutdown current topology when clearing presentation.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 01563ba91a0aa8c17b76e8467b41e73b236df3c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01563ba91a0aa8c17b76e846… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 20 16:21:18 2020 +0300 mf/session: Shutdown current topology when clearing presentation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 0381917826a..19da9a24464 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -783,6 +783,61 @@ static void release_topo_node(struct topo_node *node) heap_free(node); } +static void session_shutdown_current_topology(struct media_session *session) +{ + unsigned int shutdown, force_shutdown; + MF_TOPOLOGY_TYPE node_type; + IMFStreamSink *stream_sink; + IMFTopology *topology; + IMFTopologyNode *node; + IMFActivate *activate; + IMFMediaSink *sink; + IUnknown *object; + WORD idx = 0; + + topology = session->presentation.current_topology; + force_shutdown = session->state == SESSION_STATE_SHUT_DOWN; + + /* FIXME: should handle async MFTs, but these are not supported by the rest of the pipeline currently. */ + + while (SUCCEEDED(IMFTopology_GetNode(topology, idx++, &node))) + { + if (SUCCEEDED(IMFTopologyNode_GetNodeType(node, &node_type)) && + node_type == MF_TOPOLOGY_OUTPUT_NODE) + { + shutdown = 1; + IMFTopologyNode_GetUINT32(node, &MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, &shutdown); + + if (force_shutdown || shutdown) + { + if (SUCCEEDED(IMFTopologyNode_GetUnknown(node, &_MF_TOPONODE_IMFActivate, &IID_IMFActivate, + (void **)&activate))) + { + IMFActivate_ShutdownObject(activate); + IMFActivate_Release(activate); + } + else if (SUCCEEDED(IMFTopologyNode_GetObject(node, &object))) + { + if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink))) + { + if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) + { + IMFMediaSink_Shutdown(sink); + IMFMediaSink_Release(sink); + } + + IMFStreamSink_Release(stream_sink); + } + + IUnknown_Release(object); + } + } + } + + IMFTopologyNode_Release(node); + } +} + static void session_clear_presentation(struct media_session *session) { struct media_source *source, *source2; @@ -790,6 +845,8 @@ static void session_clear_presentation(struct media_session *session) struct topo_node *node, *node2; struct session_op *op, *op2; + session_shutdown_current_topology(session); + IMFTopology_Clear(session->presentation.current_topology); session->presentation.topo_status = MF_TOPOSTATUS_INVALID; @@ -1790,7 +1847,7 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) struct media_session *session = impl_from_IMFMediaSession(iface); HRESULT hr = S_OK; - FIXME("%p.\n", iface); + TRACE("%p.\n", iface); EnterCriticalSection(&session->cs); if (SUCCEEDED(hr = session_is_shut_down(session))) @@ -1802,6 +1859,7 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) MFShutdownObject((IUnknown *)session->clock); IMFPresentationClock_Release(session->clock); session->clock = NULL; + session_clear_presentation(session); } LeaveCriticalSection(&session->cs);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
86
Older →

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 November 2020