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

Józef Kucia : Update copyright info.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: vkd3d Branch: master Commit: f2697b0eba1d039e6b7f03a25f8cfa73e1ae6bcf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f2697b0eba1d039e6b7f03a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 26 12:35:23 2018 +0200 Update copyright info. 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> --- COPYING | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COPYING b/COPYING index 85faa25..32417ce 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ -Copyright 2016-2017 Józef Kucia for CodeWeavers -Copyright 2016-2017 Henri Verbeet for CodeWeavers +Copyright 2016-2018 the Vkd3d project authors (see the file AUTHORS for a +complete list) Vkd3d is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the

1 0

Józef Kucia : d3d10core/tests: Add test for stream output without geometry shaders.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: c1614dcddedff5e8df10c607d121f214d9d5e965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1614dcddedff5e8df10c607… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 25 11:23:49 2018 +0200 d3d10core/tests: Add test for stream output without geometry shaders. 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 | 175 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ba0a914..d3e359e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -14523,6 +14523,180 @@ static void test_stream_output_resume(void) release_test_context(&test_context); } +static void test_stream_output_vs(void) +{ + struct d3d10core_test_context test_context; + ID3D10InputLayout *input_layout; + ID3D10Buffer *vb, *so_buffer; + struct resource_readback rb; + ID3D10GeometryShader *gs; + ID3D10VertexShader *vs; + ID3D10Device *device; + const float *result; + unsigned int offset; + unsigned int i, j; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct vertex + { + float4 position : POSITION; + float4 color0 : COLOR0; + float4 color1 : COLOR1; + }; + + vertex main(in vertex i) + { + return i; + } +#endif + 0x43425844, 0xa67e993e, 0x1632c139, 0x02a7725f, 0xfb0221cd, 0x00000001, 0x00000194, 0x00000003, + 0x0000002c, 0x00000094, 0x000000fc, 0x4e475349, 0x00000060, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000059, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x00000059, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000f0f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, 0xab00524f, 0x4e47534f, 0x00000060, 0x00000003, + 0x00000008, 0x00000050, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000059, + 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x00000059, 0x00000001, 0x00000000, + 0x00000003, 0x00000002, 0x0000000f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, 0xab00524f, 0x52444853, + 0x00000090, 0x00010040, 0x00000024, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, + 0x00000001, 0x0300005f, 0x001010f2, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, + 0x001020f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, + 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, 0x05000036, + 0x001020f2, 0x00000002, 0x00101e46, 0x00000002, 0x0100003e, + }; + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 32, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + static const D3D10_SO_DECLARATION_ENTRY all_so_decl[] = + { + {"POSITION", 0, 0, 4, 0}, + {"COLOR", 0, 0, 4, 0}, + {"COLOR", 1, 0, 4, 0}, + }; + static const D3D10_SO_DECLARATION_ENTRY position_so_decl[] = + { + {"POSITION", 0, 0, 4, 0}, + }; + static const D3D10_SO_DECLARATION_ENTRY color_so_decl[] = + { + {"COLOR", 1, 0, 2, 0}, + }; + static const struct + { + struct vec4 position; + struct vec4 color0; + struct vec4 color1; + } + vb_data[] = + { + {{-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f, 2.0f, 3.0f, 4.0f}, {5.0f, 6.0f, 7.0f, 8.0f}}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, {9.0f, 1.1f, 1.2f, 1.3f}, {1.4f, 1.5f, 1.6f, 1.7f}}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, {1.8f, 1.9f, 2.0f, 2.1f}, {2.2f, 2.3f, 2.4f, 2.5f}}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, {2.5f, 2.6f, 2.7f, 2.8f}, {2.9f, 3.0f, 3.1f, 3.2f}}, + }; + static const unsigned int vb_stride[] = {sizeof(*vb_data)}; + static const float expected_data[] = + { + -1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, + -1.0f, 1.0f, 0.0f, 1.0f, 9.0f, 1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.7f, + 1.0f, -1.0f, 0.0f, 1.0f, 1.8f, 1.9f, 2.0f, 2.1f, 2.2f, 2.3f, 2.4f, 2.5f, + 1.0f, 1.0f, 0.0f, 1.0f, 2.5f, 2.6f, 2.7f, 2.8f, 2.9f, 3.0f, 3.1f, 3.2f, + }; + static const float expected_data2[] = + { + -1.0f, -1.0f, 0.0f, 1.0f, + -1.0f, 1.0f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.0f, 1.0f, + 1.0f, 1.0f, 0.0f, 1.0f, + }; + static const float expected_data3[] = + { + 5.0f, 6.0f, + 1.4f, 1.5f, + 2.2f, 2.3f, + 2.9f, 3.0f, + }; + static const struct + { + const D3D10_SO_DECLARATION_ENTRY *so_declaration; + unsigned int so_entry_count; + unsigned int so_stride; + const float *expected_data; + unsigned int expected_data_size; + BOOL todo; + } + tests[] = + { + {all_so_decl, ARRAY_SIZE(all_so_decl), 48, expected_data, ARRAY_SIZE(expected_data)}, + {position_so_decl, ARRAY_SIZE(position_so_decl), 16, expected_data2, ARRAY_SIZE(expected_data2)}, + {color_so_decl, ARRAY_SIZE(color_so_decl), 8, expected_data3, ARRAY_SIZE(expected_data3), TRUE}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(vb_data), vb_data); + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + so_buffer = create_buffer(device, D3D10_BIND_STREAM_OUTPUT, 1024, NULL); + + ID3D10Device_IASetInputLayout(device, input_layout); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, vb_stride, &offset); + ID3D10Device_VSSetShader(device, vs); + + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_POINTLIST); + + gs = NULL; + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (gs) + ID3D10GeometryShader_Release(gs); + + hr = ID3D10Device_CreateGeometryShaderWithStreamOutput(device, vs_code, sizeof(vs_code), + tests[i].so_declaration, tests[i].so_entry_count, tests[i].so_stride, &gs); + ok(hr == S_OK, "Failed to create geometry shader with stream output, hr %#x.\n", hr); + ID3D10Device_GSSetShader(device, gs); + + offset = 0; + ID3D10Device_SOSetTargets(device, 1, &so_buffer, &offset); + + ID3D10Device_Draw(device, 4, 0); + + get_buffer_readback(so_buffer, &rb); + result = rb.map_desc.pData; + for (j = 0; j < tests[i].expected_data_size; ++j) + { + float expected_value = tests[i].expected_data[j]; + todo_wine_if(tests[i].todo) + ok(compare_float(result[j], expected_value, 2), + "Test %u: Got %.8e, expected %.8e at %u.\n", + i, result[j], expected_value, j); + } + release_resource_readback(&rb); + } + + ID3D10Buffer_Release(vb); + ID3D10Buffer_Release(so_buffer); + ID3D10VertexShader_Release(vs); + ID3D10GeometryShader_Release(gs); + ID3D10InputLayout_Release(input_layout); + release_test_context(&test_context); +} + static void test_depth_bias(void) { struct vec3 vertices[] = @@ -16488,6 +16662,7 @@ START_TEST(device) test_geometry_shader(); test_stream_output(); test_stream_output_resume(); + test_stream_output_vs(); test_depth_bias(); test_format_compatibility(); test_clip_distance();

1 0

Józef Kucia : wined3d: Remove redundant size checks before memcpy().
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: 68e92f31c5c17d4f696c7e6b8ecfe5eb139d8e2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=68e92f31c5c17d4f696c7e6b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 25 11:23:50 2018 +0200 wined3d: Remove redundant size checks before memcpy(). 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/cs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b0572ab..dc07f52 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -986,8 +986,7 @@ void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_ op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_viewports, viewports[viewport_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_VIEWPORTS; - if (viewport_count) - memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports)); + memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports)); op->viewport_count = viewport_count; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); @@ -1012,8 +1011,7 @@ void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_ op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECTS; - if (rect_count) - memcpy(op->rects, rects, rect_count * sizeof(*rects)); + memcpy(op->rects, rects, rect_count * sizeof(*rects)); op->rect_count = rect_count; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT);

