March 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : amstream: Forbid changing the multimedia stream mode.
by Alexandre Julliard March 5, 2020

March 5, 2020

Module: wine Branch: master Commit: 6cb835f852bcf5eb8b65a6a8bbdfa26c7e29bc92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb835f852bcf5eb8b65a6a8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 4 22:33:36 2020 -0600 amstream: Forbid changing the multimedia stream mode. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 8 ++++++++ dlls/amstream/tests/amstream.c | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index e62c930a39..07c037505e 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -39,6 +39,7 @@ struct multimedia_stream IMediaControl* media_control; IMediaStreamFilter *filter; IPin* ipin; + BOOL initialized; STREAM_TYPE type; OAEVENT event; }; @@ -250,10 +251,17 @@ static HRESULT WINAPI multimedia_stream_Initialize(IAMMultiMediaStream *iface, return E_INVALIDARG; } + if (mmstream->initialized && type != mmstream->type) + { + WARN("Attempt to change type from %u, returning E_INVALIDARG.\n", mmstream->type); + return E_INVALIDARG; + } + if (graph && FAILED(hr = create_graph(mmstream, graph))) return hr; mmstream->type = type; + mmstream->initialized = TRUE; return S_OK; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index e2c00ebc3a..a55884d8ab 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1497,9 +1497,9 @@ static void test_initialize(void) hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_WRITE, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_TRANSFORM, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ret_graph = (IGraphBuilder *)0xdeadbeef; hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &ret_graph); @@ -1511,7 +1511,7 @@ static void test_initialize(void) type = 0xdeadbeef; hr = IMediaStream_GetInformation(stream, NULL, &type); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(type == STREAMTYPE_READ, "Got type %u.\n", type); + ok(type == STREAMTYPE_READ, "Got type %u.\n", type); IMediaStream_Release(stream); ret_graph = NULL; @@ -1531,9 +1531,9 @@ static void test_initialize(void) hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_WRITE, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_TRANSFORM, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ret_graph = (IGraphBuilder *)0xdeadbeef; hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &ret_graph); @@ -1545,7 +1545,7 @@ static void test_initialize(void) type = 0xdeadbeef; hr = IMediaStream_GetInformation(stream, NULL, &type); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(type == STREAMTYPE_WRITE, "Got type %u.\n", type); + ok(type == STREAMTYPE_WRITE, "Got type %u.\n", type); IMediaStream_Release(stream); ref = IAMMultiMediaStream_Release(mmstream); @@ -1559,9 +1559,9 @@ static void test_initialize(void) hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_TRANSFORM, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_WRITE, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ret_graph = (IGraphBuilder *)0xdeadbeef; hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &ret_graph); @@ -1573,7 +1573,7 @@ static void test_initialize(void) type = 0xdeadbeef; hr = IMediaStream_GetInformation(stream, NULL, &type); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(type == STREAMTYPE_TRANSFORM, "Got type %u.\n", type); + ok(type == STREAMTYPE_TRANSFORM, "Got type %u.\n", type); IMediaStream_Release(stream); ref = IAMMultiMediaStream_Release(mmstream); @@ -1651,9 +1651,9 @@ static void test_initialize(void) hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_WRITE, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_TRANSFORM, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); IMediaStreamFilter_Release(filter); ref = IAMMultiMediaStream_Release(mmstream);

1 0

Zebediah Figura : amstream: Forbid changing the graph in IAMMultiMediaStream::Initialize().
by Alexandre Julliard March 5, 2020

March 5, 2020

