March 2017 - Wine-Commits - list.winehq.org

Matteo Bruni : d3d11/tests: Add a geometry shader test.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: aab54ccc521ebfefe068c01f8b65cdb0ba3267a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab54ccc521ebfefe068c01f8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 22 23:53:51 2017 +0100 d3d11/tests: Add a geometry shader test. Signed-off-by: Matteo Bruni <mbruni(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 | 188 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8523265..99f87b9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15819,6 +15819,193 @@ static void test_tgsm(void) release_test_context(&test_context); } +static void test_geometry_shader(void) +{ + static const struct + { + struct vec4 position; + unsigned int color; + } + vertex[] = + { + {{0.0f, 0.0f, 1.0f, 1.0f}, 0xffffff00}, + }; + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; +#if 0 +struct vs_data +{ + float4 pos : SV_POSITION; + float4 color : COLOR; +}; + +void main(in struct vs_data vs_input, out struct vs_data vs_output) +{ + vs_output.pos = vs_input.pos; + vs_output.color = vs_input.color; +} +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; +#if 0 +struct gs_data +{ + float4 pos : SV_POSITION; + float4 color : COLOR; +}; + +[maxvertexcount(4)] +void main(point struct gs_data vin[1], inout TriangleStream<gs_data> vout) +{ + float offset = 0.2 * vin[0].pos.w; + gs_data v; + + v.color = vin[0].color; + + v.pos = float4(vin[0].pos.x - offset, vin[0].pos.y - offset, vin[0].pos.z, 1.0); + vout.Append(v); + v.pos = float4(vin[0].pos.x - offset, vin[0].pos.y + offset, vin[0].pos.z, 1.0); + vout.Append(v); + v.pos = float4(vin[0].pos.x + offset, vin[0].pos.y - offset, vin[0].pos.z, 1.0); + vout.Append(v); + v.pos = float4(vin[0].pos.x + offset, vin[0].pos.y + offset, vin[0].pos.z, 1.0); + vout.Append(v); +} +#endif + static const DWORD gs_code[] = + { + 0x43425844, 0x70616045, 0x96756e1f, 0x1caeecb8, 0x3749528c, 0x00000001, 0x0000034c, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000270, 0x00020040, + 0x0000009c, 0x05000061, 0x002010f2, 0x00000001, 0x00000000, 0x00000001, 0x0400005f, 0x002010f2, + 0x00000001, 0x00000001, 0x02000068, 0x00000001, 0x0100085d, 0x0100285c, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032, + 0x00100032, 0x00000000, 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3e4ccccd, + 0x3e4ccccd, 0x00000000, 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032, + 0x00000000, 0x00100046, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, + 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, + 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x05000036, 0x00102012, 0x00000000, + 0x0010000a, 0x00000000, 0x0e000032, 0x00100052, 0x00000000, 0x00201ff6, 0x00000000, 0x00000000, + 0x00004002, 0x3e4ccccd, 0x00000000, 0x3e4ccccd, 0x00000000, 0x00201106, 0x00000000, 0x00000000, + 0x05000036, 0x00102022, 0x00000000, 0x0010002a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, + 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, + 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x05000036, + 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010001a, + 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036, + 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, + 0x00000000, 0x00000001, 0x01000013, 0x05000036, 0x00102032, 0x00000000, 0x00100086, 0x00000000, + 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, + 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, + 0x00000001, 0x01000013, 0x0100003e, + }; +#if 0 +struct ps_data +{ + float4 pos : SV_POSITION; + float4 color : COLOR; +}; + +float4 main(struct ps_data ps_input) : SV_Target +{ + return ps_input.color; +} +#endif + static const DWORD ps_code[] = + { + 0x43425844, 0x89803e59, 0x3f798934, 0xf99181df, 0xf5556512, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + struct d3d11_test_context test_context; + ID3D11InputLayout *input_layout; + ID3D11DeviceContext *context; + unsigned int stride, offset; + struct resource_readback rb; + ID3D11GeometryShader *gs; + ID3D11VertexShader *vs; + ID3D11PixelShader *ps; + ID3D11Device *device; + ID3D11Buffer *vb; + DWORD color; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(vertex), vertex); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D11Device_CreateGeometryShader(device, gs_code, sizeof(gs_code), NULL, &gs); + ok(SUCCEEDED(hr), "Failed to create geometry shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST); + stride = sizeof(*vertex); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + ID3D11DeviceContext_Draw(context, 1, 0); + + get_texture_readback(test_context.backbuffer, 0, &rb); + color = get_readback_color(&rb, 320, 190); + ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 255, 240); + ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 240); + ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 385, 240); + ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 290); + ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + release_resource_readback(&rb); + + ID3D11PixelShader_Release(ps); + ID3D11GeometryShader_Release(gs); + ID3D11VertexShader_Release(vs); + ID3D11Buffer_Release(vb); + ID3D11InputLayout_Release(input_layout); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -15900,4 +16087,5 @@ START_TEST(d3d11) test_uav_counters(); test_compute_shader_registers(); test_tgsm(); + test_geometry_shader(); }

1 0

Matteo Bruni : d3d10core/tests: Add a geometry shader test.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 0e80009b10288062d3e429d86712ee408bc22340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e80009b10288062d3e429d86… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 22 23:53:50 2017 +0100 d3d10core/tests: Add a geometry shader test. Signed-off-by: Matteo Bruni <mbruni(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 | 204 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 203 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e80009b10288062d3e42…

1 0

Józef Kucia : wined3d: Load core GL transform feedback functions.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 4a8a7a09f650d3f02ebfa0cb8fa29f97fc96c539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8a7a09f650d3f02ebfa0cb8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:45 2017 +0100 wined3d: Load core GL transform feedback functions. 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/directx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 53255de..9a67794 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3161,6 +3161,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glActiveTexture) /* OpenGL 1.3 */ USE_GL_FUNC(glAttachShader) /* OpenGL 2.0 */ USE_GL_FUNC(glBeginQuery) /* OpenGL 1.5 */ + USE_GL_FUNC(glBeginTransformFeedback) /* OpenGL 3.0 */ USE_GL_FUNC(glBindAttribLocation) /* OpenGL 2.0 */ USE_GL_FUNC(glBindBuffer) /* OpenGL 1.5 */ USE_GL_FUNC(glBindVertexArray) /* OpenGL 3.0 */ @@ -3195,6 +3196,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glEnablei) /* OpenGL 3.0 */ USE_GL_FUNC(glEnableVertexAttribArray) /* OpenGL 2.0 */ USE_GL_FUNC(glEndQuery) /* OpenGL 1.5 */ + USE_GL_FUNC(glEndTransformFeedback) /* OpenGL 3.0 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGenQueries) /* OpenGL 1.5 */ USE_GL_FUNC(glGenVertexArrays) /* OpenGL 3.0 */ @@ -3228,6 +3230,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glTexBuffer) /* OpenGL 3.1 */ USE_GL_FUNC(glTexImage3D) /* OpenGL 1.2 */ USE_GL_FUNC(glTexSubImage3D) /* OpenGL 1.2 */ + USE_GL_FUNC(glTransformFeedbackVaryings)/* OpenGL 3.0 */ USE_GL_FUNC(glUniform1f) /* OpenGL 2.0 */ USE_GL_FUNC(glUniform1fv) /* OpenGL 2.0 */ USE_GL_FUNC(glUniform1i) /* OpenGL 2.0 */

