June 2018 - Wine-commits - list.winehq.org

Francois Gouget : testbot/WineRun*: Improve the VM and Step validation.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: tools Branch: master Commit: bd10370745d91302ef7c4af283e2f09df62a446b URL: https://source.winehq.org/git/tools.git/?a=commit;h=bd10370745d91302ef7c4af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 15:00:30 2018 +0200 testbot/WineRun*: Improve the VM and Step validation. Check that the VM is of the expected type. Also the VM should always be powered on (for powered off snapshots LibvirtTool.pl is responsible for powering on the VM), even when debugging. Move the Step validation next to the VM one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 15 ++++++++++++--- testbot/bin/WineRunReconfig.pl | 15 ++++++++++++--- testbot/bin/WineRunTask.pl | 24 ++++++++++++++---------- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 60af32c..ff04ded 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -309,18 +309,27 @@ sub FatalTAError($$) # -# Check the VM +# Check the VM and Step # -if (!$Debug and $VM->Status ne "running") +if ($VM->Type ne "build") +{ + FatalError("This is not a build VM! (" . $VM->Type . ")\n"); +} +elsif (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif ($Debug and !$VM->GetDomain()->IsPoweredOn()) +elsif (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } +if ($Step->FileType ne "patchdlls") +{ + FatalError("Unexpected file type '". $Step->FileType ."' found\n"); +} + # # Figure out what to build diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2e338c9..23b038a 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -309,18 +309,27 @@ sub FatalTAError($$) # -# Check the VM +# Check the VM and Step # -if (!$Debug and $VM->Status ne "running") +if ($VM->Type ne "build") +{ + FatalError("This is not a build VM! (" . $VM->Type . ")\n"); +} +elsif (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif ($Debug and !$VM->GetDomain()->IsPoweredOn()) +elsif (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } +if ($Step->FileType ne "none") +{ + FatalError("Unexpected file type '". $Step->FileType ."' found\n"); +} + # # Run the build diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 37c63b4..ff8aab9 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -364,18 +364,27 @@ sub FatalTAError($$;$) # -# Check the VM +# Check the VM and Step # -if (!$Debug and $VM->Status ne "running") +if ($VM->Type ne "win32" and $VM->Type ne "win64") +{ + FatalError("This is not a Windows VM! (" . $VM->Type . ")\n"); +} +elsif (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif ($Debug and !$VM->GetDomain()->IsPoweredOn()) +elsif (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } +if ($Step->FileType ne "exe32" and $Step->FileType ne "exe64") +{ + FatalError("Unexpected file type '". $Step->FileType ."' found\n"); +} + # # Setup the VM @@ -395,11 +404,6 @@ if (!$TA->SetTime()) } } -my $FileType = $Step->FileType; -if ($FileType ne "exe32" && $FileType ne "exe64") -{ - FatalError("Unexpected file type $FileType found\n"); -} my $FileName = $Step->FileName; Debug(Elapsed($Start), " Sending '". $Step->GetFullFileName() ."'\n"); if (!$TA->SendFile($Step->GetFullFileName(), $FileName, 0)) @@ -418,7 +422,7 @@ if ($Step->ReportSuccessfulTests) my $IsWineTest = 1; if ($Step->Type eq "single") { - my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe"; + my $TestLauncher = "TestLauncher" . ($Step->FileType eq "exe64" ? "64" : "32") . ".exe"; Debug(Elapsed($Start), " Sending 'latest/$TestLauncher'\n"); if (!$TA->SendFile("$DataDir/latest/$TestLauncher", $TestLauncher, 0)) { @@ -450,7 +454,7 @@ elsif ($Step->Type eq "suite") $Tag =~ s/[^a-zA-Z0-9]/-/g; if ($VM->Type eq "win64") { - $Tag .= "-" . ($FileType eq "exe64" ? "64" : "32"); + $Tag .= "-" . ($Step->FileType eq "exe64" ? "64" : "32"); } if (defined($WebHostName)) {

1 0

