October 2017 - Wine-Commits

Piotr Caban : msi: Move condition integer handling into value_i.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: wine Branch: master Commit: 024c6c1b4b9c674398cd40a1971cbe7d96903ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=024c6c1b4b9c674398cd40a19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 24 15:00:58 2017 +0200 msi: Move condition integer handling into value_i. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 079bbd9..8b63a50 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -129,7 +129,7 @@ static BOOL num_from_prop( LPCWSTR p, INT *val ) %nonassoc COND_ERROR COND_EOF %type <value> expression boolean_term boolean_factor -%type <value> value_i integer operator +%type <value> value_i operator %type <string> identifier symbol_s value_s literal %% @@ -293,9 +293,14 @@ literal: ; value_i: - integer + COND_NUMBER { - $$ = $1; + COND_input* cond = (COND_input*) info; + LPWSTR szNum = COND_GetString( cond, &$1 ); + if( !szNum ) + YYABORT; + $$ = atoiW( szNum ); + cond_free( szNum ); } | COND_DOLLARS identifier { @@ -382,18 +387,6 @@ identifier: } ; -integer: - COND_NUMBER - { - COND_input* cond = (COND_input*) info; - LPWSTR szNum = COND_GetString( cond, &$1 ); - if( !szNum ) - YYABORT; - $$ = atoiW( szNum ); - cond_free( szNum ); - } - ; - %%

1 0

Francois Gouget : testbot/TestAgent: Add --connect-attempts and --connect-interval options.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: tools Branch: master Commit: e7e490e5e2e7d883a1d8d6a8a1ba3d8e5868c614 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e7e490e5e2e7d883a1d8d6a8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 24 15:48:19 2017 +0200 testbot/TestAgent: Add --connect-attempts and --connect-interval options. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/TestAgent | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 33fc298..bfc4fbc 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -56,7 +56,8 @@ my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, $PropName, @Rm); my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; -my ($Port, $ConnectTimeout, $Timeout, $Keepalive, $TunnelOpt); +my ($Port, $ConnectTimeout, $ConnectAttempts, $ConnectInterval, $Timeout); +my ($Keepalive, $TunnelOpt); my $Usage; sub set_cmd($) @@ -103,6 +104,14 @@ while (@ARGV) { $ConnectTimeout = check_opt_val($arg, $ConnectTimeout); } + elsif ($arg eq "--connect-attempts") + { + $ConnectAttempts = check_opt_val($arg, $ConnectAttempts); + } + elsif ($arg eq "--connect-interval") + { + $ConnectInterval = check_opt_val($arg, $ConnectInterval); + } elsif ($arg eq "--timeout") { $Timeout = check_opt_val($arg, $Timeout); @@ -340,6 +349,9 @@ if (defined $Usage) print " --port <port> Use the specified port number instead of the default one.\n"; print " --connect-timeout <timeout> Use the specified timeout (in seconds) when\n"; print " connecting instead of the default one.\n"; + print " --connect-attempts <count> How many connection attempts to perform.\n"; + print " --connect-interval <time> The minimum interval (in seconds) between failed\n"; + print " connection attempts.\n"; print " --timeout <timeout> Use the specified timeout (in seconds) instead of the\n"; print " default one for the operation.\n"; print " --keepalive <keepalive> How often (in seconds) the run and wait operations\n"; @@ -363,7 +375,10 @@ if ($TunnelOpt and $TunnelOpt =~ /^ssh:/) } my $TA = TestAgent->new($Hostname, $AgentPort, $TunnelInfo); -$TA->SetConnectTimeout($ConnectTimeout) if (defined $ConnectTimeout); +if (defined $ConnectTimeout or defined $ConnectAttempts or defined $ConnectInterval) +{ + $TA->SetConnectTimeout($ConnectTimeout, $ConnectAttempts, $ConnectInterval); +} $TA->SetTimeout($Timeout) if (defined $Timeout); my $RC = 0;

1 0

