October 2020 - Wine-Commits

Biswapriyo Nath : include: Add enum flag operators for D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: a547196d303b6c8afafd36fd8fcc3b5752c3e0b2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a547196d303b6c8afafd36f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Oct 2 00:10:19 2020 +0330 include: Add enum flag operators for D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 7fc3ffc..41088d4 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -357,6 +357,7 @@ typedef enum D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_NONE = 0x00000000, D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE = 0x00000001, } D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS);") typedef struct D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS {

1 0

Zebediah Figura : tests: Import HLSL return statement tests from Wine.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: e04b917322bc0371404caaed946e49d8010ab18b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e04b917322bc0371404caae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:46 2020 -0500 tests: Import HLSL return statement 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 | 4 ++++ tests/hlsl-return-implicit-conversion.shader_test | 9 +++++++++ tests/hlsl-return-void.shader_test | 11 +++++++++++ 3 files changed, 24 insertions(+) diff --git a/Makefile.am b/Makefile.am index c6d9b06..efe0c7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,8 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-return-implicit-conversion.shader_test \ + tests/hlsl-return-void.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -185,6 +187,8 @@ SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-return-implicit-conversion.shader_test \ + tests/hlsl-return-void.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/tests/hlsl-return-implicit-conversion.shader_test b/tests/hlsl-return-implicit-conversion.shader_test new file mode 100644 index 0000000..527387b --- /dev/null +++ b/tests/hlsl-return-implicit-conversion.shader_test @@ -0,0 +1,9 @@ +[pixel shader] +float4 main() : sv_target +{ + return float2x2(0.4, 0.3, 0.2, 0.1); +} + +[test] +draw quad +probe all rgba (0.4, 0.3, 0.2, 0.1) diff --git a/tests/hlsl-return-void.shader_test b/tests/hlsl-return-void.shader_test new file mode 100644 index 0000000..1948ec5 --- /dev/null +++ b/tests/hlsl-return-void.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +void main(out float4 ret : sv_target) +{ + ret = float4(0.1, 0.2, 0.3, 0.4); + return; + ret = float4(0.5, 0.6, 0.7, 0.8); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4)

1 0

Biswapriyo Nath : include: Add more D3D12_FEATURE enum elements.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: 97af69bebda4003dca572bf7876b9253038ca705 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=97af69bebda4003dca572bf… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Oct 2 00:10:20 2020 +0330 include: Add more D3D12_FEATURE enum elements. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 41088d4..88ecba5 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1765,6 +1765,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 6, D3D12_FEATURE_SHADER_MODEL = 7, D3D12_FEATURE_D3D12_OPTIONS1 = 8, + D3D12_FEATURE_PROTECTED_RESOURCE_SESSION_SUPPORT = 10, D3D12_FEATURE_ROOT_SIGNATURE = 12, D3D12_FEATURE_ARCHITECTURE1 = 16, D3D12_FEATURE_D3D12_OPTIONS2 = 18, @@ -1776,6 +1777,11 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_SERIALIZATION = 24, D3D12_FEATURE_CROSS_NODE = 25, D3D12_FEATURE_D3D12_OPTIONS5 = 27, + D3D12_FEATURE_D3D12_OPTIONS6 = 30, + D3D12_FEATURE_QUERY_META_COMMAND = 31, + D3D12_FEATURE_D3D12_OPTIONS7 = 32, + D3D12_FEATURE_PROTECTED_RESOURCE_SESSION_TYPE_COUNT = 33, + D3D12_FEATURE_PROTECTED_RESOURCE_SESSION_TYPES = 34, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST

1 0

