December 2017 - Wine-Commits

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

Module: wine Branch: master Commit: 5815aa05884a7e3a0cb3ca9fd7d9eea83f54fc52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5815aa05884a7e3a0cb3ca9f… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Dec 22 04:27:04 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/po/nb_NO.po b/po/nb_NO.po index d00e67a..20b2b66 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -10591,6 +10591,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Opprett en symbolsk lenke.\n" +"\n" +"Syntaks: MKLINK [alternativer] lenke_navn mål\n" +"\n" +"Alternativer:\n" +"/d Opprett en symbolsk lenke til en katalog.\n" +"/h Opprett en hard lenke.\n" +"/j Opprett et katalog-knutepunkt.\n" +"lenke_navn er navnet på den nye symbolske lenken.\n" +"mål er stien som lenke_navn peker til.\n" #: cmd.rc:312 msgid ""

1 0

Nikolay Sivov : comctl32/tests: Make sure v6 module is used when running tests, run more tests with v6 module.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

Module: wine Branch: master Commit: 3eea7ff3d2b8407132723cee990cd6142ad28ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eea7ff3d2b8407132723cee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 22 15:30:47 2017 +0300 comctl32/tests: Make sure v6 module is used when running tests, run more tests with v6 module. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 619 +++++++++++++++++++--------------------- 1 file changed, 291 insertions(+), 328 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3eea7ff3d2b840713272…

1 0

Andrey Gusev : kernel32/tests: Fix a typo in ok() message.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

Module: wine Branch: master Commit: c49e306cac098cc483a57405c4134fb191b6a3eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c49e306cac098cc483a57405… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 22 17:24:36 2017 +0200 kernel32/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 91eb162..365e38c 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -260,7 +260,7 @@ static void test_GetVolumeNameForVolumeMountPointW(void) } ret = pGetVolumeNameForVolumeMountPointW(path, volume, 0); - ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointW succeeded\n"); ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE || GetLastError() == ERROR_INVALID_PARAMETER, /* Vista */ "wrong error, last=%d\n", GetLastError());

1 0

Tag wine-3.0-rc3 : Alexandre Julliard : Release 3.0-rc3
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

Module: wine Branch: refs/tags/wine-3.0-rc3 Tag: f9aeb5322250f2912ed1ad693ca8450d18043cd9 URL: https://source.winehq.org/git/wine.git/?a=tag;h=f9aeb5322250f2912ed1ad693ca… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 22 18:12:27 2017 +0100 Release 3.0-rc3

1 0

Kim Malmo : po: Update Simplified Chinese translation.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

Module: wine Branch: master Commit: 09208f7e6217212c836a127bfc7abd46443b4f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09208f7e6217212c836a127b… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Dec 22 00:49:00 2017 +0000 po: Update Simplified Chinese translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e1e92d2..d3baf01 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10402,7 +10402,7 @@ msgstr "" "/d 创建目录符号链接。\n" "/h 创建硬链接。\n" "/j 创建目录结。\n" -"link_nam 为符号链接的名称。\n" +"link_name 为符号链接的名称。\n" "target 为 link_name 指向的路径。\n" #: cmd.rc:312

1 0

Andrey Gusev : winhttp/tests: Fix typos in ok() messages.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