Francois Gouget : testbot: Make sure the patches apply and compile in Wine.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: tools Branch: master Commit: 74cb3e27ae1272e7ba963b79ef0c57d5a76f9dd0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=74cb3e27ae1272e7ba963b7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 15:02:19 2018 +0200 testbot: Make sure the patches apply and compile in Wine. This adds the base infrastructure for later testing the patches on Wine. This adds a "wine" VM type which applies to all VMs that can compile and run Wine, regardless of the underlying operating system. Adapting to the underlying operating system is thus the responsibility of the VM-side scripts. This also updates GetPatchImpacts() to detect non-Wine scripts (such as TestBot patches) so the TestBot does not report them as bad patches for failing to apply on top of Wine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 47 +++- testbot/bin/WineRunReconfig.pl | 36 +-- testbot/bin/WineRunWineTest.pl | 423 ++++++++++++++++++++++++++++ testbot/bin/build/WineReconfig.pl | 258 +++++++++++++++++ testbot/bin/build/WineTest.pl | 282 +++++++++++++++++++ testbot/ddl/update37.sql | 4 + testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/Config.pm | 9 +- testbot/lib/WineTestBot/Engine/Scheduler.pm | 3 +- testbot/lib/WineTestBot/PatchUtils.pm | 80 +++++- testbot/lib/WineTestBot/Patches.pm | 213 +++++++------- testbot/lib/WineTestBot/PendingPatchSets.pm | 14 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 5 +- testbot/lib/WineTestBot/VMs.pm | 8 +- 15 files changed, 1234 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=74cb3e27ae1272e7ba9…

1 0

Francois Gouget : testbot/web: Allow sumitting jobs to verify patches compile on Wine.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: tools Branch: master Commit: 1714aea235ef48b8dd939ca2fd1a5802d4db7e2b URL: https://source.winehq.org/git/tools.git/?a=commit;h=1714aea235ef48b8dd939ca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 15:02:41 2018 +0200 testbot/web: Allow sumitting jobs to verify patches compile on Wine. For now the Wine VMs are unchecked by default since all they do is a compilation check which is mostly redundant with the regular build step. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index afebc72..9fa252a 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -244,10 +244,14 @@ sub GenerateFields($) { $VMs->AddFilter("Type", ["win64"]); } - else + elsif ($self->{FileType} eq "exe32") { $VMs->AddFilter("Type", ["win32", "win64"]); } + else + { + $VMs->AddFilter("Type", ["win32", "win64", "wine"]); + } if ($self->{ShowAll}) { # All but the retired and deleted ones @@ -272,6 +276,10 @@ sub GenerateFields($) $Status = " [". $VM->Status ."]"; $Checked = undef; } + elsif ($VM->Type eq "wine") + { + $Checked = undef; + } if ($Checked and ($self->GetParam("Page") == 1 || $self->GetParam($FieldName))) { @@ -844,6 +852,39 @@ sub OnSubmit($) } } + if ($FileType eq "patchdlls") + { + my $Tasks; + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", ["wine"]); + my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); + foreach my $VMKey (@$SortedKeys) + { + my $VM = $VMs->GetItem($VMKey); + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + next if (!$self->GetParam($FieldName)); # skip unselected VMs + + if (!$Tasks) + { + # First create the Wine test step + my $WineStep = $Steps->Add(); + $WineStep->FileName($BaseName); + $WineStep->FileType($FileType); + $WineStep->InStaging(!1); + $WineStep->Type("build"); + $WineStep->DebugLevel($self->GetParam("DebugLevel")); + $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); + $Tasks = $WineStep->Tasks; + } + + # Then add a task for this VM + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->CmdLineArg("win32"); + $Task->Timeout($WineReconfigTimeout); + } + } + # Now save it all (or whatever's left to save) my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined($ErrMessage))

1 0

