March 2018 - Wine-devel - list.winehq.org

[PATCH 2/4] [v2] wsdapi/tests: Add tests for EndpointReference, AppSequence, MetadataVersion in Hello message.
by Owen Rudge 28 Mar '18

28 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)

2 1

[PATCH 1/4] [v2] wsdapi: Add support for writing XML attributes.
by Owen Rudge 28 Mar '18

28 Mar '18

v2: Return HRESULT instead of BOOL where practical Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 11 deletions(-)

2 1

Suggestion: VK_APPS key (i.e. popup menu key)
by Gero Zahn 28 Mar '18

28 Mar '18

Hi, I submitted a pull-request over at > https://github.com/wine-mirror/wine/pull/9 and @AndreRH was so kind as to inform me that it wouldn't be picked up over there. ;-) So, here goes: I'm using wine on macOS with a regular PC keyboard. When using Windows applications, I miss support for the right popup menu key -- that's not the right Windows / Command key, but actually VK_APPS. I've been patching winemac.drv.so via hex editor manually for quite a while to enable support for this key. Now I thought that I might contribute this otherwise harmless improvement back to the source code. ... I have to admit that I didn't compile the patch myself. :-( But I am convinced that my modification to the source should result in the desired functionality. Here's the (minuscule) patch to keyboard.c -- if the format shouldn't suffice, you can find everything else in above mentioned wine-mirror link at > https://github.com/wine-mirror/wine/pull/9/files ---------->8 snip $ diff keyboard_orig.c keyboard_patched.c 161a162 > kVK_APPS = 0x6E, 297c298 < { 0, 0, FALSE }, /* 0x6E unused */ --- > { VK_APPS, 0x6E, TRUE }, /* kVK_APPS */ 395a397 > { VK_APPS, "Apps" }, $

5 9

[PATCH] dwrite/tests: Use fabs for floating point numbers (clang)
by André Hentschel 28 Mar '18

28 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/dwrite/tests/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 347d750..b54748a 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -635,7 +635,7 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface, ok(emsize == metrics.designUnitsPerEm, "Unexpected font size %f\n", emsize); /* Expected height is in design units, allow some absolute difference from it. Seems to only happen on Vista */ - ok(abs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n", + ok(fabs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n", metrics.capHeight, underline->runHeight, wine_dbgstr_w(ctxt->familyW)); IDWriteFontFace_Release(fontface); -- 2.7.4

2 1

[PATCH 2/2] msxml3/tests: Added invalid host XHR tests.
by Jacek Caban 28 Mar '18

28 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msxml3/tests/httpreq.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)

2 1

[PATCH 1/2] msxml3/tests: Added IServerXMLHTTPRequest tests.
by Jacek Caban 28 Mar '18

28 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msxml3/tests/httpreq.c | 59 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-)

2 1

[PATCH 0/5] vulkan-1 implementation
by Roderick Colenbrander 28 Mar '18

28 Mar '18

Hi all, This patch series adds a minimal vulkan-1 implementation, which is sufficient to run cube, vulkaninfo and Wolfenstein. Compared to the official Vulkan loader I'm taking some shortcuts by only handling a single ICD (winevulkan), which allows us to skip aggregating of results from multiple ICDs. Layers are not supported either. Thanks to these simplifications, creating a vulkan loader was simple. We could just store a global function pointer table and not deal with dispatch tables. The official Vulkan loader still works and will continue to work. At some point we may provide an optional package to add it. Thanks, Roderick Roderick Colenbrander (5): winevulkan/winex11: Add VK_KHR_display stub implementation. vulkan-1: Add stub implementation. vulkan-1: Implement vkEnumerateInstanceExtensionProperties. vulkan-1: Implement thunks for Vulkan Core functions. vulkan-1: Implement vkGetInstanceProcAddr. configure.ac | 1 + dlls/vulkan-1/Makefile.in | 6 + dlls/vulkan-1/version.rc | 27 ++ dlls/vulkan-1/vulkan-1.spec | 158 +++++++ dlls/vulkan-1/vulkan.c | 143 ++++++ dlls/winevulkan/make_vulkan | 166 ++++++- dlls/winevulkan/vulkan.c | 117 +++++ dlls/winevulkan/vulkan_thunks.c | 59 +++ dlls/winevulkan/vulkan_thunks.h | 70 +++ dlls/winex11.drv/vulkan.c | 77 +++- include/wine/vulkan.h | 952 ++++++++++++++++++++++------------------ include/wine/vulkan_driver.h | 9 +- 12 files changed, 1340 insertions(+), 445 deletions(-) create mode 100644 dlls/vulkan-1/Makefile.in create mode 100644 dlls/vulkan-1/version.rc create mode 100644 dlls/vulkan-1/vulkan-1.spec create mode 100644 dlls/vulkan-1/vulkan.c -- 2.14.3

2 13

[PATCH] testbot/Janitor: Simplify the deletion of users and VMs.
by Francois Gouget 27 Mar '18

27 Mar '18

