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

Józef Kucia : wined3d: Do not compute color/ NP2 fixup PS compile arguments for SM4+.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 99e9ce3e3e1bde622998925ecb218b913fb3d41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e9ce3e3e1bde622998925ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 24 17:14:42 2017 +0100 wined3d: Do not compute color/NP2 fixup PS compile arguments for SM4+. 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/shader.c | 55 +++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 020e943..7ba6993 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3414,10 +3414,10 @@ void find_gs_compile_args(const struct wined3d_state *state, const struct wined3 void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_texture *texture; - UINT i; + unsigned int i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, state->fb)) @@ -3520,34 +3520,41 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 } } - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + if (shader->reg_maps.shader_version.major >= 4) { - if (!shader->reg_maps.resource_info[i].type) - continue; - - texture = state->textures[i]; - if (!texture) - { - args->color_fixup[i] = COLOR_FIXUP_IDENTITY; - continue; - } - if (can_use_texture_swizzle(gl_info, texture->resource.format)) + /* In SM4+ we use dcl_sampler in order to determine if we should use shadow sampler. */ + args->shadow = 0; + for (i = 0 ; i < MAX_FRAGMENT_SAMPLERS; ++i) args->color_fixup[i] = COLOR_FIXUP_IDENTITY; - else - args->color_fixup[i] = texture->resource.format->color_fixup; + args->np2_fixup = 0; + } + else + { + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + { + if (!shader->reg_maps.resource_info[i].type) + continue; + + texture = state->textures[i]; + if (!texture) + { + args->color_fixup[i] = COLOR_FIXUP_IDENTITY; + continue; + } + if (can_use_texture_swizzle(gl_info, texture->resource.format)) + args->color_fixup[i] = COLOR_FIXUP_IDENTITY; + else + args->color_fixup[i] = texture->resource.format->color_fixup; - if (texture->resource.format_flags & WINED3DFMT_FLAG_SHADOW) - args->shadow |= 1u << i; + if (texture->resource.format_flags & WINED3DFMT_FLAG_SHADOW) + args->shadow |= 1u << i; - /* Flag samplers that need NP2 texcoord fixup. */ - if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) - args->np2_fixup |= (1u << i); + /* Flag samplers that need NP2 texcoord fixup. */ + if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) + args->np2_fixup |= (1u << i); + } } - /* In SM4+ we use dcl_sampler in order to determine if we should use shadow sampler. */ - if (shader->reg_maps.shader_version.major >= 4) - args->shadow = 0; - if (shader->reg_maps.shader_version.major >= 3) { if (position_transformed)

1 0

Nikolay Sivov : include: Fix IRequestDictionary and IResponse definition.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 7e32226afd231fd242ce60c83e527687a9bea594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e32226afd231fd242ce60c83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 26 17:39:34 2017 +0300 include: Fix IRequestDictionary and IResponse definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/asptlb.idl | 73 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/include/asptlb.idl b/include/asptlb.idl index 608d220..d010908 100644 --- a/include/asptlb.idl +++ b/include/asptlb.idl @@ -28,17 +28,16 @@ import "oaidl.idl"; interface IRequestDictionary : IDispatch { [propget] - HRESULT Item(IRequestDictionary *iface, [in, optional] VARIANT Var, - [retval, out] VARIANT *pVariantReturn); + HRESULT Item([in, optional] VARIANT Var, [retval, out] VARIANT *pVariantReturn); [restricted, propget] - HRESULT _NewEnum(IRequestDictionary *iface, [retval, out] IUnknown **ppEnumReturn); + HRESULT _NewEnum([retval, out] IUnknown **ppEnumReturn); [propget] - HRESULT Count(IRequestDictionary *iface, [retval, out] int *cStrRet); + HRESULT Count([retval, out] int *count); [propget] - HRESULT Key(IRequestDictionary *iface, [in] VARIANT VarKey, [retval, out]VARIANT *pvar); + HRESULT Key([in] VARIANT key, [retval, out] VARIANT *value); }; [ @@ -49,85 +48,85 @@ interface IRequestDictionary : IDispatch interface IResponse : IDispatch { [propget] - HRESULT Buffer(IResponse *iface, [retval, out] VARIANT_BOOL *fIsBuffering); + HRESULT Buffer([retval, out] VARIANT_BOOL *is_buffering); [propput] - HRESULT Buffer(IResponse *iface, [in] VARIANT_BOOL fIsBuffering); + HRESULT Buffer([in] VARIANT_BOOL is_buffering); [propget] - HRESULT ContentType(IResponse *iface, [retval, out] BSTR *pbstrContentTypeRet); + HRESULT ContentType([retval, out] BSTR *content_type); [propput] - HRESULT ContentType(IResponse *iface, [in] BSTR bstrContentType); + HRESULT ContentType([in] BSTR content_type); [propget] - HRESULT Expires(IResponse *iface, [retval, out] VARIANT *pvarExpiresMinutesRet); + HRESULT Expires([retval, out] VARIANT *minutes); [propput] - HRESULT Expires(IResponse *iface, [in] long lExpiresMinutes); + HRESULT Expires([in] LONG minutes); [propget] - HRESULT ExpiresAbsolute(IResponse *iface, [retval, out] VARIANT *pvarExpiresRet); + HRESULT ExpiresAbsolute([retval, out] VARIANT *expires); [propput] - HRESULT ExpiresAbsolute(IResponse *iface, [in] DATE dtExpires); + HRESULT ExpiresAbsolute([in] DATE expires); [propget] - HRESULT Cookies(IResponse *iface, [retval, out] IRequestDictionary **ppCookies); + HRESULT Cookies([retval, out] IRequestDictionary **cookies); [propget] - HRESULT Status(IResponse *iface, [retval][out] BSTR *pbstrStatusRet); + HRESULT Status([retval, out] BSTR *status); [propput] - HRESULT Status(IResponse *iface, [in] BSTR bstrStatus); + HRESULT Status([in] BSTR status); [hidden] - HRESULT Add(IResponse *iface, [in] BSTR bstrHeaderValue, [in] BSTR bstrHeaderName); + HRESULT Add([in] BSTR value, [in] BSTR name); - HRESULT AddHeader(IResponse *iface, [in] BSTR bstrHeaderName, [in] BSTR bstrHeaderValue); + HRESULT AddHeader([in] BSTR name, [in] BSTR value); - HRESULT AppendToLog(IResponse *iface, [in] BSTR bstrLogEntry); + HRESULT AppendToLog([in] BSTR log_entry); - HRESULT BinaryWrite(IResponse *iface, [in] VARIANT varInput); + HRESULT BinaryWrite([in] VARIANT input); - HRESULT Clear(IResponse *iface); + HRESULT Clear(); - HRESULT End(IResponse *iface); + HRESULT End(); - HRESULT Flush(IResponse *iface); + HRESULT Flush(); - HRESULT Redirect(IResponse *iface, [in] BSTR bstrURL); + HRESULT Redirect(BSTR url); - HRESULT Write(IResponse *iface, [in] VARIANT varText); + HRESULT Write([in] VARIANT text); [hidden] - HRESULT WriteBlock(IResponse *iface, [in] short iBlockNumber); + HRESULT WriteBlock([in] short block_number); - HRESULT IsClientConnected(IResponse *iface, [retval, out] VARIANT_BOOL *pfIsClientConnected); + HRESULT IsClientConnected([retval, out] VARIANT_BOOL *is_connected); [propget] - HRESULT get_CharSet( IResponse *iface, [retval, out] BSTR *pbstrCharSetRet); + HRESULT CharSet([retval, out] BSTR *charset); [propput] - HRESULT put_CharSet(IResponse *iface, [in] BSTR bstrCharSet); + HRESULT CharSet([in] BSTR charset); - HRESULT Pics(IResponse *iface, [in] BSTR bstrHeaderValue); + HRESULT Pics([in] BSTR value); [propget] - HRESULT get_CacheControl(IResponse *iface, [retval, out] BSTR *pbstrCacheControl); + HRESULT CacheControl([retval, out] BSTR *cache_control); [propput] - HRESULT put_CacheControl(IResponse *iface, [in] BSTR bstrCacheControl); + HRESULT CacheControl([in] BSTR cache_control); [propget] - HRESULT get_CodePage(IResponse *iface, [retval, out] long *plvar); + HRESULT CodePage([retval, out] LONG *codepage); [propput] - HRESULT put_CodePage(IResponse *iface, [in] long lvar); + HRESULT CodePage([in] LONG codepage); [propget] - HRESULT get_LCID(IResponse *iface, [retval, out] long *plvar); + HRESULT LCID([retval, out] LONG *lcid); [propput] - HRESULT put_LCID(IResponse *iface, [in] long lvar); -}; + HRESULT LCID([in] LONG lcid); +}

1 0

Józef Kucia : d3d10core/tests: Introduce get_resource_data() helper function.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 556f1dc85465e2d1889066cbb59f9b730112c20d URL: http://source.winehq.org/git/wine.git/?a=commit;h=556f1dc85465e2d1889066cbb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 24 17:14:46 2017 +0100 d3d10core/tests: Introduce get_resource_data() 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/d3d10core/tests/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 44f3fae..3e8a1e8 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -568,24 +568,29 @@ static void get_texture_readback(ID3D10Texture2D *texture, unsigned int sub_reso ID3D10Device_Release(device); } +static void *get_readback_data(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned byte_width) +{ + return (BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch + x * byte_width; +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) { - return ((DWORD *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(DWORD) + x]; + return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); } static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) { - return ((float *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(float) + x]; + return *(float *)get_readback_data(rb, x, y, sizeof(float)); } static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsigned int x, unsigned int y) { - return &((const struct vec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct vec4) + x]; + return get_readback_data(rb, x, y, sizeof(struct vec4)); } static const struct uvec4 *get_readback_uvec4(struct resource_readback *rb, unsigned int x, unsigned int y) { - return &((const struct uvec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct uvec4) + x]; + return get_readback_data(rb, x, y, sizeof(struct uvec4)); } static void release_resource_readback(struct resource_readback *rb)

1 0

Francois Gouget : winetest/dissect: Simplify the known platforms list.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: tools Branch: master Commit: 0090d6cfe0da3d64b04091339101880bba168ecf URL: http://source.winehq.org/git/tools.git/?a=commit;h=0090d6cfe0da3d64b0409133… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 24 03:32:08 2017 +0100 winetest/dissect: Simplify the known platforms list. Also show the properties of the rejected platforms in case they are not known. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 97 +++++++++++++++++++++++--------------------------------- 1 file changed, 39 insertions(+), 58 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index d8fc7cf..3082d9d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -140,7 +140,7 @@ while (($_ = <IN>) =~ s/^ //) $box->{data} .= "<div class=\"output\">" . escapeHTML($_) . "</div>\n"; } -my ($wine, $wine_build, $version, $major, $minor, $plid, $product, $host); +my ($wine, $wine_build, $major, $minor, $plid, $product, $host); /^Operating system version:\r?$/ or mydie "no OS header: $_"; $box->{data} .= "<h2>Operating system version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; @@ -170,66 +170,47 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { } $box->{data} .= "</table>\n"; -my $prediluvian = 0; -if ($plid != 2) { $prediluvian = 1; } - -$version = "unknown"; -if ($plid==1 && $major==4) { - if ($minor==0) { - $version = "95"; - } elsif ($minor==10) { - $version = "98"; - } elsif ($minor==90) { - $version = "me"; - } -} elsif ($plid==2) { - if ($major==3 && $minor==51) { - $version = "nt3"; - $prediluvian = 1; - } elsif ($major==4 && $minor== 0) { - $version = "nt4"; - $prediluvian = 1; - } elsif ($major==5) { - if ($minor==0) { - $version = "2000"; - $prediluvian = 1; - } elsif ($minor==1) { - $version = "xp"; - } elsif ($minor==2) { - if ($product==1) { - $version = "xp"; - } else { - $version = "2003"; - } - } - } elsif ($major==6) { - if ($minor == 0) { - if ($product==1) { - $version = "vista"; - } elsif ($product==3) { - $version = "2008"; - } - } elsif ($minor == 1) { - if ($product==1) { - $version = "win7"; - } elsif ($product==3) { - $version = "2008"; - } - } elsif ($minor == 2 || $minor == 3) { - $version = "win8"; - } - } elsif ($major==10) { - if ($minor == 0) { - if ($product==1) { - $version = "win10"; - } - } +my @idmatch = ( + # Describes how to match a platform's version information + # with a dissect platform id: + # dissect id plid major minor product prediluvian + [ "95", 1, 4, 0, undef, 1 ], + [ "98", 1, 4, 10, undef, 1 ], + [ "me", 1, 4, 90, undef, 1 ], + [ "nt3", 2, 3, 51, undef, 1 ], + [ "2000", 2, 5, 0, undef, 1 ], + [ "xp", 2, 5, 1, 1, 0 ], + [ "2003", 2, 5, 1, undef, 0 ], + [ "vista", 2, 6, 0, 1, 0 ], + [ "2008", 2, 6, 0, 3, 0 ], + [ "win7", 2, 6, 1, 1, 0 ], + [ "2008", 2, 6, 1, 3, 0 ], + [ "win8", 2, 6, 2, undef, 0 ], + [ "win8", 2, 6, 3, undef, 0 ], + [ "win10", 2, 10, 1, undef, 0 ], +# [ "ce", 3, undef, undef, undef, 0 ], + [ "unknown", 2, undef, undef, undef, 0 ], + [ "unknown", undef, undef, undef, undef, 1 ], +); + +my ($version, $prediluvian); +foreach my $entry (@idmatch) +{ + if ((!defined $entry->[1] or $entry->[1] eq $plid) and + (!defined $entry->[2] or $entry->[2] eq $major) and + (!defined $entry->[3] or $entry->[3] eq $minor) and + (!defined $entry->[4] or $entry->[4] eq $product)) + { + $version = $entry->[0]; + $prediluvian = $entry->[5]; + last; } -} elsif ($plid==3) { - #$version = "ce$major$minor"; } -if ($prediluvian and not $acceptprediluvianwin) { mydie "platform $version not accepted\n"; } +if ($prediluvian and not $acceptprediluvianwin) +{ + mydie "platform $version (platform $plid, type $product, $major.$minor) not accepted"; +} if ($wine) { my %known_hosts = ( "Linux" => "linux",

1 0

Francois Gouget : winetest: Tweak winetest.cron so modifying it is not necessary.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: tools Branch: master Commit: 402dcab3f8717e126cff1ee845bf4483d8b50116 URL: http://source.winehq.org/git/tools.git/?a=commit;h=402dcab3f8717e126cff1ee8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 24 03:31:07 2017 +0100 winetest: Tweak winetest.cron so modifying it is not necessary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/INSTALL.txt | 13 +++---------- winetest/winetest.cron | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/winetest/INSTALL.txt b/winetest/INSTALL.txt index a0bf6de..4d18490 100644 --- a/winetest/INSTALL.txt +++ b/winetest/INSTALL.txt @@ -86,17 +86,10 @@ FIXME The site script looks like it's meant to redirect from / to The web site is essentially composed of static web pages that are refreshed by perl scripts that are run at regular intervals. -The script that orchestrates this is winetest.cron and it needs to be -modified so it knows where the tools and workdir directories are -located. Typically this would be: +The script that orchestrates this is winetest.cron so set up a cron job +in the winehq account to periodically update the pages: - tools=/home/wine/tools/winetest - workdir=/home/winehq/sites/winetest - -Then set up a cron job in the winehq account to periodically update -the pages: - - */5 * * * * /home/wine/tools/winetest/winetest.cron + */5 * * * * /home/wine/tools/winetest/winetest.cron /home/winehq/sites/winetest Still in the winehq account, you should run winetest.cron at least once before accessing the web site so the initial set of web pages has been diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 4b60d10..4fbd5a2 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -15,10 +15,21 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Cron job for generating winetest reports. Use it like -# */5 * * * * apache winetest.cron +# */5 * * * * winetest.cron WORKDIR -tools=/home/winehq/opt/tools/winetest -workdir=/home/winehq/opt/winetest +name0=`basename "$0"` +tools=`dirname "$0"` +case "$tools" in + /*) ;; # Nothing to do + *) tools=`pwd`/"$tools" ;; +esac + +workdir="$1" +if [ -z "$workdir" ] +then + echo "$name0:error: you must specify the work directory as the first parameter" >&2 + exit 1 +fi lock=/tmp/winetest.lock # expiration age (in days) before results get archived

1 0

Francois Gouget : winetest/gather: Add the test unit and group or tag to the tooltips.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: tools Branch: master Commit: ffc8c08773c4e6c213ef4648949afd4fca6d7776 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ffc8c08773c4e6c213ef4648… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 24 03:32:44 2017 +0100 winetest/gather: Add the test unit and group or tag to the tooltips. The platform result pages can have quite a lot of columns so it is easy to lose track of the test unit a line corresponds to. Similarly the index pages have a lot of lines so it is easy to lose track of which group or tag a column corresponds to. So add this information to the cell tooltips. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/winetest/gather b/winetest/gather index 9680fbb..42460da 100755 --- a/winetest/gather +++ b/winetest/gather @@ -506,16 +506,17 @@ sub singletest($$$) { my ($group, $testname, $groupname) = @_; my $result = $group->{$testname}; - my ($class, $msg, $title, $mouseover, $href, $label); + my ($msg, $prefix, $mouseover, $href, $label); if ($group->{reports} and @{$group->{reports}} > 1) { $href = $result->{omit} ? "" : "index_$group->{name}.html#$testname"; - $label = $groupname; + $label = $prefix = $groupname; } else { my $report = $group->{reports} ? $group->{reports}->[0] : $group; $label = "$groupname $report->{tag}"; + $prefix = "$testname | $report->{tag}"; if (-r "$datadir/$build/$report->{dir}/$testname.html") { $href = "$report->{dir}/$testname.html"; @@ -526,8 +527,8 @@ sub singletest($$$) { } } - $class = get_result_class( $result ); - $title = get_result_title( $testname, $result ); + my $class = get_result_class( $result ); + my $title = get_result_title( $testname, $result ); my $status = $result->{status}; if ($status eq "run") @@ -576,14 +577,15 @@ sub singletest($$$) { $status =~ /^-/ ? "crashed" : $status eq "258" ? "timeout": "failed"; } + $title = join(" | ", $prefix, $title); printf OUT " <td class=\"%s\"><a %s %s %s>%s</a></td>\n", $class, $href ? "href=\"$href\"" : "", - $title ? "title=\"$title\"" : "", $mouseover || "", $msg; + "title=\"$title\"", $mouseover || "", $msg; if ($group->{reports}) { printf SUMMARY "%s %s <td class=\"%s\"><a %s %s %s>%s</a></td>\n", $testname, $groupname, $class, $href ? "href=\"../$build/$href\"" : "", - $title ? "title=\"$title\"" : "", $mouseover || "", $msg; + "title=\"$title\"", $mouseover || "", $msg; } }

1 0

Francois Gouget : testbot/WineRunTask: Better handle non-Wine tests.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: tools Branch: master Commit: 940461b370e3dbc8631bcb07d112cefd6006cfa8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=940461b370e3dbc8631bcb07… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 24 03:40:48 2017 +0100 testbot/WineRunTask: Better handle non-Wine tests. Wine developpers can upload executables instead of Wine patches. These need not follow or use the Wine test framework. So relax the checks for them. Also detect proper Wine test executables based on telltale signs in their traces. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index d364777..7357c06 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -358,6 +358,7 @@ if ($Step->ReportSuccessfulTests) { $Script .= "set WINETEST_REPORT_SUCCESS=1\r\n"; } +my $IsWineTest = 1; if ($Step->Type eq "single") { my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe"; @@ -378,6 +379,10 @@ if ($Step->Type eq "single") $Script .= "$CmdLineArg "; } $Script .= "> $RptFileName\r\n"; + + # If StepNo is 1 then the user gave us an executable. Then there is no + # telling if it's going to follow the Wine test standards. + $IsWineTest = ($StepNo != 1); } elsif ($Step->Type eq "suite") { @@ -482,10 +487,17 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) ($CurrentUnit ne "" and $Line =~ /($CurrentUnit)\.c:\d+: Test failed: /)) { - # If the failure is not for the current test unit we'll let its - # developer hash it out with the polluter ;-) - $CurrentIsPolluted = 1 if ($1 ne $CurrentUnit); - + my $Unit = $1; + if ($Unit eq $CurrentUnit) + { + $IsWineTest = 1; + } + else + { + # If the failure is not for the current test unit we'll + # let its developer hash it out with the polluter ;-) + $CurrentIsPolluted = 1; + } $LineFailures++; } elsif ($Line =~ /^Fatal: test '([_a-z0-9]+)' does not exist/) @@ -493,6 +505,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # This also replaces a test summary line. $CurrentPids{0} = 1; $SummaryFailures++; + $IsWineTest = 1; $LineFailures++; } @@ -507,6 +520,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # This also replaces a test summary line. $CurrentPids{$Pid || 0} = 1; $SummaryFailures++; + $IsWineTest = 1; } else { @@ -528,11 +542,12 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # There may be more than one summary line due to child processes $CurrentPids{$Pid || 0} = 1; $SummaryFailures += $Failures; + $IsWineTest = 1; } else { $CurrentIsPolluted = 1; - if ($Todo or $Failures) + if ($IsWineTest and ($Todo or $Failures)) { LogTaskError("Found a misplaced '$Unit' test summary line.\n"); $LogFailures++; @@ -543,7 +558,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4); - if ($Dll ne $CurrentDll or $Unit ne $CurrentUnit) + if ($IsWineTest and ($Dll ne $CurrentDll or $Unit ne $CurrentUnit)) { LogTaskError("The start line is missing for $Dll:$Unit\n"); $LogFailures++; @@ -582,6 +597,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # done line. $LogFailures++; } + elsif (!$IsWineTest and $Rc != 0) + { + LogTaskError("The test returned a non-zero exit code\n"); + $LogFailures++; + } elsif ($LineFailures == 0 and $Rc != 0) { LogTaskError("$Dll:$Unit returned an error ($Rc) despite having no failures\n"); @@ -589,7 +609,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } } - if ($Rc != 258 and + if ($IsWineTest and $Rc != 258 and ((!$Pid and !%CurrentPids) or ($Pid and !$CurrentPids{$Pid} and !$CurrentPids{0}))) { @@ -606,9 +626,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } close($LogFile); - if ($TimedOut) + if (!$IsWineTest or $TimedOut) { - # The report got truncated due to the timeout so ignore the other checks + # This is either not a Wine test, which means the report need not follow + # the Wine test standards, or the report got truncated due to the + # timeout. In either case ignore the other checks. } elsif (!defined $LogFailures) {

1 0

Francois Gouget : winetest/gather: Remove support for the popup window.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: tools Branch: master Commit: 1fc66dd1d8bc5cd157b7fbac0977b0313b5913c3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1fc66dd1d8bc5cd157b7fbac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 24 03:36:58 2017 +0100 winetest/gather: Remove support for the popup window. The tooltip provides the same information and is easier to use since it does not require looking away from the mouse pointer position. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/INSTALL.txt | 1 - winetest/build-index | 1 - winetest/gather | 26 ++++++++++---------------- winetest/summary.js | 37 ------------------------------------- 4 files changed, 10 insertions(+), 55 deletions(-) diff --git a/winetest/INSTALL.txt b/winetest/INSTALL.txt index 4d18490..d102956 100644 --- a/winetest/INSTALL.txt +++ b/winetest/INSTALL.txt @@ -45,7 +45,6 @@ Web site account: ln -s /home/wine/tools/winetest/report.css ln -s /home/wine/tools/winetest/resultform.html ln -s /home/wine/tools/winetest/summary.css - ln -s /home/wine/tools/winetest/summary.js ln -s /home/wine/tools/winetest/winetest.cgi - Create the queue directory and make it writable by the web server (i.e. replace wwwrun by the user your web server runs under): diff --git a/winetest/build-index b/winetest/build-index index c4fa2ed..f5b19e0 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -200,7 +200,6 @@ EOF print OUT defined($alltests{$test}->{next}) ? " | <a href=\"./$alltests{$test}->{next}\">next</a>" : " | next"; print OUT <<EOF; | <a href="..">index</a> -<script type="text/javascript" src="/summary.js"></script> </div> <div class="main"> <h2>$test test runs</h2> diff --git a/winetest/gather b/winetest/gather index 42460da..cf4423a 100755 --- a/winetest/gather +++ b/winetest/gather @@ -506,16 +506,15 @@ sub singletest($$$) { my ($group, $testname, $groupname) = @_; my $result = $group->{$testname}; - my ($msg, $prefix, $mouseover, $href, $label); + my ($msg, $prefix, $mouseover, $href); if ($group->{reports} and @{$group->{reports}} > 1) { $href = $result->{omit} ? "" : "index_$group->{name}.html#$testname"; - $label = $prefix = $groupname; + $prefix = $groupname; } else { my $report = $group->{reports} ? $group->{reports}->[0] : $group; - $label = "$groupname $report->{tag}"; $prefix = "$testname | $report->{tag}"; if (-r "$datadir/$build/$report->{dir}/$testname.html") { @@ -533,10 +532,6 @@ sub singletest($$$) { my $status = $result->{status}; if ($status eq "run") { - my $mm_count=min_to_max($result->{count}); - my $mm_errors=min_to_max($result->{errors}); - my $mm_todos=min_to_max($result->{todos}); - my $mm_skips=min_to_max($result->{skips}); if ($group->{reports} and @{$group->{reports}} > 1) { $title = sprintf "%u test runs, %s", $#{$group->{reports}} + 1, $title; @@ -544,7 +539,6 @@ sub singletest($$$) { $msg=!$result->{todos}->[1] ? $result->{errors}->[1] : !$result->{errors}->[1] ? $result->{todos}->[1] : "$result->{errors}->[1]+$result->{todos}->[1]"; - $mouseover = "onMouseOver=\"refresh('$testname', '$label', '$mm_count', '$mm_todos', '$mm_errors', '$mm_skips');\""; } elsif ($status eq "dll missing") { @@ -578,14 +572,14 @@ sub singletest($$$) { $status eq "258" ? "timeout": "failed"; } $title = join(" | ", $prefix, $title); - printf OUT " <td class=\"%s\"><a %s %s %s>%s</a></td>\n", + printf OUT " <td class=\"%s\"><a %s %s>%s</a></td>\n", $class, $href ? "href=\"$href\"" : "", - "title=\"$title\"", $mouseover || "", $msg; + "title=\"$title\"", $msg; if ($group->{reports}) { - printf SUMMARY "%s %s <td class=\"%s\"><a %s %s %s>%s</a></td>\n", + printf SUMMARY "%s %s <td class=\"%s\"><a %s %s>%s</a></td>\n", $testname, $groupname, $class, $href ? "href=\"../$build/$href\"" : "", - "title=\"$title\"", $mouseover || "", $msg; + "title=\"$title\"", $msg; } } @@ -675,10 +669,10 @@ EOF print OUT " | <a href=\"/site?testing=next&group=$group_name&current=$build\">next</a>"; print OUT " | <a href=\".\">summary</a>"; print OUT " | <a href=\"..\">index</a>\n"; - print OUT "<script type=\"text/javascript\" src=\"/summary.js\"></script>\n</div>\n"; + print OUT "</div>\n"; print OUT "<div class=\"group\">\n"; print OUT "<h1>$group_name results for build <a href=\".\" title=\"$build\">$short_build</a></h1>\n"; - print OUT "<table class=\"report\">\n$header_footer\n <tbody onDblClick=\"clone();\">\n"; + print OUT "<table class=\"report\">\n$header_footer\n <tbody>\n"; } else { @@ -686,10 +680,10 @@ EOF print OUT "<a href=\"/site?testing=prev&current=$build\">prev</a>"; print OUT " | <a href=\"/site?testing=next&current=$build\">next</a>"; print OUT " | <a href=\"..\">index</a>"; - print OUT "<script type=\"text/javascript\" src=\"/summary.js\"></script>\n</div>\n"; + print OUT "</div>\n"; print OUT "<div class=\"main\">\n"; print OUT "<h1>Main summary for build $short_build</h1>\n"; - print OUT "<table class=\"report\">\n$header_footer\n <tbody onDblClick=\"clone();\">\n"; + print OUT "<table class=\"report\">\n$header_footer\n <tbody>\n"; } foreach my $testname (sort keys %alltests) diff --git a/winetest/summary.js b/winetest/summary.js deleted file mode 100644 index 372c99e..0000000 --- a/winetest/summary.js +++ /dev/null @@ -1,37 +0,0 @@ -result_window = null; -document.writeln (' | <a href="#" onClick="open_popup(); return false;">open popup</a>'); - -function open_popup () { - result_window = window.open("/resultform.html","results","width=240,height=240,resizable,scrollbars=no"); -} - -function isopen () { - return result_window && result_window.document && result_window.document.results; -} - -function refresh (test, version, tests, todo, errors, skipped) { - if (isopen ()) { - var form = result_window.document.results; - form.test.value = test; - form.version.value = version; - form.tests.value = tests; - form.todo.value = todo; - form.errors.value = errors; - form.skipped.value = skipped; - result_window.focus (); - } -} - -function clone () { - if (isopen ()) { - var cw = window.open("/resultform.html","frozen","width=200,height=140,resizable,scrollbars=no"); - var cf = cw.document.results; - var rf = result_window.document.results; - cf.test.value = rf.test.value; - cf.arch.value = rf.arch.value; - cf.tests.value = rf.tests.value; - cf.todo.value = rf.todo.value; - cf.errors.value = rf.errors.value; - cf.skipped.value = rf.skipped.value; - } -}

1 0

Francois Gouget : testbot/reporttest: Fix duplicated source paths.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: tools Branch: master Commit: 89cfa0482cb88617a4b044d678b1b311cf55cbaf URL: http://source.winehq.org/git/tools.git/?a=commit;h=89cfa0482cb88617a4b044d6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 24 03:28:22 2017 +0100 testbot/reporttest: Fix duplicated source paths. The winetest website shows the source path as the title for the test so duplicates are confusing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 6 +++--- testbot/src/reporttest/reporttest.c | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index cb83ad7..d66b829 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -262,7 +262,7 @@ eventlog.c:20: Test failed: Something wrong 088c:eventlog: 408 tests executed (0 marked as todo, 0 failures), 0 skipped. advapi32:eventlog:088c done (3) in 4s -advapi32:lsa start dlls/advapi32/tests/crypt.c - +advapi32:lsa start dlls/advapi32/tests/lsa.c - ----- A unit test with no test summary line ----- Expected assessement: "Missing test summary" error advapi32:lsa:083c done (0) in 0s @@ -299,7 +299,7 @@ advpack:advpack start dlls/advpack/tests/advpack.c - 0da0:advpack: 99 tests executed (0 marked as todo, 0 failures), 0 skipped. advpack:advpack:0da0 done (0) in 0s -advpack:files start dlls/advapi32/tests/crypt.c - +advpack:files start dlls/advpack/tests/files.c - ----- A unit test with a failed test in the main process ----- Expected assessement: 1 failure files.c:20: Test failed: A failure in the main process @@ -1020,7 +1020,7 @@ stub xcopy.exe:xcopy stub xmllite:reader stub xmllite:writer -xmllite:writer start fake/source/writer.c - +xmllite:writer start dlls/xmllite/tests/writer.c - ----- A unit test with a misplaced test failed line ----- Expected assessement: "Misplaced test failed line" error See the similar scenario before but note the lack of the extra test summary line diff --git a/testbot/src/reporttest/reporttest.c b/testbot/src/reporttest/reporttest.c index 122f90e..fecaa50 100644 --- a/testbot/src/reporttest/reporttest.c +++ b/testbot/src/reporttest/reporttest.c @@ -236,13 +236,14 @@ int main(int argc, char** argv) fputs(line, stdout); return 1; } + *unit = '\0'; unit++; - line[strlen(line)-1] = '\0'; - fprintf(logfile, "%s start fake/source/%s.c -\n", line+5, unit); + unit[strlen(unit)-1] = '\0'; + fprintf(logfile, "%s:%s start fake/%s/%s.c -\n", line+5, unit, line+5, unit); fprintf(logfile, "----- A standard successful unit test\n"); fprintf(logfile, "----- Expected assessement: Success\n"); fprintf(logfile, "1234:%s: 2 tests executed (0 marked as todo, 0 failures), 0 skipped.\n", unit); - fprintf(logfile, "%s:1234 done (0) in 0s\n", line+5); + fprintf(logfile, "%s:%s:1234 done (0) in 0s\n", line+5, unit); } else {

1 0

Jacek Caban : server: Implement server-side named pipe read.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 56ae76ce8446b2a7ccdffa42dcd2e804d5a496e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56ae76ce8446b2a7ccdffa42d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 23 15:42:03 2017 +0100 server: Implement server-side named pipe read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index e83f773..1e6bb4e 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -155,6 +155,7 @@ static const struct object_ops named_pipe_ops = }; /* common server and client pipe end functions */ +static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); static obj_handle_t pipe_end_write( struct fd *fd, struct async *async_data, int blocking, file_pos_t pos ); static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -195,7 +196,7 @@ static const struct fd_ops pipe_server_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ pipe_server_get_fd_type, /* get_fd_type */ - no_fd_read, /* read */ + pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_server_flush, /* flush */ pipe_server_ioctl, /* ioctl */ @@ -240,7 +241,7 @@ static const struct fd_ops pipe_client_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ pipe_client_get_fd_type, /* get_fd_type */ - no_fd_read, /* read */ + pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_client_flush, /* flush */ pipe_client_ioctl, /* ioctl */ @@ -794,6 +795,41 @@ static void reselect_write_queue( struct pipe_end *pipe_end ) } ignore_reselect = 0; + reselect_read_queue( reader ); +} + +static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +{ + struct pipe_end *pipe_end = get_fd_user( fd ); + obj_handle_t handle = 0; + + if (!use_server_io( pipe_end )) return no_fd_read( fd, async, blocking, pos ); + + if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) + { + set_error( STATUS_PIPE_BROKEN ); + return 0; + } + + if (!pipe_end->read_q && !(pipe_end->read_q = create_async_queue( fd ))) return 0; + if (!(handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) return 0; + + queue_async( pipe_end->read_q, async ); + reselect_read_queue( pipe_end ); + set_error( STATUS_PENDING ); + + if (!blocking) + { + struct iosb *iosb; + iosb = async_get_iosb( async ); + if (iosb->status == STATUS_PENDING) + { + close_handle( current->process, handle ); + handle = 0; + } + release_object( iosb ); + } + return handle; } static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos )

1 0