June 2019 - Wine-Devel - list.winehq.org

[PATCH v2 1/4] wined3d: Drop support for WINED3DFMT_D32_UNORM.
by Jactry Zeng June 16, 2019

June 16, 2019

Superseded patch 165301~165304. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/wined3d/utils.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 44b6c48e67..b48de3afb9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1275,6 +1275,7 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers * These are never supported on native. * WINED3DFMT_B8G8R8_UNORM * WINED3DFMT_B2G3R3_UNORM + * WINED3DFMT_D32_UNORM * WINED3DFMT_L4A4_UNORM * WINED3DFMT_S1_UINT_D15_UNORM * WINED3DFMT_S4X4_UINT_D24_UNORM @@ -1777,14 +1778,6 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_DEPTH, - WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, - ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, -- 2.20.1

1 0

[PATCH v4] ddraw: Set dwZBufferBitDepth in ddraw_GetCaps
by David Adam June 16, 2019

June 16, 2019

This patch is from Michael Muller.

2 1

[PATCH] dinput: Ensure buffer doesn't overflow. (Coverity)
by Alistair Leslie-Hughes June 16, 2019

June 16, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/joystick.c | 2 +- dlls/dinput/joystick_linuxinput.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 433348cd04..a5308b6cc4 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -700,7 +700,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; snprintf(pdidi->tszInstanceName, MAX_PATH, "Joystick %d", index); - strcpy(pdidi->tszProductName, This->name); + lstrcpynA(pdidi->tszProductName, This->name, MAX_PATH); if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3A)) { pdidi->guidFFDriver = GUID_NULL; pdidi->wUsagePage = 0; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e3371b9f44..1e8c542f21 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -411,8 +411,8 @@ static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver lpddi->guidInstance = lpddiW.guidInstance; lpddi->guidProduct = lpddiW.guidProduct; lpddi->dwDevType = lpddiW.dwDevType; - strcpy(lpddi->tszInstanceName, joydevs[id].name); - strcpy(lpddi->tszProductName, joydevs[id].name); + lstrcpynA(lpddi->tszInstanceName, joydevs[id].name, MAX_PATH); + lstrcpynA(lpddi->tszProductName, joydevs[id].name, MAX_PATH); lpddi->guidFFDriver = lpddiW.guidFFDriver; lpddi->wUsagePage = lpddiW.wUsagePage; lpddi->wUsage = lpddiW.wUsage; -- 2.20.1

1 0

[PATCH] dpnet: Remove dead code. (Coverity)
by Alistair Leslie-Hughes June 16, 2019

June 16, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/tests/server.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 698082d382..ec7b76698f 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -326,8 +326,6 @@ HRESULT set_firewall( enum firewall_op op ) hr = INetFwAuthorizedApplications_Add( apps, app ); else if (op == APP_REMOVE) hr = INetFwAuthorizedApplications_Remove( apps, image ); - else - hr = E_INVALIDARG; done: if (app) INetFwAuthorizedApplication_Release( app ); -- 2.20.1

1 0

[PATCH vkd3d 2/2] vkd3d/tests: Add tests for predicated rendering.
by Henri Verbeet June 15, 2019

June 15, 2019

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166618. tests/d3d12.c | 366 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 366 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 81fb26a..0c70d5f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30470,6 +30470,371 @@ static void test_early_depth_stencil_tests(void) destroy_test_context(&context); } +static void prepare_instanced_draw(struct test_context *context) +{ + ID3D12GraphicsCommandList *command_list = context->list; + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context->pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); +} + +static void test_conditional_rendering(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + ID3D12CommandSignature *command_signature; + ID3D12GraphicsCommandList *command_list; + D3D12_ROOT_PARAMETER root_parameters[2]; + ID3D12Resource *texture, *texture_copy; + ID3D12PipelineState *pipeline_state; + ID3D12RootSignature *root_signature; + struct test_context context; + ID3D12Resource *buffer, *cb; + struct resource_readback rb; + ID3D12Resource *conditions; + ID3D12CommandQueue *queue; + unsigned int i; + uint32_t value; + HRESULT hr; + + static const uint64_t predicate_args[] = {0, 1, (uint64_t)1 << 32}; + static const uint32_t r8g8b8a8_data[] = {0x28384858, 0x39495969}; + static const D3D12_DRAW_ARGUMENTS draw_args = {3, 1, 0, 0}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + static const uint32_t init_value = 0xdeadbeef; + static const D3D12_SUBRESOURCE_DATA copy_data[] = + { + {&r8g8b8a8_data[0], sizeof(r8g8b8a8_data[0]), sizeof(r8g8b8a8_data[0])}, + {&r8g8b8a8_data[1], sizeof(r8g8b8a8_data[1]), sizeof(r8g8b8a8_data[1])} + }; + static const DWORD cs_code[] = + { +#if 0 + cbuffer cb + { + unsigned int offset; + unsigned int value; + }; + + RWByteAddressBuffer b; + + [numthreads(1, 1, 1)] + void main() + { + b.Store(4 * offset, value); + } +#endif + 0x43425844, 0xaadc5460, 0x88c27e90, 0x2acacf4e, 0x4e06019a, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000084, 0x00050050, 0x00000021, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000, 0x00000000, 0x02000068, + 0x00000001, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x08000029, 0x00100012, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x080000a6, 0x0011e012, 0x00000000, + 0x0010000a, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e, + }; + static const struct + { + uint32_t offset; + uint32_t value; + uint32_t uav_offset; + } + input = {0, 4, 0}; + + if (!init_test_context(&context, NULL)) + return; + command_list = context.list; + queue = context.queue; + + conditions = create_default_buffer(context.device, sizeof(predicate_args), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_buffer_data(conditions, 0, sizeof(predicate_args), &predicate_args, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, conditions, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PREDICATION); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + /* Skip draw on zero. */ + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* Skip draw on non-zero. */ + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, + sizeof(uint64_t), D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + /* Don't reset predication to test automatic reset on next SetPredication() call. */ + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* Skip clear on zero. */ + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* Draw on zero. */ + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* Draw on non-zero. */ + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, + sizeof(uint64_t), D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* 64-bit conditional 0x100000000 - fails due to Vulkan 32-bit values. */ + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, + 2 * sizeof(uint64_t), D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + + /* ExecuteIndirect(). */ + buffer = create_upload_buffer(context.device, sizeof(draw_args), &draw_args); + + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + /* Skip. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, buffer, 0, NULL, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + prepare_instanced_draw(&context); + /* Draw. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, buffer, 0, NULL, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(buffer); + ID3D12CommandSignature_Release(command_signature); + reset_command_list(command_list, context.allocator); + + /* CopyResource(). */ + texture = create_default_texture(context.device, + 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST); + upload_texture_data(texture, &copy_data[0], 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + texture_copy = create_default_texture(context.device, + 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST); + upload_texture_data(texture_copy, &copy_data[1], 1, queue, command_list); + reset_command_list(command_list, context.allocator); + + /* Skip. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_CopyResource(command_list, texture_copy, texture); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(texture_copy, 0, &rb, queue, command_list); + todo check_readback_data_uint(&rb, NULL, r8g8b8a8_data[1], 0); + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); + + /* Copy. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_CopyResource(command_list, texture_copy, texture); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 0); + + /* ResolveSubresource(). */ + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_texture_data(texture_copy, &copy_data[1], 1, queue, command_list); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_DEST); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); + + /* Skip. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + texture_copy, 0, texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(texture_copy, 0, &rb, queue, command_list); + todo check_readback_data_uint(&rb, NULL, r8g8b8a8_data[1], 0); + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_DEST); + + /* Resolve. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + texture_copy, 0, texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 0); + + reset_command_list(command_list, context.allocator); + + /* Dispatch(). */ + cb = create_upload_buffer(context.device, sizeof(input), &input); + + buffer = create_default_buffer(context.device, 512, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + upload_buffer_data(buffer, 0, sizeof(uint32_t), &init_value, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; + root_parameters[0].Descriptor.ShaderRegister = 0; + root_parameters[0].Descriptor.RegisterSpace = 0; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV; + root_parameters[1].Descriptor.ShaderRegister = 0; + root_parameters[1].Descriptor.RegisterSpace = 0; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = 2; + root_signature_desc.pParameters = root_parameters; + hr = create_root_signature(context.device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + pipeline_state = create_compute_pipeline_state(context.device, root_signature, + shader_bytecode(cs_code, sizeof(cs_code))); + + for (i = 0; i < 2; ++i) + { + ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature); + ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, + 0, ID3D12Resource_GetGPUVirtualAddress(cb)); + ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list, + 1, ID3D12Resource_GetGPUVirtualAddress(buffer)); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, i * sizeof(uint64_t), + D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + value = get_readback_uint(&rb, 0, 0, 0); + ok(value == (!i ? init_value : input.value), "Got %#x, expected %#x.\n", value, input.value); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + } + + ID3D12Resource_Release(texture); + ID3D12Resource_Release(texture_copy); + ID3D12Resource_Release(conditions); + ID3D12Resource_Release(cb); + ID3D12Resource_Release(buffer); + ID3D12RootSignature_Release(root_signature); + ID3D12PipelineState_Release(pipeline_state); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -30629,4 +30994,5 @@ START_TEST(d3d12) run_test(test_queue_wait); run_test(test_graphics_compute_queue_synchronization); run_test(test_early_depth_stencil_tests); + run_test(test_conditional_rendering); } -- 2.11.0

1 0

[PATCH vkd3d 1/2] vkd3d: Implement d3d12_command_list_SetPredication().
by Henri Verbeet June 15, 2019

June 15, 2019

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Predicate arguments which are only non-zero in bit 32 or higher are not supported. Predicates will not be applied to clear and copy commands because Vulkan does not support predication of these command classes. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166617. libs/vkd3d/command.c | 66 +++++++++++++++++++++++++++++++++++++++++++++- libs/vkd3d/device.c | 12 +++++++++ libs/vkd3d/vkd3d_private.h | 3 +++ libs/vkd3d/vulkan_procs.h | 4 +++ 4 files changed, 84 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 75556f5..4723e79 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2288,6 +2288,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->xfb_enabled = false; + list->is_predicated = false; + list->current_framebuffer = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE; list->pso_render_pass = VK_NULL_HANDLE; @@ -4910,8 +4912,70 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *buffer, UINT64 aligned_buffer_offset, D3D12_PREDICATION_OP operation) { - FIXME("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x stub!\n", + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); + struct d3d12_resource *resource = unsafe_impl_from_ID3D12Resource(buffer); + const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; + const struct vkd3d_vk_device_procs *vk_procs; + + TRACE("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x.\n", iface, buffer, aligned_buffer_offset, operation); + + if (!vk_info->EXT_conditional_rendering) + { + FIXME("Vulkan conditional rendering extension not present. Conditional rendering not supported.\n"); + return; + } + + vk_procs = &list->device->vk_procs; + + if (resource) + { + VkConditionalRenderingBeginInfoEXT cond_info; + + if (aligned_buffer_offset & (sizeof(UINT64) - 1)) + { + WARN("Unaligned predicate argument buffer offset %#"PRIx64".\n", aligned_buffer_offset); + return; + } + + if (!d3d12_resource_is_buffer(resource)) + { + WARN("Predicate arguments must be stored in a buffer resource.\n"); + return; + } + + FIXME("Predication doesn't support clear and copy commands, " + "and predication values are treated as 32-bit values.\n"); + + cond_info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT; + cond_info.pNext = NULL; + cond_info.buffer = resource->u.vk_buffer; + cond_info.offset = aligned_buffer_offset; + switch (operation) + { + case D3D12_PREDICATION_OP_EQUAL_ZERO: + cond_info.flags = 0; + break; + + case D3D12_PREDICATION_OP_NOT_EQUAL_ZERO: + cond_info.flags = VK_CONDITIONAL_RENDERING_INVERTED_BIT_EXT; + break; + + default: + FIXME("Unhandled predication operation %#x.\n", operation); + return; + } + + if (list->is_predicated) + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); + VK_CALL(vkCmdBeginConditionalRenderingEXT(list->vk_command_buffer, &cond_info)); + list->is_predicated = true; + } + else if (list->is_predicated) + { + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); + list->is_predicated = false; + } } static void STDMETHODCALLTYPE d3d12_command_list_SetMarker(ID3D12GraphicsCommandList1 *iface, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fa10bb8..217c1c8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -142,6 +142,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = {VK_KHR_MAINTENANCE3_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_maintenance3)}, {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, /* EXT extensions */ + {VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_conditional_rendering)}, {VK_EXT_DEBUG_MARKER_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_debug_marker)}, {VK_EXT_DEPTH_CLIP_ENABLE_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_depth_clip_enable)}, {VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_descriptor_indexing)}, @@ -673,6 +674,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceProperties2KHR properties2; /* features */ + VkPhysicalDeviceConditionalRenderingFeaturesEXT conditional_rendering_features; VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; @@ -684,6 +686,7 @@ struct vkd3d_physical_device_info static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *info, struct d3d12_device *device) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; VkPhysicalDeviceDescriptorIndexingPropertiesEXT *descriptor_indexing_properties; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features; @@ -696,6 +699,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; memset(info, 0, sizeof(*info)); + conditional_rendering_features = &info->conditional_rendering_features; depth_clip_features = &info->depth_clip_features; descriptor_indexing_features = &info->descriptor_indexing_features; descriptor_indexing_properties = &info->descriptor_indexing_properties; @@ -705,7 +709,9 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i xfb_features = &info->xfb_features; xfb_properties = &info->xfb_properties; + conditional_rendering_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT; depth_clip_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; + depth_clip_features->pNext = conditional_rendering_features; descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; descriptor_indexing_features->pNext = depth_clip_features; xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; @@ -999,6 +1005,7 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_device_info *info) { + const VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; @@ -1109,6 +1116,10 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev TRACE(" runtimeDescriptorArray: %#x.\n", descriptor_indexing->runtimeDescriptorArray); + conditional_rendering_features = &info->conditional_rendering_features; + TRACE(" VkPhysicalDeviceConditionalRenderingFeaturesEXT:\n"); + TRACE(" conditionalRendering: %#x.\n", conditional_rendering_features->conditionalRendering); + depth_clip_features = &info->depth_clip_features; TRACE(" VkPhysicalDeviceDepthClipEnableFeaturesEXT:\n"); TRACE(" depthClipEnable: %#x.\n", depth_clip_features->depthClipEnable); @@ -1337,6 +1348,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, *user_extension_supported, vulkan_info, "device", device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); + vulkan_info->EXT_conditional_rendering = physical_device_info->conditional_rendering_features.conditionalRendering; vulkan_info->EXT_depth_clip_enable = physical_device_info->depth_clip_features.depthClipEnable; if (get_spec_version(vk_extensions, count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3af8a95..e0d563f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -97,6 +97,7 @@ struct vkd3d_vulkan_info bool KHR_maintenance3; bool KHR_push_descriptor; /* EXT device extensions */ + bool EXT_conditional_rendering; bool EXT_debug_marker; bool EXT_depth_clip_enable; bool EXT_descriptor_indexing; @@ -907,6 +908,8 @@ struct d3d12_command_list bool xfb_enabled; + bool is_predicated; + VkFramebuffer current_framebuffer; VkPipeline current_pipeline; VkRenderPass pso_render_pass; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index a55fb07..702cfd2 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -192,6 +192,10 @@ VK_DEVICE_EXT_PFN(vkGetDescriptorSetLayoutSupportKHR) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) +/* VK_EXT_conditional_rendering */ +VK_DEVICE_EXT_PFN(vkCmdBeginConditionalRenderingEXT) +VK_DEVICE_EXT_PFN(vkCmdEndConditionalRenderingEXT) + /* VK_EXT_debug_marker */ VK_DEVICE_EXT_PFN(vkDebugMarkerSetObjectNameEXT) -- 2.11.0

1 0

libunwind and windows call stack determination, wine's dbghelp...
by Tarmo Pikaro June 15, 2019

June 15, 2019

Hi ! I've managed to compile libunwind on Visual Studio 2017 with linux subsystem, made my own fork from libunwind here: https://github.com/tapika/libunwind For now I have "hardcoded" into git some of autogenerated files, just not to play aroundwith bash / shell / tools. Can push my solution / project to your git if necessary, but I think Visual studio is still bit immaturewhat concerns linux, but debugging & compilation seems to work on some level. Would it be possible to permanently rename "aux" folder, as it's name of windows device drive, andyou just cannot do checkout on windows, no matter which tool you use. At the moment I want to recombine windows stack walking with linux stack walking, something similar seems to be implemented in https://github.com/Magnusnorrby/MolyRift/blob/master/Kernel/OVR_DebugHelp.c… I'll probably try to recombine or create something similar. Need to analyze bit deeperhow can do it. I've also tried to rip off dbghelp.dll from wine linux emulator, conversation on this can be found here: http://wine.1045685.n8.nabble.com/dbghelp-detached-from-wine-into-standalon… Basically at the moment what concerns stack walking - I see couple of alternatives 1. make something similar to OVR_DebugHelp.cpp, so API would be coombination of all 3 stack walk apis. 2. create new platform support under libunwind library, but need to analyze this alternative deeperif it's feasible. (use libunwind API, but provide windows API implementation for that one). 3. create fully platform independent solution, like rip off dbghelp wired to multiple platforms.(Separate library from libunwind) I'm thinking about 2,1,3 with focus on 3 when possible (fully platform / os neutral), but priority order as specified. But despite of call stack approaches - I would like to discuss if anyone can commentof idea of having c++ compiled dll / so so that it would be platform neutral ? Original question resides in here: https://www.reddit.com/r/cpp/comments/bjgt0j/make_portable_dll_without_seco… Does libunwind provides only parsing capabilities over dwarf / elf, would it be possible to modify dwarf file format to have so / dll file format to be fully OS / platform neutral ? -- Have a nice day! Tarmo.

1 0

[PATCH v2 1/3] dmusic/tests: Add some tests for the master clock.
by Zebediah Figura June 15, 2019

June 15, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Remove tests for the clock name. dlls/dmusic/tests/dmusic.c | 123 ++++++++++++++++++++++++++++++------- 1 file changed, 101 insertions(+), 22 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index a4fbd4af717..d071e1cdef6 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -38,20 +38,10 @@ static void test_dmusic(void) DMUS_PORTCAPS port_caps; DMUS_PORTPARAMS port_params; IDirectMusicPort *port = NULL; - DMUS_CLOCKINFO clock_info; - GUID guid_clock; - IReferenceClock *clock = NULL; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); - hr = IDirectMusic_GetMasterClock(dmusic, &guid_clock, &clock); - ok(hr == S_OK, "IDirectMusic_GetMasterClock returned: %x\n", hr); - ok(clock != NULL, "No clock returned\n"); - trace(" guidPort = %s\n", wine_dbgstr_guid(&guid_clock)); - if (clock) - IReferenceClock_Release(clock); - port_params.dwSize = sizeof(port_params); port_params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; port_params.dwChannelGroups = 1; @@ -96,18 +86,6 @@ static void test_dmusic(void) index++; } - index = 0; - clock_info.dwSize = sizeof(clock_info); - while (IDirectMusic_EnumMasterClock(dmusic, index, &clock_info) == S_OK) - { - ok(clock_info.dwSize == sizeof(clock_info), "DMUS_CLOCKINFO dwSize member is wrong (%u)\n", clock_info.dwSize); - trace("Clock %u:\n", index); - trace(" ctType = %u\n", clock_info.ctType); - trace(" guidClock = %s\n", wine_dbgstr_guid(&clock_info.guidClock)); - trace(" wszDescription = %s\n", wine_dbgstr_w(clock_info.wszDescription)); - index++; - } - if (port) IDirectMusicPort_Release(port); IDirectMusic_Release(dmusic); @@ -776,6 +754,106 @@ static void test_parsedescriptor(void) IDirectMusicObject_Release(dmo); } +static void test_master_clock(void) +{ + static const GUID guid_system_clock = {0x58d58419, 0x71b4, 0x11d1, {0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12}}; + static const GUID guid_dsound_clock = {0x58d58420, 0x71b4, 0x11d1, {0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12}}; + IReferenceClock *clock, *clock2; + REFERENCE_TIME time1, time2; + LARGE_INTEGER counter, freq; + DMUS_CLOCKINFO clock_info; + IDirectMusic *dmusic; + DWORD cookie; + HRESULT hr; + ULONG ref; + GUID guid; + + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (void **)&dmusic); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectMusic_GetMasterClock(dmusic, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&guid, 0xcc, sizeof(guid)); + hr = IDirectMusic_GetMasterClock(dmusic, &guid, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(IsEqualGUID(&guid, &guid_system_clock), "Got guid %s.\n", wine_dbgstr_guid(&guid)); + + clock = (IReferenceClock *)0xdeadbeef; + hr = IDirectMusic_GetMasterClock(dmusic, NULL, &clock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock && clock != (IReferenceClock *)0xdeadbeef, "Got clock %p.\n", clock); + + hr = IDirectMusic_GetMasterClock(dmusic, NULL, &clock2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock2 == clock, "Clocks didn't match.\n"); + IReferenceClock_Release(clock2); + + memset(&guid, 0xcc, sizeof(guid)); + hr = IDirectMusic_GetMasterClock(dmusic, &guid, &clock2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(IsEqualGUID(&guid, &guid_system_clock), "Got guid %s.\n", wine_dbgstr_guid(&guid)); + ok(clock2 == clock, "Clocks didn't match.\n"); + IReferenceClock_Release(clock2); + + QueryPerformanceFrequency(&freq); + QueryPerformanceCounter(&counter); + hr = IReferenceClock_GetTime(clock, &time1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + time2 = counter.QuadPart * 10000000.0 / freq.QuadPart; + todo_wine ok(abs(time1 - time2) < 20 * 10000, "Expected about %s, got %s.\n", + wine_dbgstr_longlong(time2), wine_dbgstr_longlong(time1)); + + hr = IReferenceClock_GetTime(clock, &time2); + todo_wine ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr); + + Sleep(100); + hr = IReferenceClock_GetTime(clock, &time2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n", + wine_dbgstr_longlong(time1 + 100 * 10000), wine_dbgstr_longlong(time2)); + + hr = IReferenceClock_AdviseTime(clock, 0, 0, NULL, &cookie); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdvisePeriodic(clock, 0, 0, NULL, &cookie); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IReferenceClock_Unadvise(clock, 0); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IReferenceClock_Release(clock); + + hr = IDirectMusic_EnumMasterClock(dmusic, 0, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 0, &clock_info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock_info.ctType == DMUS_CLOCK_SYSTEM, "Got type %#x.\n", clock_info.ctType); + ok(IsEqualGUID(&clock_info.guidClock, &guid_system_clock), "Got guid %s.\n", + wine_dbgstr_guid(&clock_info.guidClock)); + ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#x.\n", clock_info.dwFlags); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 1, &clock_info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock_info.ctType == DMUS_CLOCK_SYSTEM, "Got type %#x.\n", clock_info.ctType); + ok(IsEqualGUID(&clock_info.guidClock, &guid_dsound_clock), "Got guid %s.\n", + wine_dbgstr_guid(&clock_info.guidClock)); + ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#x.\n", clock_info.dwFlags); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 2, &clock_info); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ref = IDirectMusic_Release(dmusic); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -794,6 +872,7 @@ START_TEST(dmusic) test_dmbuffer(); test_dmcoll(); test_parsedescriptor(); + test_master_clock(); CoUninitialize(); } -- 2.20.1

2 5

[PATCH] wininet: Hide GetCookie flag fixme for HTTPONLY cookies
by Tim Schumacher June 15, 2019

June 15, 2019

Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> --- HTTPONLY cookies have been added ages ago in commit db441cf58f0. This flag warning is just a remnant that was forgotten. --- dlls/wininet/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 30a9e2545b..2af752110c 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -733,7 +733,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, TRACE("(%s, %s, %p, %p, %x, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize, flags, reserved); - if (flags) + if (flags & ~INTERNET_COOKIE_HTTPONLY) FIXME("flags 0x%08x not supported\n", flags); if (!lpszUrl) -- 2.22.0

1 0

[PATCH v2 1/4] ddraw/tests: Add some tests for transform state and stateblock interaction.
by Zebediah Figura June 14, 2019

June 14, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/tests/ddraw7.c | 316 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 316 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b0fc634eef7..49a40a7840a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16289,6 +16289,321 @@ static void test_caps(void) IDirectDraw7_Release(ddraw); } +static void test_transform_state(void) +{ + D3DMATRIX mat1, mat2, ret_mat; + IDirect3DDevice7 *device; + DWORD stateblock; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + static const D3DTRANSFORMSTATETYPE tests[] = + { + D3DTRANSFORMSTATE_WORLD, + D3DTRANSFORMSTATE_VIEW, + D3DTRANSFORMSTATE_PROJECTION, + D3DTRANSFORMSTATE_WORLD1, + D3DTRANSFORMSTATE_WORLD2, + D3DTRANSFORMSTATE_WORLD3, + D3DTRANSFORMSTATE_TEXTURE0, + D3DTRANSFORMSTATE_TEXTURE1, + D3DTRANSFORMSTATE_TEXTURE2, + D3DTRANSFORMSTATE_TEXTURE3, + D3DTRANSFORMSTATE_TEXTURE4, + D3DTRANSFORMSTATE_TEXTURE5, + D3DTRANSFORMSTATE_TEXTURE6, + D3DTRANSFORMSTATE_TEXTURE7, + }; + + static const D3DMATRIX identity = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + memset(&mat1, 0x11, sizeof(mat1)); + memset(&mat2, 0x22, sizeof(mat2)); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &identity, sizeof(identity)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + /* Recorded stateblock, even states. */ + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (i % 2) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + } + + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, (i % 2) ? &mat2 : &mat1, sizeof(mat1)), + "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, (i % 2) ? &mat1 : &mat2, sizeof(mat1)), + "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + /* Recorded stateblock, odd states. */ + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (!(i % 2)) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + } + + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, (i % 2) ? &mat1 : &mat2, sizeof(mat1)), + "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, (i % 2) ? &mat2 : &mat1, sizeof(mat1)), + "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + /* Predefined stateblock, D3DSBT_ALL. */ + + hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_ALL, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + /* Predefined stateblock, D3DSBT_VERTEXSTATE. The documentation incorrectly + * states that transform matrices are included. */ + + hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_VERTEXSTATE, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + /* Predefined stateblock, D3DSBT_PIXELSTATE. */ + + hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_PIXELSTATE, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16436,4 +16751,5 @@ START_TEST(ddraw7) test_clipper_refcount(); test_begin_end_state_block(); test_caps(); + test_transform_state(); } -- 2.20.1

2 7