1 0

Józef Kucia : d3d11/tests: Introduce helper function to set viewport.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: ed3450cbfc67a94bc0096f6c13e29ede2c3701da URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed3450cbfc67a94bc0096f6c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 25 11:23:51 2018 +0200 d3d11/tests: Introduce helper function to set viewport. 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 | 112 ++++++++++++----------------------------------- 1 file changed, 29 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed3450cbfc67a94bc009…

1 0

Józef Kucia : d3d11/tests: Introduce draw_color_quad_vs() helper function.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: a81a6d6eabf4ef505e5181d54c52e201ae60b60f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a81a6d6eabf4ef505e5181d5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 25 11:23:52 2018 +0200 d3d11/tests: Introduce draw_color_quad_vs() helper function. 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 | 120 +++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a81a6d6eabf4ef505e51…

1 0

Józef Kucia : d3d10core/tests: Add test for ResolveSubresource().
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: f4b1b2019021874d5064fea3fb26e33cf253b7f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4b1b2019021874d5064fea3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 25 11:23:53 2018 +0200 d3d10core/tests: Add test for ResolveSubresource(). 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 | 139 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index d3e359e..3fdac8c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16568,6 +16568,144 @@ static void test_multiple_viewports(void) release_test_context(&test_context); } +static void test_multisample_resolve(void) +{ + struct d3d10core_test_context test_context; + D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + ID3D10Texture2D *texture, *ms_texture; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + ID3D10Device *device; + unsigned int i; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 color = {0.25f, 0.5f, 0.75f, 1.0f}; + static const struct + { + DXGI_FORMAT src_format; + DXGI_FORMAT dst_format; + DXGI_FORMAT format; + + DXGI_FORMAT rtv_format; + + const struct vec4 *color; + DWORD expected_color; + + BOOL todo; + } + tests[] = + { + {DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00}, + {DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89}, + + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + + {DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + if (FAILED(hr = ID3D10Device_CheckMultisampleQualityLevels(device, + DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, &i))) + { + skip("4xMSAA not supported.\n"); + release_test_context(&test_context); + return; + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = tests[i].dst_format; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + texture_desc.Format = tests[i].src_format; + texture_desc.SampleDesc.Count = 4; + texture_desc.SampleDesc.Quality = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &ms_texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + rtv_desc.Format = tests[i].rtv_format; + rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2DMS; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)ms_texture, &rtv_desc, &rtv); + ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + ID3D10Device_ClearRenderTargetView(device, rtv, white); + draw_color_quad(&test_context, tests[i].color); + ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)texture, 0, + (ID3D10Resource *)ms_texture, 0, tests[i].format); + todo_wine_if(tests[i].todo) + check_texture_color(texture, tests[i].expected_color, 2); + + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(ms_texture); + ID3D10Texture2D_Release(texture); + } + + release_test_context(&test_context); +} + START_TEST(device) { unsigned int argc, i; @@ -16670,4 +16808,5 @@ START_TEST(device) test_generate_mips(); test_alpha_to_coverage(); test_multiple_viewports(); + test_multisample_resolve(); }