Module: wine Branch: master Commit: fa62cde374ce438e471d60735a8d944f620ce795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa62cde374ce438e471d6073… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 4 22:33:35 2020 -0600 amstream: Forbid changing the graph in IAMMultiMediaStream::Initialize(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 6 ++++++ dlls/amstream/tests/amstream.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 9ca38d9fa4..e62c930a39 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -244,6 +244,12 @@ static HRESULT WINAPI multimedia_stream_Initialize(IAMMultiMediaStream *iface, TRACE("mmstream %p, type %u, flags %#x, graph %p.\n", mmstream, type, flags, graph); + if (graph && mmstream->graph) + { + WARN("Graph already initialized, returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + if (graph && FAILED(hr = create_graph(mmstream, graph))) return hr; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 3555eff970..e2c00ebc3a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1646,6 +1646,15 @@ static void test_initialize(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!got_add_filter, "Got %d calls to IGraphBuilder::AddFilter().\n", got_add_filter); + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, (IGraphBuilder *)&graph); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_WRITE, 0, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_TRANSFORM, 0, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + IMediaStreamFilter_Release(filter); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Zebediah Figura : amstream: Set the multimedia stream graph in IAMMultiMediaStream::Initialize() only if a graph is specified.
by Alexandre Julliard March 5, 2020

March 5, 2020

Module: wine Branch: master Commit: 20004d1557651b27f23e78223edabb654a2c55cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=20004d1557651b27f23e7822… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 4 22:33:34 2020 -0600 amstream: Set the multimedia stream graph in IAMMultiMediaStream::Initialize() only if a graph is specified. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 2 +- dlls/amstream/tests/amstream.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 43e3ee9057..9ca38d9fa4 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -244,7 +244,7 @@ static HRESULT WINAPI multimedia_stream_Initialize(IAMMultiMediaStream *iface, TRACE("mmstream %p, type %u, flags %#x, graph %p.\n", mmstream, type, flags, graph); - if (FAILED(hr = create_graph(mmstream, graph))) + if (graph && FAILED(hr = create_graph(mmstream, graph))) return hr; mmstream->type = type; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 511cd1eadd..3555eff970 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1504,7 +1504,7 @@ static void test_initialize(void) ret_graph = (IGraphBuilder *)0xdeadbeef; hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &ret_graph); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!ret_graph, "Got unexpected graph %p.\n", ret_graph); + ok(!ret_graph, "Got unexpected graph %p.\n", ret_graph); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1538,7 +1538,7 @@ static void test_initialize(void) ret_graph = (IGraphBuilder *)0xdeadbeef; hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &ret_graph); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!ret_graph, "Got unexpected graph %p.\n", ret_graph); + ok(!ret_graph, "Got unexpected graph %p.\n", ret_graph); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1566,7 +1566,7 @@ static void test_initialize(void) ret_graph = (IGraphBuilder *)0xdeadbeef; hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &ret_graph); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!ret_graph, "Got unexpected graph %p.\n", ret_graph); + ok(!ret_graph, "Got unexpected graph %p.\n", ret_graph); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : amstream: Explicitly create the graph in IAMMultiMediaStream::OpenFile().
by Alexandre Julliard March 5, 2020

March 5, 2020

Module: wine Branch: master Commit: 8e4f8771af34fc248716038e9db5c48ccac11d5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e4f8771af34fc248716038e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 4 22:33:33 2020 -0600 amstream: Explicitly create the graph in IAMMultiMediaStream::OpenFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index a14771ec75..43e3ee9057 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -364,7 +364,11 @@ static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, /* If Initialize was not called before, we do it here */ if (!This->graph) + { ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); + if (SUCCEEDED(ret)) + ret = create_graph(This, NULL); + } if (SUCCEEDED(ret)) ret = IGraphBuilder_AddSourceFilter(This->graph, filename, L"Source", &BaseFilter);

1 0

Francois Gouget : testbot: Improve the patch subject parsing.
by Alexandre Julliard March 5, 2020

March 5, 2020

Module: tools Branch: master Commit: dd749876d69ccfdc28a4bcf1502c999fc626e5a8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dd749876d69ccfdc28a4bcf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 4 21:21:09 2020 +0100 testbot: Improve the patch subject parsing. This supports a lot more subject formats and better recognizes the patch series. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48353 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 78 ++++++++-- testbot/lib/WineTestBot/PendingPatchSets.pm | 10 +- testbot/tests/TestPatches | 220 ++++++++++++++++++++++++++++ 3 files changed, 293 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=dd749876d69ccfdc28a…