Alexandre Julliard : Wine release 3.11
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: website Branch: master Commit: 2f12f80a09fd5253521c45648c6c4873d7f4638c URL: https://source.winehq.org/git/website.git/?a=commit;h=2f12f80a09fd5253521c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 23 01:32:57 2018 +0200 Wine release 3.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018062301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018062301.xml b/news/en/2018062301.xml new file mode 100644 index 0000000..0eaff37 --- /dev/null +++ b/news/en/2018062301.xml @@ -0,0 +1,16 @@ +<news> +<date>June 23, 2018</date> +<title>Wine 3.11 Released</title> +<body> + The Wine development release 3.11 is now available. + <a href="{$root}/announce/3.11">What's new</a> in this release: +<ul> + <li>More debugger support for Wow64 processes.</li> + <li>Support for sha256/sha384 hashes in ECDSA signatures.</li> + <li>Better reporting of hyper-threaded CPUs.</li> + <li>Improvements to the standard Task Dialog.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.11.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Michael Stefaniuc : crypt32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: 207e70cdc9e050c9ca4cc1c3c72d4250f80f85ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=207e70cdc9e050c9ca4cc1c3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 22 19:50:40 2018 +0200 crypt32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 10 ++-- dlls/crypt32/tests/cert.c | 2 +- dlls/crypt32/tests/encode.c | 108 +++++++++++++++++++++----------------------- dlls/crypt32/tests/main.c | 8 ++-- dlls/crypt32/tests/msg.c | 6 +-- dlls/crypt32/tests/oid.c | 6 +-- dlls/crypt32/tests/sip.c | 9 ++-- dlls/crypt32/tests/store.c | 6 +-- dlls/crypt32/tests/str.c | 17 +++---- 9 files changed, 80 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=207e70cdc9e050c9ca4c…

1 0

Alexandre Julliard : Release 3.11.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: 58c49279f5d5ac11c0af25053f47845203dffdec URL: https://source.winehq.org/git/wine.git/?a=commit;h=58c49279f5d5ac11c0af2505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 23 01:30:20 2018 +0200 Release 3.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 611 +++++++++++++++++++++++++------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 251 insertions(+), 380 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58c49279f5d5ac11c0af…

1 0

Tag wine-3.11 : Alexandre Julliard : Release 3.11
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: refs/tags/wine-3.11 Tag: f21bc6d8ea2ce5ad49d5a00bda567cfd462dcec7 URL: https://source.winehq.org/git/wine.git/?a=tag;h=f21bc6d8ea2ce5ad49d5a00bda5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 23 01:30:20 2018 +0200 Release 3.11

1 0

