September 2019 - Wine-devel

[PATCH] testbot/WineRunReconfig: Simplify retrieving the latest reference files.
by Francois Gouget 17 Sep '19

17 Sep '19

Both the build and wine VMs produce the native TestLauncher binaries now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 3a0b3f3eb..cf511f306 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -40,6 +40,7 @@ sub BEGIN my $Name0 = $0; $Name0 =~ s+^.*/++; +use File::Basename; use WineTestBot::Config; use WineTestBot::Jobs; @@ -428,32 +429,20 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq "completed") { use File::Copy; - if ($VM->Type eq "build") + foreach my $FileName ("../src/TestLauncher/TestLauncher32.exe", + "../src/TestLauncher/TestLauncher64.exe", + "latest/winefiles.txt", + "latest/wine-parentsrc.txt") { - for my $Bitness ("32", "64") + my $BaseName = basename($FileName); + Debug(Elapsed($Start), " Retrieving '$TaskDir/$BaseName'\n"); + if ($TA->GetFile($FileName, "$TaskDir/$BaseName")) { - Debug(Elapsed($Start), " Retrieving the $Bitness bit TestLauncher to '$TaskDir/TestLauncher$Bitness.exe'\n"); - if ($TA->GetFile("../src/TestLauncher/TestLauncher$Bitness.exe", "$TaskDir/TestLauncher$Bitness.exe")) - { - copy "$TaskDir/TestLauncher$Bitness.exe", "$DataDir/latest/TestLauncher$Bitness.exe"; - } - elsif (!defined $TAError) - { - FatalTAError($TA, "An error occurred while retrieving the $Bitness bit TestLauncher"); - } - } - } - - foreach my $FileName ("winefiles.txt", "wine-parentsrc.txt") - { - Debug(Elapsed($Start), " Retrieving '$TaskDir/$FileName'\n"); - if ($TA->GetFile("latest/$FileName", "$TaskDir/$FileName")) - { - copy "$TaskDir/$FileName", "$DataDir/latest/$FileName"; + copy "$TaskDir/$BaseName", "$DataDir/latest/$BaseName"; } elsif (!defined $TAError) { - FatalTAError($TA, "An error occurred while retrieving '$TaskDir/$FileName'"); + FatalTAError($TA, "An error occurred while retrieving '$TaskDir/$BaseName'"); } } } -- 2.20.1

1 0

[PATCH] testbot/Engine: Ignore ChildPid & ChildDeadline for maintenance VMs.
by Francois Gouget 17 Sep '19

17 Sep '19