Module: wine Branch: master Commit: 72052ca6c7c442e7059123a9154a361673f0dbba URL: https://source.winehq.org/git/wine.git/?a=commit;h=72052ca6c7c442e7059123a9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 22 17:25:28 2017 +0200 winhttp/tests: Fix typos in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 2 +- dlls/winhttp/tests/winhttp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 702c6a1..da8f8e9 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -944,7 +944,7 @@ static void _read_request_data(struct test_request *req, struct info *info, cons WaitForSingleObject( info->wait, INFINITE ); len = strlen(expected_data); - ok(!memcmp(buffer, expected_data, len), "unexpeceted data\n"); + ok(!memcmp(buffer, expected_data, len), "unexpected data\n"); } static void test_persistent_connection(int port) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 469b882..ec33b56 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -568,7 +568,7 @@ static void test_WinHttpAddHeaders(void) SetLastError(0xdeadbeef); ret = WinHttpAddRequestHeaders(request, test_headers[0], -1L, WINHTTP_ADDREQ_FLAG_ADD); err = GetLastError(); - ok(ret, "WinHttpAddRequestHeader failed to add new header, got %d with error %u.\n", ret, err); + ok(ret, "WinHttpAddRequestHeaders failed to add new header, got %d with error %u.\n", ret, err); ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); index = 0;

1 0

Francois Gouget : testbot/web: Show the TestBot' s mispredictions on the Activity page.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

Module: tools Branch: master Commit: 895029ce5088cafed5320cd5c5170b5b3897422d URL: https://source.winehq.org/git/tools.git/?a=commit;h=895029ce5088cafed5320cd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 22 01:46:09 2017 +0100 testbot/web: Show the TestBot's mispredictions on the Activity page. The TestBot prepares VMs in advance so they are ready for the next Task. Some times it mispredicts which VM will be needed next. Higlight such cases on the Activity page so they can be identified and analyzed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 10 ++++++++++ testbot/web/Activity.pl | 6 ++++-- testbot/web/WineTestBot.css | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 38cd556..31930ed 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -195,6 +195,16 @@ sub GetActivity($) $VMStatus->{vmstatus} = $VMStatus; weaken($VMStatus->{vmstatus}); # avoid memory cycles } + if ($LastVMStatus and $LastVMStatus->{status} ne $VMStatus->{status} and + # Ignore acts of administrator + $VMStatus->{status} !~ /^(?:maintenance|engine)$/ and + # And flag forbidden transitions + (($LastVMStatus->{status} eq "reverting" and $VMStatus->{status} ne "sleeping") or + ($LastVMStatus->{status} eq "sleeping" and $VMStatus->{status} !~ /^(?:idle|running)$/) or + ($LastVMStatus->{status} eq "idle" and $VMStatus->{status} ne "running"))) + { + $LastVMStatus->{mispredict} = 1; + } $LastStatusVMs{$VM->Name} = $StatusVMs; } } diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index e57ab7d..a33f3ef 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -160,11 +160,12 @@ EOF my $VMStatus = $Group->{statusvms}->{$VM->Name}; next if ($VMStatus->{merged}); - # Add borders to separate VM hosts + # Add borders to separate VM hosts and indicate anomalies. print "<td class='Record Record-$VMStatus->{status}"; my $Host = $VM->GetHost(); print " Record-left" if ($Col > 0 and $SortedVMs[$Col-1]->GetHost() ne $Host); print " Record-right" if ($Col+1 < @SortedVMs and $SortedVMs[$Col+1]->GetHost() ne $Host); + print " Record-miss" if ($VMStatus->{mispredict}); print "'"; print " rowspan='$VMStatus->{rows}'" if ($VMStatus->{rows} > 1); print ">"; @@ -235,7 +236,8 @@ sub GenerateFooter($) print "<span class='Record-running'>running</span> a task (in which case it links to it),<br>\n"; print "<span class='Record-dirty'>dirty</span> while the server is powering off the VM after a task or while it assesses its state on startup.</p>\n"; - print "<p>If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. A long horizontal bar indicates the TestBot server was restarted. </p>\n"; + print "<p>If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. A long horizontal bar indicates the TestBot server was restarted.</p>\n"; + print "<p>This <span class='Record Record-idle Record-miss'>border</span> indicates that the server threw away the VM's current state without using it.</p>\n"; print "<p>The VM could also be <span class='Record-offline'>offline</span> due to a temporary issue,<br>\n"; print "or until the administrator can look at it for <span class='Record-maintenance'>maintenance</span>,<br>\n"; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index f0f3c01..55de9a3 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -371,3 +371,4 @@ td.Record { text-align: center; } /* Special borders */ .Record.Record-left { border-left: thin solid #601919; } .Record.Record-right { border-right: thin solid #601919; } +.Record.Record-miss { border-top: thick dashed #ff6600; }

