October 2020 - Wine-commits

Zebediah Figura : tests: Import HLSL struct varying tests from Wine.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: vkd3d Branch: master Commit: 2c4d4277dd1fdaaf3939cb3a696832d4e942d720 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2c4d4277dd1fdaaf3939cb3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:24:24 2020 -0500 tests: Import HLSL struct varying tests from Wine. 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> --- Makefile.am | 2 ++ tests/hlsl-struct-varying.shader_test | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Makefile.am b/Makefile.am index f3a5967..ce0d193 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ vkd3d_shader_tests = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-struct-assignment.shader_test \ + tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -197,6 +198,7 @@ XFAIL_TESTS = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-struct-assignment.shader_test \ + tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/tests/hlsl-struct-varying.shader_test b/tests/hlsl-struct-varying.shader_test new file mode 100644 index 0000000..b623a99 --- /dev/null +++ b/tests/hlsl-struct-varying.shader_test @@ -0,0 +1,29 @@ +[pixel shader] +struct input +{ + struct + { + float4 pos : sv_position; + } m; +}; + +struct output +{ + struct + { + float4 color : sv_target; + } m; +}; + +struct output main(struct input i) +{ + struct output o; + o.m.color = i.m.pos; + return o; +} + +[test] +draw quad +probe rgba (0, 1) (0.5, 1.5, 0.0, 1.0) +probe rgba (1, 0) (1.5, 0.5, 0.0, 1.0) +probe rgba (3, 5) (3.5, 5.5, 0.0, 1.0)

1 0

Zebediah Figura : tests: Import HLSL static initializer tests from Wine.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: vkd3d Branch: master Commit: 57a8a908568bb267d3c8012016031b268169359e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=57a8a908568bb267d3c8012… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:24:25 2020 -0500 tests: Import HLSL static initializer tests from Wine. 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> --- Makefile.am | 2 ++ tests/hlsl-static-initializer.shader_test | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/Makefile.am b/Makefile.am index ce0d193..15be137 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ vkd3d_shader_tests = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-static-initializer.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ @@ -197,6 +198,7 @@ XFAIL_TESTS = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-static-initializer.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ diff --git a/tests/hlsl-static-initializer.shader_test b/tests/hlsl-static-initializer.shader_test new file mode 100644 index 0000000..9b9d000 --- /dev/null +++ b/tests/hlsl-static-initializer.shader_test @@ -0,0 +1,15 @@ +[pixel shader] +float myfunc() +{ + return 0.6; +} +static float a = myfunc() + 0.2; +static float b; +float4 main() : sv_target +{ + return float4(a, b, 0, 0); +} + +[test] +draw quad +probe all rgba (0.8, 0.0, 0.0, 0.0)

1 0

