May 2018 - Wine-commits - list.winehq.org

Józef Kucia : d3d10core/tests: Add test for unbound multisample textures.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: 3340f56f048b8b7ee237c0d55bac34d8eb6f8bf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3340f56f048b8b7ee237c0d5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 16 11:55:25 2018 +0200 d3d10core/tests: Add test for unbound multisample textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 86 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 65f610d..be09f44 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16339,6 +16339,91 @@ done: release_test_context(&test_context); } +static void test_unbound_multisample_texture(void) +{ + struct d3d10core_test_context test_context; + ID3D10PixelShader *ps; + struct uvec4 cb_data; + ID3D10Device *device; + ID3D10Buffer *cb; + unsigned int i; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + Texture2DMS<float4, 4> t; + + uint sample_index; + + float4 main(float4 position : SV_Position) : SV_Target + { + float3 p; + t.GetDimensions(p.x, p.y, p.z); + p *= float3(position.x / 640.0f, position.y / 480.0f, 0.0f); + /* sample index must be a literal */ + switch (sample_index) + { + case 1: return t.Load(int2(p.xy), 1); + case 2: return t.Load(int2(p.xy), 2); + case 3: return t.Load(int2(p.xy), 3); + default: return t.Load(int2(p.xy), 0); + } + } +#endif + 0x43425844, 0x03d62416, 0x1914ee8b, 0xccd08d68, 0x27f42136, 0x00000001, 0x000002f8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000025c, 0x00000040, + 0x00000097, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04042058, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000002, 0x0700003d, 0x001000f2, 0x00000000, 0x00004001, 0x00000000, 0x00107e46, + 0x00000000, 0x07000038, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00101046, 0x00000000, + 0x0a000038, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, + 0x00000000, 0x00000000, 0x0400004c, 0x0020800a, 0x00000000, 0x00000000, 0x03000006, 0x00004001, + 0x00000001, 0x0500001b, 0x00100032, 0x00000001, 0x00100046, 0x00000000, 0x08000036, 0x001000c2, + 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0900002e, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000001, 0x00107e46, 0x00000000, 0x00004001, 0x00000001, 0x0100003e, + 0x03000006, 0x00004001, 0x00000002, 0x0500001b, 0x00100032, 0x00000001, 0x00100046, 0x00000000, + 0x08000036, 0x001000c2, 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0900002e, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x00107e46, 0x00000000, 0x00004001, + 0x00000002, 0x0100003e, 0x03000006, 0x00004001, 0x00000003, 0x0500001b, 0x00100032, 0x00000001, + 0x00100046, 0x00000000, 0x08000036, 0x001000c2, 0x00000001, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0900002e, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x00107e46, + 0x00000000, 0x00004001, 0x00000003, 0x0100003e, 0x0100000a, 0x0500001b, 0x00100032, 0x00000000, + 0x00100046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0900002e, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, + 0x00000000, 0x00004001, 0x00000000, 0x0100003e, 0x01000017, 0x0100003e, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + memset(&cb_data, 0, sizeof(cb_data)); + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(cb_data), &cb_data); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + for (i = 0; i < 4; ++i) + { + cb_data.x = i; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &cb_data, 0, 0); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x00000000, 1); + } + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + static void test_multiple_viewports(void) { struct @@ -16922,6 +17007,7 @@ START_TEST(device) test_combined_clip_and_cull_distances(); test_generate_mips(); test_alpha_to_coverage(); + test_unbound_multisample_texture(); test_multiple_viewports(); test_multisample_resolve(); test_depth_clip();

1 0

Józef Kucia : wined3d: Implement SV_SampleIndex.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: ce12b09159d10808cf40853f3f508d1b3a152593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce12b09159d10808cf40853f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 16 11:55:26 2018 +0200 wined3d: Implement SV_SampleIndex. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7a7764b..da7e700 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6845,6 +6845,14 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w shader_addline(buffer, "ps_in[%u]%s = uintBitsToFloat(gl_FrontFacing ? 0xffffffffu : 0u);\n", input->register_idx, reg_mask); } + else if (input->sysval_semantic == WINED3D_SV_SAMPLE_INDEX) + { + if (gl_info->supported[ARB_SAMPLE_SHADING]) + shader_addline(buffer, "ps_in[%u]%s = intBitsToFloat(gl_SampleID);\n", + input->register_idx, reg_mask); + else + FIXME("ARB_sample_shading is not supported.\n"); + } else if (input->sysval_semantic == WINED3D_SV_RENDER_TARGET_ARRAY_INDEX && !semantic_idx) { if (gl_info->supported[ARB_FRAGMENT_LAYER_VIEWPORT])

1 0

Józef Kucia : d3d11: Add ID3D11Device2 stub.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: bf293b70c915060b4a7e465440495001aad4369e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf293b70c915060b4a7e4654… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 16 11:55:27 2018 +0200 d3d11: Add ID3D11Device2 stub. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 11 +-- dlls/d3d11/buffer.c | 11 +-- dlls/d3d11/d3d11_private.h | 48 ++++----- dlls/d3d11/device.c | 238 ++++++++++++++++++++++++++------------------- dlls/d3d11/inputlayout.c | 10 +- dlls/d3d11/shader.c | 65 ++++++------- dlls/d3d11/state.c | 46 +++++---- dlls/d3d11/tests/d3d11.c | 4 - dlls/d3d11/texture.c | 32 +++--- dlls/d3d11/view.c | 41 ++++---- 10 files changed, 264 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf293b70c915060b4a7e…

1 0

Józef Kucia : d3d11/tests: Add test for sampleinfo with rasterizer register.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: 44c8a7ae67dc5bdb9712f8c7df73e144cfcf4d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c8a7ae67dc5bdb9712f8c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 16 11:55:28 2018 +0200 d3d11/tests: Add test for sampleinfo with rasterizer register. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 71 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5cf12a8..fadcec4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -19862,9 +19862,10 @@ static void test_sm5_bufinfo_instruction(void) static void test_sampleinfo_instruction(void) { ID3D11Texture2D *float_rt_texture, *uint_rt_texture; - ID3D11RenderTargetView *float_rtv, *uint_rtv; + ID3D11RenderTargetView *float_rtv, *uint_rtv, *rtv; + ID3D11PixelShader *ps_float, *ps_uint, *ps_rt; + ID3D11Texture2D *texture, *readback_texture; struct d3d11_test_context test_context; - ID3D11PixelShader *ps_float, *ps_uint; unsigned int sample_count, quality; D3D11_TEXTURE2D_DESC texture_desc; ID3D11RenderTargetView *rtvs[2]; @@ -19872,7 +19873,6 @@ static void test_sampleinfo_instruction(void) ID3D11DeviceContext *context; struct uvec4 expected_uint; struct vec4 expected_float; - ID3D11Resource *texture; ID3D11Device *device; HRESULT hr; @@ -19915,6 +19915,21 @@ static void test_sampleinfo_instruction(void) 0x0100086a, 0x04002058, 0x00107000, 0x00000000, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x0500006f, 0x001020f2, 0x00000000, 0x0010700a, 0x00000000, 0x0100003e, }; + static const DWORD ps_rt_code[] = + { +#if 0 + float4 main() : SV_Target + { + return GetRenderTargetSampleCount(); + } +#endif + 0x43425844, 0x74404d37, 0xad6f88e4, 0xb006ea57, 0xf07d9e2a, 0x00000001, 0x000000a4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000002c, 0x00000050, 0x0000000b, + 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x0400006f, 0x001020f2, 0x00000000, 0x0000e00a, + 0x0100003e, + }; static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; if (!init_test_context(&test_context, &feature_level)) @@ -19984,16 +19999,64 @@ static void test_sampleinfo_instruction(void) expected_uint.x = expected_uint.y = expected_uint.z = expected_uint.w = sample_count; check_texture_uvec4(uint_rt_texture, &expected_uint); - ID3D11Resource_Release(texture); + ID3D11Texture2D_Release(texture); ID3D11ShaderResourceView_Release(srv); } + hr = ID3D11Device_CreatePixelShader(device, ps_rt_code, sizeof(ps_rt_code), NULL, &ps_rt); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps_rt, NULL, 0); + for (sample_count = 1; sample_count <= 8; sample_count *= 2) + { + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + texture_desc.SampleDesc.Count = sample_count; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + + hr = ID3D11Device_CheckMultisampleQualityLevels(device, texture_desc.Format, sample_count, &quality); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality) + { + skip("Sample count %u not supported.\n", sample_count); + continue; + } + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&texture); + ok(hr == S_OK, "Failed to create texture, hr %#x, sample count %u.\n", hr, sample_count); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + draw_quad(&test_context); + + if (sample_count != 1) + { + texture_desc.SampleDesc.Count = 1; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &readback_texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)readback_texture, 0, + (ID3D11Resource *)texture, 0, texture_desc.Format); + } + else + { + readback_texture = texture; + ID3D11Texture2D_AddRef(readback_texture); + } + + expected_float.x = expected_float.y = expected_float.z = expected_float.w = sample_count; + check_texture_vec4(readback_texture, &expected_float, 0); + + ID3D11Texture2D_Release(readback_texture); + ID3D11Texture2D_Release(texture); + ID3D11RenderTargetView_Release(rtv); + } + ID3D11RenderTargetView_Release(float_rtv); ID3D11RenderTargetView_Release(uint_rtv); ID3D11Texture2D_Release(float_rt_texture); ID3D11Texture2D_Release(uint_rt_texture); ID3D11PixelShader_Release(ps_float); ID3D11PixelShader_Release(ps_uint); + ID3D11PixelShader_Release(ps_rt); release_test_context(&test_context); }

1 0

Józef Kucia : d3d11/tests: Correctly check for multisample support.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: 0e397cfd7bf9c9371b15111b6a76548be959c329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e397cfd7bf9c9371b15111b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 16 11:55:29 2018 +0200 d3d11/tests: Correctly check for multisample support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index fadcec4..9e673ee 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26254,7 +26254,8 @@ static void test_alpha_to_coverage(void) ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); hr = ID3D11Device_CheckMultisampleQualityLevels(device, texture_desc.Format, 4, &quality_level_count); - if (FAILED(hr)) + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality_level_count) { skip("4xMSAA not supported.\n"); goto done; @@ -26773,8 +26774,9 @@ static void test_multisample_resolve(void) device = test_context.device; context = test_context.immediate_context; - if (FAILED(hr = ID3D11Device_CheckMultisampleQualityLevels(device, - DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, &i))) + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, &i); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!i) { skip("4xMSAA not supported.\n"); release_test_context(&test_context);

1 0

Józef Kucia : d3d10core/tests: Correctly check for multisample support.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: a10804ea4177ac8b14260a82c57fff6c9137c24b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a10804ea4177ac8b14260a82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 16 11:55:30 2018 +0200 d3d10core/tests: Correctly check for multisample support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index be09f44..4b39c1b 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16281,7 +16281,8 @@ static void test_alpha_to_coverage(void) ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); hr = ID3D10Device_CheckMultisampleQualityLevels(device, texture_desc.Format, 4, &quality_level_count); - if (FAILED(hr)) + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality_level_count) { skip("4xMSAA not supported.\n"); goto done; @@ -16794,8 +16795,9 @@ static void test_multisample_resolve(void) return; device = test_context.device; - if (FAILED(hr = ID3D10Device_CheckMultisampleQualityLevels(device, - DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, &i))) + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, &i); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!i) { skip("4xMSAA not supported.\n"); release_test_context(&test_context);

1 0

Jacek Caban : mshtml.idl: Added IHTMLCSSStyleDeclaration declaration.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: e70a8fbb10a7ec4a69351df18af44c0533e3c0e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e70a8fbb10a7ec4a69351df1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 16 17:45:48 2018 +0200 mshtml.idl: Added IHTMLCSSStyleDeclaration declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 391 +++++++++++++++++- include/mshtml.idl | 1145 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1535 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e70a8fbb10a7ec4a6935…

1 0

Zhiyi Zhang : comctl32/taskdialog: Return TRUE when message is handled.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: c5b469f7abf6a90abe5493a4385a099015132a72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b469f7abf6a90abe5493a4… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Thu May 17 00:18:05 2018 +0300 comctl32/taskdialog: Return TRUE when message is handled. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1ab9e13..4db4879 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -558,15 +558,17 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (HIWORD(wParam) == BN_CLICKED) { taskdialog_on_button_click(dialog_info, LOWORD(wParam)); - return TRUE; + break; } - break; + return FALSE; case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW); break; + default: + return FALSE; } - return FALSE; + return TRUE; } /***********************************************************************

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for TDN_HELP.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: 7dcaade498141c4edc73f0edbb8ce668dc795ff1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dcaade498141c4edc73f0ed… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Thu May 17 00:18:06 2018 +0300 comctl32/taskdialog: Add support for TDN_HELP. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 3 +++ dlls/comctl32/tests/taskdialog.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 4db4879..ae8e94d 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -561,6 +561,9 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; } return FALSE; + case WM_HELP: + taskdialog_notify(dialog_info, TDN_HELP, 0, 0); + break; case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW); diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 3fcc634..ad45555 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -121,6 +121,26 @@ static const struct message_info msg_return_press_custom10[] = { 0 } }; +static const struct message_info msg_send_click_ok[] = +{ + { TDM_CLICK_BUTTON, IDOK, 0 }, + { 0 } +}; + +static const struct message_info msg_send_f1[] = +{ + { WM_KEYF1, 0, 0, 0}, + { 0 } +}; + +static const struct message_info msg_got_tdn_help[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_f1 }, + { TDN_HELP, 0, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -291,6 +311,18 @@ static void test_buttons(void) run_test(&info, ID_START_BUTTON + 3, msg_return_press_custom4, "default button: valid default - 2"); } +static void test_help(void) +{ + TASKDIALOGCONFIG info = {0}; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + info.dwCommonButtons = TDCBF_OK_BUTTON; + + run_test(&info, IDOK, msg_got_tdn_help, "send f1"); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -327,6 +359,7 @@ START_TEST(taskdialog) test_invalid_parameters(); test_callback(); test_buttons(); + test_help(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for TDF_CAN_BE_MINIMIZED.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: 58c6ae8244717071098c9991190923807c5eb368 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58c6ae8244717071098c9991… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Thu May 17 00:18:07 2018 +0300 comctl32/taskdialog: Add support for TDF_CAN_BE_MINIMIZED. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ae8e94d..ef90efc 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -488,6 +488,7 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi } template->style = DS_MODALFRAME | DS_SETFONT | WS_CAPTION | WS_VISIBLE | WS_SYSMENU; + if (taskconfig->dwFlags & TDF_CAN_BE_MINIMIZED) template->style |= WS_MINIMIZEBOX; template->cdit = desc.control_count; template->x = (ref_rect.left + ref_rect.right + desc.dialog_width) / 2; template->y = (ref_rect.top + ref_rect.bottom + desc.dialog_height) / 2;

1 0