1 0

Francois Gouget : testbot/web: Tweak the label of 64 bit tests on the Activity page.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

Module: tools Branch: master Commit: 7197fb218984a313af5ab002604f74d50c5a4f03 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7197fb218984a313af5ab00… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 22 09:55:28 2017 +0100 testbot/web: Tweak the label of 64 bit tests on the Activity page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index a33f3ef..64a752b 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -190,9 +190,11 @@ EOF { $Label .= " ". $VMStatus->{step}->FileName; if ($VMStatus->{task}->CmdLineArg =~ /^\w+$/ and - $Label =~ s/_(?:cross)?test\.exe$//) + $Label =~ s/_(?:cross)?test(64)?\.exe$//) { + my $Bitness = $1; $Label .= ":". $VMStatus->{task}->CmdLineArg; + $Label .= "/64" if ($Bitness); } } $Label = "<a href='/JobDetails.pl?Key=". $VMStatus->{job}->Id ."#k". ($VMStatus->{step}->No * 100 + $VMStatus->{task}->No) ."'>$Label</a>";

1 0

Francois Gouget : testbot/web: Show TestBot start/ stop events on the Activity page.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

Module: tools Branch: master Commit: 4bea10ac77a1a7d23118301c7c4c5e128abad252 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4bea10ac77a1a7d23118301… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 22 01:45:02 2017 +0100 testbot/web: Show TestBot start/stop events on the Activity page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 17 ++++++++++++++++- testbot/web/Activity.pl | 8 +++++++- testbot/web/WineTestBot.css | 1 + 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index dcc5895..38cd556 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -51,6 +51,7 @@ describing the TestBot activity. The structure is as follows: end => <EndTimestamp>, runnable => <RunnableTasksCount>, queued => <QueuedTasksCount>, + engine => <StartOrStop>, statusvms => { <VMName1> => { vm => <VMObject>, @@ -102,6 +103,20 @@ sub GetActivity($) { ($Group->{runnable}, $Group->{queued}) = split / /, $Record->Value; } + elsif ($Record->Type eq "engine" and $Record->Name =~ /^(?:start|stop)$/) + { + $Group->{engine} = $Record->Name; + foreach my $VM (@{$VMs->GetItems()}) + { + my $StatusVMs = ( $Group->{statusvms} ||= {} ); + my $VMStatus = ( $StatusVMs->{$VM->Name} ||= {} ); + $VMStatus->{vmstatus} = $VMStatus; + weaken($VMStatus->{vmstatus}); # avoid memory cycles + $VMStatus->{start} = $Group->{start}; + $VMStatus->{status} = "engine"; + $VMStatus->{rows} = 1; + } + } elsif ($Record->Type eq "vmstatus") { # Ignore retired / deleted VMs @@ -165,7 +180,7 @@ sub GetActivity($) { $LastVMStatus->{end} = $VMStatus->{start} if ($LastVMStatus); } - elsif ($LastVMStatus) + elsif ($LastVMStatus and $LastVMStatus->{status} ne "engine") { $VMStatus = $StatusVMs->{$VM->Name} = $LastVMStatus; $LastStatusVMs{$VM->Name}->{$VM->Name} = {merged => 1, vmstatus => $VMStatus}; diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index ca5b94c..e57ab7d 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -139,6 +139,12 @@ EOF next if (!$Group->{statusvms}); print "<tr><td>", _GetHtmlTime($Group->{start}), "</td>"; + if ($Group->{engine}) + { + print "<td class='Record RecordEngine'>$Group->{engine}</td>\n"; + print "<td colspan='", scalar(@SortedVMs), "'><hr></td>\n"; + next; + } if ($Group->{runnable} or $Group->{queued}) { print "<td class='Record'>", ($Group->{runnable} || 0), " / ", ($Group->{queued} || 0), "</td>"; @@ -229,7 +235,7 @@ sub GenerateFooter($) print "<span class='Record-running'>running</span> a task (in which case it links to it),<br>\n"; print "<span class='Record-dirty'>dirty</span> while the server is powering off the VM after a task or while it assesses its state on startup.</p>\n"; - print "<p>If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round.</p>\n"; + print "<p>If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. A long horizontal bar indicates the TestBot server was restarted. </p>\n"; print "<p>The VM could also be <span class='Record-offline'>offline</span> due to a temporary issue,<br>\n"; print "or until the administrator can look at it for <span class='Record-maintenance'>maintenance</span>,<br>\n"; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index e58a4d8..f0f3c01 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -344,6 +344,7 @@ a.title { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; } +.RecordEngine { font-style: italic; color: #601919; } .RecordHost { font-size: smaller; } .RecordJob { font-size: smaller; } .RecordDuration { }

1 0

Alexandre Julliard : patches: Use https URLs everywhere.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

Module: tools Branch: master Commit: 268dff50ca68dca10db56b7b55930f9768c7f1e5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=268dff50ca68dca10db56b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 21 17:24:55 2017 +0100 patches: Use https URLs everywhere. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 2 +- patches/update-regressions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/update b/patches/update index 6f930ea..963234b 100755 --- a/patches/update +++ b/patches/update @@ -124,7 +124,7 @@ print INDEX "<div id=\"logo_glass\"><a href=\"/patches/\"><img src=\"//winehq.or print INDEX "<div id=\"logo_text\"><a href=\"/patches/\"><img src=\"//winehq.org/images/winehq_logo_text.png\" alt=\"WineHQ\" title=\"WineHQ\"></a></div>\n"; print INDEX "<div id=\"tabs\"><ul>", "<li><a href=\"//www.winehq.org/\">WineHQ</a></li>", - "<li><a href=\"http://wiki.winehq.org/\">Wiki</a></li>", + "<li><a href=\"//wiki.winehq.org/\">Wiki</a></li>", "<li><a href=\"//appdb.winehq.org/\">AppDB</a></li>", "<li><a href=\"//bugs.winehq.org/\">Bugzilla</a></li>", "<li><a href=\"//forum.winehq.org/\">Forums</a></li></ul></div>\n"; diff --git a/patches/update-regressions b/patches/update-regressions index 5c8b362..f4e4e2d 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -44,7 +44,7 @@ sub read_bugs() { my $csv = Text::CSV::Encoded->new({ binary => 1 }); - open LIST, "-|", "wget", "-qO-", "http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bu…" or die "cannot query bug list"; + open LIST, "-|", "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&b…" or die "cannot query bug list"; <LIST>; # skip header line while (<LIST>) @@ -125,7 +125,7 @@ print OUTPUT "<div id=\"logo_glass\"><a href=\"/regressions\"><img src=\"//wineh print OUTPUT "<div id=\"logo_text\"><a href=\"/regressions\"><img src=\"//winehq.org/images/winehq_logo_text.png\" alt=\"WineHQ\" title=\"WineHQ\"></a></div>\n"; print OUTPUT "<div id=\"tabs\"><ul>", "<li><a href=\"//www.winehq.org/\">WineHQ</a></li>", - "<li><a href=\"http://wiki.winehq.org/\">Wiki</a></li>", + "<li><a href=\"//wiki.winehq.org/\">Wiki</a></li>", "<li><a href=\"//appdb.winehq.org/\">AppDB</a></li>", "<li><a href=\"//bugs.winehq.org/\">Bugzilla</a></li>", "<li><a href=\"//forum.winehq.org/\">Forums</a></li></ul></div>\n";

1 0