1 0

Dmitry Timoshkov : sspicli: Add forwards to secur32.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: 5e74b9ea945db50bd31cef3254865f6cd9544eb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e74b9ea945db50bd31cef32… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 25 09:44:02 2018 +0800 sspicli: Add forwards to secur32. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sspicli/sspicli.spec | 98 +++++++++++++++++++++++------------------------ tools/make_specfiles | 4 ++ 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec index e18d359..38e166e 100644 --- a/dlls/sspicli/sspicli.spec +++ b/dlls/sspicli/sspicli.spec @@ -1,61 +1,61 @@ -@ stub AcceptSecurityContext -@ stub AcquireCredentialsHandleA -@ stub AcquireCredentialsHandleW -@ stub AddCredentialsA -@ stub AddCredentialsW -@ stub AddSecurityPackageA -@ stub AddSecurityPackageW -@ stub ApplyControlToken +@ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) secur32.AcceptSecurityContext +@ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleA +@ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleW +@ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) secur32.AddCredentialsA +@ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) secur32.AddCredentialsW +@ stdcall AddSecurityPackageA(str ptr) secur32.AddSecurityPackageA +@ stdcall AddSecurityPackageW(wstr ptr) secur32.AddSecurityPackageW +@ stdcall ApplyControlToken(ptr ptr) secur32.ApplyControlToken @ stub ChangeAccountPasswordA @ stub ChangeAccountPasswordW -@ stub CompleteAuthToken +@ stdcall CompleteAuthToken(ptr ptr) secur32.CompleteAuthToken @ stub CredMarshalTargetInfo @ stub CredUnmarshalTargetInfo -@ stub DecryptMessage -@ stub DeleteSecurityContext +@ stdcall DecryptMessage(ptr ptr long ptr) secur32.DecryptMessage +@ stdcall DeleteSecurityContext(ptr) secur32.DeleteSecurityContext @ stub DeleteSecurityPackageA @ stub DeleteSecurityPackageW -@ stub EncryptMessage -@ stub EnumerateSecurityPackagesA -@ stub EnumerateSecurityPackagesW -@ stub ExportSecurityContext -@ stub FreeContextBuffer -@ stub FreeCredentialsHandle +@ stdcall EncryptMessage(ptr long ptr long) secur32.EncryptMessage +@ stdcall EnumerateSecurityPackagesA(ptr ptr) secur32.EnumerateSecurityPackagesA +@ stdcall EnumerateSecurityPackagesW(ptr ptr) secur32.EnumerateSecurityPackagesW +@ stdcall ExportSecurityContext(ptr long ptr ptr) secur32.ExportSecurityContext +@ stdcall FreeContextBuffer(ptr) secur32.FreeContextBuffer +@ stdcall FreeCredentialsHandle(ptr) secur32.FreeCredentialsHandle @ stub GetSecurityUserInfo -@ stub GetUserNameExA -@ stub GetUserNameExW -@ stub ImpersonateSecurityContext -@ stub ImportSecurityContextA -@ stub ImportSecurityContextW -@ stub InitializeSecurityContextA -@ stub InitializeSecurityContextW -@ stub InitSecurityInterfaceA -@ stub InitSecurityInterfaceW +@ stdcall GetUserNameExA(long ptr ptr) secur32.GetUserNameExA +@ stdcall GetUserNameExW(long ptr ptr) secur32.GetUserNameExW +@ stdcall ImpersonateSecurityContext(ptr) secur32.ImpersonateSecurityContext +@ stdcall ImportSecurityContextA(str ptr ptr ptr) secur32.ImportSecurityContextA +@ stdcall ImportSecurityContextW(wstr ptr ptr ptr) secur32.ImportSecurityContextW +@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) secur32.InitializeSecurityContextA +@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) secur32.InitializeSecurityContextW +@ stdcall InitSecurityInterfaceA() secur32.InitSecurityInterfaceA +@ stdcall InitSecurityInterfaceW() secur32.InitSecurityInterfaceW @ stub LogonUserExExW -@ stub LsaCallAuthenticationPackage -@ stub LsaConnectUntrusted -@ stub LsaDeregisterLogonProcess -@ stub LsaEnumerateLogonSessions -@ stub LsaFreeReturnBuffer -@ stub LsaGetLogonSessionData -@ stub LsaLogonUser -@ stub LsaLookupAuthenticationPackage -@ stub LsaRegisterLogonProcess +@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) secur32.LsaCallAuthenticationPackage +@ stdcall LsaConnectUntrusted(ptr) secur32.LsaConnectUntrusted +@ stdcall LsaDeregisterLogonProcess(long) secur32.LsaDeregisterLogonProcess +@ stdcall LsaEnumerateLogonSessions(ptr ptr) secur32.LsaEnumerateLogonSessions +@ stdcall LsaFreeReturnBuffer(ptr) secur32.LsaFreeReturnBuffer +@ stdcall LsaGetLogonSessionData(ptr ptr) secur32.LsaGetLogonSessionData +@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) secur32.LsaLogonUser +@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) secur32.LsaLookupAuthenticationPackage +@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) secur32.LsaRegisterLogonProcess @ stub LsaRegisterPolicyChangeNotification @ stub LsaUnregisterPolicyChangeNotification -@ stub MakeSignature -@ stub QueryContextAttributesA +@ stdcall MakeSignature(ptr long ptr long) secur32.MakeSignature +@ stdcall QueryContextAttributesA(ptr long ptr) secur32.QueryContextAttributesA @ stub QueryContextAttributesExA @ stub QueryContextAttributesExW -@ stub QueryContextAttributesW -@ stub QueryCredentialsAttributesA +@ stdcall QueryContextAttributesW(ptr long ptr) secur32.QueryContextAttributesW +@ stdcall QueryCredentialsAttributesA(ptr long ptr) secur32.QueryCredentialsAttributesA @ stub QueryCredentialsAttributesExA @ stub QueryCredentialsAttributesExW -@ stub QueryCredentialsAttributesW -@ stub QuerySecurityContextToken -@ stub QuerySecurityPackageInfoA -@ stub QuerySecurityPackageInfoW -@ stub RevertSecurityContext +@ stdcall QueryCredentialsAttributesW(ptr long ptr) secur32.QueryCredentialsAttributesW +@ stdcall QuerySecurityContextToken(ptr ptr) secur32.QuerySecurityContextToken +@ stdcall QuerySecurityPackageInfoA(str ptr) secur32.QuerySecurityPackageInfoA +@ stdcall QuerySecurityPackageInfoW(wstr ptr) secur32.QuerySecurityPackageInfoW +@ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext @ stub SaslAcceptSecurityContext @ stub SaslEnumerateProfilesA @ stub SaslEnumerateProfilesW @@ -67,7 +67,7 @@ @ stub SaslInitializeSecurityContextA @ stub SaslInitializeSecurityContextW @ stub SaslSetContextOption -@ stub SealMessage +@ stdcall SealMessage(ptr long ptr long) secur32.SealMessage @ stub SecCacheSspiPackages @ stub SecDeleteUserModeContext @ stub SeciAllocateAndSetCallFlags @@ -75,8 +75,8 @@ @ stub SeciFreeCallContext @ stub SeciIsProtectedUser @ stub SecInitUserModeContext -@ stub SetContextAttributesA -@ stub SetContextAttributesW +@ stdcall SetContextAttributesA(ptr long ptr long) secur32.SetContextAttributesA +@ stdcall SetContextAttributesW(ptr long ptr long) secur32.SetContextAttributesW @ stub SetCredentialsAttributesA @ stub SetCredentialsAttributesW @ stub SspiCompareAuthIdentities @@ -100,5 +100,5 @@ @ stub SspiUnmarshalAuthIdentityInternal @ stub SspiValidateAuthIdentity @ stdcall SspiZeroAuthIdentity(ptr) -@ stub UnsealMessage -@ stub VerifySignature +@ stdcall UnsealMessage(ptr ptr long ptr) secur32.UnsealMessage +@ stdcall VerifySignature(ptr ptr long ptr) secur32.VerifySignature diff --git a/tools/make_specfiles b/tools/make_specfiles index 44023aa..6fe79f6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -330,6 +330,10 @@ my @dll_groups = "ext-ms-win-oleacc-l1-1-0", ], [ + "secur32", + "sspicli", + ], + [ "shell32", "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-shell-shellcom-l1-1-0",

1 0

Josh DuBois : wineandroid: Silence a noisy FIXME in ANDROID_GetKeyboardLayout.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: 998eef6eca5042fcdf72f5e8c04e2cc291bcce47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=998eef6eca5042fcdf72f5e8… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Tue Apr 24 19:27:11 2018 -0500 wineandroid: Silence a noisy FIXME in ANDROID_GetKeyboardLayout. Signed-off-by: Josh DuBois <duboisj(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 3d459cd..3167d54 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -974,6 +974,7 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) { ULONG_PTR layout = GetUserDefaultLCID(); LANGID langid; + static int once; langid = PRIMARYLANGID(LANGIDFROMLCID( layout )); if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) @@ -981,7 +982,7 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) else layout |= layout << 16; - FIXME( "returning %lx\n", layout ); + if (!once++) FIXME( "returning %lx\n", layout ); return (HKL)layout; }