1 0

Francois Gouget : winetest/dissect: Fix handling of near timeouts.
by Alexandre Julliard March 5, 2020

March 5, 2020

Module: tools Branch: master Commit: 24ec563556c4f359a9049643c8d80ec97d197468 URL: https://source.winehq.org/git/tools.git/?a=commit;h=24ec563556c4f359a904964… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 4 09:47:57 2020 +0100 winetest/dissect: Fix handling of near timeouts. Sometimes WineTest times out waiting for a test but that test completes at almost the same time so that there is still a valid result line. This was causing dissect to complain about the inconsistency between the test's failure count and the 258 'exit code'. With this change dissect matches the TestBot Wine report parser. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 87fdc65..8f30ccd 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -739,17 +739,17 @@ while ($line = <IN>) { my $class = $l_rc ? "failed" : ""; add_test_line($class, escapeHTML($line)); - if ((!$l_pid and !%pids) or ($l_pid and !$pids{$l_pid} and !$pids{0})) + if ($l_rc == 258) + { + add_test_line("end", "Test failed: timed out"); + $summary = "failed 258"; + $extra_failures++; + $broken = 1; + } + elsif ((!$l_pid and !%pids) or ($l_pid and !$pids{$l_pid} and !$pids{0})) { # The main summary line is missing - if ($l_rc == 258) - { - add_test_line("end", "Test failed: timed out"); - $summary = "failed 258"; - $extra_failures++; - $broken = 1; - } - elsif ($l_rc & 0xc0000000) + if ($l_rc & 0xc0000000) { add_test_line("end", sprintf("Test failed: crash (%08x)", $l_rc & 0xffffffff)); $summary = "failed crash";

1 0

Francois Gouget : testbot: Allow specifying extra mission capabilities.
by Alexandre Julliard March 5, 2020

March 5, 2020