Zebediah Figura : tests: Import HLSL array dimension tests from Wine.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: d0b13d51cacbb544b9208f0518cff4359801ec0d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d0b13d51cacbb544b9208f0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:47 2020 -0500 tests: Import HLSL array dimension 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-array-dimension.shader_test | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/Makefile.am b/Makefile.am index efe0c7c..7911a8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,6 +51,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ + tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ @@ -186,6 +187,7 @@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/conditional.shader_test \ + tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ diff --git a/tests/hlsl-array-dimension.shader_test b/tests/hlsl-array-dimension.shader_test new file mode 100644 index 0000000..fdb52b1 --- /dev/null +++ b/tests/hlsl-array-dimension.shader_test @@ -0,0 +1,16 @@ +# Test what kinds of expressions are valid array dimensions. +[pixel shader] +float4 main() : sv_target +{ + const int dim = 4; + float a[2 * 2] = {0.1, 0.2, 0.3, 0.4}; + float b[4.1] = a; + float c[dim] = b; + float d[true] = {c[0]}; + float e[65536]; + return float4(d[0], c[0], c[1], c[3]); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.2, 0.4)

1 0

Józef Kucia : include: Add the D3D12EnableExperimentalFeatures() prototype.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: abc4aa09ba1b4eb699f2980e8eb36e0a1a7bca48 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=abc4aa09ba1b4eb699f2980… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 2 00:10:18 2020 +0330 include: Add the D3D12EnableExperimentalFeatures() prototype. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 1a5e2f4..7fc3ffc 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2545,3 +2545,6 @@ typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **debug); [local] HRESULT __stdcall D3D12GetDebugInterface(REFIID iid, void **debug); + +[local] HRESULT __stdcall D3D12EnableExperimentalFeatures(UINT feature_count, + const IID *iids, void *configurations, UINT *configurations_sizes);

1 0

Stefan Dösinger : include: Remove backslashes from D3D12_COLOR_WRITE_ENABLE_ALL.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: 615b182846bd4d9ec02917dd9b51a215689e2023 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=615b182846bd4d9ec02917d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 2 00:10:17 2020 +0330 include: Remove backslashes from D3D12_COLOR_WRITE_ENABLE_ALL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 48b87f0..1a5e2f4 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1438,8 +1438,8 @@ typedef enum D3D12_COLOR_WRITE_ENABLE D3D12_COLOR_WRITE_ENABLE_GREEN = 0x2, D3D12_COLOR_WRITE_ENABLE_BLUE = 0x4, D3D12_COLOR_WRITE_ENABLE_ALPHA = 0x8, - D3D12_COLOR_WRITE_ENABLE_ALL = (D3D12_COLOR_WRITE_ENABLE_RED\ - | D3D12_COLOR_WRITE_ENABLE_GREEN | D3D12_COLOR_WRITE_ENABLE_BLUE\ + D3D12_COLOR_WRITE_ENABLE_ALL = (D3D12_COLOR_WRITE_ENABLE_RED + | D3D12_COLOR_WRITE_ENABLE_GREEN | D3D12_COLOR_WRITE_ENABLE_BLUE | D3D12_COLOR_WRITE_ENABLE_ALPHA), } D3D12_COLOR_WRITE_ENABLE;

1 0