1 0

Józef Kucia : d3d11: Downgrade unknown DWORD FIXMEs() to WARN() messages.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 0f5c6c7b79a7e63d87e3b6b5844d79a734aec891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f5c6c7b79a7e63d87e3b6b58… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:44 2017 +0100 d3d11: Downgrade unknown DWORD FIXMEs() to WARN() messages. 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/shader.c | 2 +- dlls/d3d11/utils.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index ae19eba..547181e 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -183,7 +183,7 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d read_dword(&ptr, &count); TRACE("%u elements\n", count); - skip_dword_unknown(&ptr, 1); + skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000008. */ if (!require_space(ptr - data, count, 6 * sizeof(DWORD), data_size)) { diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 89dbbda..bd2c840 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -727,11 +727,11 @@ void skip_dword_unknown(const char **ptr, unsigned int count) unsigned int i; DWORD d; - FIXME("Skipping %u unknown DWORDs:\n", count); + WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) { read_dword(ptr, &d); - FIXME("\t0x%08x\n", d); + WARN("\t0x%08x\n", d); } } @@ -754,10 +754,10 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, return E_INVALIDARG; } - /* checksum? */ + WARN("Ignoring DXBC checksum.\n"); skip_dword_unknown(&ptr, 4); - skip_dword_unknown(&ptr, 1); + skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size);

1 0