Module: tools Branch: master Commit: 17e6b89d14e6bb90bf611e323f444cfe6268bb63 URL: https://source.winehq.org/git/tools.git/?a=commit;h=17e6b89d14e6bb90bf611e3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 4 16:30:11 2020 +0100 testbot: Allow specifying extra mission capabilities. This allows specifying extra builds or locales that a VM can handle, without having these used for every mailing list patch or WineTest run. The extra capabilities can then be used when manually scheduling a job on the TestBot. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47853 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/ddl/update42.sql | 5 +++++ testbot/ddl/winetestbot.sql | 1 + testbot/doc/winetestbot-schema.dia | 23 +++++++++++++++++++++++ testbot/lib/WineTestBot/Missions.pm | 26 ++++++++++++++++++++++++-- testbot/lib/WineTestBot/VMs.pm | 10 +++++++++- testbot/web/Submit.pl | 2 +- testbot/web/admin/VMDetails.pl | 3 ++- 7 files changed, 65 insertions(+), 5 deletions(-) diff --git a/testbot/ddl/update42.sql b/testbot/ddl/update42.sql new file mode 100644 index 0000000..f38833e --- /dev/null +++ b/testbot/ddl/update42.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE VMs + ADD MissionCaps VARCHAR(512) NOT NULL + AFTER Missions; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index e6114e0..e1cb571 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -49,6 +49,7 @@ CREATE TABLE VMs Type ENUM('win32', 'win64', 'build', 'wine') NOT NULL, Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, Missions VARCHAR(256) NOT NULL, + MissionCaps VARCHAR(512) NOT NULL, Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, Errors INT(2) NULL, ChildPid INT(5) NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 372d3bf..81ab656 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2406,6 +2406,29 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#MissionCaps#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(512)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#Status#</dia:string> diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 4f83875..810eb4d 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -142,9 +142,10 @@ sub GetTaskMissionDescription($$) return $Description; } -sub GetMissionCaps($) +sub GetMissionCaps($$) { - my ($MissionStatement) = @_; + my ($MissionStatement, $MissionCaps) = @_; + my $Capabilities = { build => {}, lang => {} }; # Extract capabilities from the mission statement @@ -165,6 +166,27 @@ sub GetMissionCaps($) } } } + + # Parse the additional capabilities + foreach my $Capability (split /,/, $MissionCaps || "") + { + if ($Capability =~ s/^lang=//) + { + foreach my $Lang (split /[|]/, $Capability) + { + $Capabilities->{lang}->{$Lang} = 1; + } + } + elsif ($Capability =~ /^(?:win32|wow32|wow64)$/) + { + $Capabilities->{build}->{$Capability} = 1; + } + else + { + $ErrMessage ||= "Invalid option capability '$Capability'"; + } + } + if (%{$Capabilities->{lang}}) { # en_US is the default for Wine VMs and must always be supported diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6c3c8b7..6dd1ff2 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -311,6 +311,7 @@ sub ResetModified($) $self->SUPER::ResetModified(); $self->{OldType} = $self->Type; $self->{OldMissions} = $self->Missions; + $self->{OldMissionCaps} = $self->MissionCaps; } my $_SupportedMissions = { @@ -347,7 +348,8 @@ sub Validate($) return ("Role", "Only win32, win64 and wine VMs can have a role of '" . $self->Role . "'"); } if ($self->ValuesDiffer($self->{OldType}, $self->Type) or - $self->ValuesDiffer($self->{OldMissions}, $self->Missions)) + $self->ValuesDiffer($self->{OldMissions}, $self->Missions) or + $self->ValuesDiffer($self->{OldMissionCaps}, $self->MissionCaps)) { my ($ErrMessage, $Missions) = ParseMissionStatement($self->Missions); return ("Missions", $ErrMessage) if (defined $ErrMessage); @@ -366,8 +368,13 @@ sub Validate($) } } } + + ($ErrMessage, my $_Caps) = GetMissionCaps("", $self->MissionCaps); + return ("MissionCaps", $ErrMessage) if (defined $ErrMessage); + $self->{OldType} = $self->Type; $self->{OldMissions} = $self->Missions; + $self->{OldMissionCaps} = $self->MissionCaps; } return $self->SUPER::Validate(); @@ -734,6 +741,7 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build', 'wine']), CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), CreateBasicPropertyDescriptor("Missions", "Missions", !1, 1, "A", 256), + CreateBasicPropertyDescriptor("MissionCaps", "Mission Capabilities", !1, !1, "A", 512), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), CreateBasicPropertyDescriptor("Errors", "Errors", !1, !1, "N", 2), CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index f76ca6e..5e9a61e 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -484,7 +484,7 @@ sub _initialize($$$) foreach my $VMKey (@$SortedKeys) { my $VM = $VMs->GetItem($VMKey); - my ($ErrMessage, $Caps) = GetMissionCaps($VM->Missions); + my ($ErrMessage, $Caps) = GetMissionCaps($VM->Missions, $VM->MissionCaps); LogMsg "$ErrMessage\n" if (defined $ErrMessage); my @Builds = $VM->Type eq "wine" ? keys %{$Caps->{build}} : ("vm"); diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 095de3a..27ffd2f 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -74,7 +74,7 @@ sub GenerateFooter($) print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; print "<tbody><tr><td class='Record'>\n"; - print "The Missions syntax is mission1:mission2:...|mission3|... where mission1 and mission2 will be run in the same task, and mission3 in a separate task. \n"; + print "The Missions syntax is mission1:mission2:...|mission3|... where mission1 and mission2 will be run in the same task, and mission3 in a separate task. \n"; print "Each mission is composed of a build and options separated by commas: build,option1=value,option2,.... The value can be omitted for boolean options and defaults to true. \n"; print "The supported builds are build for build VMs; exe32 and exe64 for Windows VMs; win32, wow32 and wow64 for Wine VMs.\n"; print "On Wine VMs: \n"; @@ -82,6 +82,7 @@ sub GenerateFooter($) print "The lang option can be set to run the tests in the specified \$LANG locale. The default is en_US (.UTF-8 can be omitted). \n"; print "The dir option can be set to specify the directory in which to run the tests. A path starting with a single letter followed by a slash specifies the drive, for instance 'c/' for 'c:' (the default). \n"; print "If set, the nosubmit option specifies that the WineTest results should not be published online.\n"; + print "The MissionCaps syntax is option1,option2=value1|value2,... where option1 is either a build or an option name, and option2 is the name of an option that can be set to either value1 or value2. \n"; print "</td></tr></tbody>\n"; print "</table></div>\n"; $self->SUPER::GenerateFooter();