Roderick Colenbrander : ntdll: Store core information by core on macOS.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: c6a71b91c5095e01eba08a6d02def259a0a46478 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6a71b91c5095e01eba08a6d… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jun 20 22:29:43 2018 -0700 ntdll: Store core information by core on macOS. The id parameter can be used for core / package lookup. On Linux we pass package or core values. On Mac, we use package for both. Use a core identifier on Mac as well. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 985f58c..e4fec63 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1811,6 +1811,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** for(p = 0; p < pkgs_no; ++p){ for(j = 0; j < cores_per_package && p * cores_per_package + j < cores_no; ++j){ ULONG_PTR mask = 0; + DWORD phys_core; for(k = 0; k < lcpu_per_core; ++k) mask |= (ULONG_PTR)1 << (j * lcpu_per_core + k); @@ -1822,7 +1823,8 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** return STATUS_NO_MEMORY; /* add new core */ - if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, p, mask)) + phys_core = p * cores_per_package + j; + if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, phys_core, mask)) return STATUS_NO_MEMORY; for(i = 1; i < 5; ++i){

1 0

Roderick Colenbrander : ntdll: Report physical cores once with proper thread mask.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: 1312c6642851d4a0c5de9a71c824800935f96691 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1312c6642851d4a0c5de9a71… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jun 20 22:29:44 2018 -0700 ntdll: Report physical cores once with proper thread mask. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 48 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index e4fec63..82f1b02 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1333,17 +1333,16 @@ static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMAT if (pdata) { DWORD i; - if(rel == RelationProcessorPackage){ - for(i=0; i<*len; i++) + for (i=0; i<*len; i++) + { + if (rel == RelationProcessorPackage && (*pdata)[i].Relationship == rel && (*pdata)[i].u.Reserved[1] == id) { - if ((*pdata)[i].Relationship!=rel || (*pdata)[i].u.Reserved[1]!=id) - continue; - (*pdata)[i].ProcessorMask |= mask; return TRUE; } - }else - i = *len; + else if (rel == RelationProcessorCore && (*pdata)[i].Relationship == rel && (*pdata)[i].u.Reserved[1] == id) + return TRUE; + } while(*len == *pmax_len) { @@ -1369,6 +1368,10 @@ static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMAT dataex->u.Processor.GroupMask[0].Mask |= mask; return TRUE; } + else if (rel == RelationProcessorCore && dataex->Relationship == rel && dataex->u.Processor.Reserved[1] == id) + { + return TRUE; + } ofs += dataex->Size; } @@ -1554,6 +1557,9 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** for(i=beg; i<=end; i++) { + DWORD phys_core = 0; + ULONG_PTR thread_mask = 0; + if(i > 8*sizeof(ULONG_PTR)) { FIXME("skipping logical processor %d\n", i); @@ -1574,15 +1580,35 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** return STATUS_NO_MEMORY; } - sprintf(name, core_info, i, "core_id"); + /* Sysfs enumerates logical cores (and not physical cores), but Windows enumerates + * by physical core. Upon enumerating a logical core in sysfs, we register a physical + * core and all its logical cores. In order to not report physical cores multiple + * times, we pass a unique physical core ID to logical_proc_info_add_by_id and let + * that call figure out any duplication. + * Obtain a unique physical core ID from the first element of thread_siblings_list. + * This list provides logical cores sharing the same physical core. The IDs are based + * on kernel cpu core numbering as opposed to a hardware core ID like provided through + * 'core_id', so are suitable as a unique ID. + */ + sprintf(name, core_info, i, "thread_siblings_list"); f = fopen(name, "r"); if(f) { - fscanf(f, "%u", &r); + fscanf(f, "%d%c", &phys_core, &op); + fclose(f); + } + else phys_core = i; + + /* Mask of logical threads sharing same physical core in kernel core numbering. */ + sprintf(name, core_info, i, "thread_siblings"); + f = fopen(name, "r"); + if(f) + { + fscanf(f, "%lx", &thread_mask); fclose(f); } - else r = i; - if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, r, (ULONG_PTR)1 << i)) + else thread_mask = 1<<i; + if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, phys_core, thread_mask)) { fclose(fcpu_list); return STATUS_NO_MEMORY;

1 0

Roderick Colenbrander : ntdll: GetLogicalProcessorInformationEx report LTP_PC_SMT for SMT cores.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: 13bd1b9f752560083ef16bd9ddd56823bc88309c URL: https://source.winehq.org/git/wine.git/?a=commit;h=13bd1b9f752560083ef16bd9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jun 20 22:29:45 2018 -0700 ntdll: GetLogicalProcessorInformationEx report LTP_PC_SMT for SMT cores. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 5 ++++- include/winnt.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 82f1b02..5712e4c 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1388,7 +1388,10 @@ static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMAT dataex->Relationship = rel; dataex->Size = log_proc_ex_size_plus(sizeof(PROCESSOR_RELATIONSHIP)); - dataex->u.Processor.Flags = 0; /* TODO */ + if (rel == RelationProcessorCore) + dataex->u.Processor.Flags = count_bits(mask) > 1 ? LTP_PC_SMT : 0; + else + dataex->u.Processor.Flags = 0; dataex->u.Processor.EfficiencyClass = 0; dataex->u.Processor.GroupCount = 1; dataex->u.Processor.GroupMask[0].Mask = mask; diff --git a/include/winnt.h b/include/winnt.h index 4492f86..80a2fc3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6050,6 +6050,8 @@ typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP RelationAll = 0xffff } LOGICAL_PROCESSOR_RELATIONSHIP; +#define LTP_PC_SMT 0x1 + typedef enum _PROCESSOR_CACHE_TYPE { CacheUnified,

1 0