Francois Gouget : winetest/dissect: Remove some pointless sprintfs.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: tools Branch: master Commit: 91fa8fe2d6d989eee5960fbd9133449d5ee7a0d9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=91fa8fe2d6d989eee5960fbd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 13:02:14 2017 +0100 winetest/dissect: Remove some pointless sprintfs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index c6b4b71..d8fc7cf 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -130,9 +130,9 @@ $_ = <IN>; my $box = create_box( "version", "version", "Version information for $tag" ); $box->{data} .= "<h2>Build version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; -$box->{data} .= sprintf "<tr><td>Build</td><td><a title=\"%s\" href=\"$gitweb/?a=shortlog;h=%s\">%s</a></td></tr>\n", $testbuild, $testbuild, $shortbuild; +$box->{data} .= "<tr><td>Build</td><td><a title=\"$testbuild\" href=\"$gitweb/?a=shortlog;h=$testbuild\">$shortbuild</a></td></tr>\n"; $box->{data} .= "<tr><td>Tag</td><td><a title=\"Full report\" href=\"report.html\">$tag</a></td></tr></table>\n"; -$box->{data} .= sprintf "<div class=\"output\"> </div>\n"; +$box->{data} .= "<div class=\"output\"> </div>\n"; while (($_ = <IN>) =~ s/^ //) { chomp; @@ -301,7 +301,7 @@ while (<IN>) { } if ($3 eq "skipped") { - $testbox->{data} .= sprintf "<div class=\"test result skipped\">Skipped by user request.</div>\n"; + $testbox->{data} .= "<div class=\"test result skipped\">Skipped by user request.</div>\n"; print SUM "- $dll $unit skipped - - - $source $rev\n"; $dll = undef; mydie "too many tests skipped by user request\n" if ++$user_skips > $maxuserskips; @@ -428,7 +428,7 @@ for (my $i = 0; $i <= $#boxes; $i++) printf REPORT "<div class=\"updownbar\"><table><tr><td width=\"100%%\">%s</td>\n", $boxes[$i]->{title}; printf REPORT "<td class=\"arrow\"><a href=\"#%s\">↑</a></td>\n", $boxes[$i]->{prev} if defined $boxes[$i]->{prev}; printf REPORT "<td class=\"arrow\"><a href=\"#%s\">↓</a></td>\n", $boxes[$i]->{next} if defined $boxes[$i]->{next}; - printf REPORT "</tr></table></div>\n"; + print REPORT "</tr></table></div>\n"; print REPORT $boxes[$i]->{data}, "</div>\n"; } print REPORT end_html();

1 0

Francois Gouget : winetest/gather: In case of error keep the old summary and totals files.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: tools Branch: master Commit: 7860f80df8cdd7a92a3592ffff9d71e4ec75f414 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7860f80df8cdd7a92a3592ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 12:58:08 2017 +0100 winetest/gather: In case of error keep the old summary and totals files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index a24f06e..9680fbb 100755 --- a/winetest/gather +++ b/winetest/gather @@ -622,7 +622,7 @@ sub build_totals($) printf TOTAL "%s %u %u %u %u %u\n", $report->{group}->{name}, $report_count, $unit_count, $report->{errors}, $report->{todos}, $report->{successes}; } close TOTAL; - rename "$datadir/$build/total.txt.new", "$datadir/$build/total.txt" or unlink "$datadir/$build/total.txt"; + rename "$datadir/$build/total.txt.new", "$datadir/$build/total.txt" or unlink "$datadir/$build/total.txt.new"; } sub output_table($) @@ -749,7 +749,7 @@ foreach my $group (@groups) { output_table(undef); close SUMMARY; -rename "$datadir/$build/summary.txt.new", "$datadir/$build/summary.txt" or unlink "$datadir/$build/summary.txt"; +rename "$datadir/$build/summary.txt.new", "$datadir/$build/summary.txt" or unlink "$datadir/$build/summary.txt.new"; build_totals(\@groups);

1 0

Francois Gouget : winetest/dissect: Simplify handling of $tag.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: tools Branch: master Commit: d65ea7e95403fba612221870fde114fc3c1ae14f URL: http://source.winehq.org/git/tools.git/?a=commit;h=d65ea7e95403fba612221870… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 13:02:10 2017 +0100 winetest/dissect: Simplify handling of $tag. We don't want the leading underscore except in one place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index c2c453c..c6b4b71 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -73,7 +73,7 @@ sub mydie(@) { print STDERR "$name0:error: unable to rename '$tmpdir' to '$errdir': $!\n"; exit 3; } - my $label = $tag ? substr($tag, 1) : "<notag>"; + my $label = $tag ? $tag : "<notag>"; if (open ERR, ">$errdir/error") { print ERR "$label: ", @_; @@ -123,15 +123,15 @@ $_ = <IN>; if (/^Archive: /) { $_ = <IN>; } # ignore Archive header /^Tag: ([-.0-9a-zA-Z]*)\r?$/ or mydie "no tag line: $_"; -$tag = $1 eq ""?"":"_$1"; +$tag = $1; $_ = <IN>; /^Build info:\r?$/ or mydie "no Build info header: $_"; -my $box = create_box( "version", "version", sprintf "Version information for %s", substr($tag,1) ); +my $box = create_box( "version", "version", "Version information for $tag" ); $box->{data} .= "<h2>Build version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; $box->{data} .= sprintf "<tr><td>Build</td><td><a title=\"%s\" href=\"$gitweb/?a=shortlog;h=%s\">%s</a></td></tr>\n", $testbuild, $testbuild, $shortbuild; -$box->{data} .= sprintf "<tr><td>Tag</td><td><a title=\"Full report\" href=\"report.html\">%s</a></td></tr></table>\n", substr($tag,1); +$box->{data} .= "<tr><td>Tag</td><td><a title=\"Full report\" href=\"report.html\">$tag</a></td></tr></table>\n"; $box->{data} .= sprintf "<div class=\"output\"> </div>\n"; while (($_ = <IN>) =~ s/^ //) { @@ -464,7 +464,7 @@ foreach ($datadir, $builddir) { } my ($dir, $dirbase, $try); -$dir = $dirbase = "$builddir/$version$tag"; +$dir = $dirbase = "$builddir/${version}_$tag"; $try = 0; while (!rename $tmpdir, $dir) { $!{ENOTEMPTY} or mydie "unable to rename '$tmpdir' to '$dir': $!\n";

1 0

Francois Gouget : winetest/build-index: Remove an unused variable.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: tools Branch: master Commit: 33da13a13141b9a61f1f9aae71d6ff26ef839349 URL: http://source.winehq.org/git/tools.git/?a=commit;h=33da13a13141b9a61f1f9aae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 12:59:25 2017 +0100 winetest/build-index: Remove an unused variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 2 -- 1 file changed, 2 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 33cc9a5..c4fa2ed 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -100,8 +100,6 @@ my %wine = (name => "Wine"); my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8, \%win10, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); -my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); - # read the test data dir my @builds;

1 0

Francois Gouget : winetest/build-index: Use a relative link to the rejected reports page.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: tools Branch: master Commit: 0fe6c628563604f2576944b43af0af780cbb3271 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0fe6c628563604f2576944b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 12:48:25 2017 +0100 winetest/build-index: Use a relative link to the rejected reports page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/build-index b/winetest/build-index index e811b62..1f0b2f5 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -328,7 +328,7 @@ print OUT <<"EOF"; <div class="navbar"> To run the tests on your Windows machine, download the <a href="/builds/winetest-latest.exe">latest winetest.exe</a> build. If you have a 64-bit Windows OS, you can also run the <a href="/builds/winetest64-latest.exe">64-bit winetest</a>.<br> -If you don't see your results, check the <a href="/data/errors.html">rejected reports</a> list. +If you don't see your results, check the <a href="errors.html">rejected reports</a> list. </div> </body></html> EOF

1 0

Francois Gouget : winetest/gather: Remove some old format compatibility code.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: tools Branch: master Commit: cb1c6fda2f6ac6919eee398021b81f0d1b42a776 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cb1c6fda2f6ac6919eee3980… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 12:54:54 2017 +0100 winetest/gather: Remove some old format compatibility code. We no longer generate dllinfo.html files for the reports. Now all platform information is in the version.html file. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/winetest/gather b/winetest/gather index 275ad0d..a24f06e 100755 --- a/winetest/gather +++ b/winetest/gather @@ -370,19 +370,10 @@ sub build_header_footer($) my $group = $report->{group}; if (!defined $msg) { - if (-r "$datadir/$build/$report->{dir}/dllinfo.html") { - $msg = <<"EOF"; - $group->{name}<br><small> - <a href=\"$report->{dir}/version.html\">$report->{tag}</a><br> - <a href=\"$report->{dir}/dllinfo.html\">[info]</a> - <a href=\"$report->{dir}/report.html\">[file]</a></small> -EOF - } else { - $msg = <<"EOF"; + $msg = <<"EOF"; $group->{name}<br><small> <a href=\"$report->{dir}/version.html\">$report->{tag}</a></small> EOF - } chop $msg; } $title .= <<"EOF";

1 0