Handle the deleted users and deleted VMs separately. Also iterate over the tasks directly instead of going through the Jobs and Steps when checking the deleted VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 77 ++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 56e024a67..7c4168ca8 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -49,6 +49,7 @@ use WineTestBot::Patches; use WineTestBot::PendingPatchSets; use WineTestBot::CGI::Sessions; use WineTestBot::RecordGroups; +use WineTestBot::Tasks; use WineTestBot::Users; use WineTestBot::VMs; @@ -195,70 +196,66 @@ if ($JobArchiveDays != 0) } } -# Purge the deleted users and VMs if they are not referenced anymore +# Purge the deleted VMs if they are not referenced anymore my $VMs = CreateVMs(); $VMs->AddFilter("Role", ["deleted"]); my %DeletedVMs; map { $DeletedVMs{$_} = 1 } @{$VMs->GetKeys()}; -my $Users = CreateUsers(); -$Users->AddFilter("Status", ["deleted"]); -my %DeletedUsers; -map { $DeletedUsers{$_} = 1 } @{$Users->GetKeys()}; - -if (%DeletedUsers or %DeletedVMs) +if (%DeletedVMs) { - foreach my $Job (@{CreateJobs()->GetItems()}) + foreach my $Task (@{CreateTasks($VMs)->GetItems()}) { - if (exists $DeletedUsers{$Job->User->Name}) + if (exists $DeletedVMs{$Task->VM->Name}) { - Trace "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; - delete $DeletedUsers{$Job->User->Name}; + Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; + delete $DeletedVMs{$Task->VM->Name}; + last if (!%DeletedVMs); } + } + foreach my $VMKey (keys %DeletedVMs) + { + Trace "Deleting the $VMKey VM\n"; + next if ($DryRun); - if (%DeletedVMs) + my $VM = $VMs->GetItem($VMKey); + my $ErrMessage = $VMs->DeleteItem($VM); + if (defined $ErrMessage) { - foreach my $Step (@{$Job->Steps->GetItems()}) - { - foreach my $Task (@{$Step->Tasks->GetItems()}) - { - if (exists $DeletedVMs{$Task->VM->Name}) - { - Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; - delete $DeletedVMs{$Task->VM->Name}; - } - } - } + Error "Unable to delete the $VMKey VM: $ErrMessage\n"; } } +} - if (%DeletedUsers) +# Purge the deleted users if they are not referenced anymore +my $Users = CreateUsers(); +$Users->AddFilter("Status", ["deleted"]); +my %DeletedUsers; +map { $DeletedUsers{$_} = 1 } @{$Users->GetKeys()}; + +if (%DeletedUsers) +{ + foreach my $Job (@{CreateJobs($Users)->GetItems()}) { - foreach my $UserName (keys %DeletedUsers) + if (exists $DeletedUsers{$Job->User->Name}) { - my $User = $Users->GetItem($UserName); - Trace "Deleting the $UserName account\n"; - next if ($DryRun); - - DeleteSessions($User); - my $ErrMessage = $Users->DeleteItem($User); - if (defined $ErrMessage) - { - Error "Unable to delete the $UserName account: $ErrMessage\n"; - } + Trace "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; + delete $DeletedUsers{$Job->User->Name}; + last if (!%DeletedUsers); } } - foreach my $VMKey (keys %DeletedVMs) + foreach my $UserKey (keys %DeletedUsers) { - my $VM = $VMs->GetItem($VMKey); - Trace "Deleting the $VMKey VM\n"; + Trace "Deleting the $UserKey account\n"; next if ($DryRun); - my $ErrMessage = $VMs->DeleteItem($VM); + my $User = $Users->GetItem($UserKey); + DeleteSessions($User); + my $ErrMessage = $Users->DeleteItem($User); if (defined $ErrMessage) { - Error "Unable to delete the $VMKey VM: $ErrMessage\n"; + Error "Unable to delete the $UserKey account: $ErrMessage\n"; } } } -- 2.16.2

1 0

[PATCH] testbot: Allow running a second, higher privilege TestAgentd.
by Francois Gouget 27 Mar '18

27 Mar '18

By convention it shall run on $AgentPort+1. This makes it possible to run the tests in an unprivileged account, while still having a TestAgentd server with high enough privileges to adjust the VM clock. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 10 ++++++++-- testbot/lib/WineTestBot/VMs.pm | 8 +++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 88c3b5884..4f69a1e4e 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -372,8 +372,14 @@ my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Setting the time\n"); if (!$TA->SetTime()) { - # Not a fatal error - LogTaskError("Unable to set the VM system time: ". $TA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n"); + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + my $PrivilegedTA = $VM->GetAgent(1); + if (!$PrivilegedTA->SetTime()) + { + LogTaskError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n"); + $PrivilegedTA->Disconnect(); + } } my $FileType = $Step->FileType; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index e93208201..e74640bf2 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -208,9 +208,9 @@ sub GetDomain($) return LibvirtDomain->new($self); } -sub GetAgent($) +sub GetAgent($;$) { - my ($self) = @_; + my ($self, $Privileged) = @_; # Use either the tunnel specified in the configuration file # or autodetect the settings based on the VM's VirtURI setting. @@ -226,7 +226,9 @@ sub GetAgent($) $TunnelInfo->{sshport} = $ParsedURI->port; $TunnelInfo->{username} = $ParsedURI->userinfo; } - return TestAgent->new($self->Hostname, $AgentPort, $TunnelInfo); + my $Port = $AgentPort; + $Port++ if ($Privileged); + return TestAgent->new($self->Hostname, $Port, $TunnelInfo); } sub Status($;$) -- 2.16.2

1 0

[PATCH] usp10: Don't increment variable both in the loop header and body (clang)
by André Hentschel 27 Mar '18

27 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/usp10/shape.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 4031386..1927be0 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1721,7 +1721,6 @@ static void ComposeConsonants(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const Co break; } } - cWalk++; } } -- 2.7.4

2 1