Nikolay Sivov : evr/presenter: Add IMFGetService stub.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: b21d2b7c9cd7ab319ff7781352dff998206bef44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21d2b7c9cd7ab319ff77813… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 1 15:59:32 2020 +0300 evr/presenter: Add IMFGetService stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 ++++ 2 files changed, 48 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index a7da070492..5e458f72f1 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -46,6 +46,7 @@ struct video_presenter IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; IMFVideoDisplayControl IMFVideoDisplayControl_iface; IMFRateSupport IMFRateSupport_iface; + IMFGetService IMFGetService_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -88,6 +89,11 @@ static struct video_presenter *impl_from_IMFRateSupport(IMFRateSupport *iface) return CONTAINING_RECORD(iface, struct video_presenter, IMFRateSupport_iface); } +static struct video_presenter *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFGetService_iface); +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -119,6 +125,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFRateSupport_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &presenter->IMFGetService_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -576,6 +586,39 @@ static const IMFRateSupportVtbl video_presenter_rate_support_vtbl = video_presenter_rate_support_IsRateSupported, }; +static HRESULT WINAPI video_presenter_getservice_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFGetService(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_getservice_AddRef(IMFGetService *iface) +{ + struct video_presenter *presenter = impl_from_IMFGetService(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_getservice_Release(IMFGetService *iface) +{ + struct video_presenter *presenter = impl_from_IMFGetService(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl video_presenter_getservice_vtbl = +{ + video_presenter_getservice_QueryInterface, + video_presenter_getservice_AddRef, + video_presenter_getservice_Release, + video_presenter_getservice_GetService, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -600,6 +643,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_presenter_service_client_vtbl; object->IMFVideoDisplayControl_iface.lpVtbl = &video_presenter_control_vtbl; object->IMFRateSupport_iface.lpVtbl = &video_presenter_rate_support_vtbl; + object->IMFGetService_iface.lpVtbl = &video_presenter_getservice_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7fa28e7522..b59da51e47 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1002,6 +1002,10 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFGetService, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + /* Rate support. */ hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFRateSupport, (void **)&rate_support); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Jacek Caban : conhost: Call ensure_tty_input_thread in IOCTL_CONDRV_PEEK implementation.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 45b8489ba5a1726cb9d0e163de41cb1c0ddaa23b URL: https://source.winehq.org/git/wine.git/?a=commit;h=45b8489ba5a1726cb9d0e163… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 15:08:40 2020 +0200 conhost: Call ensure_tty_input_thread in IOCTL_CONDRV_PEEK implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index fadba2728d..86a400307d 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2476,6 +2476,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, void *result; TRACE( "peek\n "); if (in_size) return STATUS_INVALID_PARAMETER; + ensure_tty_input_thread( console ); *out_size = min( *out_size, console->record_count * sizeof(INPUT_RECORD) ); if (!(result = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; if (*out_size) memcpy( result, console->records, *out_size );

1 0

Jacek Caban : server: Don't propagate STATUS_PENDING in get_next_console_request request.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 95e1de8215ce8b0ece486dcf8c713e98d5dd3a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=95e1de8215ce8b0ece486dcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 15:10:09 2020 +0200 server: Don't propagate STATUS_PENDING in get_next_console_request request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index b0b6de2eef..44cacfbb99 100644 --- a/server/console.c +++ b/server/console.c @@ -2715,10 +2715,11 @@ DECL_HANDLER(get_next_console_request) if (ioctl) { unsigned int status = req->status; + if (status == STATUS_PENDING) status = STATUS_INVALID_PARAMETER; if (ioctl->async) { iosb = async_get_iosb( ioctl->async ); - iosb->status = req->status; + iosb->status = status; iosb->out_size = min( iosb->out_size, get_req_data_size() ); if (iosb->out_size) {

1 0

Zebediah Figura : wined3d: Correct off-by-one errors when comparing against ARRAY_SIZE.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 95ab7e8a0902acb736565092f00a43f6dcc2184e URL: https://source.winehq.org/git/wine.git/?a=commit;h=95ab7e8a0902acb736565092… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 15:27:37 2020 -0500 wined3d: Correct off-by-one errors when comparing against ARRAY_SIZE. Spotted by Alex Henrie. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0166746bfd..d3921d5a98 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2059,7 +2059,7 @@ static void shader_dump_resource_type(struct wined3d_string_buffer *buffer, enum /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", }; - if (type <= ARRAY_SIZE(resource_type_names)) + if (type < ARRAY_SIZE(resource_type_names)) shader_addline(buffer, "%s", resource_type_names[type]); else shader_addline(buffer, "unknown"); @@ -2080,7 +2080,7 @@ static void shader_dump_data_type(struct wined3d_string_buffer *buffer, enum win /* WINED3D_DATA_OPAQUE */ "(opaque)", }; - if (type <= ARRAY_SIZE(data_type_names)) + if (type < ARRAY_SIZE(data_type_names)) shader_addline(buffer, "%s", data_type_names[type]); else shader_addline(buffer, "(unknown)");

1 0