October 2019 - Wine-Commits

Nikolay Sivov : include: Move DWRITE_GLYPH_IMAGE_FORMATS definition to dcommon.h.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 729c920325ef826f31c6ef1c291ef9d7e647588a URL: https://source.winehq.org/git/wine.git/?a=commit;h=729c920325ef826f31c6ef1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 2 16:12:51 2019 +0300 include: Move DWRITE_GLYPH_IMAGE_FORMATS definition to dcommon.h. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dcommon.idl | 13 +++++++++++++ include/dwrite_3.idl | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/dcommon.idl b/include/dcommon.idl index 88f97c56a4..53281bd487 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -33,6 +33,19 @@ typedef enum DWRITE_MEASURING_MODE DWRITE_MEASURING_MODE_GDI_NATURAL } DWRITE_MEASURING_MODE; +typedef enum DWRITE_GLYPH_IMAGE_FORMATS +{ + DWRITE_GLYPH_IMAGE_FORMATS_NONE = 0, + DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE = 1 << 0, + DWRITE_GLYPH_IMAGE_FORMATS_CFF = 1 << 1, + DWRITE_GLYPH_IMAGE_FORMATS_COLR = 1 << 2, + DWRITE_GLYPH_IMAGE_FORMATS_SVG = 1 << 3, + DWRITE_GLYPH_IMAGE_FORMATS_PNG = 1 << 4, + DWRITE_GLYPH_IMAGE_FORMATS_JPEG = 1 << 5, + DWRITE_GLYPH_IMAGE_FORMATS_TIFF = 1 << 6, + DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7 +} DWRITE_GLYPH_IMAGE_FORMATS; + typedef enum D2D1_ALPHA_MODE { D2D1_ALPHA_MODE_UNKNOWN = 0, diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index dc8bf0e959..b148bd725b 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -733,19 +733,6 @@ interface IDWriteFactory3 : IDWriteFactory2 HRESULT GetFontDownloadQueue(IDWriteFontDownloadQueue **queue); } -typedef enum DWRITE_GLYPH_IMAGE_FORMATS -{ - DWRITE_GLYPH_IMAGE_FORMATS_NONE = 0, - DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE = 1 << 0, - DWRITE_GLYPH_IMAGE_FORMATS_CFF = 1 << 1, - DWRITE_GLYPH_IMAGE_FORMATS_COLR = 1 << 2, - DWRITE_GLYPH_IMAGE_FORMATS_SVG = 1 << 3, - DWRITE_GLYPH_IMAGE_FORMATS_PNG = 1 << 4, - DWRITE_GLYPH_IMAGE_FORMATS_JPEG = 1 << 5, - DWRITE_GLYPH_IMAGE_FORMATS_TIFF = 1 << 6, - DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7 -} DWRITE_GLYPH_IMAGE_FORMATS; - typedef struct DWRITE_GLYPH_IMAGE_DATA { void const *imageData;

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetPixelShaderConstant().
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: decbed41847e7bb32dbffd6f68615eacdaa06f04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=decbed41847e7bb32dbffd6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 20:03:53 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetPixelShaderConstant(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 011364ccbc..827ec47c60 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3231,7 +3231,9 @@ static HRESULT WINAPI d3d8_device_SetPixelShaderConstant(IDirect3DDevice8 *iface iface, start_register, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_f(device->wined3d_device, start_register, count, data); + hr = wined3d_stateblock_set_ps_consts_f(device->update_state, start_register, count, data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_ps_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantF().
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 334e4880b33fe2a1bc79a7738c335b599517c0a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=334e4880b33fe2a1bc79a773… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 20:03:52 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantF(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 90882f0f92..539af97fbb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3815,8 +3815,11 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantF(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_f(device->wined3d_device, + hr = wined3d_stateblock_set_ps_consts_f(device->update_state, reg_idx, count, (const struct wined3d_vec4 *)data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_ps_consts_f(device->wined3d_device, + reg_idx, count, (const struct wined3d_vec4 *)data); wined3d_mutex_unlock(); return hr;

1 0

Nikolay Sivov : include: Add IDWriteFontSet3 definition.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: de5db669138fd722deb61fac8b22634bc22a1e42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de5db669138fd722deb61fac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 2 16:12:50 2019 +0300 include: Add IDWriteFontSet3 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 5958e6fb1b..dc8bf0e959 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -84,6 +84,15 @@ typedef enum DWRITE_FONT_AXIS_TAG DWRITE_FONT_AXIS_TAG_ITALIC = 0x6c617469, /* 'ital' */ } DWRITE_FONT_AXIS_TAG; +typedef enum DWRITE_FONT_SOURCE_TYPE +{ + DWRITE_FONT_SOURCE_TYPE_UNKNOWN, + DWRITE_FONT_SOURCE_TYPE_PER_MACHINE, + DWRITE_FONT_SOURCE_TYPE_PER_USER, + DWRITE_FONT_SOURCE_TYPE_APPX_PACKAGE, + DWRITE_FONT_SOURCE_TYPE_REMOTE_FONT_PROVIDER +} DWRITE_FONT_SOURCE_TYPE; + typedef struct DWRITE_FONT_AXIS_VALUE { DWRITE_FONT_AXIS_TAG axisTag; @@ -441,6 +450,18 @@ interface IDWriteFontSet2 : IDWriteFontSet1 HANDLE GetExpirationEvent(); } +[ + local, + object, + uuid(7c073ef2-a7f4-4045-8c32-8ab8ae640f90) +] +interface IDWriteFontSet3 : IDWriteFontSet2 +{ + DWRITE_FONT_SOURCE_TYPE GetFontSourceType(UINT32 index); + UINT32 GetFontSourceNameLength(UINT32 index); + HRESULT GetFontSourceName(UINT32 index, WCHAR *buffer, UINT32 buffer_size); +} + [ local, object,

1 0

Hans Leidekker : winhttp/tests: Fix some test failures.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 310620c07295d8a76826c21ef24603ef1056516f URL: https://source.winehq.org/git/wine.git/?a=commit;h=310620c07295d8a76826c21e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:43:35 2019 +0200 winhttp/tests: Fix some test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index b005514dfa..552f6ce778 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1139,7 +1139,7 @@ static void test_secure_connection(void) ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); err = GetLastError(); if (!ret && (err == ERROR_WINHTTP_SECURE_FAILURE || err == ERROR_WINHTTP_CANNOT_CONNECT || - err == ERROR_WINHTTP_TIMEOUT)) + err == ERROR_WINHTTP_TIMEOUT || err == SEC_E_ILLEGAL_MESSAGE)) { skip("secure connection failed, skipping remaining secure tests\n"); goto cleanup; @@ -1172,6 +1172,11 @@ static void test_secure_connection(void) } ret = WinHttpReceiveResponse(req, NULL); + if (!ret && GetLastError() == ERROR_WINHTTP_CONNECTION_ERROR) + { + skip("connection error, skipping remaining secure tests\n"); + goto cleanup; + } ok(ret, "failed to receive response %u\n", GetLastError()); available_size = 0; @@ -3780,9 +3785,9 @@ static void test_IWinHttpRequest(int port) V_VT( &data ) = VT_BSTR; V_BSTR( &data ) = SysAllocString( test_dataW ); hr = IWinHttpRequest_Send( req, data ); - ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32(ERROR_WINHTTP_INVALID_SERVER_RESPONSE)), - "got %08x\n", hr ); + ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %08x\n", hr ); SysFreeString( V_BSTR( &data ) ); + if (hr != S_OK) goto done; hr = IWinHttpRequest_Open( req, NULL, NULL, empty ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -4250,14 +4255,14 @@ static void test_IWinHttpRequest(int port) SysFreeString( url ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE )), "got %08x\n", hr ); - if (hr == S_OK) - { - hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); - SysFreeString( response ); - } + ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ) || + hr == SEC_E_ILLEGAL_MESSAGE /* winxp */, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); + SysFreeString( response ); IWinHttpRequest_Release( req ); @@ -4294,8 +4299,8 @@ static void test_IWinHttpRequest(int port) ok( hr == S_OK, "got %08x\n", hr ); ok( status == HTTP_STATUS_DENIED, "got %d\n", status ); +done: IWinHttpRequest_Release( req ); - CoUninitialize(); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_pixel_shader().
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 25c460fb268a617c764db01713a8e89b7cbc2a0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=25c460fb268a617c764db017… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 20:03:48 2019 -0500 wined3d: Introduce wined3d_stateblock_set_pixel_shader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 12 ++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4268d085a7..1ee64b3224 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1340,6 +1340,18 @@ HRESULT CDECL wined3d_stateblock_set_vs_consts_b(struct wined3d_stateblock *stat return WINED3D_OK; } +void CDECL wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader) +{ + TRACE("stateblock %p, shader %p.\n", stateblock, shader); + + if (shader) + wined3d_shader_incref(shader); + if (stateblock->stateblock_state.ps) + wined3d_shader_decref(stateblock->stateblock_state.ps); + stateblock->stateblock_state.ps = shader; + stateblock->changed.pixelShader = TRUE; +} + void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 975de561d0..6e6f50a7e1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,6 +258,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1bf103c8a4..2f6e7f3bc0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2660,6 +2660,7 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetPixelShader().
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 8d84579540f997b4b2e74353ac46e4655f788641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d84579540f997b4b2e74353… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 20:03:49 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetPixelShader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 26b1b982f8..90882f0f92 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3768,8 +3768,11 @@ static HRESULT WINAPI d3d9_device_SetPixelShader(IDirect3DDevice9Ex *iface, IDir TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - wined3d_device_set_pixel_shader(device->wined3d_device, + wined3d_stateblock_set_pixel_shader(device->update_state, shader_obj ? shader_obj->wined3d_shader : NULL); + if (!device->recording) + wined3d_device_set_pixel_shader(device->wined3d_device, + shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); return D3D_OK;

1 0

Francois Gouget : testbot/web: Allow downloading the raw task reports and logs.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: tools Branch: master Commit: f730e3fbb4ef500be232ad3893dcf6629c8d9729 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f730e3fbb4ef500be232ad3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 07:02:08 2019 +0200 testbot/web: Allow downloading the raw task reports and logs. This can make analysis easier or allow processing through scripts to derive statistics. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/GetTaskFile.pl | 79 ++++++++++++++++++++++++++++++++++++++++++++++ testbot/web/JobDetails.pl | 14 ++++++-- 2 files changed, 90 insertions(+), 3 deletions(-) diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl new file mode 100644 index 0000000..83e723e --- /dev/null +++ b/testbot/web/GetTaskFile.pl @@ -0,0 +1,79 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Sends a Task's report or log file +# +# Copyright 2019 Francois Gouget +# +# This library 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 Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use warnings; +use strict; + +use Apache2::Const -compile => qw(REDIRECT); +use CGI; +use Fcntl; # for O_READONLY +use WineTestBot::Config; + + +sub SendTaskFile($$$$$) +{ + my ($Request, $JobId, $StepNo, $TaskNo, $File) = @_; + + # Validate and untaint + return undef if ($JobId !~ m/^(\d+)$/); + $JobId = $1; + return undef if ($StepNo !~ m/^(\d+)$/); + $StepNo = $1; + return undef if ($TaskNo !~ m/^(\d+)$/); + $TaskNo = $1; + return undef if ($File !~ m/^(log|[a-zA-Z0-9_-]+\.report)$/); + $File = $1; + + my $FileName = "$DataDir/jobs/$JobId/$StepNo/$TaskNo/$File"; + if (sysopen(my $fh, $FileName, O_RDONLY)) + { + my ($FileSize, $MTime, $BlkSize) = (stat($fh))[7, 9, 11]; + + $Request->headers_out->add("Last-Modified", scalar(gmtime($MTime)) ." GMT"); + $Request->content_type("text/plain"); + $Request->headers_out->add("Content-length", $FileSize); + $Request->headers_out->add("Content-Disposition", + "attachment; filename='$File'"); + + $BlkSize ||= 16384; + print $_ while (sysread($fh, $_, $BlkSize)); + close($fh); + + return 1; + } + + return undef; +} + + +my $Request = shift; + +my $CGIObj = CGI->new($Request); +my $JobId = $CGIObj->param("Job") || ""; +my $StepNo = $CGIObj->param("Step") || ""; +my $TaskNo = $CGIObj->param("Task") || ""; +my $File = $CGIObj->param("File") || ""; + +if (!SendTaskFile($Request, $JobId, $StepNo, $TaskNo, $File)) +{ + $Request->headers_out->set("Location", "/"); + $Request->status(Apache2::Const::REDIRECT); +} + +exit; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8d87880..fc98e14 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -321,14 +321,22 @@ sub GetMoreInfoLink($$$$;$) return ($Action, $Url); } -sub GenerateMoreInfoLink($$$$;$) +sub GenerateMoreInfoLink($$$$;$$) { - my ($self, $LinkKey, $Label, $Set, $Value) = @_; + my ($self, $LinkKey, $Label, $Set, $Value, $StepTask) = @_; my ($Action, $Url) = $self->GetMoreInfoLink($LinkKey, $Label, $Set, $Value); my $Title = ($Value =~ /^(.*)\.report$/) ? " title='$1'" : ""; my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'$Title>$Action $Label</a>"; + if (defined $Value) + { + $Url = "/GetTaskFile.pl?Job=". uri_escape($self->{JobId}) + ."&Step=". uri_escape($StepTask->StepNo) + ."&Task=". uri_escape($StepTask->TaskNo) + ."&File=". uri_escape($Value); + $Html = "<a href='$Url'>↓</a> $Html"; + } if ($Action eq "Hide") { $Html = "<span class='TaskMoreInfoSelected'>$Html</span>"; @@ -442,7 +450,7 @@ EOF my $ReportCount; foreach my $LogName (@{$MoreInfo->{Logs}}) { - $self->GenerateMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); + $self->GenerateMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName, $StepTask); $ReportCount++ if ($LogName !~ /^old_/ and $LogName =~ /\.report$/); } print "</div>\n";

1 0

Francois Gouget : testbot/LibvirtTool: Check the X session for Wine VMs after booting.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: tools Branch: master Commit: ae2ecce33aad2f1cefecf5e8fa7ca65cfa6be587 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ae2ecce33aad2f1cefecf5e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 07:00:28 2019 +0200 testbot/LibvirtTool: Check the X session for Wine VMs after booting. We need to wait for the X session whenever a Wine VM is booted, even when not creating a snapshot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f6e2d4f..5438f29 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -420,6 +420,25 @@ sub SetupTestAgentd($$$$) # A side effect is that it will force TestAgentd.exe.old to stay around. } + if ($Booting and $VM->Type eq "wine") + { + # Make sure the X session has had time to start + Debug(Elapsed($Start), " Waiting for the X session\n"); + LogMsg "Waiting for the $VMKey X session\n"; + my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); + FatalError("Could not check for the X session on $VMKey\n") if (!$Pid); + + if (!defined $TA->Wait($Pid, $SleepAfterBoot)) + { + my $ErrMessage = $TA->GetLastError(); + if ($ErrMessage =~ /timed out waiting for the child process/) + { + FatalError("Timed out waiting for the X session\n"); + } + FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); + } + } + if ($ResetStartCount) { # If SetProperty() is not supported neither is --show-restarts. @@ -443,29 +462,6 @@ sub CreateSnapshot($$) { my ($Domain, $SnapshotName) = @_; - if ($VM->Type eq "wine") - { - # Make sure an X session has started before taking the snapshot - Debug(Elapsed($Start), " Waiting for the X session\n"); - LogMsg "Waiting for the $VMKey X session\n"; - my $TA = $VM->GetAgent(); - my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - if (!$Pid) - { - FatalError("Could not check for the X session on the $VMKey VM\n"); - } - if (!defined $TA->Wait($Pid, $SleepAfterBoot)) - { - my $ErrMessage = $TA->GetLastError(); - if ($ErrMessage =~ /timed out waiting for the child process/) - { - FatalError("Timed out waiting for the X session\n"); - } - FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); - } - $TA->Disconnect(); - } - if ($SleepAfterBoot != 0) { Debug(Elapsed($Start), " Sleeping for the $SnapshotName snapshot\n");

1 0

Francois Gouget : testbot/LibvirtTool: Only create locale snapshots for Windows VMs.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: tools Branch: master Commit: 980fc8a758b729f1181c0a22b270b1e67ff31935 URL: https://source.winehq.org/git/tools.git/?a=commit;h=980fc8a758b729f1181c0a2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 2 07:02:15 2019 +0200 testbot/LibvirtTool: Only create locale snapshots for Windows VMs. This is the only supported and needed case. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 5438f29..415cdc5 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -491,7 +491,8 @@ sub Revert() my ($SetLocale, $CreateSnapshot); my $Domain = $VM->GetDomain(); - if (!$Domain->HasSnapshot($DomainSnapshot) and + if (($VM->Type eq "win32" or $VM->Type eq "win64") and + !$Domain->HasSnapshot($DomainSnapshot) and $DomainSnapshot =~ s/-([a-z]{2})[_-]([A-Z]{2})$//) { # Add some extra time to set up the VM locale and reboot it

1 0