Zebediah Figura : tests: Import invalid HLSL shader tests from Wine.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: vkd3d Branch: master Commit: ce4c7a16347bd71310aa40e40657f7c15ddb48ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce4c7a16347bd71310aa40e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:24:26 2020 -0500 tests: Import invalid HLSL shader tests from Wine. 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> --- Makefile.am | 2 + tests/hlsl-invalid.shader_test | 117 +++++++++++++++++++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 47 ++++++++++++++--- 3 files changed, 159 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 15be137..93289a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,7 @@ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ @@ -194,6 +195,7 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test new file mode 100644 index 0000000..16e75d0 --- /dev/null +++ b/tests/hlsl-invalid.shader_test @@ -0,0 +1,117 @@ +[pixel shader fail] +float4 main() : sv_target +{ + return y; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float4 x = float4(0, 0, 0, 0); + x.xzzx = float4(1, 2, 3, 4); + return x; +} + +[pixel shader fail] +float4 main(float2 pos : TEXCOORD0) : sv_target +{ + float4 x = pos; + return x; +} + +[pixel shader fail] +float4 563r(float2 45s : TEXCOORD0) : sv_target +{ + float4 x = 45s; + return float4(x.x, x.y, 0, 0); +} + +[pixel shader fail] +float4 main() : sv_target +{ + struct { int b,c; } x = {0}; + return x; +} + +[pixel shader fail] +float4 main() : sv_target +{ + struct {} x = {}; + return x; +} + +[pixel shader fail] +float4 main(float2 pos : TEXCOORD0) : sv_target +{ + return; +} + +[pixel shader fail] +void main(float2 pos : TEXCOORD0) +{ + return pos; +} + +[pixel shader fail] +float4 main(float2 pos : TEXCOORD0) : sv_target +{ + return pos; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float a[0]; + return 0; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float a[65537]; + return 0; +} + +[pixel shader fail] +float4 main() : sv_target +{ + int x; + float a[(x = 2)]; + return 0; +} + +[pixel shader fail] +uniform float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +typedef row_major float4x4 matrix_t; +typedef column_major matrix_t matrix2_t; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +float4 main() +{ + return 0; +} + +[pixel shader fail] +float4 main(out float4 o : sv_target) +{ + o = 1; + return 0; +} + +[pixel shader fail] +struct {float4 a;}; + +float4 main() : sv_target +{ + return 0; +} diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 0e9694a..df7076c 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_SHADER_INVALID_PIXEL, STATE_SHADER_PIXEL, STATE_TEST, }; @@ -269,10 +270,10 @@ START_TEST(shader_runner_d3d12) }; size_t shader_source_size = 0, shader_source_len = 0; enum parse_state state = STATE_NONE; + unsigned int i, line_number = 0; struct shader_context context; const char *filename = NULL; char *shader_source = NULL; - unsigned int i; char line[256]; FILE *f; @@ -304,12 +305,13 @@ START_TEST(shader_runner_d3d12) memset(&context, 0, sizeof(context)); init_test_context(&context.c, &desc); - while (fgets(line, sizeof(line), f)) + for (;;) { - if (line[0] == '\n') - continue; + char *ret = fgets(line, sizeof(line), f); - if (line[0] == '[') + ++line_number; + + if (!ret || line[0] == '[') { switch (state) { @@ -322,14 +324,43 @@ START_TEST(shader_runner_d3d12) return; shader_source_len = 0; break; + + case STATE_SHADER_INVALID_PIXEL: + { + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + hr = D3DCompile(shader_source, strlen(shader_source), NULL, + NULL, NULL, "main", "ps_4_0", 0, 0, &blob, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!blob, "Expected no compiled shader blob.\n"); + ok(!!errors, "Expected non-NULL error blob.\n"); + + if (vkd3d_test_state.debug_level) + trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + + shader_source_len = 0; + break; + } } + } + + if (!ret) + break; + if (line[0] == '[') + { if (!strcmp(line, "[pixel shader]\n")) state = STATE_SHADER_PIXEL; + else if (!strcmp(line, "[pixel shader fail]\n")) + state = STATE_SHADER_INVALID_PIXEL; else if (!strcmp(line, "[test]\n")) state = STATE_TEST; + + vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); } - else + else if (line[0] != '\n') { switch (state) { @@ -338,6 +369,7 @@ START_TEST(shader_runner_d3d12) fprintf(stderr, "Ignoring line '%s' in %s.\n", line, argv[1]); break; + case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_PIXEL: { size_t len = strlen(line); @@ -356,7 +388,8 @@ START_TEST(shader_runner_d3d12) } } - ID3D10Blob_Release(context.ps_code); + if (context.ps_code) + ID3D10Blob_Release(context.ps_code); destroy_test_context(&context.c); fclose(f);

1 0

Zebediah Figura : vkd3d-common: Correctly escape whitespace characters in debugstr_*().
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: vkd3d Branch: master Commit: 0c6cd3ba21ccdbb934dae16713b4fb2c6988ff0f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0c6cd3ba21ccdbb934dae16… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:25:11 2020 -0500 vkd3d-common: Correctly escape whitespace characters in debugstr_*(). 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-common/debug.c | 66 +++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 33deed6..5e49cf1 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -114,6 +114,24 @@ const char *vkd3d_dbg_sprintf(const char *fmt, ...) return buffer; } +static int get_escape_char(int c) +{ + switch (c) + { + case '"': + case '\\': + return c; + case '\t': + return 't'; + case '\n': + return 'n'; + case '\r': + return 'r'; + default: + return 0; + } +} + const char *debugstr_a(const char *str) { char *buffer, *ptr; @@ -127,21 +145,7 @@ const char *debugstr_a(const char *str) *ptr++ = '"'; while ((c = *str++) && ptr <= buffer + VKD3D_DEBUG_BUFFER_SIZE - 8) { - int escape_char; - - switch (c) - { - case '"': - case '\\': - case '\n': - case '\r': - case '\t': - escape_char = c; - break; - default: - escape_char = 0; - break; - } + int escape_char = get_escape_char(c); if (escape_char) { @@ -187,21 +191,7 @@ static const char *debugstr_w16(const uint16_t *wstr) *ptr++ = '"'; while ((c = *wstr++) && ptr <= buffer + VKD3D_DEBUG_BUFFER_SIZE - 10) { - int escape_char; - - switch (c) - { - case '"': - case '\\': - case '\n': - case '\r': - case '\t': - escape_char = c; - break; - default: - escape_char = 0; - break; - } + int escape_char = get_escape_char(c); if (escape_char) { @@ -247,21 +237,7 @@ static const char *debugstr_w32(const uint32_t *wstr) *ptr++ = '"'; while ((c = *wstr++) && ptr <= buffer + VKD3D_DEBUG_BUFFER_SIZE - 10) { - int escape_char; - - switch (c) - { - case '"': - case '\\': - case '\n': - case '\r': - case '\t': - escape_char = c; - break; - default: - escape_char = 0; - break; - } + int escape_char = get_escape_char(c); if (escape_char) {

1 0

Andrew Eikum : mmdevapi: Stub implement IAudioClient2.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 370a538e54bc7d2b97c8f845f702adfc51902862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=370a538e54bc7d2b97c8f845… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:22 2020 -0500 mmdevapi: Stub implement IAudioClient2. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 3 +- dlls/mmdevapi/tests/render.c | 11 +++ dlls/winealsa.drv/mmdevdrv.c | 144 +++++++++++++++++++++++-------------- dlls/wineandroid.drv/mmdevdrv.c | 147 +++++++++++++++++++++++--------------- dlls/winecoreaudio.drv/mmdevdrv.c | 144 +++++++++++++++++++++++-------------- dlls/wineoss.drv/mmdevdrv.c | 145 +++++++++++++++++++++++-------------- dlls/winepulse.drv/mmdevdrv.c | 142 ++++++++++++++++++++++-------------- 7 files changed, 463 insertions(+), 273 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=370a538e54bc7d2b97c8…

1 0

Andrew Eikum : mmdevapi: Implement IsOffloadCapable.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 530c79fba272219e9ed7bc1ebf309fe7163ac8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=530c79fba272219e9ed7bc1e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:27 2020 -0500 mmdevapi: Implement IsOffloadCapable. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 7 +++++++ dlls/winealsa.drv/mmdevdrv.c | 9 +++++++-- dlls/wineandroid.drv/mmdevdrv.c | 9 +++++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 9 +++++++-- dlls/wineoss.drv/mmdevdrv.c | 9 +++++++-- dlls/winepulse.drv/mmdevdrv.c | 9 +++++++-- 6 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 8d52f48333..e58cc449d8 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -140,6 +140,7 @@ static void test_audioclient(void) WAVEFORMATEX *pwfx, *pwfx2; REFERENCE_TIME t1, t2; HANDLE handle; + BOOL offload_capable; hr = IMMDevice_Activate(dev, &IID_IAudioClient2, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); @@ -253,6 +254,12 @@ static void test_audioclient(void) hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient2, (void**)&ac2); ok(hr == S_OK, "Failed to query IAudioClient2 interface: %08x\n", hr); + hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, NULL); + ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08x\n", hr); + + hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); + ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); + IAudioClient2_Release(ac2); test_uninitialized(ac); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2c3165385e..233b0dfda1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2661,9 +2661,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 4e9ada3f55..8ee1bb12d3 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1620,9 +1620,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index dd2ad916f8..f32c1d5e41 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2228,9 +2228,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 50c7db2c7c..9b1cdf3fa7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1785,9 +1785,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index b8386cfe55..e384955b01 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2233,9 +2233,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface,

1 0

Andrew Eikum : mmdevapi: Implement SetClientProperties.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: d8ae98d4216b85b3da342ef71b28674996e5c9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8ae98d4216b85b3da342ef7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:32 2020 -0500 mmdevapi: Implement SetClientProperties. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 25 +++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/wineandroid.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/wineoss.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/winepulse.drv/mmdevdrv.c | 18 ++++++++++++++++-- 6 files changed, 105 insertions(+), 10 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index e58cc449d8..a4f271e557 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -141,6 +141,7 @@ static void test_audioclient(void) REFERENCE_TIME t1, t2; HANDLE handle; BOOL offload_capable; + AudioClientProperties client_props; hr = IMMDevice_Activate(dev, &IID_IAudioClient2, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); @@ -260,6 +261,30 @@ static void test_audioclient(void) hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); + hr = IAudioClient2_SetClientProperties(ac2, NULL); + ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); + + client_props.cbSize = 0; + client_props.bIsOffload = FALSE; + client_props.eCategory = AudioCategory_BackgroundCapableMedia; + client_props.Options = 0; + + 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); + client_props.bIsOffload = TRUE; + + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + if(!offload_capable) + ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08x\n", hr); + else + ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); + + client_props.bIsOffload = FALSE; + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); + IAudioClient2_Release(ac2); test_uninitialized(ac); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 233b0dfda1..04f90d0d16 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2676,9 +2676,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 8ee1bb12d3..aa32c49185 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1635,9 +1635,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f32c1d5e41..f065d5bc1e 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2243,9 +2243,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9b1cdf3fa7..3a3cb57b64 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1800,9 +1800,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index e384955b01..91b8230bd8 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2248,9 +2248,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface,

1 0

Andrew Eikum : audioclient.idl: Declare IAudioClient3.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 496a8c1cf55f3836260d5ca485c5c5753bad1d9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=496a8c1cf55f3836260d5ca4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:36 2020 -0500 audioclient.idl: Declare IAudioClient3. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/audioclient.idl b/include/audioclient.idl index 4759f3ef46..132e78a602 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -151,6 +151,35 @@ interface IAudioClient2 : IAudioClient ); } +[ + local, + pointer_default(unique), + uuid(7ed4ee07-8e67-4cd4-8c1a-2b7a5987ad42), + object, +] +interface IAudioClient3 : IAudioClient2 +{ + HRESULT GetSharedModeEnginePeriod( + [in] const WAVEFORMATEX *format, + [out] UINT32 *default_period_frames, + [out] UINT32 *unit_period_frames, + [out] UINT32 *min_period_frames, + [out] UINT32 *max_period_frames + ); + + HRESULT GetCurrentSharedModeEnginePeriod( + [out] WAVEFORMATEX **cur_format, + [out] UINT32 *cur_period_frames + ); + + HRESULT InitializeSharedAudioStream( + [in] DWORD flags, + [in] UINT32 period_frames, + [in] const WAVEFORMATEX *format, + [in] const GUID *session_guid + ); +} + [ local, pointer_default(unique),

1 0

Andrew Eikum : mmdevapi: Stub implement IAudioClient3.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 6314a75006d1cfb86c1fb3da71be037fe646437c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6314a75006d1cfb86c1fb3da… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 15:23:05 2020 -0500 mmdevapi: Stub implement IAudioClient3. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 3 +- dlls/mmdevapi/tests/render.c | 17 +++++ dlls/winealsa.drv/mmdevdrv.c | 155 +++++++++++++++++++++++-------------- dlls/wineandroid.drv/mmdevdrv.c | 157 +++++++++++++++++++++++--------------- dlls/winecoreaudio.drv/mmdevdrv.c | 155 +++++++++++++++++++++++-------------- dlls/wineoss.drv/mmdevdrv.c | 155 +++++++++++++++++++++++-------------- dlls/winepulse.drv/mmdevdrv.c | 153 +++++++++++++++++++++++-------------- 7 files changed, 499 insertions(+), 296 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6314a75006d1cfb86c1f…

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_ACCEPT.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 5474c035e7dca04b0c9c2abba9d208c18e839b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5474c035e7dca04b0c9c2abb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:13:57 2020 -0500 server: Introduce IOCTL_AFD_ACCEPT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 50 +++++++++++++++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index 24e6c31f22..9ca03039f8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,6 +24,7 @@ #include <winioctl.h> #define IOCTL_AFD_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_AFD_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) diff --git a/server/sock.c b/server/sock.c index f165e86b12..f66fe09117 100644 --- a/server/sock.c +++ b/server/sock.c @@ -851,16 +851,11 @@ static int accept_new_fd( struct sock *sock ) } /* accept a socket (creates a new fd) */ -static struct sock *accept_socket( obj_handle_t handle ) +static struct sock *accept_socket( struct sock *sock ) { struct sock *acceptsock; - struct sock *sock; int acceptfd; - sock = (struct sock *)get_handle_obj( current->process, handle, FILE_READ_DATA, &sock_ops ); - if (!sock) - return NULL; - if (get_unix_fd( sock->fd ) == -1) return NULL; if ( sock->deferred ) @@ -870,15 +865,10 @@ static struct sock *accept_socket( obj_handle_t handle ) } else { - if ((acceptfd = accept_new_fd( sock )) == -1) - { - release_object( sock ); - return NULL; - } + if ((acceptfd = accept_new_fd( sock )) == -1) return NULL; if (!(acceptsock = create_socket())) { close( acceptfd ); - release_object( sock ); return NULL; } @@ -899,7 +889,6 @@ static struct sock *accept_socket( obj_handle_t handle ) get_fd_options( sock->fd ) ))) { release_object( acceptsock ); - release_object( sock ); return NULL; } } @@ -907,7 +896,6 @@ static struct sock *accept_socket( obj_handle_t handle ) sock->pmask &= ~FD_ACCEPT; sock->hmask &= ~FD_ACCEPT; sock_reselect( sock ); - release_object( sock ); return acceptsock; } @@ -1100,6 +1088,26 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_ACCEPT: + { + struct sock *acceptsock; + obj_handle_t handle; + + if (get_reply_max_size() != sizeof(handle)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + if (!(acceptsock = accept_socket( sock ))) return 0; + handle = alloc_handle( current->process, &acceptsock->obj, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, OBJ_INHERIT ); + acceptsock->wparam = handle; + release_object( acceptsock ); + set_reply_data( &handle, sizeof(handle) ); + return 0; + } + case IOCTL_AFD_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) { @@ -1420,15 +1428,19 @@ struct object *create_socket_device( struct object *root, const struct unicode_s /* accept a socket */ DECL_HANDLER(accept_socket) { - struct sock *sock; + struct sock *sock, *acceptsock; + + if (!(sock = (struct sock *)get_handle_obj( current->process, req->lhandle, FILE_READ_DATA, &sock_ops ))) + return; reply->handle = 0; - if ((sock = accept_socket( req->lhandle )) != NULL) + if ((acceptsock = accept_socket( sock )) != NULL) { - reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->attributes ); - sock->wparam = reply->handle; /* wparam for message is the socket handle */ - release_object( &sock->obj ); + reply->handle = alloc_handle( current->process, &acceptsock->obj, req->access, req->attributes ); + acceptsock->wparam = reply->handle; /* wparam for message is the socket handle */ + release_object( acceptsock ); } + release_object( sock ); } /* accept a socket into an initialized socket */

1 0