1 0

Dmitry Timoshkov : schedsvc: Fix NetrJobGetInfo return value in case of invalid job id.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: 31d2026537816bdc94b52c2fe2c778815f2d48f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31d2026537816bdc94b52c2f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 25 11:29:45 2018 +0800 schedsvc: Fix NetrJobGetInfo return value in case of invalid job id. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 3 ++- dlls/schedsvc/tests/atsvcapi.c | 8 +++++--- include/wine/atsvc.idl | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 83e7dca..2010245 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -686,7 +686,7 @@ DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **info) { struct job_t *job; - DWORD ret = ERROR_SUCCESS; + DWORD ret = APE_AT_ID_NOT_FOUND; TRACE("%s,%u,%p\n", debugstr_w(server_name), jobid, info); @@ -706,6 +706,7 @@ DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **in info_ret->Flags = job->info.Flags; info_ret->Command = heap_strdupW(job->info.Command); *info = info_ret; + ret = ERROR_SUCCESS; } } diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index 2226480..367c6da 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -58,7 +58,7 @@ START_TEST(atsvcapi) WCHAR server_name[MAX_COMPUTERNAME_LENGTH + 1]; PTOP_LEVEL_EXCEPTION_FILTER old_exception_filter; AT_ENUM_CONTAINER container; - AT_INFO info; + AT_INFO info, *info2; DWORD ret, i, total, start_index, jobid, try, try_count; BOOL found; @@ -104,6 +104,10 @@ START_TEST(atsvcapi) test_failures = 1; test_skipped = 0; + info2 = NULL; + ret = NetrJobGetInfo(server_name, 0xdeadbeef, &info2); + ok(ret == APE_AT_ID_NOT_FOUND || broken(1) /* vista and w2008 return rubbish here */, "wrong error %u\n", ret); + try_count = 5; for (try = 1; try <= try_count; try++) @@ -127,8 +131,6 @@ START_TEST(atsvcapi) for (i = 0; i < container.EntriesRead; i++) { - AT_INFO *info2; - trace("%u: jobid %u, command %s\n", i, container.Buffer[i].JobId, wine_dbgstr_w(container.Buffer[i].Command)); if (container.Buffer[i].JobId == jobid || diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl index c1fce98..5c723ed 100644 --- a/include/wine/atsvc.idl +++ b/include/wine/atsvc.idl @@ -29,6 +29,8 @@ import "ocidl.idl"; ] interface atsvc { + const DWORD APE_AT_ID_NOT_FOUND = 0x00000ede; + typedef [handle] const WCHAR *ATSVC_HANDLE; typedef struct _AT_ENUM

1 0

Dmitry Timoshkov : schedsvc: Fix NetrJobDel return value in case of invalid job id.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: 325f96b952435cb7a963582ea8df9667cfa83b32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=325f96b952435cb7a963582e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 25 11:29:50 2018 +0800 schedsvc: Fix NetrJobDel return value in case of invalid job id. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 4 ++-- dlls/schedsvc/tests/atsvcapi.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 2010245..e7e59a4 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -589,7 +589,7 @@ DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid) { - DWORD jobid, ret = ERROR_FILE_NOT_FOUND; + DWORD jobid, ret = APE_AT_ID_NOT_FOUND; TRACE("%s,%u,%u\n", debugstr_w(server_name), min_jobid, max_jobid); @@ -602,7 +602,7 @@ DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jo if (!job) { TRACE("job %u not found\n", jobid); - ret = ERROR_FILE_NOT_FOUND; + ret = APE_AT_ID_NOT_FOUND; break; } diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index 367c6da..66f237e 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -108,6 +108,9 @@ START_TEST(atsvcapi) ret = NetrJobGetInfo(server_name, 0xdeadbeef, &info2); ok(ret == APE_AT_ID_NOT_FOUND || broken(1) /* vista and w2008 return rubbish here */, "wrong error %u\n", ret); + ret = NetrJobDel(server_name, 0xdeadbeef, 0xdeadbeef); + ok(ret == APE_AT_ID_NOT_FOUND, "wrong error %u\n", ret); + try_count = 5; for (try = 1; try <= try_count; try++)

1 0