Francois Gouget : testbot/TestAgent: Better report invalid options.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: tools Branch: master Commit: 252359b01c26d2f4f164ef26e0c590afb3e9c209 URL: http://source.winehq.org/git/tools.git/?a=commit;h=252359b01c26d2f4f164ef26… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 24 15:49:05 2017 +0200 testbot/TestAgent: Better report invalid options. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/TestAgent | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index bfc4fbc..c410556 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -152,6 +152,11 @@ while (@ARGV) { $RunFlags |= $TestAgent::RUN_DNTRUNC_ERR; } + elsif ($arg =~ /^-/) + { + error("unknown option '$arg'\n"); + $Usage = 2; + } elsif (!defined $Hostname) { $Hostname = $arg;

1 0

Francois Gouget : testbot/LibvirtTool: Give enough time for the VM to boot.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: tools Branch: master Commit: e94abb3ffad8819461f9bfa3c2e55936b8e4d3d9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e94abb3ffad8819461f9bfa3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 24 15:48:24 2017 +0200 testbot/LibvirtTool: Give enough time for the VM to boot. In particular if the VM has not been used for a while one can get "No route to host" errors in quick succession. It's only once the VM has reclaimed its IP address that this error goes away. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 937821f..670c553 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -361,7 +361,7 @@ sub Revert() Debug(Elapsed($Start), " Trying the TestAgent connection\n"); LogMsg "Waiting for ". $VM->Name ." (up to ${WaitForToolsInVM}s per attempt)\n"; my $TA = $VM->GetAgent(); - $TA->SetConnectTimeout($WaitForToolsInVM); + $TA->SetConnectTimeout($WaitForToolsInVM, undef, $WaitForToolsInVM); my $Success = $TA->Ping(); $TA->Disconnect(); if (!$Success)

1 0

Francois Gouget : testbot: Document CompareJobPriority(), particularly the Priority field.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: tools Branch: master Commit: dd51cc7f8afc40b6c583d5ac1b1922456da25eae URL: http://source.winehq.org/git/tools.git/?a=commit;h=dd51cc7f8afc40b6c583d5ac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 24 19:04:55 2017 +0200 testbot: Document CompareJobPriority(), particularly the Priority field. Its naming is quite unfortunate since higher values mean a lower priority. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 3c7ce0d..c787e8a 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -399,6 +399,8 @@ sub CreateJobs(;$) sub CompareJobPriority { + # Process Jobs with a higher Priority value last (it's a niceness in fact), + # and older Jobs first. return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id; }

1 0

Francois Gouget : testbot/TestAgent: Add a minimum interval between connection attempts.
by Alexandre Julliard Oct. 25, 2017

Oct. 25, 2017

Module: tools Branch: master Commit: 81f6422814b5cfa30af6aad6a77411059603609d URL: http://source.winehq.org/git/tools.git/?a=commit;h=81f6422814b5cfa30af6aad6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 24 15:47:43 2017 +0200 testbot/TestAgent: Add a minimum interval between connection attempts. This can be used to ensure the remote host has enough time to boot before TestAgent gives up, or to paper over very short network outages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index e4d655c..255c1a1 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -106,6 +106,7 @@ sub new($$$;$) connection => "$Hostname:$Port", ctimeout => 20, cattempts => 3, + cinterval => 0, timeout => 0, fd => undef, deadline => undef, @@ -147,9 +148,9 @@ sub Disconnect($) $self->{agentversion} = undef; } -sub SetConnectTimeout($$;$) +sub SetConnectTimeout($$;$$) { - my ($self, $Timeout, $Attempts) = @_; + my ($self, $Timeout, $Attempts, $Interval) = @_; my @Ret; if (defined $Timeout) { @@ -161,6 +162,11 @@ sub SetConnectTimeout($$;$) push @Ret, $self->{cattempts}; $self->{cattempts} = $Attempts; } + if (defined $Interval) + { + push @Ret, $self->{cinterval}; + $self->{cinterval} = $Interval; + } return @Ret; } @@ -891,7 +897,8 @@ sub _Connect($) $self->{rpc} = ($self->{rpc} ? "$self->{rpc}/" : "") ."connect"; my $Step; - foreach my $Dummy (1..$self->{cattempts}) + my $Start = time(); + foreach my $Attempt (1..$self->{cattempts}) { my $Step = "initializing"; eval @@ -1026,7 +1033,8 @@ sub _Connect($) } # Ideally we should probably check the error and not retry if it is likely # permanent, like a hostname that does not resolve. - sleep(1); + my $Remaining = $Attempt * $self->{cinterval} - (time() - $Start); + sleep($Remaining) if ($Remaining > 0); } $self->{rpc} = $OldRPC; return undef;