For debugging it is useful to set a VM in maintenance mode and then manually run scripts operating on that VM. When doing so ChildPid is undefined since it is normally set by the Engine when starting the script. But the scripts may modify other VM fields, including ChildDeadline. But when the Scheduler sees such a 'left-over' ChildDeadline field it normally marks the VM as dirty and powers it off, thus interfering with the script being tested. So modify the Scheduler to ignore ChildDeadline for maintenance VMs whether for cleanup or to compute when to reschedule next. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 3ec51d242..569dff7be 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -350,8 +350,13 @@ sub _CheckAndClassifyVMs() } else { - if (defined $VM->ChildPid or defined $VM->ChildDeadline or - $VM->Status =~ /^(?:running|reverting|sleeping)$/) + if ($VM->Status eq "maintenance") + { + # Don't touch the VM while the administrator is working on it + $Sched->{busyvms}->{$VMKey} = 1; + } + elsif (defined $VM->ChildPid or defined $VM->ChildDeadline or + $VM->Status =~ /^(?:running|reverting|sleeping)$/) { # The VM is missing its child process or it died unexpectedly. Mark # the VM dirty so a revert or shutdown brings it back to a known state. @@ -381,11 +386,6 @@ sub _CheckAndClassifyVMs() # Ignore the VM for this round since we cannot use it $Sched->{busyvms}->{$VMKey} = 1; } - elsif ($VM->Status eq "maintenance") - { - # Don't touch the VM while the administrator is working on it - $Sched->{busyvms}->{$VMKey} = 1; - } elsif ($VM->Status ne "off") { LogMsg "Unexpected $VMKey status ". $VM->Status ."\n"; @@ -1025,7 +1025,7 @@ sub ScheduleJobs() $VMs->FilterEnabledRole(); foreach my $VM (@{$VMs->GetItems()}) { - if (defined $VM->ChildDeadline and + if ($VM->Status ne "maintenance" and defined $VM->ChildDeadline and (!defined $FirstDeadline or $VM->ChildDeadline < $FirstDeadline)) { $FirstDeadline = $VM->ChildDeadline; -- 2.20.1

1 0

[PATCH] testbot/TestAgent: Fix handling of connection timeouts.
by Francois Gouget 17 Sep '19

17 Sep '19

$@ does not just contain the die string we provided but also where die was called. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index a4a2f4906..d3d7137a5 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -938,7 +938,7 @@ sub _Connect($) if ($@) { - if ($@ eq "timeout") + if ($@ =~ /^timeout /) { $self->_SetError($FATAL, "Timed out in $Step while connecting to $self->{connection}"); } -- 2.20.1

1 0

[PATCH] testbot: Modify ParseTaskLog() so it can return more information.
by Francois Gouget 17 Sep '19

17 Sep '19

This also makes the 'NoLog' error case a bit cleaner. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 10 +++++----- testbot/bin/WineRunReconfig.pl | 8 ++++---- testbot/bin/WineRunWineTest.pl | 12 ++++++------ testbot/lib/WineTestBot/LogUtils.pm | 28 +++++++++++++++++++--------- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 1d57c4408..a8b7803e9 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -391,23 +391,23 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - my ($Result, $_Type) = ParseTaskLog("$TaskDir/log"); - if ($Result eq "ok") + my $Summary = ParseTaskLog("$TaskDir/log"); + if ($Summary->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. # So forget any prior error. $NewStatus = "completed"; $TAError = $ErrMessage = undef; } - elsif ($Result eq "badpatch") + elsif ($Summary->{Task} eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; $TAError = $ErrMessage = undef; } - elsif ($Result =~ s/^nolog://) + elsif ($Summary->{NoLog}) { - FatalError("$Result\n", "retry"); + FatalError("$Summary->{NoLog}\n", "retry"); } else { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index cf511f306..ec12d960a 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -392,17 +392,17 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - my ($Result, $_Type) = ParseTaskLog("$TaskDir/log"); - if ($Result eq "ok") + my $Summary = ParseTaskLog("$TaskDir/log"); + if ($Summary->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. # So forget any prior error. $NewStatus = "completed"; $TAError = $ErrMessage = undef; } - elsif ($Result =~ s/^nolog://) + elsif ($Summary->{NoLog}) { - FatalError("$Result\n", "retry"); + FatalError("$Summary->{NoLog}\n", "retry"); } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 508605b39..514c57cda 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -512,8 +512,8 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/log")) { - my ($Result, $Type) = ParseTaskLog("$TaskDir/log"); - if ($Result eq "ok") + my $Summary = ParseTaskLog("$TaskDir/log"); + if ($Summary->{Task} eq "ok") { # We must have gotten the full log and the task completed successfully # (with or without test failures). So clear any previous errors, including @@ -521,17 +521,17 @@ if ($TA->GetFile("Task.log", "$TaskDir/log")) $NewStatus = "completed"; $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } - elsif ($Result eq "badpatch") + elsif ($Summary->{Task} eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } - elsif ($Result =~ s/^nolog://) + elsif ($Summary->{NoLog}) { - FatalError("$Result\n", "retry"); + FatalError("$Summary->{NoLog}\n", "retry"); } - elsif ($Type eq "build") + elsif ($Summary->{Type} eq "build") { # The error happened before the tests started so blame the build. $NewStatus = "badbuild"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 21f7dd054..d23a99c6b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -69,7 +69,17 @@ sub _IsPerlError($) =item C<ParseTaskLog()> -Returns ok if the task was successful and an error code otherwise. +Returns a hashtable containing a summary of the task log: +=over + +=item Type +'tests' if the task ran Wine tests and 'build' otherwise. + +=item Task +Either 'ok' if the task was successful or a code indicating why it failed. + +=item NoLog +Contains an error message if the task log could not be read. =back =cut @@ -80,33 +90,33 @@ sub ParseTaskLog($) if (open(my $LogFile, "<", $FileName)) { - my $Result; - my $Type = "build"; + my $Summary = {Type => "build"}; foreach my $Line (<$LogFile>) { chomp $Line; if ($Line eq "Task: tests") { - $Type = "tests"; + $Summary->{Type} = "tests"; } elsif ($Line eq "Task: ok") { - $Result ||= "ok"; + $Summary->{Task} ||= "ok"; } elsif ($Line eq "Task: Patch failed to apply") { - $Result = "badpatch"; + $Summary->{Task} = "badpatch"; last; # Should be the last and most specific message } elsif ($Line =~ /^Task: / or _IsPerlError($Line)) { - $Result = "failed"; + $Summary->{Task} = "failed"; } } close($LogFile); - return ($Result || "missing", $Type); + $Summary->{Task} ||= "missing"; + return $Summary; } - return ("nolog:Unable to open the task log for reading: $!", undef); + return {NoLog => "Unable to open the task log for reading: $!"}; } -- 2.20.1

1 0

[PATCH] testbot/CheckForWinetestUpdate: Clean up handling of the 'other' VMs.
by Francois Gouget 17 Sep '19

17 Sep '19

The job is called 'WineTest: other VMs' so calling the corresponding option 'other32' is clearer. Also, setting $BaseJob to 'other' when appropriate simplifies building the job description. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 590226cde..b4672a73b 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -67,7 +67,7 @@ my %WineTestUrls = ( my %TaskTypes = (build => "Update and rebuild Wine on the build VMs.", base32 => "Run WineTest on the 32 bit Windows VMs with the 'base' role.", - winetest32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.", + other32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.", all64 => "Run WineTest on the all the 64 bit Windows VMs.", wine => "Update, rebuild and run WineTest on the Wine VMs."); @@ -171,7 +171,7 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Build) = @_; - my $Remarks = ($Build eq "exe64" ? "64-bit" : $BaseJob ? "base" : "other"); + my $Remarks = $Build eq "exe64" ? "64-bit" : $BaseJob; $Remarks = "WineTest: $Remarks VMs"; Debug("Creating the '$Remarks' job\n"); @@ -181,7 +181,7 @@ sub AddJob($$$) $VMs->AddFilter("Type", ["win64"]); $VMs->AddFilter("Role", ["base", "winetest"]); } - elsif ($BaseJob) + elsif ($BaseJob eq "base") { $VMs->AddFilter("Type", ["win32", "win64"]); $VMs->AddFilter("Role", ["base"]); @@ -202,7 +202,7 @@ sub AddJob($$$) my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); - $NewJob->Priority($BaseJob && $Build eq "exe32" ? 8 : 9); + $NewJob->Priority($BaseJob eq "base" and $Build eq "exe32" ? 8 : 9); $NewJob->Remarks($Remarks); # Add a task for each VM @@ -458,7 +458,7 @@ if (defined $Usage) # my $Rc = 0; -if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or +if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{other32} or $OptTypes{wine}) { my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, "exe32"); @@ -473,7 +473,7 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or # arbitrarily do it only for 32-bit executables to avoid redundant updates. $Rc = 1 if ($OptTypes{build} and !AddReconfigJob("build")); $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, "exe32")); - $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, "exe32")); + $Rc = 1 if ($OptTypes{other32} and !AddJob("other", $LatestBaseName, "exe32")); $Rc = 1 if ($OptTypes{wine} and !AddReconfigJob("wine")); } -- 2.20.1

1 0

[PATCH v3] rpcrt4: Implement wait_for_incoming_data() for named pipes transport.
by Dmitry Timoshkov 17 Sep '19

17 Sep '19

This version of the patch passes the tests and allows a fairly complex application communicate with its service using asynchronous RPC calls. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rpcrt4/rpc_transport.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 02fd56ce96..12d15f8654 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -463,10 +463,33 @@ static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) CancelIoEx(connection->pipe, NULL); } -static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *Connection) +static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *conn) { - /* FIXME: implement when named pipe writes use overlapped I/O */ - return -1; + RpcConnection_np *connection = (RpcConnection_np *)conn; + FILE_PIPE_PEEK_BUFFER buf; + HANDLE event; + NTSTATUS status; + int ret; + + event = get_np_event(connection); + if (!event) return -1; + + status = NtFsControlFile(connection->pipe, event, NULL, NULL, &connection->io_status, FSCTL_PIPE_PEEK, NULL, 0, &buf, sizeof(buf)); + if (status == STATUS_SUCCESS) + ret = 0; + else if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + ret = 0; + } + else + { + WARN("NtFsControlFile error %08x\n", status); + ret = -1; + } + + release_np_event(connection, event); + return ret; } static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data, -- 2.20.1

