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

Francois Gouget : testbot/web: Allow sumitting jobs to verify patches compile on Wine.
by Alexandre Julliard June 25, 2018

June 25, 2018

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

Francois Gouget : testbot: Build the per-module test unit list from the list of Wine files.
by Alexandre Julliard June 25, 2018

June 25, 2018

Module: tools Branch: master Commit: 53d36c0be43fdcff1422bf95c1113217c13a03c7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=53d36c0be43fdcff1422bf9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 15:00:07 2018 +0200 testbot: Build the per-module test unit list from the list of Wine files. This also caches winefiles.txt so it is only reloaded when it changes. Also stop generating and retrieving testlist.txt since it is not needed anymore. If desired testlist.txt can be deleted for cleanup. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 10 ------ testbot/lib/WineTestBot/PatchUtils.pm | 62 +++++++++++++++++------------------ 2 files changed, 31 insertions(+), 41 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2950799..2e338c9 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -414,16 +414,6 @@ if ($NewStatus eq "completed") } } - Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n"); - if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt")) - { - copy "$TaskDir/testlist.txt", "$DataDir/latest/testlist.txt"; - } - elsif (!defined $TAError) - { - $TAError = "An error occurred while retrieving the test list: ". $TA->GetLastError(); - } - Debug(Elapsed($Start), " Retrieving the list of Wine files '$TaskDir/winefiles.txt'\n"); if ($TA->GetFile("latest/winefiles.txt", "$TaskDir/winefiles.txt")) { diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index b6ea54b..725d53f 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -58,8 +58,8 @@ my $IgnoredPathsRe = join('|', =item C<UpdateWineData()> -Updates the summary information about the Wine source such as the list of -tests (testlist.txt) and the full list of Wine files. +Updates information about the Wine source, such as the list of Wine files, +for use by the TestBot server. =back =cut @@ -72,51 +72,51 @@ sub UpdateWineData($) my $ErrMessage = `cd '$WineDir' && git ls-tree -r --name-only HEAD 2>&1 >'$DataDir/latest/winefiles.txt'`; return $ErrMessage if ($? != 0); - - if (open(my $fh, ">", "$DataDir/testlist.txt")) - { - foreach my $TestFile (glob("$WineDir/*/*/tests/*.c"), - glob("$WineDir/*/*/tests/*.spec")) - { - next if ($TestFile =~ m=/testlist\.c$=); - $TestFile =~ s=^$WineDir/==; - print $fh "$TestFile\n"; - } - close($fh); - return undef; - } - - return "Could not open 'testlist.txt' for writing: $!"; } +my $_TimeStamp; +my $_TestList; + =pod =over 12 -=item C<GetTestList()> +=item C<_LoadWineFiles()> -Returns a hashtable containing the list of the source files for a given module. -This structure is built from the latest/testlist.txt file. +Reads latest/winefiles.txt to build a per-module hashtable of the test unit +files. =back =cut -sub GetTestList() +sub _LoadWineFiles() { - my $TestList = {}; - if (open(my $File, "<", "$DataDir/latest/testlist.txt")) + my $FileName = "$DataDir/latest/winefiles.txt"; + my $MTime = (stat($FileName))[9] || 0; + + if ($_TestList and $_TimeStamp == $MTime) { - while (my $TestFileName = <$File>) + # The file has not changed since we loaded it + return; + } + + $_TimeStamp = $MTime; + $_TestList = {}; + if (open(my $fh, "<", $FileName)) + { + while (my $Line = <$fh>) { - chomp $TestFileName; - if ($TestFileName =~ m~^\w+/([^/]+)/tests/([^/]+)$~) + chomp $Line; + + if ($Line =~ m~^\w+/([^/]+)/tests/([^/]+)$~) { my ($Module, $File) = ($1, $2); - $TestList->{$Module}->{$File} = 1; + next if ($File eq "testlist.c"); + next if ($File !~ /\.(?:c|spec)$/); + $_TestList->{$Module}->{$File} = 1; } } - close($File); + close($fh); } - return $TestList; } sub _HandleFile($$$) @@ -154,8 +154,7 @@ sub _HandleFile($$$) if (!$Tests->{$Module}->{Files}) { - my $TestList = ( $Impacts->{TestList} ||= GetTestList() ); - foreach my $File (keys %{$TestList->{$Module}}) + foreach my $File (keys %{$_TestList->{$Module}}) { $Tests->{$Module}->{Files}->{$File} = 0; # not modified } @@ -192,6 +191,7 @@ sub GetPatchImpact($;$$) NoUnits => $NoUnits, Tests => {}, }; + _LoadWineFiles(); if ($PastImpacts) {

1 0

Zebediah Figura : winetest: Allow hyphens in test filenames.
by Alexandre Julliard June 25, 2018

June 25, 2018

Module: tools Branch: master Commit: 0d7e1f53e53163cdf6fed24eb177203a810a1cda URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d7e1f53e53163cdf6fed24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 24 11:54:14 2018 -0500 winetest: Allow hyphens in test filenames. For vulkan-1:vulkan. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 7416317..4db4f85 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -583,7 +583,7 @@ while ($line = <IN>) { next if ($line =~ /^\s*$/); chomp $line; $line =~ s/\r+$//; - if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9]+) (-|[.0-9a-f]+)\r?$%) + if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)\r?$%) { my ($l_dll, $l_unit, $l_type, $l_source, $l_rev) = ($1, $2, $3, $4, $5);

1 0

Alexandre Julliard : Wine release 3.11
by Alexandre Julliard June 22, 2018

June 22, 2018

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 June 22, 2018

June 22, 2018

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

Tag wine-3.11 : Alexandre Julliard : Release 3.11
by Alexandre Julliard June 22, 2018

June 22, 2018

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

Alexandre Julliard : Release 3.11.
by Alexandre Julliard June 22, 2018

June 22, 2018

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

Józef Kucia : ninput: Add RegisterOutputCallbackInteractionContext() stub.
by Alexandre Julliard June 22, 2018

June 22, 2018

Module: wine Branch: master Commit: bf04ee668556e8e13ddabc4ae0dc80ee5a4e1191 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf04ee668556e8e13ddabc4a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 21 16:19:46 2018 +0200 ninput: Add RegisterOutputCallbackInteractionContext() stub. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ninput/main.c | 13 +++++++++++++ dlls/ninput/ninput.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 0170374..5d2be62 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -148,6 +148,19 @@ HRESULT WINAPI SetInteractionConfigurationInteractionContext(HINTERACTIONCONTEXT return S_OK; } +HRESULT WINAPI RegisterOutputCallbackInteractionContext(HINTERACTIONCONTEXT handle, + INTERACTION_CONTEXT_OUTPUT_CALLBACK callback, void *data) +{ + struct interaction_context *context = context_from_handle(handle); + + FIXME("context %p, callback %p, data %p: stub!.\n", context, callback, data); + + if (!context) + return E_HANDLE; + + return S_OK; +} + HRESULT WINAPI ProcessInertiaInteractionContext(HINTERACTIONCONTEXT context) { FIXME("context %p: stub!\n", context); diff --git a/dlls/ninput/ninput.spec b/dlls/ninput/ninput.spec index 70d296c..e289787 100644 --- a/dlls/ninput/ninput.spec +++ b/dlls/ninput/ninput.spec @@ -12,7 +12,7 @@ @ stub ProcessBufferedPacketsInteractionContext @ stdcall ProcessInertiaInteractionContext(ptr) @ stub ProcessPointerFramesInteractionContext -@ stub RegisterOutputCallbackInteractionContext +@ stdcall RegisterOutputCallbackInteractionContext(ptr ptr ptr) @ stub RemovePointerInteractionContext @ stub ResetInteractionContext @ stub SetCrossSlideParametersInteractionContext

1 0

Józef Kucia : ninput: Add SetInteractionConfigurationInteractionContext() stub.
by Alexandre Julliard June 22, 2018

June 22, 2018

Module: wine Branch: master Commit: b86e7dfccdadf7d134bdb3cea2f1f119916ca1e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b86e7dfccdadf7d134bdb3ce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 21 16:19:45 2018 +0200 ninput: Add SetInteractionConfigurationInteractionContext() stub. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ninput/main.c | 17 +++++++++++++++++ dlls/ninput/ninput.spec | 2 +- dlls/ninput/tests/ninput.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 90f9e7e..0170374 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -131,6 +131,23 @@ HRESULT WINAPI SetPropertyInteractionContext(HINTERACTIONCONTEXT handle, } } +HRESULT WINAPI SetInteractionConfigurationInteractionContext(HINTERACTIONCONTEXT handle, + UINT32 count, const INTERACTION_CONTEXT_CONFIGURATION *configuration) +{ + struct interaction_context *context = context_from_handle(handle); + + FIXME("context %p, count %u, configuration %p: stub!.\n", context, count, configuration); + + if (!context) + return E_HANDLE; + if (!count) + return E_INVALIDARG; + if (!configuration) + return E_POINTER; + + return S_OK; +} + HRESULT WINAPI ProcessInertiaInteractionContext(HINTERACTIONCONTEXT context) { FIXME("context %p: stub!\n", context); diff --git a/dlls/ninput/ninput.spec b/dlls/ninput/ninput.spec index 166e3d1..70d296c 100644 --- a/dlls/ninput/ninput.spec +++ b/dlls/ninput/ninput.spec @@ -17,7 +17,7 @@ @ stub ResetInteractionContext @ stub SetCrossSlideParametersInteractionContext @ stub SetInertiaParameterInteractionContext -@ stub SetInteractionConfigurationInteractionContext +@ stdcall SetInteractionConfigurationInteractionContext(ptr long ptr) @ stub SetMouseWheelParameterInteractionContext @ stub SetPivotInteractionContext @ stdcall SetPropertyInteractionContext(ptr long long) diff --git a/dlls/ninput/tests/ninput.c b/dlls/ninput/tests/ninput.c index 156e3e8..7fd3893 100644 --- a/dlls/ninput/tests/ninput.c +++ b/dlls/ninput/tests/ninput.c @@ -82,8 +82,44 @@ static void test_properties(void) ok(hr == S_OK, "Failed to destroy context, hr %#x.\n", hr); } +static void test_configuration(void) +{ + HINTERACTIONCONTEXT context; + HRESULT hr; + + static const INTERACTION_CONTEXT_CONFIGURATION config[] = + { + { + INTERACTION_ID_MANIPULATION, + INTERACTION_CONFIGURATION_FLAG_MANIPULATION | + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_TRANSLATION_X | + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_TRANSLATION_Y | + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_SCALING | + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_TRANSLATION_INERTIA | + INTERACTION_CONFIGURATION_FLAG_MANIPULATION_SCALING_INERTIA + }, + }; + + hr = CreateInteractionContext(&context); + ok(hr == S_OK, "Failed to create context, hr %#x.\n", hr); + + hr = SetInteractionConfigurationInteractionContext(NULL, 0, NULL); + ok(hr == E_HANDLE, "Got hr %#x.\n", hr); + hr = SetInteractionConfigurationInteractionContext(context, 0, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = SetInteractionConfigurationInteractionContext(context, 1, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = SetInteractionConfigurationInteractionContext(context, ARRAY_SIZE(config), config); + ok(hr == S_OK, "Failed to set configuration, hr %#x.\n", hr); + + hr = DestroyInteractionContext(context); + ok(hr == S_OK, "Failed to destroy context, hr %#x.\n", hr); +} + START_TEST(ninput) { test_context(); test_properties(); + test_configuration(); }

1 0

Józef Kucia : ninput: Add ProcessInertiaInteractionContext() stub.
by Alexandre Julliard June 22, 2018

June 22, 2018

Module: wine Branch: master Commit: 116ad14952633346a7d37952cc5dd3a46ad69e6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=116ad14952633346a7d37952… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 21 16:19:43 2018 +0200 ninput: Add ProcessInertiaInteractionContext() stub. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ninput/main.c | 6 ++++++ dlls/ninput/ninput.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 1aa3c46..932d159 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -72,6 +72,12 @@ HRESULT WINAPI DestroyInteractionContext(HINTERACTIONCONTEXT handle) return S_OK; } +HRESULT WINAPI ProcessInertiaInteractionContext(HINTERACTIONCONTEXT context) +{ + FIXME("context %p: stub!\n", context); + return E_NOTIMPL; +} + BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { TRACE("(%p, %d, %p)\n", inst, reason, reserved); diff --git a/dlls/ninput/ninput.spec b/dlls/ninput/ninput.spec index 0717cb1..fe7c6b3 100644 --- a/dlls/ninput/ninput.spec +++ b/dlls/ninput/ninput.spec @@ -10,7 +10,7 @@ @ stub GetPropertyInteractionContext @ stub GetStateInteractionContext @ stub ProcessBufferedPacketsInteractionContext -@ stub ProcessInertiaInteractionContext +@ stdcall ProcessInertiaInteractionContext(ptr) @ stub ProcessPointerFramesInteractionContext @ stub RegisterOutputCallbackInteractionContext @ stub RemovePointerInteractionContext

1 0