1 0

Jacek Caban : mshtml/tests: Skip postMessage test on IE7.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: caa3c43272f95f0093bd4b845e5f09d76a3a74c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa3c43272f95f0093bd4b845… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:37:44 2017 +0200 mshtml/tests: Skip postMessage test on IE7. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/jstest.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 00dd35d..cce8050 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -362,7 +362,12 @@ function test_xhr() { ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); } -function test_sendMessage() { +function test_postMessage() { + if(!("postMessage" in window)) { + win_skip("postMessage not available"); + return; + } + var onmessage_called = false; window.onmessage = function() { onmessage_called = true; @@ -397,7 +402,7 @@ function runTests() { test_language_attribute(); test_text_node(); test_xhr(); - test_sendMessage(); + test_postMessage(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Vijay Kiran Kamuju : msvcp100: Add time_get::do_get and time_get:: get functions.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: f6f0be8f2d60d48bc2d12032fb78a66f6f120353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f0be8f2d60d48bc2d12032f… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Oct 24 18:41:23 2017 +0200 msvcp100: Add time_get::do_get and time_get::get functions. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 8 ++++---- dlls/msvcp110/msvcp110.spec | 10 +++++----- dlls/msvcp120/msvcp120.spec | 10 +++++----- dlls/msvcp120_app/msvcp120_app.spec | 10 +++++----- dlls/msvcp140/msvcp140.spec | 10 +++++----- dlls/msvcp90/locale.c | 36 +++++++++++++++++++++++++++++++++++- 6 files changed, 59 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6f0be8f2d60d48bc2d12…

1 0

Andrey Gusev : gdiplus: Fix misplaced parentheses.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: ef5a3ffe51f7029e1d09a07e95707f19839c26c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5a3ffe51f7029e1d09a07e9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Oct 24 13:33:27 2017 +0300 gdiplus: Fix misplaced parentheses. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 91e18a5..e40487a 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2001,14 +2001,14 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d if (pendata->PenDataFlags & PenDataMiterLimit) { - if ((status = GdipSetPenMiterLimit(pen, *(REAL *)((BYTE *)pendata + offset)) != Ok)) + if ((status = GdipSetPenMiterLimit(pen, *(REAL *)((BYTE *)pendata + offset))) != Ok) goto penfailed; offset += sizeof(REAL); } if (pendata->PenDataFlags & PenDataLineStyle) { - if ((status = GdipSetPenDashStyle(pen, *(DWORD *)((BYTE *)pendata + offset)) != Ok)) + if ((status = GdipSetPenDashStyle(pen, *(DWORD *)((BYTE *)pendata + offset))) != Ok) goto penfailed; offset += sizeof(DWORD); }

1 0

Alex Henrie : vbscript/tests: Try calling GetObject again if it fails the first time.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: 8d8ebc964152ef0158fabea5c896ee5a0d93b400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8ebc964152ef0158fabea5c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 24 15:15:35 2017 +0100 vbscript/tests: Try calling GetObject again if it fails the first time. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/createobj.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 002f12f..1c72ed2 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -50,6 +50,8 @@ extern const CLSID CLSID_VBScript; +#define VB_E_ACCESS_DENIED 0x800a0046 + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -988,6 +990,8 @@ static void test_GetObject(void) SET_EXPECT(SetSite); SET_EXPECT(reportSuccess); hres = parse_script_ae(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); + if(broken(hres == VB_E_ACCESS_DENIED)) /* 64-bit win8 fails on the first try */ + hres = parse_script_ae(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); if(hres == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) { /* Workaround for broken win2k */ win_skip("got unexpected error %08x\n", hres); CLEAR_CALLED(QI_IObjectWithSite);

1 0