1 0

[PATCH] wininet: Pass correct server name when retrieving username information
by Alistair Leslie-Hughes 17 Sep '19

17 Sep '19

szServer is never set, so retrieving user information always failed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/dialogs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index b4aa49c0eb..5e26c8b7b4 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -216,7 +216,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( { HWND hitem; struct WININET_ErrorDlgParams *params; - WCHAR szRealm[0x80], szServer[0x80]; + WCHAR szRealm[0x80]; if( uMsg == WM_INITDIALOG ) { @@ -237,7 +237,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( hitem = GetDlgItem( hdlg, IDC_PROXY ); SetWindowTextW( hitem, params->req->session->appInfo->proxy ); - WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE ); + WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, FALSE ); return TRUE; } @@ -291,7 +291,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( { HWND hitem; struct WININET_ErrorDlgParams *params; - WCHAR szRealm[0x80], szServer[0x80]; + WCHAR szRealm[0x80]; if( uMsg == WM_INITDIALOG ) { @@ -312,7 +312,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( hitem = GetDlgItem( hdlg, IDC_SERVER ); SetWindowTextW( hitem, params->req->session->hostName ); - WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE ); + WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, FALSE ); return TRUE; } -- 2.17.1

2 2

[PATCH 3/4] winex11.drv: Support XRandR display device handler.
by Zhiyi Zhang 16 Sep '19

16 Sep '19

XRandR supports multiple GPUs and runtime device change compared to Xinerama. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 7 +- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xinerama.c | 2 +- dlls/winex11.drv/xrandr.c | 421 ++++++++++++++++++++++++++++++++++++ 4 files changed, 429 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b39b6b2c90..692c8d1c77 100644 --- a/configure.ac +++ b/configure.ac @@ -1223,7 +1223,12 @@ then [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> #include <X11/extensions/Xrandr.h>]], [[static typeof(XRRGetScreenResources) *f; if (f) return 0;]])], [AC_DEFINE(HAVE_XRRGETSCREENRESOURCES, 1, - [Define if Xrandr has the XRRGetScreenResources function])])],,[$X_LIBS $X_EXTRA_LIBS])]) + [Define if Xrandr has the XRRGetScreenResources function])]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> +#include <X11/extensions/Xrandr.h>]], [[static typeof(XRRGetProviderResources) *f; if (f) return 0;]])], + [AC_DEFINE(HAVE_XRRGETPROVIDERREDOURCES, 1, + [Define if Xrandr has the XRRGetProviderResources function])], + [WINE_NOTICE([libxrandr ${notice_platform}development files too old, XRandR display device handler won't be supported.])])],,[$X_LIBS $X_EXTRA_LIBS])]) fi WINE_NOTICE_WITH(xrandr,[test "x$ac_cv_lib_soname_Xrandr" = "x"], [libxrandr ${notice_platform}development files not found, XRandr won't be supported.]) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d4e476facb..1d3d68ad30 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -640,6 +640,7 @@ extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; +extern void query_work_area( RECT *rc_work ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; struct x11drv_mode_info diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 8e08221343..61c422e835 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -55,7 +55,7 @@ static inline MONITORINFOEXW *get_primary(void) return &monitors[idx]; } -static void query_work_area( RECT *rc_work ) +void query_work_area( RECT *rc_work ) { Atom type; int format; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 288b83fde5..fd3bfd8b87 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -3,6 +3,7 @@ * * Copyright 2003 Alexander James Pasadyn * Copyright 2012 Henri Verbeet for CodeWeavers + * Copyright 2019 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,7 +35,9 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #include <X11/extensions/Xrandr.h> #include "x11drv.h" +#include "wine/heap.h" #include "wine/library.h" +#include "wine/unicode.h" static void *xrandr_handle; @@ -64,6 +67,14 @@ static RRMode *xrandr12_modes; static int primary_crtc; #endif +#ifdef HAVE_XRRGETPROVIDERREDOURCES +MAKE_FUNCPTR(XRRGetOutputPrimary) +MAKE_FUNCPTR(XRRGetProviderResources) +MAKE_FUNCPTR(XRRFreeProviderResources) +MAKE_FUNCPTR(XRRGetProviderInfo) +MAKE_FUNCPTR(XRRFreeProviderInfo) +#endif + #undef MAKE_FUNCPTR static struct x11drv_mode_info *dd_modes; @@ -106,6 +117,16 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRSetScreenSize) r = 2; #endif + +#ifdef HAVE_XRRGETPROVIDERREDOURCES + LOAD_FUNCPTR(XRRGetOutputPrimary) + LOAD_FUNCPTR(XRRGetProviderResources) + LOAD_FUNCPTR(XRRFreeProviderResources) + LOAD_FUNCPTR(XRRGetProviderInfo) + LOAD_FUNCPTR(XRRFreeProviderInfo) + r = 4; +#endif + #undef LOAD_FUNCPTR sym_not_found: @@ -560,8 +581,393 @@ done: #endif /* HAVE_XRRGETSCREENRESOURCES */ +#ifdef HAVE_XRRGETPROVIDERREDOURCES + +static BOOL xrandr14_get_gpus(struct x11drv_gpu **new_gpus, int *count) +{ + struct x11drv_gpu *gpus = NULL; + XRRScreenResources *screen_resources = NULL; + XRRProviderResources *provider_resources = NULL; + XRRProviderInfo *provider_info = NULL; + RROutput primary_output; + INT primary_provider = 0; + BOOL ret = FALSE; + INT i, j; + + screen_resources = xrandr_get_screen_resources(); + if (!screen_resources) + goto done; + + provider_resources = pXRRGetProviderResources( gdi_display, root_window ); + if (!provider_resources) + goto done; + + gpus = heap_calloc( provider_resources->nproviders, sizeof(*gpus) ); + if (!gpus) + goto done; + + primary_output = pXRRGetOutputPrimary( gdi_display, root_window ); + + for (i = 0; i < provider_resources->nproviders; i++) + { + provider_info = pXRRGetProviderInfo( gdi_display, screen_resources, provider_resources->providers[i] ); + if (!provider_info) + goto done; + + for (j = 0; !primary_provider && j < provider_info->noutputs; j++) + { + if (primary_output == provider_info->outputs[j]) + { + primary_provider = i; + break; + } + } + + gpus[i].id = provider_resources->providers[i]; + MultiByteToWideChar( CP_UTF8, 0, provider_info->name, -1, gpus[i].name, ARRAY_SIZE(gpus[i].name) ); + /* PCI ID is all zero because there is currently no portable way to get it via XRandR. Some AMD drivers report + * their PCI address in the name but many others don't */ + pXRRFreeProviderInfo( provider_info ); + } + + /* Make primary GPU the first */ + if (primary_provider) + { + struct x11drv_gpu tmp; + tmp = gpus[0]; + gpus[0] = gpus[primary_provider]; + gpus[primary_provider] = tmp; + } + + *new_gpus = gpus; + *count = provider_resources->nproviders; + ret = TRUE; +done: + if (provider_resources) + pXRRFreeProviderResources( provider_resources ); + if (screen_resources) + pXRRFreeScreenResources( screen_resources ); + if (!ret) + { + heap_free( gpus ); + ERR("Failed to get gpus\n"); + } + return ret; +} + +static void xrandr14_free_gpus( struct x11drv_gpu *gpus ) +{ + heap_free( gpus ); +} + +static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new_adapters, int *count ) +{ + struct x11drv_adapter *adapters = NULL; + XRRScreenResources *screen_resources = NULL; + XRRProviderInfo *provider_info = NULL; + XRRCrtcInfo *enum_crtc_info, *crtc_info = NULL; + XRROutputInfo *output_info = NULL; + RROutput primary_output; + INT primary_adapter = 0; + INT adapter_count = 0; + BOOL mirrored, detached; + BOOL ret = FALSE; + INT i, j; + + screen_resources = xrandr_get_screen_resources(); + if (!screen_resources) + goto done; + + provider_info = pXRRGetProviderInfo( gdi_display, screen_resources, gpu_id ); + if (!provider_info) + goto done; + + /* Actual adapter count could be less */ + adapters = heap_calloc( provider_info->ncrtcs, sizeof(*adapters) ); + if (!adapters) + goto done; + + primary_output = pXRRGetOutputPrimary( gdi_display, root_window ); + for (i = 0; i < provider_info->noutputs; i++) + { + output_info = pXRRGetOutputInfo( gdi_display, screen_resources, provider_info->outputs[i] ); + if (!output_info) + goto done; + + /* Only connected output are considered as monitors */ + if (output_info->connection != RR_Connected) + { + pXRRFreeOutputInfo( output_info ); + output_info = NULL; + continue; + } + + /* Connected output doesn't mean the output is attached to a crtc */ + detached = FALSE; + if (output_info->crtc) + { + crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, output_info->crtc ); + if (!crtc_info) + goto done; + } + + if (!output_info->crtc || (!crtc_info->width && !crtc_info->height)) + detached = TRUE; + + /* Ignore crtc mirroring slaves because mirrored monitors are under the same adapter */ + mirrored = FALSE; + if (!detached) + { + for (j = 0; j < screen_resources->ncrtc; j++) + { + enum_crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, screen_resources->crtcs[j] ); + if (!enum_crtc_info) + goto done; + + /* Some crtc on different provider may have the same coordinates, aka mirrored. + * Choose the crtc with the lowest value as primary and the rest will then be slaves + * in the mirroring set */ + if (crtc_info->x == enum_crtc_info->x && + crtc_info->y == enum_crtc_info->y && + crtc_info->width == enum_crtc_info->width && + crtc_info->height == enum_crtc_info->height && + output_info->crtc > screen_resources->crtcs[j]) + { + mirrored = TRUE; + pXRRFreeCrtcInfo( enum_crtc_info ); + break; + } + + pXRRFreeCrtcInfo( enum_crtc_info ); + } + } + + if (!mirrored || detached) + { + /* Use RROutput as adapter id. The reason of not using RRCrtc is that we need to detect inactive but + * attached monitors */ + adapters[adapter_count].id = provider_info->outputs[i]; + if (!detached) + adapters[adapter_count].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + if (primary_output == provider_info->outputs[i]) + { + adapters[adapter_count].state_flags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + primary_adapter = adapter_count; + } + + adapter_count++; + } + + pXRRFreeOutputInfo( output_info ); + output_info = NULL; + if (crtc_info) + { + pXRRFreeCrtcInfo( crtc_info ); + crtc_info = NULL; + } + } + + /* Make primary adapter the first */ + if (primary_adapter) + { + struct x11drv_adapter tmp; + tmp = adapters[0]; + adapters[0] = adapters[primary_adapter]; + adapters[primary_adapter] = tmp; + } + + *new_adapters = adapters; + *count = adapter_count; + ret = TRUE; +done: + if (screen_resources) + pXRRFreeScreenResources( screen_resources ); + if (provider_info) + pXRRFreeProviderInfo( provider_info ); + if (output_info) + pXRRFreeOutputInfo( output_info); + if (crtc_info) + pXRRFreeCrtcInfo( crtc_info ); + if (!ret) + { + heap_free( adapters ); + ERR("Failed to get adapters\n"); + } + return ret; +} + +static void xrandr14_free_adapters( struct x11drv_adapter *adapters ) +{ + heap_free( adapters ); +} + +static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor **new_monitors, int *count ) +{ + static const WCHAR generic_nonpnp_monitorW[] = { + 'G','e','n','e','r','i','c',' ', + 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; + struct x11drv_monitor *realloc_monitors, *monitors = NULL; + XRRScreenResources *screen_resources = NULL; + XRROutputInfo *output_info = NULL, *enum_output_info = NULL, *primary_output_info = NULL; + XRRCrtcInfo *crtc_info = NULL, *enum_crtc_info, *primary_crtc_info = NULL; + INT primary_index = 0, monitor_count = 0, capacity; + RROutput primary_output; + RECT rc_work; + BOOL ret = FALSE; + INT i; + + screen_resources = xrandr_get_screen_resources(); + if (!screen_resources) + goto done; + + /* First start with a 2 monitors, should be enough for most cases */ + capacity = 2; + monitors = heap_calloc( capacity, sizeof(*monitors) ); + if (!monitors) + goto done; + + output_info = pXRRGetOutputInfo( gdi_display, screen_resources, adapter_id ); + if (!output_info) + goto done; + + if (output_info->crtc) + { + crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, output_info->crtc ); + if (!crtc_info) + goto done; + } + + /* Inactive but attached monitor, no need to check for mirrored/slave monitors */ + if (!output_info->crtc || (!crtc_info->width && !crtc_info->height)) + { + lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); + monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor_count = 1; + } + /* Active monitors, need to find other monitors with the same coordinates as mirrored */ + else + { + query_work_area( &rc_work ); + primary_output = pXRRGetOutputPrimary( gdi_display, root_window ); + primary_output_info = pXRRGetOutputInfo( gdi_display, screen_resources, primary_output ); + if (!primary_output_info) + goto done; + + primary_crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, primary_output_info->crtc ); + if (!primary_crtc_info) + goto done; + + for (i = 0; i < screen_resources->noutput; i++) + { + enum_output_info = pXRRGetOutputInfo( gdi_display, screen_resources, screen_resources->outputs[i] ); + if (!enum_output_info) + goto done; + + /* Detached outputs don't count */ + if (enum_output_info->connection != RR_Connected) + { + pXRRFreeOutputInfo( enum_output_info ); + enum_output_info = NULL; + continue; + } + + /* Allocate more space if needed */ + if (monitor_count >= capacity) + { + capacity *= 2; + realloc_monitors = heap_realloc( monitors, capacity * sizeof(*monitors) ); + if (!realloc_monitors) + goto done; + monitors = realloc_monitors; + } + + if (enum_output_info->crtc) + { + enum_crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, enum_output_info->crtc ); + if (!enum_crtc_info) + goto done; + + if (enum_crtc_info->x == crtc_info->x && + enum_crtc_info->y == crtc_info->y && + enum_crtc_info->width == crtc_info->width && + enum_crtc_info->height == crtc_info->height) + { + /* FIXME: Read output EDID property and parse the data to get the correct name */ + lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); + + SetRect( &monitors[monitor_count].rc_monitor, crtc_info->x, crtc_info->y, + crtc_info->x + crtc_info->width, crtc_info->y + crtc_info->height ); + if (!IntersectRect( &monitors[monitor_count].rc_work, &rc_work, &monitors[monitor_count].rc_monitor )) + monitors[monitor_count].rc_work = monitors[monitor_count].rc_monitor; + + monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + if (!IsRectEmpty( &monitors[monitor_count].rc_monitor )) + monitors[monitor_count].state_flags |= DISPLAY_DEVICE_ACTIVE; + + if (primary_output == screen_resources->outputs[i]) + primary_index = monitor_count; + monitor_count++; + } + + pXRRFreeCrtcInfo( enum_crtc_info ); + } + + pXRRFreeOutputInfo( enum_output_info ); + enum_output_info = NULL; + } + + /* Make sure the first monitor is the primary */ + if (primary_index) + { + struct x11drv_monitor tmp; + + tmp = monitors[0]; + monitors[0] = monitors[primary_index]; + monitors[primary_index] = tmp; + } + + /* Make sure the primary monitor origin is at (0,0) */ + for (i = 0; i < monitor_count; i++) + { + OffsetRect( &monitors[i].rc_monitor, -primary_crtc_info->x, -primary_crtc_info->y ); + OffsetRect( &monitors[i].rc_work, -primary_crtc_info->x, -primary_crtc_info->y ); + } + } + + *new_monitors = monitors; + *count = monitor_count; + ret = TRUE; +done: + if (screen_resources) + pXRRFreeScreenResources( screen_resources ); + if (output_info) + pXRRFreeOutputInfo( output_info); + if (crtc_info) + pXRRFreeCrtcInfo( crtc_info ); + if (primary_crtc_info) + pXRRFreeCrtcInfo( primary_crtc_info ); + if (primary_output_info) + pXRRFreeOutputInfo( primary_output_info ); + if (enum_output_info) + pXRRFreeOutputInfo( enum_output_info ); + if (!ret) + { + heap_free( monitors ); + ERR("Failed to get monitors\n"); + } + return ret; +} + +static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) +{ + heap_free( monitors ); +} + +#endif + void X11DRV_XRandR_Init(void) { + struct x11drv_display_device_handler handler; int event_base, error_base, minor, ret; static int major; Bool ok; @@ -591,6 +997,21 @@ void X11DRV_XRandR_Init(void) if (!pXRRGetScreenResourcesCurrent || xrandr12_init_modes() < 0) #endif xrandr10_init_modes(); + +#ifdef HAVE_XRRGETPROVIDERREDOURCES + if (ret >= 4 && (major > 1 || (major == 1 && minor >= 4))) + { + handler.name = "XRandR 1.4"; + handler.priority = 200; + handler.pGetGpus = xrandr14_get_gpus; + handler.pFreeGpus = xrandr14_free_gpus; + handler.pGetAdapters = xrandr14_get_adapters; + handler.pFreeAdapters = xrandr14_free_adapters; + handler.pGetMonitors = xrandr14_get_monitors; + handler.pFreeMonitors = xrandr14_free_monitors; + X11DRV_DisplayDevices_SetHandler( &handler ); + } +#endif } #else /* SONAME_LIBXRANDR */ -- 2.23.0

3 2

[PATCH] ntdll: Fix the Mac build with SDKs older than 10.14.
by Ken Thomases 16 Sep '19

16 Sep '19

Also, fix some warnings with the 10.14 SDK. Thanks to Gijs Vermeulen for reporting the issue. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index e76e5be6aad..81ebe8c7e74 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -55,6 +55,9 @@ # define UNW_LOCAL_ONLY # include <libunwind.h> #endif +#ifdef __APPLE__ +# include <mach/mach.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -3209,10 +3212,10 @@ static void *mac_thread_gsbase(void) static int gsbase_offset = -1; void *ret; - kern_return_t kr = thread_info(mach_thread_self(), THREAD_IDENTIFIER_INFO, (thread_identifier_info_t) &tiinfo, &info_count); + kern_return_t kr = thread_info(mach_thread_self(), THREAD_IDENTIFIER_INFO, (thread_info_t) &tiinfo, &info_count); if (kr == KERN_SUCCESS) { - TRACE("pthread_self() %p thread ID %lx gsbase %lx\n", pthread_self(), tiinfo.thread_id, tiinfo.thread_handle); + TRACE("pthread_self() %p thread ID %llx gsbase %llx\n", pthread_self(), tiinfo.thread_id, tiinfo.thread_handle); return (void*)tiinfo.thread_handle; } -- 2.21.0

1 0

[PATCH] ieframe/tests: Fix the spelling of an ok() message.
by Francois Gouget 16 Sep '19

16 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ieframe/tests/ie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index cb901d7763b..b27323cc2e8 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -215,7 +215,7 @@ static void test_window(IWebBrowser2 *wb) HRESULT hres; hres = IWebBrowser2_get_HWND(wb, &handle); - ok(hres == S_OK, "get_HWND faile: %08x\n", hres); + ok(hres == S_OK, "get_HWND failed: %08x\n", hres); ok(handle, "handle == 0\n"); hwnd = (HWND)handle; -- 2.20.1

2 1