1 0

Jacek Caban : configure: Try using explicit target option for cross compiling.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 0eea1b09d3f619ea35b6b4a70b4091eae85c4834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eea1b09d3f619ea35b6b4a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 17:15:58 2020 +0100 configure: Try using explicit target option for cross compiling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 44 ++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 14 ++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/configure b/configure index 564a296198..feba035107 100755 --- a/configure +++ b/configure @@ -9812,6 +9812,50 @@ $as_echo "$wine_cv_crosscc" >&6; } esac shift done + + llvm_target=$CROSSTARGET + if test -z "$llvm_target" + then + case $host_cpu in + *i[3456789]86*) llvm_target=i686-windows-gnu ;; + *) llvm_target=$host_cpu-windows-gnu ;; + esac + fi + as_ac_var=`$as_echo "ac_cv_crosscflags_-target $llvm_target -fuse-ld=lld" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -target $llvm_target -fuse-ld=lld" >&5 +$as_echo_n "checking whether the cross-compiler supports -target $llvm_target -fuse-ld=lld... " >&6; } +if eval \${$as_ac_var+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -target $llvm_target -fuse-ld=lld" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void __stdcall __delayLoadHelper2(void *descr, void *addr) {} int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_var=yes" +else + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + CROSSTARGET=$llvm_target + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -target $CROSSTARGET" + CFLAGS="$CFLAGS -fuse-ld=lld" +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-strict-aliasing" >&5 $as_echo_n "checking whether the cross-compiler supports -fno-strict-aliasing... " >&6; } diff --git a/configure.ac b/configure.ac index 47d2b750c0..e411c2eb0e 100644 --- a/configure.ac +++ b/configure.ac @@ -1041,6 +1041,20 @@ then esac shift done + + dnl Check if cross compiler supports -target argument + llvm_target=$CROSSTARGET + if test -z "$llvm_target" + then + case $host_cpu in + *i[[3456789]]86*) llvm_target=i686-windows-gnu ;; + *) llvm_target=$host_cpu-windows-gnu ;; + esac + fi + WINE_TRY_CROSSCFLAGS([-target $llvm_target -fuse-ld=lld], + [CROSSTARGET=$llvm_target + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -target $CROSSTARGET" + CFLAGS="$CFLAGS -fuse-ld=lld"]) fi WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options

1 0

Jacek Caban : winebuild: Add an option to build a static library.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: c0467a14700cf874b81b17dfeedd18515183197b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0467a14700cf874b81b17df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 17:15:34 2020 +0100 winebuild: Add an option to build a static library. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 8 ++++---- tools/winebuild/main.c | 12 +++++++++++- tools/winebuild/winebuild.man.in | 3 +++ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 29cd997b96..65493ec37f 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -303,7 +303,7 @@ extern void output_get_pc_thunk(void); extern void output_module( DLLSPEC *spec ); extern void output_stubs( DLLSPEC *spec ); extern void output_imports( DLLSPEC *spec ); -extern void output_import_lib( DLLSPEC *spec, char **argv ); +extern void output_static_lib( DLLSPEC *spec, char **argv ); extern void output_exports( DLLSPEC *spec ); extern int load_res32_file( const char *name, DLLSPEC *spec ); extern void output_resources( DLLSPEC *spec ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c4dc31957d..04ab433dd6 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1539,16 +1539,16 @@ static void build_unix_import_lib( DLLSPEC *spec ) } /* output an import library for a Win32 module and additional object files */ -void output_import_lib( DLLSPEC *spec, char **argv ) +void output_static_lib( DLLSPEC *spec, char **argv ) { if (target_platform == PLATFORM_WINDOWS) { - build_windows_import_lib( spec ); - if (argv[0]) build_library( output_file_name, argv, 0 ); + if (spec) build_windows_import_lib( spec ); + if (argv[0] || !spec) build_library( output_file_name, argv, !spec ); } else { - build_unix_import_lib( spec ); + if (spec) build_unix_import_lib( spec ); build_library( output_file_name, argv, 1 ); } } diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index e30ecdd4b5..81f7678eae 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -113,6 +113,7 @@ enum exec_mode_values MODE_EXE, MODE_DEF, MODE_IMPLIB, + MODE_STATICLIB, MODE_BUILTIN, MODE_RESOURCES }; @@ -299,6 +300,7 @@ static const char usage_str[] = " --def Build a .def file from a .spec file\n" " --exe Build an executable from object files\n" " --implib Build an import library\n" +" --staticlib Build a static library\n" " --builtin Mark a library as a Wine builtin\n" " --resources Build a .o or .res file for the resource files\n\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; @@ -320,6 +322,7 @@ enum long_options_values LONG_OPT_NXCOMPAT, LONG_OPT_RESOURCES, LONG_OPT_SAVE_TEMPS, + LONG_OPT_STATICLIB, LONG_OPT_SUBSYSTEM, LONG_OPT_VERSION }; @@ -332,6 +335,7 @@ static const struct option long_options[] = { "def", 0, 0, LONG_OPT_DEF }, { "exe", 0, 0, LONG_OPT_EXE }, { "implib", 0, 0, LONG_OPT_IMPLIB }, + { "staticlib", 0, 0, LONG_OPT_STATICLIB }, { "builtin", 0, 0, LONG_OPT_BUILTIN }, { "as-cmd", 1, 0, LONG_OPT_ASCMD }, { "cc-cmd", 1, 0, LONG_OPT_CCCMD }, @@ -501,6 +505,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_IMPLIB: set_exec_mode( MODE_IMPLIB ); break; + case LONG_OPT_STATICLIB: + set_exec_mode( MODE_STATICLIB ); + break; case LONG_OPT_BUILTIN: set_exec_mode( MODE_BUILTIN ); break; @@ -685,7 +692,10 @@ int main(int argc, char **argv) case MODE_IMPLIB: if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; - output_import_lib( spec, argv ); + output_static_lib( spec, argv ); + break; + case MODE_STATICLIB: + output_static_lib( NULL, argv ); break; case MODE_BUILTIN: if (!argv[0]) fatal_error( "missing file argument for --builtin option\n" ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 4da48ffa81..29a17484ad 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -51,6 +51,9 @@ Build a .a import library from a spec file. The .spec file is specified via the \fB-E\fR option. If the output library name ends in .delay.a, a delayed import library is built. .TP +.BI \--staticlib +Build a .a static library from object files. +.TP .BI \--builtin Mark a PE module as a Wine builtin module, by adding the "Wine builtin DLL" signature string after the DOS header.

1 0

Jacek Caban : winebuild: Also try llvm variants of tools in find_tool.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: d473611469e1590c10abfedcf3200640e2a5c031 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d473611469e1590c10abfedc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 17:15:22 2020 +0100 winebuild: Also try llvm variants of tools in find_tool. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index a73f520ccc..be87708048 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -375,7 +375,8 @@ struct strarray find_tool( const char *name, const char * const *names ) while (*names) { - if ((file = find_binary( target_alias, *names ))) + if ((file = find_binary( target_alias, *names )) + || (names == alt_names && (file = find_binary( "llvm", *names )))) { struct strarray ret = empty_strarray; strarray_add_one( &ret, file );

1 0